Merge lp:~mvo/software-center/lp1009967 into lp:software-center

Proposed by Michael Vogt
Status: Merged
Approved by: Gary Lasker
Approved revision: 3231
Merged at revision: 3235
Proposed branch: lp:~mvo/software-center/lp1009967
Merge into: lp:software-center
Diff against target: 47 lines (+4/-4)
3 files modified
data/extra-unity-categories.menu.in (+0/-1)
data/top-rated.menu.in (+0/-1)
softwarecenter/ui/gtk3/widgets/buttons.py (+4/-2)
To merge this branch: bzr merge lp:~mvo/software-center/lp1009967
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+128695@code.launchpad.net

Description of the change

This implements "top rated" according to the spec (LP: #1009967) by
also showing the already installed items.

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Does the trick nicely! Thanks, mvo.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/extra-unity-categories.menu.in'
2--- data/extra-unity-categories.menu.in 2012-09-17 15:47:14 +0000
3+++ data/extra-unity-categories.menu.in 2012-10-09 12:49:22 +0000
4@@ -26,7 +26,6 @@
5 <Flags>
6 <Flag>available-only</Flag>
7 <Flag>carousel-only</Flag>
8- <Flag>not-installed-only</Flag>
9 </Flags>
10 <SCSortMode>4</SCSortMode>
11 <SCItemLimit>100</SCItemLimit>
12
13=== modified file 'data/top-rated.menu.in'
14--- data/top-rated.menu.in 2012-09-17 15:47:14 +0000
15+++ data/top-rated.menu.in 2012-10-09 12:49:22 +0000
16@@ -7,7 +7,6 @@
17 <Flags>
18 <Flag>available-only</Flag>
19 <Flag>carousel-only</Flag>
20- <Flag>not-installed-only</Flag>
21 </Flags>
22 <SCSortMode>4</SCSortMode>
23 <SCItemLimit>100</SCItemLimit>
24
25=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
26--- softwarecenter/ui/gtk3/widgets/buttons.py 2012-10-05 03:34:26 +0000
27+++ softwarecenter/ui/gtk3/widgets/buttons.py 2012-10-09 12:49:22 +0000
28@@ -285,6 +285,10 @@
29 return w, w
30
31 def do_draw(self, cr):
32+ # draw icons first
33+ for child in self:
34+ self.propagate_draw(child, cr)
35+ # then draw focus/installed overlay on top
36 cr.save()
37 A = self.get_allocation()
38 if self._pressed:
39@@ -307,8 +311,6 @@
40 Gdk.cairo_set_source_pixbuf(cr, self._overlay, x, y)
41 cr.paint()
42 cr.restore()
43- for child in self:
44- self.propagate_draw(child, cr)
45
46 def on_transaction_finished(self, backend, result, helper, doc):
47 trans_pkgname = str(result.pkgname)

Subscribers

People subscribed via source and target branches