Merge lp:~maco.m/ubiquity/791446 into lp:ubiquity

[Mackenzie Morgan]

make ubi-prepare.py use Qt API when using Qt widgets instead of trying to use the GTK API on them

[lp:~maco.m/ubiquity/791446]

4746. By Mackenzie Morgan on 2011-06-02

debian/changelog: fix versions

[Evan (ev)]

I'd rather not have toolkit-specific code in an abstraction, as it is here. This should be refactored so that the PageGTK and PageKDE classes provide their own methods for setting the UI controls but call into the common code for processing the wget call. This can be most easily accomplished by factoring out the UI calls into a single stub function that check_returncode calls, which both classes provide variants of.

review: Needs Fixing

[lp:~maco.m/ubiquity/791446]

4747. By Mackenzie Morgan on 2011-06-08

ubi-prepare.py: check_returncode() calls abstracted functions in PageGtk and Page Kde for checkbutton/checkbox

4748. By Mackenzie Morgan on 2011-06-08

merge from trunk

[Mackenzie Morgan (maco.m)]

Is this what you mean?

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-08 14:55:06 +0000
+++ debian/changelog	2011-06-08 17:32:18 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.7.6) UNRELEASED; urgency=low
+
+  * make ubi-prepare.py handle cases where prepare_download_updates
+    is Qt too (LP: #791446)
+
+ -- Mackenzie Morgan <[e-mail]>  Thu, 02 Jun 2011 02:18:12 -0400
+
 ubiquity (2.7.5) oneiric; urgency=low
 
   * Stop installing earth.jpg; it's 250KiB and we no longer use it.

=== modified file 'ubiquity/plugins/ubi-prepare.py'
--- ubiquity/plugins/ubi-prepare.py	2011-05-31 09:18:59 +0000
+++ ubiquity/plugins/ubi-prepare.py	2011-06-08 17:32:18 +0000
@@ -90,9 +90,9 @@
                 if WGET_HASH == h.hexdigest():
                     state = True
             self.prepare_network_connection.set_state(state)
-            self.prepare_download_updates.set_sensitive(state)
+            self.set_download_updates(state)
             if not state:
-                self.prepare_download_updates.set_active(False)
+                self.enable_download_updates(False)
             self.controller.dbfilter.set_online_state(state)
             return False
 
@@ -158,12 +158,15 @@
             gobject.source_remove(self.timeout_id)
         self.timeout_id = gobject.timeout_add(300, self.check_returncode)
 
+    def enable_download_updates(self, val):
+        self.prepare_download_updates.set_sensitive(val)
+
     def set_download_updates(self, val):
         self.prepare_download_updates.set_active(val)
 
     def get_download_updates(self):
         return self.prepare_download_updates.get_active()
-    
+
     def set_allow_nonfree(self, allow):
         if not allow:
             self.prepare_nonfree_software.set_active(False)
@@ -243,6 +246,9 @@
             self.timer.disconnect(self.timer, SIGNAL("timeout()"),
                 self.check_returncode)
 
+    def enable_download_updates(self, val):
+        self.prepare_download_updates.setEnabled(val)
+
     def set_download_updates(self, val):
         self.prepare_download_updates.setChecked(val)