1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2014-01-31 17:57:40 +0000
3
+++ CMakeLists.txt	2014-02-23 17:08:29 +0000
4
@@ -54,7 +54,7 @@
5
54
  message ("-- Zeitgeist integration disabled")
54
  message ("-- Zeitgeist integration disabled")
6
55
endif ()
55
endif ()
7
56
56
9
57
set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-1.0;libgnome-menu;libwnck-3.0;gdk-x11-3.0;${UNITY_DEPS};")
57
set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-1.0;libgnome-menu-3.0;libwnck-3.0;gdk-x11-3.0;${UNITY_DEPS};")
10
58
set (UI_DEPS "gtk+-3.0>=3.2.0;granite;${ZEITGEIST_DEPS};")
58
set (UI_DEPS "gtk+-3.0>=3.2.0;granite;${ZEITGEIST_DEPS};")
11
59
59
12
60
find_package (PkgConfig)
60
find_package (PkgConfig)
13
@@ -62,7 +62,7 @@
14
62
62
15
63
find_package (Vala REQUIRED)
63
find_package (Vala REQUIRED)
16
64
include (ValaVersion)
64
include (ValaVersion)
18
65
ensure_vala_version ("0.15.1" MINIMUM)
65
ensure_vala_version ("0.18.0" MINIMUM)
19
66
66
20
67
include (ValaPrecompile)
67
include (ValaPrecompile)
21
68
vala_precompile (VALA_C ${APPNAME}
68
vala_precompile (VALA_C ${APPNAME}
22
69
69
23
=== modified file 'src/Backend/App.vala'
24
--- src/Backend/App.vala	2014-01-31 17:57:40 +0000
25
+++ src/Backend/App.vala	2014-02-23 17:08:29 +0000
26
@@ -24,7 +24,7 @@
27
24
    public string exec { get; private set; }
24
    public string exec { get; private set; }
28
25
    public string icon_name { get; private set; default = ""; }
25
    public string icon_name { get; private set; default = ""; }
29
26
    public string[] keywords { get; private set;}
26
    public string[] keywords { get; private set;}
31
27
    public Gdk.Pixbuf icon { get; private set; }
27
    public Gdk.Pixbuf? icon { get; private set; default = null; }
32
28
    public double popularity { get; set; }
28
    public double popularity { get; set; }
33
29
    public double relevancy { get; set; }
29
    public double relevancy { get; set; }
34
30
    public string desktop_path { get; private set; }
30
    public string desktop_path { get; private set; }
35
@@ -36,18 +36,34 @@
36
36
    public signal void launched (App app);
36
    public signal void launched (App app);
37
37
37
38
38
    public App (GMenu.TreeEntry entry) {
38
    public App (GMenu.TreeEntry entry) {
42
39
        name = entry.get_display_name ();
39
        unowned GLib.DesktopAppInfo info = entry.get_app_info ();
43
40
        description = entry.get_comment () ?? name;
40
        name = info.get_display_name ().dup ();
44
41
        exec = entry.get_exec ();
41
        description = info.get_description ().dup () ?? name;
45
42
        exec = info.get_commandline ().dup ();
46
42
        desktop_id = entry.get_desktop_file_id ();
43
        desktop_id = entry.get_desktop_file_id ();
47
43
        icon_name = entry.get_icon () ?? "application-default-icon";
48
44
        desktop_path = entry.get_desktop_file_path ();
44
        desktop_path = entry.get_desktop_file_path ();
49
45
#if HAVE_UNITY
45
#if HAVE_UNITY
50
46
        keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);
46
        keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);
51
47
#endif
47
#endif
55
48
        generic_name = entry.get_generic_name ();
48
        generic_name = info.get_generic_name ();
56
49
49
57
50
        update_icon ();
50
        if (info.get_icon () is ThemedIcon) {
58
51
            icon_name = (info.get_icon () as ThemedIcon).get_names ()[0].dup ();
59
52
        } else if (info.get_icon () is LoadableIcon) {
60
53
            try {
61
54
                var ios = (info.get_icon () as LoadableIcon).load (0, null, null);
62
55
                icon = new Gdk.Pixbuf.from_stream_at_scale (ios, Slingshot.settings.icon_size,
63
56
                    Slingshot.settings.icon_size, true, null);
64
57
            } catch {
65
58
                icon_name = "application-default-icon";
66
59
            }
67
60
        } else {
68
61
            icon_name = "application-default-icon";
69
62
        }
70
63
71
64
        if (icon == null)
72
65
            update_icon ();
73
66
74
51
        Slingshot.icon_theme.changed.connect (update_icon);
67
        Slingshot.icon_theme.changed.connect (update_icon);
75
52
    }
68
    }
