usb-creator-hackers team mailing list archive

[Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxx>]

Dmitrijs Ledkovs has proposed merging lp:~dmitrij.ledkov/usb-creator/sensetivity into lp:usb-creator.

Requested reviews:
  usb-creator hackers (usb-creator-hackers)


Splitting out the commit that fixes install button sensitive issue out of the "infobar / missing iso" notification branch.
-- 
https://code.launchpad.net/~dmitrij.ledkov/usb-creator/sensetivity/+merge/27536
Your team usb-creator hackers is requested to review the proposed merge of lp:~dmitrij.ledkov/usb-creator/sensetivity into lp:usb-creator.

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-27 15:13:58 +0000
+++ debian/changelog	2010-06-14 17:18:26 +0000
@@ -42,6 +42,7 @@
 
   * Use XDG_CACHE_DIR for usb-creator.log
   * Use XDG IconTheme spec for window icons (LP: #535061)
+  * Fix install button sensetivity (LP: #582531)
 
   [ Ignace Mouzannar ]
   * Initial Debian release (Closes: #582884, #576359)

=== modified file 'gui/usbcreator-gtk.ui'
--- gui/usbcreator-gtk.ui	2010-05-18 16:00:05 +0000
+++ gui/usbcreator-gtk.ui	2010-06-14 17:18:26 +0000
@@ -389,6 +389,7 @@
                   <object class="GtkButton" id="button_install">
                     <property name="label" translatable="yes">Make Startup Disk</property>
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="has_default">True</property>

=== modified file 'usbcreator/frontends/gtk/frontend.py'
--- usbcreator/frontends/gtk/frontend.py	2010-05-21 04:09:58 +0000
+++ usbcreator/frontends/gtk/frontend.py	2010-06-14 17:18:26 +0000
@@ -161,6 +161,9 @@
                 if fname.endswith('.iso') or fname.endswith('.img'):
                     self.backend.add_image(os.path.join(download_dir, fname))
 
+        # Sets first pre-populated image as current in the backend
+        self.selection_changed_source(self.source_treeview.get_selection())
+
         if not persistent:
             self.persist_disabled.set_active(True)
             self.persist_vbox.hide()
@@ -441,15 +444,11 @@
         # Update install button state.
         status = target['status']
         source = self.backend.get_current_source()
-        if status == CAN_USE:
-            self.button_install.set_sensitive(True)
-        else:
-            self.button_install.set_sensitive(False)
         if not source:
+            self.button_install.set_sensitive(False)
             return
         stype = self.backend.sources[source]['type']
-        if (self.button_install.get_property('sensitive')
-                and stype == SOURCE_IMG):
+        if status == CAN_USE and stype in (SOURCE_IMG, SOURCE_ISO):
             self.button_install.set_sensitive(True)
         else:
             self.button_install.set_sensitive(False)