Merge lp:~aaronp/software-center/top-rated-gtk3-fixes into lp:software-center

[Aaron Peachey]

1. Fixes bug LP: #830272 for gtk3 - remove 'More' from top rated screens in subcategories and increase number of tiles to 12.
2. Simplify code in catview_gtk.py for gtk3 by providing a single method to add tiles to FlowableGrids rather than repeating the same code in all append_xxxxxx methods.

[Michael Vogt (mvo)]

Thanks, I love the _add_tiles_to_flowgrid() fix!

I renamed qty to amount, I'm not a native speaker, but it feels a tiny bit more readable this way (and used min() while I was at it).

In the code:
+ frame.set_header_label(_('Top Rated %s' % self.header))
this part will cause issues with i18n. it needs to be
set_header_label(_('Top Rated %s') % self.header)
(not the slightly different parenthesis).

With the later, it will translate into e.g. "Superbewertung %s" and then the header is added.

When the parentheses are different it will first add the header and then try to translate. But that will fail as in gettext it expectes the "%s" in the string and will not find a match if that is not there (the string it will search for will be something like "Top Rated Internet" but the gettext catalogue only has "Top Rated %s").

I fixed that tiny issue during the merge.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-19 19:48:18 +0000
+++ debian/changelog	2011-08-21 11:59:17 +0000
@@ -11,8 +11,18 @@
     - gtk3 fixes
   * softwarecenter/ui/gtk3/widgets/stars.py:
     - add get_rating() to make the submit_review_gtk3.py work