76
53
69
77
54
70
78
=== modified file 'src/Backend/AppSystem.vala'
79
--- src/Backend/AppSystem.vala	2014-01-31 15:20:32 +0000
80
+++ src/Backend/AppSystem.vala	2014-02-23 17:08:29 +0000
81
@@ -27,7 +27,6 @@
82
27
#endif
27
#endif
83
28
28
84
29
    public signal void changed ();
29
    public signal void changed ();
85
30
    private bool index_changed = false;
86
31
30
87
32
    construct {
31
    construct {
88
33
32
89
@@ -36,43 +35,43 @@
90
36
        rl_service.update_complete.connect (update_popularity);
35
        rl_service.update_complete.connect (update_popularity);
91
37
#endif
36
#endif
92
38
37
104
39
        apps_menu = GMenu.Tree.lookup ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED);
38
        apps_menu = new GMenu.Tree ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED | GMenu.TreeFlags.SORT_DISPLAY_NAME);
105
40
        apps_menu.add_monitor ((menu) => {
39
        apps_menu.changed.connect (update_app_system);
106
41
40
        
107
42
            debug ("Apps menu tree changed. Updating…");
41
        apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
108
43
            index_changed = true;
42
        categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
109
44
            update_app_system ();
43
99
45
            changed ();
100
46
101
47
        });
102
48
103
49
        apps_menu.set_sort_key (GMenu.TreeSortKey.DISPLAY_NAME);
110
50
        update_app_system ();
44
        update_app_system ();
111
51
45
112
52
    }
46
    }
113
53
47
114
54
    private void update_app_system () {
48
    private void update_app_system () {
115
55
49
116
50
        debug ("Updating Applications menu tree...");
117
56
#if HAVE_ZEITGEIST
51
#if HAVE_ZEITGEIST
118
57
        rl_service.refresh_popularity ();
52
        rl_service.refresh_popularity ();
119
58
#endif
53
#endif
120
59
54
121
55
        apps_menu.load_sync ();
122
56
123
60
        update_categories_index ();
57
        update_categories_index ();
124
61
        update_apps ();
58
        update_apps ();
125
62
59
126
60
        changed ();
127
61
128
63
    }
62
    }
129
64
63
130
65
    private void update_categories_index () {
64
    private void update_categories_index () {
131
66
65
141
67
        var root_tree = apps_menu.get_root_directory ();
66
        categories.clear ();
142
68
67
143
69
        if (categories == null || index_changed) {
68
        var iter = apps_menu.get_root_directory ().iter ();
144
70
            categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
69
        GMenu.TreeItemType type;
145
71
70
        while ((type = iter.next ()) != GMenu.TreeItemType.INVALID) {
146
72
            foreach (GMenu.TreeItem item in root_tree.get_contents ()) {
71
            if (type == GMenu.TreeItemType.DIRECTORY) {
147
73
                if (item.get_type () == GMenu.TreeItemType.DIRECTORY)
72
                var dir = iter.get_directory ();
148
74
                    if (((GMenu.TreeDirectory) item).get_is_nodisplay () == false)
73
                if (!dir.get_is_nodisplay ())
149
75
                        categories.add ((GMenu.TreeDirectory) item);
74
                    categories.add (dir);
150
76
            }
75
            }
151
77
        }
76
        }
152
78
77
153
@@ -89,21 +88,10 @@
154
89
88
155
90
    private void update_apps () {
89
    private void update_apps () {
156
91
90
172
92
        if (index_changed) {
91
        apps.clear ();
173
93
            apps.clear ();
92
174
94
            apps = null;
93
        foreach (var cat in categories)
175
95
            index_changed = false;
94
            apps.set (cat.get_name (), get_apps_by_category (cat));
161
96
        }
162
97
163
98
        if (apps == null) {
164
99
165
100
            apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
166
101
167
102
            foreach (GMenu.TreeDirectory cat in categories) {
168
103
                apps.set (cat.get_name (), get_apps_by_category (cat));
169
104
            }
170
105
171
106
        }
176
107
95
177
108
    }
96
    }
178
109
97
179
@@ -117,39 +105,27 @@
180
117
105
181
118
        var app_list = new Gee.ArrayList<App> ();
106
        var app_list = new Gee.ArrayList<App> ();
182
119
107
186
120
        foreach (GMenu.TreeItem item in category.get_contents ()) {
108
        var iter = category.iter ();
187
121
            App app;
109
        GMenu.TreeItemType type;
188
122
            switch (item.get_type ()) {
110
        while ((type = iter.next ()) != GMenu.TreeItemType.INVALID) {
189
111
            switch (type) {
190
123
                case GMenu.TreeItemType.DIRECTORY:
112
                case GMenu.TreeItemType.DIRECTORY:
192
124
                    app_list.add_all (get_apps_by_category ((GMenu.TreeDirectory) item));
113
                    app_list.add_all (get_apps_by_category (iter.get_directory ()));
193
125
                    break;
114
                    break;
194
126
                case GMenu.TreeItemType.ENTRY:
115
                case GMenu.TreeItemType.ENTRY:
197
127
                    if (is_entry ((GMenu.TreeEntry) item)) {
116
                    var app = new App (iter.get_entry ());
196
128
                        app = new App ((GMenu.TreeEntry) item);
198
129
#if HAVE_ZEITGEIST
117
#if HAVE_ZEITGEIST
200
130
                        app.launched.connect (rl_service.app_launched);
118
                    app.launched.connect (rl_service.app_launched);
201
131
#endif
119
#endif
204
132
                        app_list.add (app);
120
                    app_list.add (app);
203
133
                    }
205
134
                    break;
121
                    break;
206
135
            }
122
            }
207
136
        }
123
        }
208
124
209
137
        return app_list;
125
        return app_list;
210
138
126
211
139
    }
127
    }
