Merge lp:~evfool/software-center/scfixes into lp:software-center

[Robert Roth]

Small fixes, in the order of the respective commits, one commit/fix:
* Added border to the scrolledwindow in the dependencies have to be removed dialog (fixes bug #844028)
* Check for None in package-specific parsers before calling .lower (fixes bug #839113)
* parse_color does not return a tuple anymore, update the description focus_in and focus_out methods (fixes bug #843317)
* Set the minimum size (size-request) of the main window to 730x470 to fit the toolbar and look better (fixes bug #842684)
* Only show the "You need to install the app to review it" text once in case of not installed apps with no reviews (removed the one from the right side, only show the one below the App has not been reviewed yet text) (fixes bug #823255)

[Gary Lasker (gary-lasker)]

Very nice fixes, thanks very much, Robert! Merged to trunk.

review: Approve

=== modified file 'data/ui/gtk3/dialogs.ui'
--- data/ui/gtk3/dialogs.ui	2011-08-12 12:03:34 +0000
+++ data/ui/gtk3/dialogs.ui	2011-09-07 19:03:24 +0000
@@ -409,6 +409,7 @@
                       <object class="GtkScrolledWindow" id="scrolledwindow_dependencies">
                         <property name="height_request">150</property>
                         <property name="visible">True</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
                         <child>
 
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2011-09-07 06:21:20 +0000
+++ softwarecenter/ui/gtk3/app.py	2011-09-07 19:03:24 +0000
@@ -332,7 +332,7 @@
         self.menuitem_help.set_label(_("%s _Help")%self.distro.get_app_name())
 
         # specify the smallest allowable window size
-        self.window_main.set_default_size(700, 400)
+        self.window_main.set_size_request(730, 470)
 
         # reviews
         self.review_loader = get_review_loader(self.cache, self.db)
 
=== modified file 'softwarecenter/ui/gtk3/widgets/description.py'
--- softwarecenter/ui/gtk3/widgets/description.py	2011-09-02 22:53:39 +0000
+++ softwarecenter/ui/gtk3/widgets/description.py	2011-09-07 19:03:24 +0000
@@ -37,6 +37,8 @@
 class _SpecialCasePreParsers(object):
 
     def preparse(self, k, desc):
+        if k is None:
+            return desc
         func_name = '_%s_preparser' % k.lower()
         if not hasattr(self, func_name):
             return desc
@@ -456,24 +458,23 @@
     def do_draw(self, cr):
         self.render(self, cr)
         return
+     
+    # small helper to be consitent with the ever changing pygi API
+    def _color_parse(self, s):
+        l = Gdk.color_parse(s)
+        if type(l) is tuple:
+            return l[1]
+        return l
 
     def _on_style_updated(self, widget):
         #style = self.get_style()
-    
-        # small helper to be consitent with the ever changing pygi API
-        def color_parse(s):
-            l = Gdk.color_parse(s)
-            if type(l) is tuple:
-                return l[1]
-            return l
-
         if self.has_focus():
-            self._bg = color_parse('red')
-            self._fg = color_parse('#000')
+            self._bg = self._color_parse('red')
+            self._fg = self._color_parse('#000')
         else:
             #~ _, self._bg = Gdk.color_parse('#E5E3E1')
-            self._bg = color_parse('red')
-            self._fg = color_parse('#000')
+            self._bg = self._color_parse('red')
+            self._fg = self._color_parse('#000')
         return
 
 #    def _on_drag_begin(self, widgets, context, event_helper):
@@ -488,14 +489,14 @@
 
     def _on_focus_in(self, widget, event):
         #~ _, self._bg = self.style.base[Gtk.StateType.SELECTED]
-        tmp, self._bg = Gdk.color_parse('red')
-        tmp, self._fg = Gdk.color_parse('#000')
+        self._bg = self._color_parse('red')
+        self._fg = self._color_parse('#000')
         return
 
     def _on_focus_out(self, widget, event):
         #~ _, self._bg = Gdk.color_parse('#E5E3E1')
-        tmp, self._bg = Gdk.color_parse('red')
-        tmp, self._fg = Gdk.color_parse('#000')
+        self._bg = self._color_parse('red')
+        self._fg = self._color_parse('#000')
         return
 
     def _on_motion(self, widget, event, event_helper, cur, sel):
 
=== modified file 'softwarecenter/ui/gtk3/widgets/reviews.py'
--- softwarecenter/ui/gtk3/widgets/reviews.py	2011-08-31 12:40:40 +0000
+++ softwarecenter/ui/gtk3/widgets/reviews.py	2011-09-07 19:03:24 +0000
@@ -209,7 +209,10 @@
             self.new_review.show()
         else:
             self.new_review.hide()
-            self._install_to_review()
+            # if there are no reviews, the install to review text appears 
+            # where the reviews usually are (LP #823255)
+            if self.reviews:
+                self._install_to_review()
 
         # always hide spinner and call _fill (fine if there is nothing to do)
         self.hide_spinner()