Slingshot

Merge lp:~mefrio-g/slingshot/fix-923060 into lp:~elementary-pantheon/slingshot/trunk

  1. fix-923060
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Approved by: Cody Garver
Approved revision: 164
Merged at revision: 164
Proposed branch: lp:~mefrio-g/slingshot/fix-923060
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 243 lines (+141/-14)
4 files modified
po/it.po (+40/-0)
po/slingshot.pot (+52/-8)
src/Widgets/CategoryView.vala (+47/-4)
src/Widgets/Sidebar.vala (+2/-2)
To merge this branch: bzr merge lp:~mefrio-g/slingshot/fix-923060
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+103113@code.launchpad.net
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
=== modified file 'po/it.po'
--- po/it.po 2012-03-01 04:39:08 +0000
+++ po/it.po 2012-04-23 14:48:20 +0000
@@ -29,6 +29,46 @@
29msgid "This Category is Empty"29msgid "This Category is Empty"
30msgstr "Questa categoria è vuota"30msgstr "Questa categoria è vuota"
3131
32#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:74
33msgid "Accessories"
34msgstr "Accessori"
35
36#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:77
37msgid "Universal Access"
38msgstr "Accesso universale"
39
40#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:80
41msgid "Graphics"
42msgstr "Grafica"
43
44#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:83
45msgid "Development"
46msgstr "Sviluppo"
47
48#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:86
49msgid "Other"
50msgstr "Altro"
51
52#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:89
53msgid "Internet"
54msgstr "Internet"
55
56#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:92
57msgid "System"
58msgstr "Sistema"
59
60#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:95
61msgid "Multimedia"
62msgstr "Multimedia"
63
64#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:98
65msgid "Games"
66msgstr "Giochi"
67
68#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:101
69msgid "Office"
70msgstr "Ufficio"
71
32#: /home/random/Projects/slingshot/po/../src/Widgets/Sidebar.vala:8272#: /home/random/Projects/slingshot/po/../src/Widgets/Sidebar.vala:82
33msgid "<b>Bookmarks</b>"73msgid "<b>Bookmarks</b>"
34msgstr "<b>Segnalibri</b>"74msgstr "<b>Segnalibri</b>"
3575
=== modified file 'po/slingshot.pot'
--- po/slingshot.pot 2011-10-27 20:19:38 +0000
+++ po/slingshot.pot 2012-04-23 14:48:20 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2011-10-27 22:16+0200\n"11"POT-Creation-Date: 2012-04-23 11:56+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,30 +17,74 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: /home/random/Projects/slingshot/po/../src/Widgets/CategoryView.vala:3820#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:39
21msgid "All Applications"21msgid "All Applications"
22msgstr ""22msgstr ""
2323
24#: /home/random/Projects/slingshot/po/../src/Widgets/CategoryView.vala:3924#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:40
25msgid "Most Used Apps"25msgid "Most Used Apps"
26msgstr ""26msgstr ""
2727
28#: /home/random/Projects/slingshot/po/../src/Widgets/CategoryView.vala:6028#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:41
29msgid "Create a new Filter"
30msgstr ""
31
32#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:63
29msgid "This Category is Empty"33msgid "This Category is Empty"
30msgstr ""34msgstr ""
3135
32#: /home/random/Projects/slingshot/po/../src/Widgets/Sidebar.vala:8236#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:74
37msgid "Accessories"
38msgstr ""
39
40#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:77
41msgid "Universal Access"
42msgstr ""
43
44#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:80
45msgid "Graphics"
46msgstr ""
47
48#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:83
49msgid "Development"
50msgstr ""
51
52#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:86
53msgid "Other"
54msgstr ""
55
56#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:89
57msgid "Internet"
58msgstr ""
59
60#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:92
61msgid "System"
62msgstr ""
63
64#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:95
65msgid "Multimedia"
66msgstr ""
67
68#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:98
69msgid "Games"
70msgstr ""
71
72#: /home/mario/elementary/slingshot/po/../src/Widgets/CategoryView.vala:101
73msgid "Office"
74msgstr ""
75
76#: /home/mario/elementary/slingshot/po/../src/Widgets/Sidebar.vala:82
33msgid "<b>Bookmarks</b>"77msgid "<b>Bookmarks</b>"
34msgstr ""78msgstr ""
3579
36#: /home/random/Projects/slingshot/po/../src/Widgets/Sidebar.vala:8580#: /home/mario/elementary/slingshot/po/../src/Widgets/Sidebar.vala:85
37msgid "<b>Categories</b>"81msgid "<b>Categories</b>"
38msgstr ""82msgstr ""
3983
40#: /home/random/Projects/slingshot/po/../src/Backend/App.vala:5384#: /home/mario/elementary/slingshot/po/../src/Backend/App.vala:55
41msgid "Run this command..."85msgid "Run this command..."
42msgstr ""86msgstr ""
4387
44#: /home/random/Projects/slingshot/po/../src/SlingshotView.vala:12888#: /home/mario/elementary/slingshot/po/../src/SlingshotView.vala:123
45msgid "Search Apps..."89msgid "Search Apps..."
46msgstr ""90msgstr ""
4791
=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala 2012-04-23 01:25:57 +0000
+++ src/Widgets/CategoryView.vala 2012-04-23 14:48:20 +0000
@@ -41,7 +41,9 @@
41 private const string NEW_FILTER = _("Create a new Filter");41 private const string NEW_FILTER = _("Create a new Filter");
42 private int current_position = 0;42 private int current_position = 0;
43 private bool from_category = false;43 private bool from_category = false;
4444
45 private HashMap<int, string> category_ids = new HashMap<int, string> ();
46
45 public CategoryView (SlingshotView parent) {47 public CategoryView (SlingshotView parent) {
4648
47 view = parent;49 view = parent;
@@ -68,8 +70,44 @@
68 category_switcher.can_focus = false;70 category_switcher.can_focus = false;
6971
70 // Fill the sidebar72 // Fill the sidebar
73 int n = 0;
74
71 foreach (string cat_name in view.apps.keys) {75 foreach (string cat_name in view.apps.keys) {
72 category_switcher.add_category (cat_name);76 category_ids.set (n, cat_name);
77
78 switch (cat_name) {
79 case "Accessories":
80 category_switcher.add_category (_("Accessories"));
81 break;
82 case "Universal Access":
83 category_switcher.add_category (_("Universal Access"));
84 break;
85 case "Graphics":
86 category_switcher.add_category (_("Graphics"));
87 break;
88 case "Development":
89 category_switcher.add_category (_("Development"));
90 break;
91 case "Other":
92 category_switcher.add_category (_("Other"));
93 break;
94 case "Internet":
95 category_switcher.add_category (_("Internet"));
96 break;
97 case "System":
98 category_switcher.add_category (_("System"));
99 break;
100 case "Multimedia":
101 category_switcher.add_category (_("Multimedia"));
102 break;
103 case "Games":
104 category_switcher.add_category (_("Games"));
105 break;
106 case "Office":
107 category_switcher.add_category (_("Office"));
108 break;
109 }
110 n++;
73 }111 }
74112
75 category_switcher.add_bookmark (MOST_USED_APPS);113 category_switcher.add_bookmark (MOST_USED_APPS);
@@ -102,8 +140,13 @@
102140
103 private void connect_events () { 141 private void connect_events () {
104142
105 category_switcher.selection_changed.connect ((category) => {143 category_switcher.selection_changed.connect ((name, nth) => {
106144
145 string category = category_ids.get (nth);
146
147 if (name == MOST_USED_APPS)
148 category = name;
149
107 if (category == ALL_APPLICATIONS)150 if (category == ALL_APPLICATIONS)
108 show_all_apps ();151 show_all_apps ();
109 else152 else
110153
=== modified file 'src/Widgets/Sidebar.vala'
--- src/Widgets/Sidebar.vala 2011-11-01 12:02:58 +0000
+++ src/Widgets/Sidebar.vala 2012-04-23 14:48:20 +0000
@@ -58,7 +58,7 @@
58 N_COLUMNS58 N_COLUMNS
59 }59 }
6060
61 public signal void selection_changed (string entry_name);61 public signal void selection_changed (string entry_name, int nth);
6262
63 public Sidebar () {63 public Sidebar () {
6464
@@ -124,7 +124,7 @@
124 selected = _selected;124 selected = _selected;
125 } else {125 } else {
126 _selected = nth;126 _selected = nth;
127 selection_changed (name);127 selection_changed (name, nth);
128 }128 }
129 }129 }
130130

Subscribers

People subscribed via source and target branches