Slingshot

Merge lp:~voldyman/slingshot/fixed-1045583 into lp:~elementary-pantheon/slingshot/trunk

  1. fixed-1045583
  2. Merge into trunk
Proposed by Akshay Shekher
Status: Merged
Merged at revision: 268
Proposed branch: lp:~voldyman/slingshot/fixed-1045583
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 43 lines (+14/-1)
2 files modified
data/pantheon-applications.menu (+10/-0)
src/Widgets/CategoryView.vala (+4/-1)
To merge this branch: bzr merge lp:~voldyman/slingshot/fixed-1045583
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+123413@code.launchpad.net

Description of the change

wine category support

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/pantheon-applications.menu'
2--- data/pantheon-applications.menu 2012-08-23 19:03:42 +0000
3+++ data/pantheon-applications.menu 2012-09-08 13:04:21 +0000
4@@ -194,6 +194,16 @@
5 </Include>
6 </Menu> <!-- End Other -->
7
8+ <Menu>
9+ <Name>Wine</Name>
10+ <Directory>Wine.directory</Directory>
11+ <Include>
12+ <And>
13+ <Category>Wine</Category>
14+ </And>
15+ </Include>
16+ </Menu> <!-- End Wine -->
17+
18 <Layout>
19 <Merge type="menus" />
20 <Menuname>Other</Menuname>
21
22=== modified file 'src/Widgets/CategoryView.vala'
23--- src/Widgets/CategoryView.vala 2012-08-26 16:25:44 +0000
24+++ src/Widgets/CategoryView.vala 2012-09-08 13:04:21 +0000
25@@ -114,6 +114,9 @@
26 case "Universal Access":
27 category_switcher.add_category (_("Universal Access"));
28 break;
29+ case "Wine":
30+ category_switcher.add_category ("Wine");
31+ break;
32 }
33 n++;
34 }
35@@ -320,7 +323,7 @@
36
37 public void show_page_switcher (bool show) {
38
39- if (page_switcher.get_parent () == null)
40+ if (page_switcher.get_parent () == null)
41 container.attach (page_switcher, 2, 1, 1, 1);
42
43 if (show) {

Subscribers

People subscribed via source and target branches