Merge lp:~gary-lasker/software-center/lp556995 into lp:software-center

[Gary Lasker]

This branch is a proposed fix for bug 556995. The failure mode is this: When the update_channel_list method of ViewSwitcherList is executed after an update-apt-xapian-index call is completed, the set of channel nodes in the ViewSwitcher tree is replaced. A side effect of this is that the previously selected item in the list becomes unselected (no item is selected), and worse, the contents of the list view breaks pretty badly (see detailed description in bug 556995).

This branch adds a "channels-refreshed" signal that is emitted by ViewSwitcherList at the end of update_channel_list and this signal is handled by a new on_channel_refreshed method in ViewSwitcher itself. When on_channel_refreshed is called, the channel node that corresponds to the previously selected channel (if there is one) is looked up by its name, and is reselected. This restores the selection immediately and refreshes the listview correctly so the list view problems described in the bug no longer occur.

Michael, please note that this branch exhibits an intermittent artifact (as I mentioned to you in IRC) where on some occasions the first navigation button is not replaced with the result that a second identical button gets appended to the first. However, I tested with Matthew's branch below and found that the problem no longer occurs:

lp:~mmcg069/software-center/pathbar-atk

So, hopefully we can merge Matthew's branch as well.

Thanks!!
Gary

[Michael Vogt (mvo)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-06 12:46:46 +0000
+++ debian/changelog	2010-04-08 22:39:17 +0000
@@ -4,6 +4,9 @@
   * softwarecenter/view/viewswitcher.py:
     - fix intermittent AttributeError if a model doesn't
       exist when checking node expanded state (LP: #554388)
+  * softwarecenter/view/viewswitcher.py:
+    - fix nasty list view errors when disabling partner
+      repository (LP: #556995)
   
   [ Michael Vogt ]
   * softwarecenter/apt/aptcache.py:
@@ -14,7 +17,7 @@
   * softwarecenter/view/appdetailsview.py:
     - use package name when application name is not available (LP: #549011)
 
- -- Michael Vogt <[e-mail]>  Tue, 06 Apr 2010 10:14:43 +0200
+ -- Gary Lasker <[e-mail]>  Thu, 08 Apr 2010 18:01:20 -0400
 
 software-center (1.1.24) lucid; urgency=low
 
 
=== modified file 'softwarecenter/view/channelpane.py'
--- softwarecenter/view/channelpane.py	2010-03-23 16:50:23 +0000
+++ softwarecenter/view/channelpane.py	2010-04-08 22:39:17 +0000
@@ -85,7 +85,6 @@
                                             self.on_navigation_search, 
                                             "search")
         else:
-            # FIXME: don't replace first part, just update the button in-place
             self.navigation_bar.remove_all(keep_first_part=False)
             self.navigation_bar.add_with_id(self.channel.get_channel_display_name(),
                                         self.on_navigation_list,
 
=== modified file 'softwarecenter/view/viewswitcher.py'
--- softwarecenter/view/viewswitcher.py	2010-04-05 04:40:27 +0000
+++ softwarecenter/view/viewswitcher.py	2010-04-08 22:39:17 +0000
@@ -81,10 +81,14 @@
         self.get_selection().set_select_function(self.on_treeview_selected)
         self.set_level_indentation(4)
         self.set_enable_search(False)
+
+        self.selected_channel_name = None
         
         self.connect("row-expanded", self.on_treeview_row_expanded)
         self.connect("row-collapsed", self.on_treeview_row_collapsed)
         self.connect("cursor-changed", self.on_cursor_changed)
+
+        self.get_model().connect("channels-refreshed", self._on_channels_refreshed)
         
     def on_treeview_row_expanded(self, widget, iter, path):
         # do nothing on a node expansion
@@ -102,6 +106,7 @@
     def on_cursor_changed(self, widget):
         (path, column) = self.get_cursor()
         model = self.get_model()
+        self.selected_channel_name = model[path][ViewSwitcherList.COL_NAME]
         action = model[path][ViewSwitcherList.COL_ACTION]
         channel = model[path][ViewSwitcherList.COL_CHANNEL]
         self.emit("view-changed", action, channel)
@@ -146,6 +151,16 @@
             expanded = self.row_expanded(available_path)
         return expanded
 
+    def _on_channels_refreshed(self, model):
+        """
+        when channels are refreshed, the viewswitcher channel is unselected so
+        we need to reselect it
+        """
+        model = self.get_model()
+        channel_iter_to_select = model.get_channel_iter_for_name(self.selected_channel_name)
+        if channel_iter_to_select:
+            self.set_cursor(model.get_path(channel_iter_to_select))
+
 class ViewSwitcherList(gtk.TreeStore):
     
     # columns
@@ -165,6 +180,10 @@
 
     ANIMATION_PATH = "/usr/share/icons/hicolor/24x24/status/softwarecenter-progress.png"
 
+    __gsignals__ = {'channels-refreshed':(gobject.SIGNAL_RUN_FIRST,
+                                     gobject.TYPE_NONE,
+                                     ())}
+
     def __init__(self, datadir, db, icons):
         gtk.TreeStore.__init__(self, AnimatedImage, str, int, gobject.TYPE_PYOBJECT)
         self.icons = icons
@@ -215,6 +234,16 @@
             for (i, row) in enumerate(self):
                 if row[self.COL_ACTION] == self.ACTION_ITEM_PENDING:
                     del self[(i,)]
+
+    def get_channel_iter_for_name(self, channel_name):
+        channel_iter_for_name = None
+        child = self.iter_children(self.available_iter)
+        while child:
+            if self.get_value(child, self.COL_NAME) == channel_name:
+                channel_iter_for_name = child
+                break
+            child = self.iter_next(child)
+        return channel_iter_for_name
                     
     def _get_icon(self, icon_name):
         if self.icons.lookup_icon(icon_name, self.ICON_SIZE, 0):
@@ -253,6 +282,8 @@
         for child in iters_to_kill:
             self.remove(child)
 
+        self.emit("channels-refreshed")
+
     def _get_channels(self):
         """
         return a list of SoftwareChannel objects in display order