Merge lp:~jjed/software-center/smooth_search into lp:software-center

[Jjed]

In the current trunk, updating the searchbox causes the application view to replace its model entirely. This causes a distracting white flash while the new model loads in.

This branch reimplements set_model() in AppView so that the model is only updated, not replaced when the new model and old model are both application stores. Search is much, much less jerky now.

To test, just try searching.

NOTE: If you decide to merge this in conjunction with my custom_lists branch, the `exact`, `installable_apps`, and `existing_apps` variables must be copied at the end of the update method.

[lp:~jjed/software-center/smooth_search]

743. By Jacob Johan Edwards <jacob@jacob-laptop> on 2010-04-23

Match behavior of selected apps in view to trunk.

Note that this revision strips a lot of extra checks and "redo to be sure"
patches of code from softwarepane.py's update_app_view(). I am unable to find
a situation where they are necessary, and one of them was overprotecting and
caused the bug necessitating this revision.

[Michael Vogt (mvo)]

Very very nice work, I love it. I created bug #570682 so that we can hopefully get it into lucid-updates too.

review: Approve

=== modified file 'softwarecenter/view/appview.py'
--- softwarecenter/view/appview.py	2010-04-18 11:35:39 +0000
+++ softwarecenter/view/appview.py	2010-04-23 23:46:27 +0000
@@ -193,6 +193,37 @@
                     self.pkgname_index_map[app.pkgname] = []
                 self.pkgname_index_map[app.pkgname].append(i)
 
+    def update(self, appstore):
+        """ update this appstore to match data from another """
+        # Updating instead of replacing prevents a distracting white
+        # flash. First, match list of apps.
+        to_update = min(len(self), len(appstore))
+        for i in range(to_update):
+            self.apps[i] = appstore.apps[i]
+            self.row_changed(i, self.get_iter(i))
+
+        to_remove = max(0, len(self) - len(appstore))
+        for i in range(to_remove):
+            self.apps.pop()
+            self.row_deleted(len(self))
+
+        to_add = max(0, len(appstore) - len(self))
+        apps_to_add = appstore.apps[len(appstore) - to_add:]
+        for app in apps_to_add:
+            path = len(self)
+            self.apps.append(app)
+            self.row_inserted(path, self.get_iter(path))
+
+        # Next, match data about the store.
+        self.cache = appstore.cache
+        self.db = appstore.db
+        self.icons = appstore.icons
+        self.search_query = appstore.search_query
+        self.sorted = appstore.sorted
+        self.filter = appstore.filter
+        self.app_index_map = appstore.app_index_map
+        self.pkgname_index_map = appstore.pkgname_index_map
+
     def is_filtered_out(self, filter, doc):
         """ apply filter and return True if the package is filtered out """
         pkgname = self.db.get_pkgname(doc)
@@ -937,6 +968,19 @@
         self.backend.connect("transaction-finished", self._on_transaction_finished)
         self.backend.connect("transaction-stopped", self._on_transaction_stopped)
 
+    def set_model(self, new_model):
+        # Only allow use of an AppStore model
+        if type(new_model) != AppStore:
+            return
+        model = self.get_model()
+
+        # If there is no current model, simply set the new one.
+        if not model:
+            super(AppView, self).set_model(new_model)
+        # Otherwise update the current model using the new data.
+        else:
+            model.update(new_model)
+
     def is_action_in_progress_for_selected_app(self):
         """
         return True if an install or remove of the current package

=== modified file 'softwarecenter/view/softwarepane.py'
--- softwarecenter/view/softwarepane.py	2010-04-13 15:54:16 +0000
+++ softwarecenter/view/softwarepane.py	2010-04-23 23:46:27 +0000
@@ -170,24 +170,13 @@
         first app in the list is selected.  If a row is already selected,
         nothing is done.
         """
-        selected_iter = None
-        selection = self.app_view.get_selection()
         model = self.app_view.get_model()
-        if selection:
-            selected_iter = selection.get_selected()[1]
         current_app = self.get_current_app()
-        if (model is not None and 
-            model.get_iter_root() is not None 
-            and selected_iter is None):
-            index=0
-            vadj = self.scroll_app_list.get_vadjustment()
-            if current_app:
-                if current_app in model.app_index_map:
-                    index = model.app_index_map.get(current_app)
-            # re-select item
-            if vadj:
-                self.app_view.set_cursor(index)
-                vadj.value_changed()
+
+        index = 0
+        if current_app in model.app_index_map:
+            index =  model.app_index_map.get(current_app)
+        self.app_view.set_cursor(index)
 
     def get_status_text(self):
         """return user readable status text suitable for a status bar"""