Merge lp:~mmcg069/software-center/bug635994-again into lp:software-center

[Matthew Paul Thomas]

Fixes bug 635994.

I have tested this branch on the home screen, search results, subcategorized category screen, unsubcategorized category screen, and software item screen. It seems to work well with all of them.

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview_gtk.py'
--- softwarecenter/ui/gtk3/views/appdetailsview_gtk.py	2011-09-19 23:35:54 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview_gtk.py	2011-09-21 12:54:02 +0000
@@ -53,6 +53,7 @@
 from softwarecenter.ui.gtk3.em import StockEms, em
 from softwarecenter.ui.gtk3.drawing import color_to_hex
 from softwarecenter.ui.gtk3.widgets.separators import HBar
+from softwarecenter.ui.gtk3.widgets.viewport import Viewport
 from softwarecenter.ui.gtk3.widgets.reviews import UIReviewsList
 from softwarecenter.ui.gtk3.widgets.containers import SmallBorderRadiusFrame
 from softwarecenter.ui.gtk3.widgets.stars import Star, StarRatingsWidget
@@ -638,7 +639,7 @@
 
 
 _asset_cache = {}
-class AppDetailsViewGtk(Gtk.Viewport, AppDetailsViewBase):
+class AppDetailsViewGtk(Viewport, AppDetailsViewBase):
 
     """ The view that shows the application details """
 
@@ -669,7 +670,7 @@
 
     def __init__(self, db, distro, icons, cache, datadir, pane):
         AppDetailsViewBase.__init__(self, db, distro, icons, cache, datadir)
-        GObject.GObject.__init__(self)
+        Viewport.__init__(self)
         self.set_shadow_type(Gtk.ShadowType.NONE)
 
         self.set_name("view")
@@ -1063,43 +1064,9 @@
         self.show_all()
 
         # signals!
-        #~ vb.connect('draw', self._on_draw, alignment)
-        vb.connect('key-press-event', self._on_key_press)
         self.connect('size-allocate', lambda w,a: w.queue_draw())
         return
 
-    def _on_key_press(self, widget, event):
-        kv = event.keyval
-
-        # key values we want to respond to
-        uppers = (Gdk.KEY_KP_Up, Gdk.KEY_Up)
-        downers = (Gdk.KEY_KP_Down, Gdk.KEY_Down)
-
-        if kv in uppers or kv in downers:
-            # get the ScrolledWindow adjustments and tweak them appropriately
-            if not self.get_parent(): return False
-
-            # the ScrolledWindow vertical-adjustment
-            v_adj = self.get_parent().get_vadjustment()
-
-            # scroll up
-            if kv in uppers:
-                v = max(v_adj.get_value() - v_adj.get_step_increment(),
-                        v_adj.get_lower())
-
-            # scroll down 
-            elif kv in downers:
-                v = min(v_adj.get_value() + v_adj.get_step_increment(),
-                        v_adj.get_upper() - v_adj.get_page_size())
-
-            # set our new value
-            v_adj.set_value(v)
-
-            # do not share the event with other widgets
-            return True
-        # share the event with other widgets
-        return False
-
     def _on_review_new(self, button):
         self._review_write_new()
 

=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py	2011-09-20 12:22:29 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py	2011-09-21 12:54:02 +0000
@@ -34,6 +34,7 @@
                                   TOP_RATED_CAROUSEL_LIMIT)
 from softwarecenter.utils import wait_for_apt_cache_ready
 from softwarecenter.ui.gtk3.models.appstore2 import AppPropertiesHelper