212
140
128
213
141
    private bool is_entry (GMenu.TreeEntry entry) {
214
142
215
143
        if (entry.get_launch_in_terminal () == false
216
144
            && entry.get_is_excluded () == false
217
145
            && entry.get_is_nodisplay () == false) {
218
146
            return true;
219
147
        } else {
220
148
            return false;
221
149
        }
222
150
223
151
    }
224
152
225
153
    public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {
129
    public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {
226
154
130
227
155
        return apps;
131
        return apps;
Reviewer	Date Requested	Status
Corentin Noël		Approve on 2014-02-23
Tom Beckmann (community)	2012-09-15	Approve on 2012-09-16
Review via email: mp+124553@code.launchpad.net
1	=== modified file 'CMakeLists.txt'
2	--- CMakeLists.txt 2014-01-31 17:57:40 +0000
3	+++ CMakeLists.txt 2014-02-23 17:08:29 +0000
4	@@ -54,7 +54,7 @@
5	54	message ("-- Zeitgeist integration disabled")	54	message ("-- Zeitgeist integration disabled")
6	55	endif ()	55	endif ()
7	56		56
9	57	set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-1.0;libgnome-menu;libwnck-3.0;gdk-x11-3.0;${UNITY_DEPS};")	57	set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-1.0;libgnome-menu-3.0;libwnck-3.0;gdk-x11-3.0;${UNITY_DEPS};")
10	58	set (UI_DEPS "gtk+-3.0>=3.2.0;granite;${ZEITGEIST_DEPS};")	58	set (UI_DEPS "gtk+-3.0>=3.2.0;granite;${ZEITGEIST_DEPS};")
11	59		59
12	60	find_package (PkgConfig)	60	find_package (PkgConfig)
13	@@ -62,7 +62,7 @@
14	62		62
15	63	find_package (Vala REQUIRED)	63	find_package (Vala REQUIRED)
16	64	include (ValaVersion)	64	include (ValaVersion)
18	65	ensure_vala_version ("0.15.1" MINIMUM)	65	ensure_vala_version ("0.18.0" MINIMUM)
19	66		66
20	67	include (ValaPrecompile)	67	include (ValaPrecompile)
21	68	vala_precompile (VALA_C ${APPNAME}	68	vala_precompile (VALA_C ${APPNAME}
22	69		69
23	=== modified file 'src/Backend/App.vala'
24	--- src/Backend/App.vala 2014-01-31 17:57:40 +0000
25	+++ src/Backend/App.vala 2014-02-23 17:08:29 +0000
26	@@ -24,7 +24,7 @@
27	24	public string exec { get; private set; }	24	public string exec { get; private set; }
28	25	public string icon_name { get; private set; default = ""; }	25	public string icon_name { get; private set; default = ""; }
29	26	public string[] keywords { get; private set;}	26	public string[] keywords { get; private set;}
31	27	public Gdk.Pixbuf icon { get; private set; }	27	public Gdk.Pixbuf? icon { get; private set; default = null; }
32	28	public double popularity { get; set; }	28	public double popularity { get; set; }
33	29	public double relevancy { get; set; }	29	public double relevancy { get; set; }
34	30	public string desktop_path { get; private set; }	30	public string desktop_path { get; private set; }
35	@@ -36,18 +36,34 @@
36	36	public signal void launched (App app);	36	public signal void launched (App app);
37	37		37
38	38	public App (GMenu.TreeEntry entry) {	38	public App (GMenu.TreeEntry entry) {
42	39	name = entry.get_display_name ();	39	unowned GLib.DesktopAppInfo info = entry.get_app_info ();
43	40	description = entry.get_comment () ?? name;	40	name = info.get_display_name ().dup ();
44	41	exec = entry.get_exec ();	41	description = info.get_description ().dup () ?? name;
45			42	exec = info.get_commandline ().dup ();
46	42	desktop_id = entry.get_desktop_file_id ();	43	desktop_id = entry.get_desktop_file_id ();
47	43	icon_name = entry.get_icon () ?? "application-default-icon";
48	44	desktop_path = entry.get_desktop_file_path ();	44	desktop_path = entry.get_desktop_file_path ();
49	45	#if HAVE_UNITY	45	#if HAVE_UNITY
50	46	keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);	46	keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);
51	47	#endif	47	#endif
55	48	generic_name = entry.get_generic_name ();	48	generic_name = info.get_generic_name ();
56	49		49
57	50	update_icon ();	50	if (info.get_icon () is ThemedIcon) {
58			51	icon_name = (info.get_icon () as ThemedIcon).get_names ()[0].dup ();
59			52	} else if (info.get_icon () is LoadableIcon) {
60			53	try {
61			54	var ios = (info.get_icon () as LoadableIcon).load (0, null, null);
62			55	icon = new Gdk.Pixbuf.from_stream_at_scale (ios, Slingshot.settings.icon_size,
63			56	Slingshot.settings.icon_size, true, null);
64			57	} catch {
65			58	icon_name = "application-default-icon";
66			59	}
67			60	} else {
68			61	icon_name = "application-default-icon";
69			62	}
70			63
71			64	if (icon == null)
72			65	update_icon ();
73			66
74	51	Slingshot.icon_theme.changed.connect (update_icon);	67	Slingshot.icon_theme.changed.connect (update_icon);
75	52	}	68	}
76	53		69
77	54		70
78	=== modified file 'src/Backend/AppSystem.vala'
79	--- src/Backend/AppSystem.vala 2014-01-31 15:20:32 +0000
80	+++ src/Backend/AppSystem.vala 2014-02-23 17:08:29 +0000
81	@@ -27,7 +27,6 @@
82	27	#endif	27	#endif
83	28		28
84	29	public signal void changed ();	29	public signal void changed ();
85	30	private bool index_changed = false;
86	31		30
87	32	construct {	31	construct {
88	33		32
89	@@ -36,43 +35,43 @@
90	36	rl_service.update_complete.connect (update_popularity);	35	rl_service.update_complete.connect (update_popularity);
91	37	#endif	36	#endif
92	38		37
104	39	apps_menu = GMenu.Tree.lookup ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED);	38	apps_menu = new GMenu.Tree ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED \| GMenu.TreeFlags.SORT_DISPLAY_NAME);
105	40	apps_menu.add_monitor ((menu) => {	39	apps_menu.changed.connect (update_app_system);
106	41		40
107	42	debug ("Apps menu tree changed. Updating…");	41	apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
108	43	index_changed = true;	42	categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
109	44	update_app_system ();	43
99	45	changed ();
100	46
101	47	});
102	48
103	49	apps_menu.set_sort_key (GMenu.TreeSortKey.DISPLAY_NAME);
110	50	update_app_system ();	44	update_app_system ();
111	51		45
112	52	}	46	}
113	53		47
114	54	private void update_app_system () {	48	private void update_app_system () {
115	55		49
116			50	debug ("Updating Applications menu tree...");
117	56	#if HAVE_ZEITGEIST	51	#if HAVE_ZEITGEIST
118	57	rl_service.refresh_popularity ();	52	rl_service.refresh_popularity ();
119	58	#endif	53	#endif
120	59		54
121			55	apps_menu.load_sync ();
122			56
123	60	update_categories_index ();	57	update_categories_index ();
124	61	update_apps ();	58	update_apps ();
125	62		59
126			60	changed ();
127			61
128	63	}	62	}
129	64		63
130	65	private void update_categories_index () {	64	private void update_categories_index () {
131	66		65
141	67	var root_tree = apps_menu.get_root_directory ();	66	categories.clear ();
142	68		67
143	69	if (categories == null \|\| index_changed) {	68	var iter = apps_menu.get_root_directory ().iter ();
144	70	categories = new Gee.ArrayList<GMenu.TreeDirectory> ();	69	GMenu.TreeItemType type;
145	71		70	while ((type = iter.next ()) != GMenu.TreeItemType.INVALID) {
146	72	foreach (GMenu.TreeItem item in root_tree.get_contents ()) {	71	if (type == GMenu.TreeItemType.DIRECTORY) {
147	73	if (item.get_type () == GMenu.TreeItemType.DIRECTORY)	72	var dir = iter.get_directory ();
148	74	if (((GMenu.TreeDirectory) item).get_is_nodisplay () == false)	73	if (!dir.get_is_nodisplay ())
149	75	categories.add ((GMenu.TreeDirectory) item);	74	categories.add (dir);
150	76	}	75	}
151	77	}	76	}
152	78		77
153	@@ -89,21 +88,10 @@
154	89		88
155	90	private void update_apps () {	89	private void update_apps () {
156	91		90
172	92	if (index_changed) {	91	apps.clear ();
173	93	apps.clear ();	92
174	94	apps = null;	93	foreach (var cat in categories)
175	95	index_changed = false;	94	apps.set (cat.get_name (), get_apps_by_category (cat));
161	96	}
162	97
163	98	if (apps == null) {
164	99
165	100	apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
166	101
167	102	foreach (GMenu.TreeDirectory cat in categories) {
168	103	apps.set (cat.get_name (), get_apps_by_category (cat));
169	104	}
170	105
171	106	}
176	107		95
177	108	}	96	}
178	109		97
179	@@ -117,39 +105,27 @@
180	117		105
181	118	var app_list = new Gee.ArrayList<App> ();	106	var app_list = new Gee.ArrayList<App> ();
182	119		107
186	120	foreach (GMenu.TreeItem item in category.get_contents ()) {	108	var iter = category.iter ();
187	121	App app;	109	GMenu.TreeItemType type;
188	122	switch (item.get_type ()) {	110	while ((type = iter.next ()) != GMenu.TreeItemType.INVALID) {
189			111	switch (type) {
190	123	case GMenu.TreeItemType.DIRECTORY:	112	case GMenu.TreeItemType.DIRECTORY:
192	124	app_list.add_all (get_apps_by_category ((GMenu.TreeDirectory) item));	113	app_list.add_all (get_apps_by_category (iter.get_directory ()));
193	125	break;	114	break;
194	126	case GMenu.TreeItemType.ENTRY:	115	case GMenu.TreeItemType.ENTRY:
197	127	if (is_entry ((GMenu.TreeEntry) item)) {	116	var app = new App (iter.get_entry ());
196	128	app = new App ((GMenu.TreeEntry) item);
198	129	#if HAVE_ZEITGEIST	117	#if HAVE_ZEITGEIST
200	130	app.launched.connect (rl_service.app_launched);	118	app.launched.connect (rl_service.app_launched);
201	131	#endif	119	#endif
204	132	app_list.add (app);	120	app_list.add (app);
203	133	}
205	134	break;	121	break;
206	135	}	122	}
207	136	}	123	}
208			124
209	137	return app_list;	125	return app_list;
210	138		126
211	139	}	127	}
212	140		128
213	141	private bool is_entry (GMenu.TreeEntry entry) {
214	142
215	143	if (entry.get_launch_in_terminal () == false
216	144	&& entry.get_is_excluded () == false
217	145	&& entry.get_is_nodisplay () == false) {
218	146	return true;
219	147	} else {
220	148	return false;
221	149	}
222	150
223	151	}
224	152
225	153	public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {	129	public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {
226	154		130
227	155	return apps;	131	return apps;