Merge lp:~kiwinote/software-center/remember-scroll-position into lp:software-center

[Kiwinote]

first change in this branch is to make the backspace key no longer trigger a navigation back as it has started to cause many many odd side effects, the possible workarounds to keep this behaviour all seem a bit messy but perhaps i can come up with something at a later stage

the main change is to remember the list position when eg going from a list to details back to the list again. after much experimentation the code in this branch seems to work fairly reasonably, but there are a few oddities, ie the restored scroll position isn't pixel perfect, but can vary by up to roughly one item height - despite reading the value and restoring that pixel perfect value.. also for some odd reason we need to restore the vadjustment value to both set_value and set_lower, otherwise it doesn't work..
the scroll position is only remembered in the available pane

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-16 13:40:21 +0000
+++ debian/changelog	2012-02-16 14:35:00 +0000
@@ -1,12 +1,20 @@
-software-center (5.1.10) UNRELEASED; urgency=low
+software-center (5.1.10) precise; urgency=low
 
+  [ Michael Vogt ]
   * revert again:
     lp:~gary-lasker/software-center/temp-disable-lobby-recommendations-view
   * softwarecenter/region.py:
     - trivial change to make region tag prefix "iso3166::" to align
       with the latest debtags upstream plans
 
- -- Michael Vogt <[e-mail]>  Thu, 16 Feb 2012 12:30:20 +0100
+  [ Kiwinote ]
+  * softwarecenter/ui/gtk3/app.py:
+    - disable navigating back by pressing the backspace key because it has
+      started showing dodgy side effects - use ctrl+[ or alt+LEFT instead
+  * remember the scroll position when navigating back to a list view,
+    this only works in the available pane (LP: #852763)
+
+ -- Kiwinote <[e-mail]>  Thu, 16 Feb 2012 14:08:17 +0000
 
 software-center (5.1.9) precise; urgency=low
 
 
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-02-16 11:30:57 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-02-16 14:35:00 +0000
@@ -559,8 +559,10 @@
              event.state == Gdk.ModifierType.CONTROL_MASK) or
             ((event.keyval == Gdk.keyval_from_name("Left") or
               event.keyval == Gdk.keyval_from_name("KP_Left")) and
-             event.state == Gdk.ModifierType.MOD1_MASK) or
-            event.keyval == Gdk.keyval_from_name("BackSpace")):
+             event.state == Gdk.ModifierType.MOD1_MASK)):
+            # using the backspace key to navigate back has been disabled as it
+            # has started to show dodgy side effects which I can't figure how
+            # to deal with
             self.menuitem_view.activate()
             if self.menuitem_go_back.get_sensitive():
                 self.menuitem_go_back.activate()
 
=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-01-19 16:39:15 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-02-16 14:35:00 +0000
@@ -500,6 +500,7 @@
             self.nonapps_visible = NonAppVisibility.ALWAYS_VISIBLE
 
         vm = get_viewmanager()
+        self.app_view.tree_view_scroll.get_vadjustment().set_value(0.0)
 
         # yeah for special cases - as discussed on irc, mpt
         # wants this to return to the category screen *if*
@@ -572,6 +573,8 @@
         header_strings = self._get_header_for_view_state(view_state)
         self.app_view.set_header_labels(*header_strings)
 
+        self.app_view.vadj = view_state.vadjustment
+
         self.refresh_apps()
         self.cat_view.stop_carousels()
         return True
@@ -605,6 +608,8 @@
         if view_state.search_term:
             self._clear_search()
 
+        self.app_view.vadj = view_state.vadjustment
+
         self.refresh_apps()
         self.cat_view.stop_carousels()
         return True
 
=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
--- softwarecenter/ui/gtk3/panes/softwarepane.py	2012-02-15 15:40:41 +0000
+++ softwarecenter/ui/gtk3/panes/softwarepane.py	2012-02-16 14:35:00 +0000
@@ -64,7 +64,8 @@
               'application': (type(None), Application),
               'limit': (int,),
               'filter': (type(None), AppFilter),
-              'previous_purchases_query': (type(None), xapian.Query)
+              'previous_purchases_query': (type(None), xapian.Query),
+              'vadjustment': (float, ),
             }
 
     def __init__(self):
@@ -76,6 +77,7 @@
         self.limit = 0
         self.filter = None
         self.previous_purchases_query = None
+        self.vadjustment = 0.0
         return
 
     def __setattr__(self, name, val):
@@ -110,6 +112,7 @@
             state.filter = self.filter.copy()
         else:
             state.filter = None
+        state.vadjustment = self.vadjustment
         return state
 
     def reset(self):
@@ -120,6 +123,7 @@
         self.application = None
         self.limit = 0
         #~ self.filter = None
+        self.vadjustment = 0.0
         return
 
 class SoftwarePane(Gtk.VBox, BasePane):
 
=== modified file 'softwarecenter/ui/gtk3/session/viewmanager.py'
--- softwarecenter/ui/gtk3/session/viewmanager.py	2012-01-12 19:16:29 +0000
+++ softwarecenter/ui/gtk3/session/viewmanager.py	2012-02-16 14:35:00 +0000
@@ -165,6 +165,13 @@
         return self.navhistory.stack[-1]
 
     def display_page(self, pane, page, view_state, callback=None):
+        # if previous page is a list view, then store the scroll positions
+        if self.navhistory.stack:
+            ni = self.navhistory.stack[self.navhistory.stack.cursor]
+            if ni.pane.is_applist_view_showing():
+                v = ni.pane.app_view.tree_view_scroll.get_vadjustment()
+                ni.view_state.vadjustment = v.get_value()
+
         if callback is None:
             callback = pane.get_callback_for_page(page, view_state)
 
 
=== modified file 'softwarecenter/ui/gtk3/views/appview.py'
--- softwarecenter/ui/gtk3/views/appview.py	2011-10-26 12:19:26 +0000
+++ softwarecenter/ui/gtk3/views/appview.py	2012-02-16 14:35:00 +0000
@@ -92,6 +92,7 @@
         self.tree_view_scroll.add(self.tree_view)
 
         self.appcount = None
+        self.vadj = 0.0
 
         self.user_defined_sort_method = False
         self._handler = self.sort_methods_combobox.connect(
@@ -131,6 +132,7 @@
 
     def on_sort_method_changed(self, *args):
         self.user_defined_sort_method = True
+        self.vadj = 0.0
         self.emit("sort-method-changed", self.sort_methods_combobox)
         return
 
@@ -206,6 +208,9 @@
         if model:
             model.set_from_matches(matches)
         self.user_defined_sort_method = False
+
+        self.tree_view_scroll.get_vadjustment().set_lower(self.vadj)
+        self.tree_view_scroll.get_vadjustment().set_value(self.vadj)
         return
 
     def clear_model(self):