+from softwarecenter.ui.gtk3.widgets.viewport import Viewport
 from softwarecenter.ui.gtk3.widgets.containers import (
      FramedHeaderBox, FramedBox, FlowableGrid)
 from softwarecenter.ui.gtk3.widgets.exhibits import (
@@ -56,7 +57,7 @@
 
 
 _asset_cache = {}
-class CategoriesViewGtk(Gtk.Viewport, CategoriesParser):
+class CategoriesViewGtk(Viewport, CategoriesParser):
 
     __gsignals__ = {
         "category-selected" : (GObject.SignalFlags.RUN_LAST,
@@ -109,7 +110,7 @@
         self.icons = icons
         self.section = None
 
-        Gtk.Viewport.__init__(self)
+        Viewport.__init__(self)
         CategoriesParser.__init__(self, db)
 
         self.set_name("category-view")

=== modified file 'softwarecenter/ui/gtk3/widgets/description.py'
--- softwarecenter/ui/gtk3/widgets/description.py	2011-09-20 21:30:20 +0000
+++ softwarecenter/ui/gtk3/widgets/description.py	2011-09-21 12:54:02 +0000
@@ -387,7 +387,7 @@
         self.set_size_request(200, -1)
         #~ self.set_redraw_on_allocate(False)
 
-        self.set_can_focus(True)
+        #~ self.set_can_focus(True)
         self.set_events(Gdk.EventMask.KEY_PRESS_MASK|
                         Gdk.EventMask.ENTER_NOTIFY_MASK|
                         Gdk.EventMask.LEAVE_NOTIFY_MASK|
@@ -395,25 +395,18 @@
                         Gdk.EventMask.POINTER_MOTION_MASK)
 
         self._is_new = False
-        self._bullet = self._new_layout()
-        self._bullet.set_markup(self.BULLET_POINT)
-        font_desc = Pango.FontDescription()
-
-        font_desc.set_weight(Pango.Weight.BOLD)
-        self._bullet.set_font_description(font_desc)
-
-        event_helper = EventHelper()
-
-        e = self._bullet.get_pixel_extents()
-        self.indent, self.line_height  = e.width, e.height
 
         self.order = []
         self.cursor = cur = PrimaryCursor(self)
         self.selection = sel = SelectionCursor(self.cursor)
         self.clipboard = None
 
+        #~ event_helper = EventHelper()
+        self._update_cached_layouts()
         self._test_layout = self.create_pango_layout('')
+
         #self._xterm = Gdk.Cursor.new(Gdk.XTERM)
+<<<<<<< TREE
 
         # popup menu and menuitem's
         self.copy_menuitem = Gtk.ImageMenuItem.new_from_stock(
@@ -434,6 +427,15 @@
 
         self.connect('key-press-event', self._on_key_press, cur, sel)
         self.connect('key-release-event', self._on_key_release, cur, sel)
+=======
+#~ 
+        #~ self.connect('button-press-event', self._on_press, event_helper, cur, sel)
+        #~ self.connect('button-release-event', self._on_release, event_helper, cur, sel)
+        #~ self.connect('motion-notify-event', self._on_motion, event_helper, cur, sel)
+
+        #~ self.connect('key-press-event', self._on_key_press, cur, sel)
+        #~ self.connect('key-release-event', self._on_key_release, cur, sel)
+>>>>>>> MERGE-SOURCE
 
         #~ Gtk.drag_source_set(self, Gdk.ModifierType.BUTTON1_MASK,
                             #~ None, Gdk.DragAction.COPY)
@@ -441,8 +443,8 @@
         #~ self.connect('drag-begin', self._on_drag_begin)
         #~ self.connect('drag-data-get', self._on_drag_data_get, sel)
 
-        self.connect('focus-in-event', self._on_focus_in)
-        self.connect('focus-out-event', self._on_focus_out)
+        #~ self.connect('focus-in-event', self._on_focus_in)
+        #~ self.connect('focus-out-event', self._on_focus_out)
 
         self.connect("size-allocate", self.on_size_allocate)
         self.connect('style-updated', self._on_style_updated)
@@ -503,7 +505,20 @@
         return
 
     def _on_style_updated(self, widget):
+<<<<<<< TREE
         self._config_colors()
+=======
+        print 'description style-updated'
+        #style = self.get_style()
+        #~ if self.has_focus():
+            #~ self._bg = self._color_parse('red')
+            #~ self._fg = self._color_parse('#000')
+        #~ else:
+            #~ _, self._bg = Gdk.color_parse('#E5E3E1')
+            #~ self._bg = self._color_parse('red')
+            #~ self._fg = self._color_parse('#000')
+        self._update_cached_layouts()
+>>>>>>> MERGE-SOURCE
         return
 
 #    def _on_drag_begin(self, widgets, context, event_helper):
@@ -995,6 +1010,18 @@
         layout.set_wrap(Pango.WrapMode.WORD_CHAR)
         return layout
 
+    def _update_cached_layouts(self):
+        self._bullet = self._new_layout()
+        self._bullet.set_markup(self.BULLET_POINT)
+        font_desc = Pango.FontDescription()
+
+        font_desc.set_weight(Pango.Weight.BOLD)
+        self._bullet.set_font_description(font_desc)
+
+        e = self._bullet.get_pixel_extents()
+        self.indent, self.line_height  = e.width, e.height
+        return
+
     def _selection_highlight(self, layout, sel, bg, fg):
         i = layout.index
         start, end = sel.get_range()

=== added file 'softwarecenter/ui/gtk3/widgets/viewport.py'
--- softwarecenter/ui/gtk3/widgets/viewport.py	1970-01-01 00:00:00 +0000
+++ softwarecenter/ui/gtk3/widgets/viewport.py	2011-09-21 12:54:02 +0000
@@ -0,0 +1,46 @@
+from gi.repository import Gtk, Gdk
+
+# key values we want to respond to
+_uppers = (Gdk.KEY_KP_Up, Gdk.KEY_Up)
+_downers = (Gdk.KEY_KP_Down, Gdk.KEY_Down)
+
+
+
+class Viewport(Gtk.Viewport):
+
+    def __init__(self):
+        Gtk.Viewport.__init__(self)
+        self.connect("key-press-event", self.on_key_press_event)
+        return
+
+    def on_key_press_event(self, widget, event):
+        global _uppers, _downers
+        kv = event.keyval
+
+        if kv in _uppers or kv in _downers:
+            # get the ScrolledWindow adjustments and tweak them appropriately
+            if not self.get_parent(): return False
+
+            # the ScrolledWindow vertical-adjustment
+            scroll = self.get_ancestor('GtkScrolledWindow')
+            if not scroll: return False
+
+            v_adj = scroll.get_vadjustment()
+
+            # scroll up
+            if kv in _uppers:
+                v = max(v_adj.get_value() - v_adj.get_step_increment(),
+                        v_adj.get_lower())
+
+            # scroll down 
+            elif kv in _downers:
+                v = min(v_adj.get_value() + v_adj.get_step_increment(),
+                        v_adj.get_upper() - v_adj.get_page_size())
+
+            # set our new value
+            v_adj.set_value(v)
+
+            # do not share the event with other widgets
+            return True
+        # share the event with other widgets
+        return False