Merge lp:~mvo/software-center/reoder-lobby-screen into lp:software-center

[Michael Vogt]

This branch reoders the lobby screen according to the spec at https://wiki.ubuntu.com/SoftwareCenter#Home_screen

[Łukasz Czyżykowski (lukasz-czyzykowski)]

LGTM

review: Approve

=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py	2012-08-17 08:13:20 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py	2012-08-22 06:19:27 +0000
@@ -267,6 +267,12 @@
 
         self.right_column = Gtk.Box.new(Gtk.Orientation.VERTICAL, self.SPACING)
         self.top_hbox.pack_start(self.right_column, True, True, 0)
+        self.bottom_hbox = Gtk.HBox(spacing=StockEms.SMALL)
+        bottom_hbox_alignment = Gtk.Alignment()
+        bottom_hbox_alignment.set_padding(0, 0, StockEms.MEDIUM - 2,
+            StockEms.MEDIUM - 2)
+        bottom_hbox_alignment.add(self.bottom_hbox)
+        self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)
 
         self._append_whats_new()
         self._append_top_rated()
@@ -366,7 +372,7 @@
         self.top_rated_frame = FramedHeaderBox()
         self.top_rated_frame.set_header_label(_("Top Rated"))
         self.top_rated_frame.add(self.top_rated)
-        self.right_column.pack_start(self.top_rated_frame, True, True, 0)
+        self.bottom_hbox.pack_start(self.top_rated_frame, True, True, 0)
         top_rated_cat = self._update_top_rated_content()
         # only display the 'More' LinkButton if we have top_rated content
         if top_rated_cat is not None:
@@ -404,29 +410,15 @@
     def _update_recommended_for_you_content(self):
         if (self.recommended_for_you_panel and
             self.recommended_for_you_panel.get_parent()):
-            self.bottom_hbox.remove(self.recommended_for_you_panel)
+            self.right_column.remove(self.recommended_for_you_panel)
         self.recommended_for_you_panel = RecommendationsPanelLobby(self)
-        self.bottom_hbox.pack_start(self.recommended_for_you_panel,
+        self.right_column.pack_start(self.recommended_for_you_panel,
                                     True, True, 0)
 
     def _append_recommended_for_you(self):
-        # TODO: This space will initially contain an opt-in screen, and this
-        #       will update to the tile view of recommended apps when ready
-        #       see https://wiki.ubuntu.com/SoftwareCenter#Home_screen
-        self.bottom_hbox = Gtk.HBox(spacing=StockEms.SMALL)
-        bottom_hbox_alignment = Gtk.Alignment()
-        bottom_hbox_alignment.set_padding(0, 0, StockEms.MEDIUM - 2,
-            StockEms.MEDIUM - 2)
-        bottom_hbox_alignment.add(self.bottom_hbox)
-        self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)
-
-        # TODO: During development, place the "Recommended For You" panel
-        #       at the bottom, but swap this with the Top Rated panel once
-        #       the recommended for you pieces are done and deployed
-        #       see https://wiki.ubuntu.com/SoftwareCenter#Home_screen
         self.recommended_for_you_panel = RecommendationsPanelLobby(self)
-        self.bottom_hbox.pack_start(self.recommended_for_you_panel,
-                                    True, True, 0)
+        self.right_column.pack_start(
+            self.recommended_for_you_panel, True, True, 0)
 
     def _update_appcount(self):
         enq = AppEnquire(self.cache, self.db)