Merge lp:~mpt/software-center/fit-and-finish-2 into lp:software-center

[Matthew Paul Thomas]

- Uses the same size text for all elements in the installation state bar.
- Shortens "Find it in the menu at:" to "Find it in the menu:", and removes the italics.
- Lessens the visual punishment for applications with too-small icons.
- Stops changing the search field color whenever it's being used.

[lp:~mpt/software-center/fit-and-finish-2]

1057. By Matthew Paul Thomas on 2010-08-26

Fixes bug 623460 (Pathbutton element that doesn't do anything is strongly highlighted).

=== modified file 'softwarecenter/view/appdetailsview_gtk.py'
--- softwarecenter/view/appdetailsview_gtk.py	2010-08-26 09:04:43 +0000
+++ softwarecenter/view/appdetailsview_gtk.py	2010-08-26 12:49:54 +0000
@@ -1411,7 +1411,7 @@
             where = searcher.get_main_menu_path(self.app_details.desktop_file)
             if not where:
                 return
-            label = gtk.Label(_("Find it in "))
+            label = gtk.Label(_("Find it in the menu: "))
             self.desc_installed_where.pack_start(label, False, False)
             for (i, item) in enumerate(where):
                 iconname = item.get_icon()
@@ -1421,7 +1421,8 @@
                     self.desc_installed_where.pack_start(image, False, False)
 
                 label_name = gtk.Label()
-                label_name.set_markup('<i>%s</i>' % gobject.markup_escape_text(item.get_name()))
+                label_name.set_markup(
+                    gobject.markup_escape_text(item.get_name()))
                 self.desc_installed_where.pack_start(label_name, False, False)
                 if i+1 < len(where):
                     right_arrow = gtk.Arrow(gtk.ARROW_RIGHT, gtk.SHADOW_NONE)
@@ -1630,13 +1631,12 @@
 
         rr.layout(cr, a.x, a.y, a.x+a.width, a.y+a.height, radius=3)
         cr.set_source_rgb(*mkit.floats_from_gdkcolor(self.style.base[0]))
-        cr.fill()
 
         cr.save()
 
         # line width should be 0.05em but for the sake of simplicity
-        # make it 1 pixel
-        cr.set_line_width(1)
+        # make it 0.25 pixels
+        cr.set_line_width(0.25)
         cr.translate(0.5, 0.5)
 
         r,g,b = mkit.floats_from_gdkcolor(self.style.dark[self.state])

=== modified file 'softwarecenter/view/widgets/mkit.py'
--- softwarecenter/view/widgets/mkit.py	2010-08-26 08:12:29 +0000
+++ softwarecenter/view/widgets/mkit.py	2010-08-26 12:49:54 +0000
@@ -571,10 +571,6 @@
         curv = self["curvature"]
         aw = self["arrow-width"]
 
-        if CACHED_THEME_NAME == 'Ambiance-maverick-beta':
-            if state == gtk.STATE_PRELIGHT and part.is_active:
-                state = gtk.STATE_SELECTED
-
         cr.save()
         cr.rectangle(x, y, w+1, h)
 
@@ -582,12 +578,7 @@
         cr.translate(x-sxO, y)
 
         # bg linear vertical gradient
-        if state != gtk.STATE_ACTIVE or not part.is_active:
-            color1, color2 = self.gradients[state]
-        elif state == gtk.STATE_ACTIVE and part.is_active:
-            color1, color2 = self.gradients[gtk.STATE_SELECTED]
-            #color1 = color2
-            color1 = color2.shade(1.1)
+        color1, color2 = self.gradients[state]
 
         shape.layout(cr, 1, 1, w, h-1, arrow_width=aw, radius=curv)
         lin = cairo.LinearGradient(0, 0, 0, h)

=== modified file 'softwarecenter/view/widgets/pathbar_gtk_atk.py'
--- softwarecenter/view/widgets/pathbar_gtk_atk.py	2010-08-20 06:48:31 +0000
+++ softwarecenter/view/widgets/pathbar_gtk_atk.py	2010-08-26 12:49:54 +0000
@@ -147,10 +147,7 @@
         return
 
     def _part_leave_notify(self, part, event):
-        if part == self._active_part:
-            part.set_state(gtk.STATE_SELECTED)
-        else:
-            part.set_state(gtk.STATE_NORMAL)
+        part.set_state(gtk.STATE_NORMAL)
         self._part_queue_draw(part)
         return
 
@@ -190,7 +187,6 @@
         # react to spacebar, enter, numpad-enter
         if event.keyval in (32, 65293, 65421):
             self.set_active(part)
-            part.set_state(gtk.STATE_SELECTED)
             self._part_queue_draw(part)
         return
 
@@ -464,7 +460,6 @@
             self._active_part.set_state(gtk.STATE_NORMAL)
             self._part_queue_draw(self._active_part)
 
-        part.set_state(gtk.STATE_SELECTED)
         self._part_queue_draw(part)
         self._active_part = part
         if do_callback and part.callback:

=== modified file 'softwarecenter/view/widgets/searchentry.py'
--- softwarecenter/view/widgets/searchentry.py	2010-04-20 09:25:44 +0000
+++ softwarecenter/view/widgets/searchentry.py	2010-08-26 12:49:54 +0000
@@ -1,7 +1,6 @@
 # coding: utf-8
 #
-# SearchEntry - An enhanced search entry with alternating background colouring 
-#               and timeout support
+# SearchEntry - An enhanced search entry with timeout
 #
 # Copyright (C) 2007 Sebastian Heinlein
 #               2007-2009 Canonical Ltd.
@@ -38,8 +37,7 @@
 
     def __init__(self, icon_theme=None):
         """
-        Creates an enhanced IconEntry that supports a time out when typing
-        and uses a different background colour when the search is active
+        Creates an enhanced IconEntry that triggers a timeout when typing
         """
         gtk.Entry.__init__(self)
         if not icon_theme:
@@ -51,12 +49,6 @@
         self.set_icon_from_stock(gtk.ENTRY_ICON_PRIMARY, gtk.STOCK_FIND)
         self.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, None)
 
-        # Do not draw a yellow bg if an a11y theme is used
-        settings = gtk.settings_get_default()
-        theme = settings.get_property("gtk-theme-name")
-        self._a11y = (theme.startswith("HighContrast") or
-                      theme.startswith("LowContrast"))
-        
         # set sensible atk name
         atk_desc = self.get_accessible()
         atk_desc.set_name(_("Search"))
@@ -129,24 +121,12 @@
 
     def _check_style(self):
         """
-        Use a different background colour if a search is active
+        Show the clear icon whenever the field is not empty
         """
-        # show/hide icon
         if self.get_text() != "":
             self.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, gtk.STOCK_CLEAR)
         else:
             self.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, None)
-        # Based on the Rhythmbox code
-        yellowish = gtk.gdk.Color(63479, 63479, 48830)
-        black = gtk.gdk.Color(0, 0, 0)
-        if self._a11y == True:
-            return
-        if self.get_text() == "":
-            self.modify_base(gtk.STATE_NORMAL, None)
-            self.modify_text(gtk.STATE_NORMAL, None)
-        else:
-            self.modify_base(gtk.STATE_NORMAL, yellowish)
-            self.modify_text(gtk.STATE_NORMAL, black)
 
 def on_entry_changed(self, terms):
     print terms