Ubuntu Software Center

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

  1. reoder-lobby-screen
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 3116
Proposed branch: lp:~mvo/software-center/reoder-lobby-screen
Merge into: lp:software-center
Diff against target: 59 lines (+11/-19)
1 file modified
softwarecenter/ui/gtk3/views/catview_gtk.py (+11/-19)
To merge this branch: bzr merge lp:~mvo/software-center/reoder-lobby-screen
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski (community) Approve
software-store-developers Pending
Review via email: mp+120709@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
267267
268 self.right_column = Gtk.Box.new(Gtk.Orientation.VERTICAL, self.SPACING)268 self.right_column = Gtk.Box.new(Gtk.Orientation.VERTICAL, self.SPACING)
269 self.top_hbox.pack_start(self.right_column, True, True, 0)269 self.top_hbox.pack_start(self.right_column, True, True, 0)
270 self.bottom_hbox = Gtk.HBox(spacing=StockEms.SMALL)
271 bottom_hbox_alignment = Gtk.Alignment()
272 bottom_hbox_alignment.set_padding(0, 0, StockEms.MEDIUM - 2,
273 StockEms.MEDIUM - 2)
274 bottom_hbox_alignment.add(self.bottom_hbox)
275 self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)
270276
271 self._append_whats_new()277 self._append_whats_new()
272 self._append_top_rated()278 self._append_top_rated()
@@ -366,7 +372,7 @@
366 self.top_rated_frame = FramedHeaderBox()372 self.top_rated_frame = FramedHeaderBox()
367 self.top_rated_frame.set_header_label(_("Top Rated"))373 self.top_rated_frame.set_header_label(_("Top Rated"))
368 self.top_rated_frame.add(self.top_rated)374 self.top_rated_frame.add(self.top_rated)
369 self.right_column.pack_start(self.top_rated_frame, True, True, 0)375 self.bottom_hbox.pack_start(self.top_rated_frame, True, True, 0)
370 top_rated_cat = self._update_top_rated_content()376 top_rated_cat = self._update_top_rated_content()
371 # only display the 'More' LinkButton if we have top_rated content377 # only display the 'More' LinkButton if we have top_rated content
372 if top_rated_cat is not None:378 if top_rated_cat is not None:
@@ -404,29 +410,15 @@
404 def _update_recommended_for_you_content(self):410 def _update_recommended_for_you_content(self):
405 if (self.recommended_for_you_panel and411 if (self.recommended_for_you_panel and
406 self.recommended_for_you_panel.get_parent()):412 self.recommended_for_you_panel.get_parent()):
407 self.bottom_hbox.remove(self.recommended_for_you_panel)413 self.right_column.remove(self.recommended_for_you_panel)
408 self.recommended_for_you_panel = RecommendationsPanelLobby(self)414 self.recommended_for_you_panel = RecommendationsPanelLobby(self)
409 self.bottom_hbox.pack_start(self.recommended_for_you_panel,415 self.right_column.pack_start(self.recommended_for_you_panel,
410 True, True, 0)416 True, True, 0)
411417
412 def _append_recommended_for_you(self):418 def _append_recommended_for_you(self):
413 # TODO: This space will initially contain an opt-in screen, and this
414 # will update to the tile view of recommended apps when ready
415 # see https://wiki.ubuntu.com/SoftwareCenter#Home_screen
416 self.bottom_hbox = Gtk.HBox(spacing=StockEms.SMALL)
417 bottom_hbox_alignment = Gtk.Alignment()
418 bottom_hbox_alignment.set_padding(0, 0, StockEms.MEDIUM - 2,
419 StockEms.MEDIUM - 2)
420 bottom_hbox_alignment.add(self.bottom_hbox)
421 self.vbox.pack_start(bottom_hbox_alignment, False, False, 0)
422
423 # TODO: During development, place the "Recommended For You" panel
424 # at the bottom, but swap this with the Top Rated panel once
425 # the recommended for you pieces are done and deployed
426 # see https://wiki.ubuntu.com/SoftwareCenter#Home_screen
427 self.recommended_for_you_panel = RecommendationsPanelLobby(self)419 self.recommended_for_you_panel = RecommendationsPanelLobby(self)
428 self.bottom_hbox.pack_start(self.recommended_for_you_panel,420 self.right_column.pack_start(
429 True, True, 0)421 self.recommended_for_you_panel, True, True, 0)
430422
431 def _update_appcount(self):423 def _update_appcount(self):
432 enq = AppEnquire(self.cache, self.db)424 enq = AppEnquire(self.cache, self.db)

Subscribers

People subscribed via source and target branches