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

[Gary Lasker]

Heya Michael,

Here's a branch that implements your suggestion to set the model to None on a refresh_apps as a fix for the visual glitch when (for instance) navigating to Developer Tools->Libraries (and the resulting extra .6 second delay when showing the non-app packages).

I found however that if I just implemented the model = None technique generally it introduced an ugly flash on those list view updates that are normally very clean and fast, including when selecting PPAs with very few packages in them and on every search update. You can see this effect if you try this branch at revision 836.

So I fine-tuned the effect to only come into play for the views where it actually helps, and to be skipped for those other cases where it made things worse. That's what you'll see at the latest revision.

Note that I agree it's not pretty to directly check the channel component string "partner". Really, I think that's just a reminder that I need to get my partner-fixmes branch updated and finalized.

Please let me know what you think. Thanks!
Gary

[lp:~gary-lasker/software-center/hide_nonapps_pkgs_xapian]

839. By Gary Lasker on 2010-06-10

merge with trunk

840. By Gary Lasker on 2010-06-10

add changelog entry

841. By Gary Lasker on 2010-06-10

    a large number of items (LP: #592296)

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-10 10:07:26 +0000
+++ debian/changelog	2010-06-10 15:28:29 +0000
@@ -1,3 +1,13 @@
+software-center (2.1.3) UNRELEASED; urgency=low
+
+  * softwarecenter/view/appview.py,
+    softwarecenter/view/availablepane.py,
+    softwarecenter/view/channelpane.py:
+    - fix visual glitch when updating a list view that contains
+      a large number of items (LP: #592296)
+
+ -- Gary Lasker <[e-mail]>  Thu, 10 Jun 2010 11:25:22 -0400
+
 software-center (2.1.2) maverick; urgency=low
 
   [ Gary Lasker ]
 
=== modified file 'softwarecenter/view/appview.py'
--- softwarecenter/view/appview.py	2010-06-09 13:07:17 +0000
+++ softwarecenter/view/appview.py	2010-06-10 15:28:29 +0000
@@ -1186,6 +1186,9 @@
         if abs(len(new_model)-len(model)) > AppStore.DEFAULT_SEARCH_LIMIT:
             return super(AppView, self).set_model(new_model)
         return model.update(new_model)
+        
+    def clear_model(self):
+        self.set_model(None)
 
     def is_action_in_progress_for_selected_app(self):
         """
 
=== modified file 'softwarecenter/view/availablepane.py'
--- softwarecenter/view/availablepane.py	2010-06-09 13:07:17 +0000
+++ softwarecenter/view/availablepane.py	2010-06-10 15:28:29 +0000
@@ -209,9 +209,6 @@
     def refresh_apps(self):
         """refresh the applist and update the navigation bar
         """
-        #import traceback
-        #print "refresh_apps"
-        #print traceback.print_stack()
         logging.debug("refresh_apps")
         # mvo: its important to fist show the subcategories and then
         #      the new model, otherwise we run into visual lack
@@ -226,6 +223,13 @@
         logging.debug("availablepane query: %s" % query)
 
         old_model = self.app_view.get_model()
+        
+        # if a search is not in progress, clear the current model to
+        # display an empty list while the full list is generated; this
+        # prevents a visual glitch when a list is replaced
+        if not self.apps_search_term:
+            self.app_view.clear_model()
+        
         if old_model is not None:
             # *ugh* deactivate the old model because otherwise it keeps
             # getting progress_changed events and eats CPU time until its
 
=== modified file 'softwarecenter/view/channelpane.py'
--- softwarecenter/view/channelpane.py	2010-06-09 14:34:01 +0000
+++ softwarecenter/view/channelpane.py	2010-06-10 15:28:29 +0000
@@ -101,6 +101,15 @@
         # getting progress_changed events and eats CPU time until its
         # garbage collected
         old_model = self.app_view.get_model()
+        
+        # if the list is expected to contain many items, clear the current model to display
+        # an empty list while the full list is generated; this prevents a visual glitch when
+        # the list is replaced
+        if ((self.channel.get_channel_name() == self.distro.get_distro_channel_name() and
+             self.channel.get_channel_component() != "partner") and
+             not self.search_terms):
+            self.app_view.clear_model()
+        
         if old_model is not None:
             old_model.active = False
             while gtk.events_pending():