Odoo GTK Client (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-client/dev_client_rga into lp:~openerp-dev/openobject-client/trunk-dev-client

  1. dev_client_rga
  2. Merge into trunk-dev-client
Proposed by Ravi Gadhia (OpenERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: 1439
Merge reported by: Naresh(OpenERP)
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openobject-client/dev_client_rga
Merge into: lp:~openerp-dev/openobject-client/trunk-dev-client
Diff against target: 49 lines (+15/-4)
2 files modified
bin/modules/gui/window/win_import.py (+13/-4)
bin/openerp.glade (+2/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client/dev_client_rga
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+46480@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/modules/gui/window/win_import.py'
2--- bin/modules/gui/window/win_import.py 2010-12-27 17:57:11 +0000
3+++ bin/modules/gui/window/win_import.py 2011-01-17 14:15:11 +0000
4@@ -84,9 +84,11 @@
5 self.win.set_transient_for(parent)
6 self.win.set_icon(common.OPENERP_ICON)
7 self.parent = parent
8-
9- self.glade.get_widget('import_csv_file').set_current_folder(
10+ self.autodetect_btn = self.glade.get_widget('button_autodetect')
11+ self.filechooser = self.glade.get_widget('import_csv_file')
12+ self.filechooser.set_current_folder(
13 options.options['client.default_path'])
14+ self.filechooser.connect('selection-changed',self.file_changed)
15 self.view1 = gtk.TreeView()
16 self.view1.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
17 self.glade.get_widget('import_vp_left').add(self.view1)
18@@ -152,9 +154,16 @@
19 self.glade.signal_connect('on_but_select_clicked', self.sig_sel)
20 self.glade.signal_connect('on_but_unselect_clicked', self.sig_unsel)
21 self.glade.signal_connect('on_but_autodetect_clicked', self.sig_autodetect)
22-
23+
24+ def file_changed(self, widget=None):
25+ fname= self.filechooser.get_filename()
26+ if not fname:
27+ self.autodetect_btn.set_sensitive(False)
28+ else:
29+ self.autodetect_btn.set_sensitive(True)
30+
31 def sig_autodetect(self, widget=None):
32- fname= self.glade.get_widget('import_csv_file').get_filename()
33+ fname= self.filechooser.get_filename()
34 if not fname:
35 common.message('You must select an import file first !')
36 return True
37
38=== modified file 'bin/openerp.glade'
39--- bin/openerp.glade 2011-01-07 10:03:46 +0000
40+++ bin/openerp.glade 2011-01-17 14:15:11 +0000
41@@ -5546,6 +5546,8 @@
42 </child>
43 </widget>
44 <widget class="GtkDialog" id="win_import">
45+ <property name="width_request">723</property>
46+ <property name="height_request">569</property>
47 <property name="title" translatable="yes">Import from CSV</property>
48 <property name="modal">True</property>
49 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>

Subscribers

People subscribed via source and target branches