← Back to team overview

openerp-dev-web team mailing list archive

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

 

Ravi Gadhia (OpenERP) has proposed merging lp:~openerp-dev/openobject-client/dev_client_rga into lp:~openerp-dev/openobject-client/trunk-dev-client.

Requested reviews:
  OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
  #702772 shortcut menu in menu bar doesn't work
  https://bugs.launchpad.net/bugs/702772
  #703830 Usability issue in import form 
  https://bugs.launchpad.net/bugs/703830

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/dev_client_rga/+merge/46480
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/dev_client_rga/+merge/46480
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/dev_client_rga.
=== modified file 'bin/modules/gui/window/win_import.py'
--- bin/modules/gui/window/win_import.py	2010-12-27 17:57:11 +0000
+++ bin/modules/gui/window/win_import.py	2011-01-17 14:15:11 +0000
@@ -84,9 +84,11 @@
         self.win.set_transient_for(parent)
         self.win.set_icon(common.OPENERP_ICON)
         self.parent = parent
-
-        self.glade.get_widget('import_csv_file').set_current_folder(
+        self.autodetect_btn = self.glade.get_widget('button_autodetect')
+        self.filechooser = self.glade.get_widget('import_csv_file')
+        self.filechooser.set_current_folder(
                 options.options['client.default_path'])
+        self.filechooser.connect('selection-changed',self.file_changed)
         self.view1 = gtk.TreeView()
         self.view1.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
         self.glade.get_widget('import_vp_left').add(self.view1)
@@ -152,9 +154,16 @@
         self.glade.signal_connect('on_but_select_clicked', self.sig_sel)
         self.glade.signal_connect('on_but_unselect_clicked', self.sig_unsel)
         self.glade.signal_connect('on_but_autodetect_clicked', self.sig_autodetect)
-
+        
+    def file_changed(self, widget=None):
+        fname= self.filechooser.get_filename()
+        if not fname:
+            self.autodetect_btn.set_sensitive(False)
+        else:
+            self.autodetect_btn.set_sensitive(True)
+          
     def sig_autodetect(self, widget=None):
-        fname= self.glade.get_widget('import_csv_file').get_filename()
+        fname= self.filechooser.get_filename()
         if not fname:
             common.message('You must select an import file first !')
             return True

=== modified file 'bin/openerp.glade'
--- bin/openerp.glade	2011-01-07 10:03:46 +0000
+++ bin/openerp.glade	2011-01-17 14:15:11 +0000
@@ -5546,6 +5546,8 @@
     </child>
   </widget>
   <widget class="GtkDialog" id="win_import">
+    <property name="width_request">723</property>
+    <property name="height_request">569</property>
     <property name="title" translatable="yes">Import from CSV</property>
     <property name="modal">True</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>


Follow ups