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

Proposed by Robert Roth
Status: Merged
Merged at revision: 3020
Proposed branch: lp:~evfool/software-center/lp987801
Merge into: lp:software-center/5.2
Diff against target: 44 lines (+12/-4)
1 file modified
softwarecenter/ui/gtk3/widgets/reviews.py (+12/-4)
To merge this branch: bzr merge lp:~evfool/software-center/lp987801
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+105552@code.launchpad.net

Description of the change

Only show the version label once for each label, as specified in the specification and requested in bug #987801.

To post a comment you must log in.

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 11:31:19 +0000
4@@ -194,11 +194,18 @@
5 UI vbox out of them
6 """
7 self.logged_in_person = get_person_from_config()
8+ is_first_for_version = None
9 if self.reviews:
10+ previous_review = None
11 for r in self.reviews:
12 pkgversion = self._parent.app_details.version
13+ if previous_review:
14+ is_first_for_version = previous_review.version != r.version
15+ else:
16+ is_first_for_version = True
17+ previous_review = r
18 review = UIReview(r, pkgversion, self.logged_in_person,
19- self.useful_votes)
20+ self.useful_votes, is_first_for_version)
21 review.show_all()
22 self.vbox.pack_start(review, True, True, 0)
23
24@@ -398,7 +405,8 @@
25 useful/inappropriate etc
26 """
27 def __init__(self, review_data=None, app_version=None,
28- logged_in_person=None, useful_votes=None):
29+ logged_in_person=None, useful_votes=None,
30+ first_for_version=True):
31 GObject.GObject.__init__(self)
32 self.set_spacing(StockEms.SMALL)
33
34@@ -438,8 +446,8 @@
35 self.usefulness_error = False
36 self.delete_error = False
37 self.modify_error = False
38-
39- self.pack_start(self.version_label, False, False, 0)
40+ if first_for_version:
41+ self.pack_start(self.version_label, False, False, 0)
42 self.pack_start(self.header, False, False, 0)
43 self.pack_start(self.body, False, False, 0)
44 self.pack_start(self.footer, False, False, StockEms.SMALL)

Subscribers

People subscribed via source and target branches