+    
+  [ Aaron Peachey ]
+  * softwarecenter/ui/gtk3/views/catview_gtk.py:
+    - remove 'More' button from sub-category top rated sections
+    - increase number of apps in top-rated feature frames from 8 to 12
+    - add sub category name into frame header for subcategory toprated
+     (LP: #830272)
+  * softwarecenter/ui/gtk3/views/catview_gtk.py:
+    - provide standard method for adding tiles to Flowable grid to 
+      simplify repeated append code (and DRY)
 
- -- Michael Vogt <[e-mail]>  Fri, 19 Aug 2011 14:52:03 +0200
+ -- Aaron Peachey <[e-mail]>  Sun, 21 Aug 2011 21:51:34 +1000
 
 software-center (4.1.17) oneiric; urgency=low
 
 
=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py	2011-08-18 18:36:55 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py	2011-08-21 11:59:17 +0000
@@ -143,6 +143,25 @@
         self.connect("size-allocate", self.on_size_allocate)
         return
 
+    def _add_tiles_to_flowgrid(self, docs, flowgrid, qty):
+        '''Adds application tiles to a FlowableGrid:
+           docs = xapian documents (apps)
+           flowgrid = the FlowableGrid to add tiles to
+           qty = number of tiles to add from start of doc range'''
+        if len(docs) < qty:
+            qty = len(docs)
+            
+        for doc in docs[0:qty]:
+            name = self.helper.get_appname(doc)
+            icon_pb = self.helper.get_icon_at_size(doc, 48, 48)
+            stats = self.helper.get_review_stats(doc)
+            categories = self.helper.get_categories(doc)
+            tile = FeaturedTile(name, icon_pb, stats, categories)
+            tile.connect('clicked', self.on_app_clicked,
+                         self.helper.get_application(doc))
+            flowgrid.add_child(tile)
+        return
+
     def on_size_allocate(self, widget, _):
         a = widget.get_allocation()
         prev = self._prev_alloc
@@ -345,7 +364,7 @@
         enq = AppEnquire(self.cache, self.db)
         app_filter = AppFilter(self.db, self.cache)
         enq.set_query(toprated_cat.query,
-                      limit=8,
+                      limit=TOP_RATED_CAROUSEL_LIMIT,
                       sortmode=toprated_cat.sortmode,
                       filter=app_filter,
                       nonapps_visible=NonAppVisibility.ALWAYS_VISIBLE,
@@ -360,16 +379,10 @@
         frame.add(self.toprated)
         self.right_column.pack_start(frame, True, True, 0)
 
-        helper = AppPropertiesHelper(self.db, self.cache, self.icons)
-        for doc in enq.get_documents():
-            name = helper.get_appname(doc)
-            icon_pb = helper.get_icon_at_size(doc, 48, 48)
-            stats = helper.get_review_stats(doc)
-            categories = helper.get_categories(doc)
-            tile = FeaturedTile(name, icon_pb, stats, categories)
-            tile.connect('clicked', self.on_app_clicked,
-                         helper.get_application(doc))
-            self.toprated.add_child(tile)
+        self.helper = AppPropertiesHelper(self.db, self.cache, self.icons)
+        docs = enq.get_documents()
+        self._add_tiles_to_flowgrid(docs, self.toprated, TOP_RATED_CAROUSEL_LIMIT)
+        return
         
 
     def _append_featured(self):
@@ -395,16 +408,9 @@
         frame.add(self.featured)
         self.right_column.pack_start(frame, True, True, 0)
 
-        helper = AppPropertiesHelper(self.db, self.cache, self.icons)
-        for doc in enq.get_documents():
-            name = helper.get_appname(doc)
-            icon_pb = helper.get_icon_at_size(doc, 48, 48)
-            stats = helper.get_review_stats(doc)
-            categories = helper.get_categories(doc)
-            tile = FeaturedTile(name, icon_pb, stats, categories)
-            tile.connect('clicked', self.on_app_clicked,
-                         helper.get_application(doc))
-            self.featured.add_child(tile)
+        self.helper = AppPropertiesHelper(self.db, self.cache, self.icons)
+        docs = enq.get_documents()
+        self._add_tiles_to_flowgrid(docs, self.featured, 8)
         return
 
     def _append_recommendations(self):
@@ -426,16 +432,9 @@
         frame.header_implements_more_button()
         self.right_column.pack_start(frame, True, True, 0)
 
-        helper = AppPropertiesHelper(self.db, self.cache, self.icons)
-        for doc in enq.get_documents():
-            name = helper.get_appname(doc)
-            icon_pb = helper.get_icon_at_size(doc, 48, 48)
-            stats = helper.get_review_stats(doc)
-            categories = helper.get_categories(doc)
-            tile = FeaturedTile(name, icon_pb, stats, categories)
-            tile.connect('clicked', self.on_app_clicked,
-                         helper.get_application(doc))
-            self.featured.add_child(tile)
+        self.helper = AppPropertiesHelper(self.db, self.cache, self.icons)
+        docs = enq.get_documents()
+        self._add_tiles_to_flowgrid(docs, self.featured, 12)
         return
 
     def _append_appcount(self, supported_only=False):
@@ -514,27 +513,14 @@
             frame = FramedHeaderBox()
             # set x/y-alignment and x/y-expand
             #~ frame.set(0.5, 0.0, 1.0, 1.0)
-            frame.set_header_label(_("Top Rated"))
-            frame.header_implements_more_button()
+            frame.set_header_label(_('Top Rated %s' % self.header))
             frame.pack_start(self.toprated, True, True, 0)
             # append the departments section to the page
             self.vbox.pack_start(frame, False, True, 0)
             self.toprated_frame = frame
         else:
             self.toprated.remove_all()
-
-        # ensure that we update the more button
-        cat_with_toprated_search = copy.copy(category)
-        cat_with_toprated_search.sortmode = SortMethods.BY_TOP_RATED
-        cat_with_toprated_search.item_limit = TOP_RATED_CAROUSEL_LIMIT
-        # disconnect old handler (if there is one)
-        try:
-            self.toprated_frame.more.disconnect_by_func(
-                self.on_category_clicked)
-        except TypeError:
-            pass
-        self.toprated_frame.more.connect(
-            'clicked', self.on_category_clicked, cat_with_toprated_search)
+            self.toprated_frame.set_header_label(_('Top Rated %s' % self.header))
 
         # and fill the toprated grid
         self.enquire.set_query(category.query,
@@ -544,15 +530,8 @@
                                nonapps_visible=NonAppVisibility.ALWAYS_VISIBLE,
                                nonblocking_load=False)
 
-        for doc in self.enquire.get_documents()[0:8]:
-            name = self.helper.get_appname(doc)
-            icon_pb = self.helper.get_icon_at_size(doc, 48, 48)
-            stats = self.helper.get_review_stats(doc)
-            categories = self.helper.get_categories(doc)
-            tile = FeaturedTile(name, icon_pb, stats, categories)
-            tile.connect('clicked', self.on_app_clicked,
-                         self.helper.get_application(doc))
-            self.toprated.add_child(tile)
+        docs = self.enquire.get_documents()
+        self._add_tiles_to_flowgrid(docs, self.toprated, TOP_RATED_CAROUSEL_LIMIT)
         return
 
     def _append_subcat_departments(self, root_category, num_items):