Ubuntu Software Center

Merge lp:~mvo/software-center/extra-unity-categories into lp:software-center

  1. extra-unity-categories
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 3183
Proposed branch: lp:~mvo/software-center/extra-unity-categories
Merge into: lp:software-center
Diff against target: 88 lines (+46/-2)
4 files modified
data/extra-unity-categories.menu.in (+40/-0)
data/top-rated.menu.in (+2/-0)
data/whats_new.menu.in (+2/-1)
setup.cfg (+2/-1)
To merge this branch: bzr merge lp:~mvo/software-center/extra-unity-categories
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+124727@code.launchpad.net

Description of the change

Small branch to provide the unity people with a ascii only stable
alias name for the "Top Rated" and "What's new" (the later has a utf8
char in it). As its marked "carousel-only" it will not be displayed
in the main UI nor will anything expect unity query it.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Setting to WIP until I get ok from the unity guys that it works as expected.

Revision history for this message
Michael Vogt (mvo) wrote :

<pstolowski> mvo: yes, works fine
<mvo> pstolowski: great, will propose it now
<pstolowski> mvo: thanks!

Revision history for this message
Gary Lasker (gary-lasker) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/extra-unity-categories.menu.in'
2--- data/extra-unity-categories.menu.in 1970-01-01 00:00:00 +0000
3+++ data/extra-unity-categories.menu.in 2012-09-17 15:56:20 +0000
4@@ -0,0 +1,40 @@
5+<Menu>
6+
7+ <!-- The unity people like to have categories with stable non-utf8
8+ names, this menu provides them.
9+ -->
10+
11+ <!-- Keep in sync with whats-new.menu.in and top-rated.menu.in -->
12+ <Menu>
13+ <Name>unity-whats-new</Name>
14+ <Flags>
15+ <Flag>available-only</Flag>
16+ <Flag>carousel-only</Flag>
17+ <Flag>not-installed-only</Flag>
18+ </Flags>
19+ <SCSortMode>3</SCSortMode>
20+ <SCItemLimit>20</SCItemLimit>
21+ <Include>
22+ <And>
23+ <SCType>Application</SCType>
24+ </And>
25+ </Include>
26+ </Menu>
27+
28+ <Menu>
29+ <Name>unity-top-rated</Name>
30+ <Flags>
31+ <Flag>available-only</Flag>
32+ <Flag>carousel-only</Flag>
33+ <Flag>not-installed-only</Flag>
34+ </Flags>
35+ <SCSortMode>4</SCSortMode>
36+ <SCItemLimit>100</SCItemLimit>
37+ <Include>
38+ <And>
39+ <SCType>Application</SCType>
40+ </And>
41+ </Include>
42+ </Menu>
43+
44+</Menu>
45
46=== modified file 'data/top-rated.menu.in'
47--- data/top-rated.menu.in 2011-07-26 12:37:19 +0000
48+++ data/top-rated.menu.in 2012-09-17 15:56:20 +0000
49@@ -1,4 +1,6 @@
50 <Menu>
51+
52+ <!-- Keep in sync with extra-unity-categories.menu.in -->
53 <Menu>
54 <_Name>Top Rated</_Name>
55 <SCIcon>gtk-about</SCIcon>
56
57=== modified file 'data/whats_new.menu.in'
58--- data/whats_new.menu.in 2012-01-24 23:50:29 +0000
59+++ data/whats_new.menu.in 2012-09-17 15:56:20 +0000
60@@ -1,4 +1,6 @@
61 <Menu>
62+
63+ <!-- Keep in sync with extra-unity-categories.menu.in -->
64 <Menu>
65 <_Name>What’s New</_Name>
66 <SCIcon>gtk-about</SCIcon>
67@@ -12,7 +14,6 @@
68 <Include>
69 <And>
70 <SCType>Application</SCType>
71-<!-- <SCOrigin>LP-PPA-app-review-board</SCOrigin> -->
72 </And>
73 </Include>
74 </Menu>
75
76=== modified file 'setup.cfg'
77--- setup.cfg 2012-01-31 10:16:26 +0000
78+++ setup.cfg 2012-09-17 15:56:20 +0000
79@@ -13,7 +13,8 @@
80 ("data/software-center.menu.in", )
81 ),
82 ("share/app-install/menu.d/",
83- ("data/featured.menu.in",
84+ ("data/extra-unity-categories.menu.in",
85+ "data/featured.menu.in",
86 "data/whats_new.menu.in",
87 "data/top-rated.menu.in",
88 )

Subscribers

People subscribed via source and target branches