tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Make Import/Export Data no-modal

Browse Source 
issue2666
review410001
This commit is contained in:
Cédric Krier committed 2012-06-28 15:16:23 +02:00
1 parent 909e171e18
commit 2c0308bb0c
4 files changed
+63 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGELOG
+1
View File
@@ -1,3 +1,4 @@
* Make Import/Export Data no-modal
* Deactivate switch view button when there is only 1 view
* Manage create/delete field access
* Add dynamic size limit on the One2Many, Many2Many and Char
tryton/gui/window/form.py
+2 -5
View File
@@ -319,8 +319,7 @@ class Form(SignalEvent, TabContent):
fields = {}
for name, field in self.screen.group.fields.iteritems():
fields[name] = field.attrs
win = WinImport(self.model)
win.run()
WinImport(self.model)
def sig_save_as(self, widget=None):
while self.screen.view_to_load:
@@ -328,9 +327,7 @@ class Form(SignalEvent, TabContent):
fields = {}
for name, field in self.screen.group.fields.iteritems():
fields[name] = field.attrs
win = WinExport(self.model, self.ids_get(),
context=self.context)
win.run()
WinExport(self.model, self.ids_get(), context=self.context)
def sig_new(self, widget=None, autosave=True):
if not common.MODELACCESS[self.model]['create']:
tryton/gui/window/win_export.py
+30 -16
View File
@@ -10,19 +10,22 @@ import csv
import tempfile
import os
from tryton.common import RPCExecute, RPCException
from tryton.gui.window.nomodal import NoModal
_ = gettext.gettext
class WinExport(object):
class WinExport(NoModal):
"Window export"
def __init__(self, model, ids, context=None):
self.parent = common.get_toplevel_window()
super(WinExport, self).__init__()
self.dialog = gtk.Dialog(title=_("Export to CSV"), parent=self.parent,
flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT |
gtk.WIN_POS_CENTER_ON_PARENT)
flags=gtk.DIALOG_DESTROY_WITH_PARENT)
self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
self.dialog.set_icon(TRYTON_ICON)
self.dialog.connect('response', self.response)
vbox = gtk.VBox()
frame_predef_exports = gtk.Frame()
@@ -153,7 +156,6 @@ class WinExport(object):
button_ok.set_flags(gtk.CAN_DEFAULT)
self.dialog.vbox.pack_start(vbox)
self.dialog.show_all()
self.ids = ids
self.model = model
@@ -189,8 +191,6 @@ class WinExport(object):
self.view1.set_model(self.model1)
self.view2.set_model(self.model2)
self.view1.show_all()
self.view2.show_all()
self.wid_action = combo_saveas
self.wid_write_field_names = checkbox_add_field_names
@@ -204,13 +204,20 @@ class WinExport(object):
self.pref_export.connect("row-activated", self.sel_predef)
# Fill the predefined export tree view and show everything
# Fill the predefined export tree view
self.predef_model = gtk.ListStore(
gobject.TYPE_INT,
gobject.TYPE_PYOBJECT,
gobject.TYPE_STRING)
self.fill_predefwin()
self.pref_export.show_all()
sensible_allocation = self.sensible_widget.get_allocation()
self.dialog.set_default_size(int(sensible_allocation.width * 0.9),
int(sensible_allocation.height * 0.9))
self.dialog.show_all()
common.center_window(self.dialog, self.parent, self.sensible_widget)
self.register()
def model_populate(self, fields, parent_node=None, prefix_field='',
prefix_name=''):
@@ -361,9 +368,18 @@ class WinExport(object):
continue
self.model2.append((self.fields_data[field]['string'], field))
def run(self):
button = self.dialog.run()
if button == gtk.RESPONSE_OK:
def destroy(self):
super(WinExport, self).destroy()
self.dialog.destroy()
def show(self):
self.dialog.show()
def hide(self):
self.dialog.hide()
def response(self, dialog, response):
if response == gtk.RESPONSE_OK:
fields = []
fields2 = []
iter = self.model2.get_iter_root()
@@ -372,8 +388,7 @@ class WinExport(object):
fields2.append(self.model2.get_value(iter, 0))
iter = self.model2.iter_next(iter)
action = self.wid_action.get_active()
self.parent.present()
self.dialog.destroy()
self.destroy()
result = self.datas_read(self.ids, self.model, fields,
context=self.context)
@@ -391,8 +406,7 @@ class WinExport(object):
self.wid_write_field_names.get_active())
return True
else:
self.parent.present()
self.dialog.destroy()
self.destroy()
return False
def export_csv(self, fname, fields, result, write_title=False, popup=True):
tryton/gui/window/win_import.py
+30 -17
View File
@@ -7,20 +7,21 @@ import tryton.common as common
import csv
from tryton.config import TRYTON_ICON, CONFIG
from tryton.common import RPCExecute, RPCException
from tryton.gui.window.nomodal import NoModal
_ = gettext.gettext
class WinImport(object):
class WinImport(NoModal):
"Window import"
def __init__(self, model):
self.parent = common.get_toplevel_window()
self.dialog = gtk.Dialog(
title=_("Import from CSV"), parent=self.parent,
flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
| gtk.WIN_POS_CENTER_ON_PARENT)
super(WinImport, self).__init__()
self.dialog = gtk.Dialog(title=_("Import from CSV"),
parent=self.parent, flags=gtk.DIALOG_DESTROY_WITH_PARENT)
self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
self.dialog.set_icon(TRYTON_ICON)
self.dialog.connect('response', self.response)
dialog_vbox = gtk.VBox()
hbox_mapping = gtk.HBox(True)
@@ -111,7 +112,6 @@ class WinImport(object):
hbox_csv_import.pack_start(self.import_csv_file, True, True, 0)
expander_csv_import = gtk.Expander(None)
expander_csv_import.set_expanded(True)
vbox_csv_param.pack_start(expander_csv_import, False, True, 0)
label_import_csv_param = gtk.Label(_("CSV Parameters"))
expander_csv_import.set_label_widget(label_import_csv_param)
@@ -144,6 +144,7 @@ class WinImport(object):
self.import_csv_enc = gtk.combo_box_new_text()
self.import_csv_enc.append_text("UTF-8")
self.import_csv_enc.append_text("Latin1")
self.import_csv_enc.set_active(0)
table.attach(self.import_csv_enc, 1, 2, 1, 2)
label_import_csv_skip = gtk.Label(_("Lines to Skip:"))
@@ -167,7 +168,6 @@ class WinImport(object):
self.model = model
self.fields_data = {}
self.dialog.show_all()
self.import_csv_file.set_current_folder(CONFIG['client.default_path'])
self.view1 = gtk.TreeView()
@@ -200,8 +200,14 @@ class WinImport(object):
self.view1.set_model(self.model1)
self.view2.set_model(self.model2)
self.view1.show_all()
self.view2.show_all()
sensible_allocation = self.sensible_widget.get_allocation()
self.dialog.set_default_size(int(sensible_allocation.width * 0.9),
int(sensible_allocation.height * 0.9))
self.dialog.show_all()
common.center_window(self.dialog, self.parent, self.sensible_widget)
self.register()
def model_populate(self, fields, parent_node=None, prefix_field='',
prefix_name=''):
@@ -305,9 +311,18 @@ class WinImport(object):
def sig_unsel_all(self, widget=None):
self.model2.clear()
def run(self):
button = self.dialog.run()
if button == gtk.RESPONSE_OK:
def destroy(self):
super(WinImport, self).destroy()
self.dialog.destroy()
def show(self):
self.dialog.show()
def hide(self):
self.dialog.hide()
def response(self, dialog, response):
if response == gtk.RESPONSE_OK:
fields = []
iter = self.model2.get_iter_root()
while iter:
@@ -321,14 +336,12 @@ class WinImport(object):
'skip': self.import_csv_skip.get_value(),
'combo': self.import_csv_enc.get_active_text() or 'UTF-8'
}
self.parent.present()
self.dialog.destroy()
self.destroy()
if csv_data['fname']:
return self.import_csv(csv_data, fields, self.model)
return False
else:
self.parent.present()
self.dialog.destroy()
self.destroy()
return False
def import_csv(self, csv_data, fields, model):