Merge lp:~mmcg069/software-center/misbehaving-pathbar-fix into lp:software-center

[Matthew McGowan]

Fixes bug #625210. Pathbutton no longer shrinks to available width.

This issue is resolved by removing the Viewport which parented the main Notebook widget. The Viewport was only used to paint the border around the Notebook so this is harmless.

The border width of the Notebook is now set to 1px and the borders a painted in an expose-event handler connected to the Notebook.

[Gary Lasker (gary-lasker)]

Looks good, Matthew McGowan! I've merged it. Thanks a lot as always. :)

With aggressive resizing, I do notice some minor artifacts showing for the redrawn pathbutton. Do you see that? They seem quite minor so we can decide if we want to take a look at that.

This does indeed fix bug #625210 (and bug #625210).

Thanks again!

review: Approve

[Gary Lasker (gary-lasker)]

Of course, the second bug listed above should be bug #620514. ;)

=== modified file 'data/ui/SoftwareCenter.ui'
--- data/ui/SoftwareCenter.ui	2010-08-30 09:40:20 +0000
+++ data/ui/SoftwareCenter.ui	2010-08-30 23:36:49 +0000
@@ -60,7 +60,11 @@
                     <child>
                       <object class="GtkMenuItem" id="menuitem_reinstall_purchases">
                         <property name="visible">True</property>
+<<<<<<< TREE
                         <property name="label" translatable="yes">Reinstall Previous Purchases…</property>
+=======
+                        <property name="label" translatable="yes">Reinstall Previous Purchases&#x2026;</property>
+>>>>>>> MERGE-SOURCE
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_menuitem_reinstall_purchases_activate"/>
                       </object>
@@ -188,7 +192,11 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_search">
+<<<<<<< TREE
                         <property name="label" translatable="yes">Search…</property>
+=======
+                        <property name="label" translatable="yes">Search&#x2026;</property>
+>>>>>>> MERGE-SOURCE
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="image">image2</property>
@@ -204,7 +212,11 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_software_sources">
+<<<<<<< TREE
                         <property name="label" translatable="yes">_Software Sources…</property>
+=======
+                        <property name="label" translatable="yes">_Software Sources&#x2026;</property>
+>>>>>>> MERGE-SOURCE
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="image">image4</property>
@@ -341,21 +353,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkViewport" id="viewport1">
+              <object class="GtkNotebook" id="notebook_view">
                 <property name="visible">True</property>
-                <property name="resize_mode">queue</property>
+                <property name="show_tabs">False</property>
+                <property name="show_border">False</property>
                 <child>
-                  <object class="GtkNotebook" id="notebook_view">
-                    <property name="visible">True</property>
-                    <property name="show_tabs">False</property>
-                    <property name="show_border">False</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child type="tab">
-                      <placeholder/>
-                    </child>
-                  </object>
+                  <placeholder/>
+                </child>
+                <child type="tab">
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -455,7 +461,11 @@
         <child>
           <object class="GtkLabel" id="label_rebuilding">
             <property name="visible">True</property>
+<<<<<<< TREE
             <property name="label" translatable="yes">Rebuilding software catalog…</property>
+=======
+            <property name="label" translatable="yes">Rebuilding software catalog&#x2026;</property>
+>>>>>>> MERGE-SOURCE
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

=== modified file 'softwarecenter/app.py'
--- softwarecenter/app.py	2010-08-28 11:16:59 +0000
+++ softwarecenter/app.py	2010-08-30 23:36:49 +0000
@@ -189,6 +189,10 @@
         self._block_menuitem_view = False
         self._available_items_for_page = {}
  
+        # hackery, paint viewport borders around notebook
+        self.notebook_view.set_border_width(1)
+        self.notebook_view.connect('expose-event', self._on_notebook_expose)
+
         # register view manager and create view panes/widgets
         self.view_manager = ViewManager(self.notebook_view)
         
@@ -723,7 +727,22 @@
             return
         if view.dialogs.confirm_repair_broken_cache(self.window_main, self.datadir):
             self.backend.fix_broken_depends()
-        
+
+    def _on_notebook_expose(self, widget, event):
+        # use availabel pane as the Style source so viewport colours are the same
+        # as a real Viewport
+        self.available_pane.style.paint_shadow(widget.window,
+                                    gtk.STATE_NORMAL,
+                                    gtk.SHADOW_IN,
+                                    event.area,
+                                    widget,
+                                    'viewport',
+                                    widget.allocation.x,
+                                    widget.allocation.y,
+                                    widget.allocation.width,
+                                    widget.allocation.height)
+        return
+
     def _on_apt_cache_broken(self, aptcache):
         self._ask_and_repair_broken_cache()