Merge lp:~roadmr/checkbox/868995 into lp:checkbox

[Daniel Manrique]

This fix takes care of the dreaded "checkbox constantly minimizes to the dash" bug 868995. It does this by removing the transient progress window altogether, instead integrating the progress indicators (a label and a progress bar) directly into the main checkbox dialog.

I tried to make the fix as unintrusive as possible, just a couple lines of python code and about 50 lines of Glade XML stuff that were moved within the checkbox-gtk.ui file. This should make it trivial to backport this change to Oneiric.

The UI does jump a bit when the progress widgets get hidden/unhidden, but it's certainly less disruptive than having checkbox minimize all the time.

Reviewing and testing would be appreciated, this can be run from trunk (branch trunk, then bin/checkbox-gtk -W data/whitelists/default.whitelist). Just to make sure I didn't introduce some other quirks that'll give us more trouble :)

[Brendan Donegan (brendan-donegan)]

This works pretty well, I think I like it more than the original dialog! Might end up doing something similar in the new UI.

review: Approve

=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-09-23 02:01:56 +0000
+++ checkbox_gtk/gtk_interface.py	2011-11-04 21:01:24 +0000
@@ -102,10 +102,8 @@
             image_head.connect("expose-event",self.draw_image_head)
 
         # Set wait transient for dialog
-        self._wait = self._get_widget("window_wait")
-        self._wait.set_transient_for(self._dialog)
-        self._wait.realize()
-        self._wait.get_window().set_functions(Gdk.WMFunction.MOVE)
+        self._wait = self._get_widget("box_wait")
+        self._wait.hide()
 
         # Set shorthand for notebook
         self._notebook = self._get_widget("notebook_main")
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-10-27 20:18:26 +0000
+++ debian/changelog	2011-11-04 21:01:24 +0000
@@ -8,6 +8,8 @@
 
   [Daniel Manrique]
   * Use gettext for string (LP: #869267)
+  * Move progress indicator to main checkbox dialog instead of a 
+    transient window (LP: #868995)
 
   [Jeff Lane]
   * Went through all the job files and:
@@ -24,7 +26,7 @@
    [Ara Pulido]
    * Rewrote all job descriptions to match OEM QA syntax
 
- -- Daniel Manrique <[e-mail]>  Wed, 12 Oct 2011 15:20:36 -0400
+ -- Daniel Manrique <[e-mail]>  Fri, 04 Nov 2011 16:32:08 -0400
 
 checkbox (0.12.8) oneiric; urgency=low
 
 
=== modified file 'gtk/checkbox-gtk.ui'
--- gtk/checkbox-gtk.ui	2011-06-09 16:29:26 +0000
+++ gtk/checkbox-gtk.ui	2011-11-04 21:01:24 +0000
@@ -374,6 +374,43 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box_wait">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="label_wait">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="progressbar_wait">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pulse_step">0.10000000149</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+
+
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area">
             <property name="visible">True</property>
@@ -452,41 +489,4 @@
       <action-widget response="1">button_next</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="window_wait">
-    <property name="title" translatable="yes"></property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox_wait">
-        <property name="visible">True</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="label_wait">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkProgressBar" id="progressbar_wait">
-            <property name="visible">True</property>
-            <property name="pulse_step">0.10000000149</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
 </interface>