Merge lp:~evfool/software-center/lp987797 into lp:software-center/5.2

Proposed by Robert Roth on 2012-05-12
Status: Merged
Merged at revision: 3010
Proposed branch: lp:~evfool/software-center/lp987797
Merge into: lp:software-center/5.2
Diff against target: 51 lines (+10/-10)
1 file modified
softwarecenter/ui/gtk3/widgets/reviews.py (+10/-10)
To merge this branch: bzr merge lp:~evfool/software-center/lp987797
Reviewer Review Type Date Requested Status
Michael Vogt 2012-05-12 Approve on 2012-05-15
Review via email: mp+105557@code.launchpad.net

Description of the change

Updated the reviews header (line up the reviews title with the language selection and sort box) to match the specification, as requested in bug #987797.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Hi Robert! Thanks a lot for your branch.

It looks great, but I noticed that it contains one line that has "tabs" vs "spaces". This is not ideal, we uses spaces in software-center, I fixed it during the merge but it would be nice if you could make your editor uses spaces instead of tabs.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/widgets/reviews.py'
2--- softwarecenter/ui/gtk3/widgets/reviews.py 2012-04-18 08:53:29 +0000
3+++ softwarecenter/ui/gtk3/widgets/reviews.py 2012-05-12 13:46:17 +0000
4@@ -114,18 +114,12 @@
5 label.set_padding(6, 6)
6 label.set_use_markup(True)
7 label.set_alignment(0, 0.5)
8- self.pack_start(label, False, False, 0)
9+ self.header = Gtk.HBox()
10+ self.header.pack_start(label, False, False, 0)
11
12 # header
13- self.header = Gtk.HBox()
14 self.header.set_spacing(StockEms.MEDIUM)
15
16- self.new_review = Link(_('Write your own review'))
17- self.new_review.connect('clicked', lambda w: self.emit('new-review'))
18- inner_vb = Gtk.VBox()
19- inner_vb.pack_start(self.new_review, False, False, StockEms.SMALL)
20- self.header.pack_start(inner_vb, False, False, 0)
21- self.pack_start(self.header, False, False, 0)
22
23 # review sort method
24 self.sort_combo = Gtk.ComboBoxText()
25@@ -151,10 +145,16 @@
26 "changed", self._on_different_review_language_clicked)
27 self.header.pack_end(self.review_language, False, True, 0)
28
29+ self.pack_start(self.header, False, False, 0)
30+ self.reviews_info_hbox = Gtk.HBox()
31+ self.new_review = Link(_('Write your own review'))
32+ self.new_review.connect('clicked', lambda w: self.emit('new-review'))
33+ self.reviews_info_hbox.pack_start(self.new_review, False, False, StockEms.SMALL)
34+ self.pack_start(self.reviews_info_hbox, True, True, 0)
35 # this is where the reviews end up
36 self.vbox = Gtk.VBox()
37 self.vbox.set_spacing(24)
38- self.pack_start(self.vbox, True, True, 0)
39+ self.pack_end(self.vbox, True, True, 0)
40
41 # ensure network state updates
42 self.no_network_msg = None
43@@ -214,7 +214,7 @@
44 self.install_first_label = Gtk.Label(label=s)
45 self.install_first_label.set_use_markup(True)
46 self.install_first_label.set_alignment(1.0, 0.5)
47- self.header.pack_start(self.install_first_label, False, False, 0)
48+ self.reviews_info_hbox.pack_start(self.install_first_label, False, False, 0)
49 self.install_first_label.show()
50
51 # FIXME: this needs to be smarter in the future as we will

Subscribers

People subscribed via source and target branches