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
=== modified file 'softwarecenter/ui/gtk3/widgets/reviews.py'
--- softwarecenter/ui/gtk3/widgets/reviews.py 2012-04-18 08:53:29 +0000
+++ softwarecenter/ui/gtk3/widgets/reviews.py 2012-05-12 11:31:19 +0000
@@ -194,11 +194,18 @@
194 UI vbox out of them194 UI vbox out of them
195 """195 """
196 self.logged_in_person = get_person_from_config()196 self.logged_in_person = get_person_from_config()
197 is_first_for_version = None
197 if self.reviews:198 if self.reviews:
199 previous_review = None
198 for r in self.reviews:200 for r in self.reviews:
199 pkgversion = self._parent.app_details.version201 pkgversion = self._parent.app_details.version
202 if previous_review:
203 is_first_for_version = previous_review.version != r.version
204 else:
205 is_first_for_version = True
206 previous_review = r
200 review = UIReview(r, pkgversion, self.logged_in_person,207 review = UIReview(r, pkgversion, self.logged_in_person,
201 self.useful_votes)208 self.useful_votes, is_first_for_version)
202 review.show_all()209 review.show_all()
203 self.vbox.pack_start(review, True, True, 0)210 self.vbox.pack_start(review, True, True, 0)
204211
@@ -398,7 +405,8 @@
398 useful/inappropriate etc405 useful/inappropriate etc
399 """406 """
400 def __init__(self, review_data=None, app_version=None,407 def __init__(self, review_data=None, app_version=None,
401 logged_in_person=None, useful_votes=None):408 logged_in_person=None, useful_votes=None,
409 first_for_version=True):
402 GObject.GObject.__init__(self)410 GObject.GObject.__init__(self)
403 self.set_spacing(StockEms.SMALL)411 self.set_spacing(StockEms.SMALL)
404412
@@ -438,8 +446,8 @@
438 self.usefulness_error = False446 self.usefulness_error = False
439 self.delete_error = False447 self.delete_error = False
440 self.modify_error = False448 self.modify_error = False
441449 if first_for_version:
442 self.pack_start(self.version_label, False, False, 0)450 self.pack_start(self.version_label, False, False, 0)
443 self.pack_start(self.header, False, False, 0)451 self.pack_start(self.header, False, False, 0)
444 self.pack_start(self.body, False, False, 0)452 self.pack_start(self.body, False, False, 0)
445 self.pack_start(self.footer, False, False, StockEms.SMALL)453 self.pack_start(self.footer, False, False, StockEms.SMALL)

Subscribers

People subscribed via source and target branches