Merge lp:~ricotz/slingshot/port-gmenu3 into lp:~elementary-pantheon/slingshot/trunk

[Rico Tzschichholz]

Transition to use libgnome-menu-3.0

[lp:~ricotz/slingshot/port-gmenu3]

274. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-16

Launchpad automatic translations update.

[Tom Beckmann (tombeckmann)]

Working perfectly now.

review: Approve

[lp:~ricotz/slingshot/port-gmenu3]

275. By Rico Tzschichholz on 2012-09-16

Port App and AppSystem to use libgnome-menu-3.0

276. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-17

Launchpad automatic translations update.

277. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-22

Launchpad automatic translations update.

278. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-23

Launchpad automatic translations update.

279. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-24

Launchpad automatic translations update.

280. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-26

Launchpad automatic translations update.

281. By Launchpad Translations on behalf of elementary-pantheon on 2012-09-30

Launchpad automatic translations update.

282. By Launchpad Translations on behalf of elementary-pantheon on 2012-10-11

Launchpad automatic translations update.

283. By Launchpad Translations on behalf of elementary-pantheon on 2012-10-21

Launchpad automatic translations update.

284. By Andrea Basso on 2012-10-21

Reverted the gmenu-3 commit since it caused a severe bug. It'll be re-introduced after beta1

285. By Andrea Basso on 2012-10-21

Now Slingshot shows Ubuntu One and Ubuntu Tweak

286. By Launchpad Translations on behalf of elementary-pantheon on 2012-10-22

Launchpad automatic translations update.

287. By Andrea Basso on 2012-10-29

Some final tweaking and solving the single-letter problem

288. By Adam Davies on 2012-11-02

Changed from using the released event in the AppEntry to the clicked event to fix bug #956063.

289. By Cody Garver on 2012-11-02

Be less picky about Granite version for the time being.

290. By Adam Davies on 2012-11-02

Add tooltips to fix bug #1063333.

291. By Cody Garver on 2012-11-02

Updated POT file.

292. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-03

Launchpad automatic translations update.

293. By Andrea Basso on 2012-11-04

Fixed sidebar not updating after installation and changed value. Slingshot is now beta1 ready

294. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-05

Launchpad automatic translations update.

295. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-06

Launchpad automatic translations update.

296. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-07

Launchpad automatic translations update.

297. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-08

Launchpad automatic translations update.

298. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-15

Launchpad automatic translations update.

299. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-16

Launchpad automatic translations update.

300. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-17

Launchpad automatic translations update.

301. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-19

Launchpad automatic translations update.

302. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-20

Launchpad automatic translations update.

303. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-21

Launchpad automatic translations update.

304. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-24

Launchpad automatic translations update.

305. By Launchpad Translations on behalf of elementary-pantheon on 2012-11-28

Launchpad automatic translations update.

306. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-04

Launchpad automatic translations update.

307. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-07

Launchpad automatic translations update.

308. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-17

Launchpad automatic translations update.

309. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-22

Launchpad automatic translations update.

310. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-23

Launchpad automatic translations update.

311. By Tom Beckmann on 2012-12-25

Re-added wnck activation in order to make everything work with newest gala update

312. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-28

Launchpad automatic translations update.

313. By Launchpad Translations on behalf of elementary-pantheon on 2012-12-29

Launchpad automatic translations update.

314. By Launchpad Translations on behalf of elementary-pantheon on 2013-01-02

Launchpad automatic translations update.

315. By Akshay Shekher on 2013-01-09

Search now lists apps with NoDisplay=true as well

316. By Andrea Basso on 2013-01-09

Removed open-on-mouse option

317. By Victor Martinez on 2013-01-09

Added patch so that when Wingpanel will do as well, we get highlit Applications when Slingshot's open

318. By Andrea Basso on 2013-01-12

General improvements to code

319. By Andrea Basso on 2013-01-12

Forgot to remove a nasty bracket

320. By Launchpad Translations on behalf of elementary-pantheon on 2013-01-13

Launchpad automatic translations update.

321. By Andrea Basso on 2013-01-13

Fixed appearing of NoDisplay=True apps in CategoryView

322. By Andrea Basso on 2013-01-13

No more disappearing pages

323. By Andrea Basso on 2013-01-13

Zeitgeist is back with us

324. By Launchpad Translations on behalf of elementary-pantheon on 2013-01-15

Launchpad automatic translations update.

325. By Launchpad Translations on behalf of elementary-pantheon on 2013-01-28

Launchpad automatic translations update.

326. By Andrea Basso on 2013-01-31

Fixed scrolling bugs in CategoryView

327. By Andrea Basso on 2013-01-31

Slingshot doesn't show up when changing screen resolution

328. By Andrea Basso on 2013-01-31

Fixed a bug introduced with last commit

329. By Andrea Basso on 2013-01-31

Fixed bugs concerning the SearchEntry

330. By Andrea Basso on 2013-02-06

Fixed categories not switching after installation

331. By Launchpad Translations on behalf of elementary-pantheon on 2013-02-08

Launchpad automatic translations update.

332. By Julien Spautz on 2013-02-14

Move from press to release event for pages to fix bug #1094277.

333. By Julien Spautz on 2013-02-15

Fixes all sort of bugs concerning the SearchEntry

334. By Andrea Basso on 2013-02-16

Remove NoDisplay=True apps from SearchView.

335. By Launchpad Translations on behalf of elementary-pantheon on 2013-02-18

Launchpad automatic translations update.

336. By Andrea Basso on 2013-02-19

When typing after scrolling in SearchView, SearchView now scrolls back to the top to fix bug #1127170.

337. By Andrea Basso on 2013-02-22

Pages always display on startup to fix bug #1120825.

338. By Launchpad Translations on behalf of elementary-pantheon on 2013-02-26

Launchpad automatic translations update.

339. By Launchpad Translations on behalf of elementary-pantheon on 2013-02-27

Launchpad automatic translations update.

340. By Launchpad Translations on behalf of elementary-pantheon on 2013-03-06

Launchpad automatic translations update.

341. By Launchpad Translations on behalf of elementary-pantheon on 2013-03-08

Launchpad automatic translations update.

342. By Launchpad Translations on behalf of elementary-pantheon on 2013-03-09

Launchpad automatic translations update.

343. By Rico Tzschichholz on 2013-03-09

build: explictly link against libm

344. By Launchpad Translations on behalf of elementary-pantheon on 2013-03-10

Launchpad automatic translations update.

345. By Tom Beckmann on 2013-03-19

Allow using KP_Enter to trigger execute

346. By Launchpad Translations on behalf of elementary-pantheon on 2013-03-27

Launchpad automatic translations update.

347. By Cody Garver on 2013-03-27

Add 'make dist' command for creating release tarball to fix bug #1076823. Approved by David Gomes.

348. By Launchpad Translations on behalf of elementary-pantheon on 2013-04-04

Launchpad automatic translations update.

349. By Launchpad Translations on behalf of elementary-pantheon on 2013-04-09

Launchpad automatic translations update.

350. By Launchpad Translations on behalf of elementary-pantheon on 2013-05-07

Launchpad automatic translations update.

351. By Launchpad Translations on behalf of elementary-pantheon on 2013-05-08

Launchpad automatic translations update.

352. By Launchpad Translations on behalf of elementary-pantheon on 2013-05-22

Launchpad automatic translations update.

353. By Launchpad Translations on behalf of elementary-pantheon on 2013-05-23

Launchpad automatic translations update.

354. By Launchpad Translations on behalf of elementary-pantheon on 2013-05-26

Launchpad automatic translations update.

355. By Launchpad Translations on behalf of elementary-pantheon on 2013-05-27

Launchpad automatic translations update.

356. By Cody Garver on 2013-06-12

Release 0.7.1

357. By Julien Spautz on 2013-06-12

Fix bug #1084150

358. By Julien Spautz on 2013-06-12

Fixes bug #1099602

359. By Julien Spautz on 2013-06-12

Fixes bug #1152844 by removing "KP_" from the key name and thus mapping keypad keys to their "normal" equivalent.

I also added support for Home and End, switching to the first/last page or category.

Alt + n switches to the nth page, Alt+0 to the last one. This might need some designer input, but I thinks it's a neat feature, and consistent with DynamicNotebook's behaviour.

360. By Launchpad Translations on behalf of elementary-pantheon on 2013-06-18

Launchpad automatic translations update.

361. By Launchpad Translations on behalf of elementary-pantheon on 2013-06-19

Launchpad automatic translations update.

362. By Launchpad Translations on behalf of elementary-pantheon on 2013-06-20

Launchpad automatic translations update.

363. By Launchpad Translations on behalf of elementary-pantheon on 2013-06-24

Launchpad automatic translations update.

364. By Cody Garver on 2013-06-24

Release 0.7.2

365. By Launchpad Translations on behalf of elementary-pantheon on 2013-06-25

Launchpad automatic translations update.

366. By Launchpad Translations on behalf of elementary-pantheon on 2013-06-28

Launchpad automatic translations update.

367. By Marcus Lundgren on 2013-08-13

Change view modes with Ctrl + n, fixing bug #1182740.

368. By Tigran Gabrielyan on 2013-08-14

Only use OptionContext parser if we have args to avoid slow down in startup time to fix bug #1043689.

369. By Cody Garver on 2013-08-14

Release 0.7.3

370. By Rico Tzschichholz on 2013-08-14

Fix build with valac 0.21.1

371. By Julien Spautz on 2013-08-15

Fixed bug #1200223 and Slingshot now orders accented-name apps too.

372. By Airlangga Cahya Utama on 2013-08-16

Make it so that Chromium, Wine and other third party apps show up on Slingshot.

373. By Airlangga Cahya Utama on 2013-08-16

Fixed bug #1211562 by forcing listen to Home and End keys.

374. By Cody Garver on 2013-08-20

Release 0.7.4

375. By Launchpad Translations on behalf of elementary-pantheon on 2013-08-21

Launchpad automatic translations update.

376. By Launchpad Translations on behalf of elementary-pantheon on 2013-08-27

Launchpad automatic translations update.

377. By Tigran Gabrielyan on 2013-08-30

Fix fallback methods of finding an apps icon to work in all views. Fixes bug #1072036.

378. By Tigran Gabrielyan on 2013-09-04

Accept ctrl+shift+v as paste in search Edit to fix bug #1084887.

379. By Tigran Gabrielyan on 2013-09-06

Fix previous commit. Couldn't type "v" in searchbar.

380. By Launchpad Translations on behalf of elementary-pantheon on 2013-09-07

Launchpad automatic translations update.

381. By Raphael Isemann on 2013-09-10

Code style cleanup.

382. By Tigran Gabrielyan on 2013-09-10

Fixed bug #1221557, pressing Escape on Slingshot now works as expected.

If the search bar is empty, it will hide() Slingshot, but if there's text on it, it'll clear the text entry.

383. By Launchpad Translations on behalf of elementary-pantheon on 2013-09-18

Launchpad automatic translations update.

384. By Cody Garver on 2013-09-22

Release 0.7.5

385. By Launchpad Translations on behalf of elementary-pantheon on 2013-09-29

Launchpad automatic translations update.

386. By Jeremy Wootten on 2013-09-30

Prevents infinite loop in key_press_event handling when an input manager (ibus) is active, which appears to be due to a bug in either Gtk3 or ibus, by using an event box and custom handler rather than overriding the default handler.

Two other minor changes:
1) prevent some critical error messages when apps have no keywords.
2) prevent critical error message due to empty_cat_label not being created.

Fixes bug #1213321.

387. By Jeremy Wootten on 2013-10-05

Connect to searchbar activate signal to detect Return key.

Fixes regression introduced by revision 386 by connecting to searchbar activate signal. The Enter/Return key press is now detected.

388. By Jeremy Wootten on 2013-10-05

Whitelist ibus-setup to fix bug #1103660.

389. By Cody Garver on 2013-10-07

Silence C compilation warnings.

390. By Cody Garver on 2013-10-07

Release 0.7.6

391. By Launchpad Translations on behalf of elementary-pantheon on 2013-10-08

Launchpad automatic translations update.

392. By Launchpad Translations on behalf of elementary-pantheon on 2013-10-21

Launchpad automatic translations update.

393. By Tigran Gabrielyan on 2013-10-24

1) Long pressing "Applications" button will no longer cause slingshot to be unclosable.

2) Clicking dock items with slingshot open will work with only 1 click, however, slingshot needs to be closed on mouse press, rather than mouse up. If that's an issue, that part will have to be reverted.

3) Slingshot will now close if topleft hotcorner is set to show slingshot.

4) Grab keyboard focus, prevents alt tab bug, and be consistent with other popovers/indicator menus

394. By Launchpad Translations on behalf of elementary-pantheon on 2013-11-01

Launchpad automatic translations update.

395. By Cody Garver on 2013-12-07

Release 0.7.6.1

396. By Launchpad Translations on behalf of elementary-pantheon on 2013-12-15

Launchpad automatic translations update.

[Corentin Noël (tintou)]

This branch can be modified as the vapi is now provided by vala on Isis

review: Needs Fixing

[lp:~ricotz/slingshot/port-gmenu3]

397. By Launchpad Translations on behalf of elementary-pantheon on 2013-12-30

Launchpad automatic translations update.

398. By Launchpad Translations on behalf of elementary-pantheon on 2013-12-31

Launchpad automatic translations update.

399. By Corentin Noël on 2014-01-14

* Removed every using statement
* Changed VWidgets and HWidgets to Widgets with the corresponding orientation (Gtk deprecation)
* Ported Zeitgeist parts to version 2.0

400. By Launchpad Translations on behalf of elementary-pantheon on 2014-01-22

Launchpad automatic translations update.

401. By Launchpad Translations on behalf of elementary-pantheon on 2014-01-24

Launchpad automatic translations update.

402. By Pim Vullers <email address hidden> on 2014-02-06

Unity and Zeitgeist integration is now optional. Default is ON.

403. By Launchpad Translations on behalf of elementary-pantheon on 2014-02-14

Launchpad automatic translations update.

404. By Launchpad Translations on behalf of elementary-pantheon on 2014-02-15

Launchpad automatic translations update.

405. By Rico Tzschichholz on 2013-01-10

Port to libgnome-menu-3.0 API

[Corentin Noël (tintou)]

review: Approve

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-31 17:57:40 +0000
+++ CMakeLists.txt	2014-02-23 17:08:29 +0000
@@ -54,7 +54,7 @@
   message ("-- Zeitgeist integration disabled")
 endif ()
 
-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};")
+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};")
 set (UI_DEPS "gtk+-3.0>=3.2.0;granite;${ZEITGEIST_DEPS};")
 
 find_package (PkgConfig)
@@ -62,7 +62,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.15.1" MINIMUM)
+ensure_vala_version ("0.18.0" MINIMUM)
 
 include (ValaPrecompile)
 vala_precompile (VALA_C ${APPNAME}

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2014-01-31 17:57:40 +0000
+++ src/Backend/App.vala	2014-02-23 17:08:29 +0000
@@ -24,7 +24,7 @@
     public string exec { get; private set; }
     public string icon_name { get; private set; default = ""; }
     public string[] keywords { get; private set;}
-    public Gdk.Pixbuf icon { get; private set; }
+    public Gdk.Pixbuf? icon { get; private set; default = null; }
     public double popularity { get; set; }
     public double relevancy { get; set; }
     public string desktop_path { get; private set; }
@@ -36,18 +36,34 @@
     public signal void launched (App app);
 
     public App (GMenu.TreeEntry entry) {
-        name = entry.get_display_name ();
-        description = entry.get_comment () ?? name;
-        exec = entry.get_exec ();
+        unowned GLib.DesktopAppInfo info = entry.get_app_info ();
+        name = info.get_display_name ().dup ();
+        description = info.get_description ().dup () ?? name;
+        exec = info.get_commandline ().dup ();
         desktop_id = entry.get_desktop_file_id ();
-        icon_name = entry.get_icon () ?? "application-default-icon";
         desktop_path = entry.get_desktop_file_path ();
 #if HAVE_UNITY
         keywords = Unity.AppInfoManager.get_default ().get_keywords (desktop_id);
 #endif
-        generic_name = entry.get_generic_name ();
-
-        update_icon ();
+        generic_name = info.get_generic_name ();
+
+        if (info.get_icon () is ThemedIcon) {
+            icon_name = (info.get_icon () as ThemedIcon).get_names ()[0].dup ();
+        } else if (info.get_icon () is LoadableIcon) {
+            try {
+                var ios = (info.get_icon () as LoadableIcon).load (0, null, null);
+                icon = new Gdk.Pixbuf.from_stream_at_scale (ios, Slingshot.settings.icon_size,
+                    Slingshot.settings.icon_size, true, null);
+            } catch {
+                icon_name = "application-default-icon";
+            }
+        } else {
+            icon_name = "application-default-icon";
+        }
+
+        if (icon == null)
+            update_icon ();
+
         Slingshot.icon_theme.changed.connect (update_icon);
     }
 

=== modified file 'src/Backend/AppSystem.vala'
--- src/Backend/AppSystem.vala	2014-01-31 15:20:32 +0000
+++ src/Backend/AppSystem.vala	2014-02-23 17:08:29 +0000
@@ -27,7 +27,6 @@
 #endif
 
     public signal void changed ();
-    private bool index_changed = false;
 
     construct {
 
@@ -36,43 +35,43 @@
         rl_service.update_complete.connect (update_popularity);
 #endif
 
-        apps_menu = GMenu.Tree.lookup ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED);
-        apps_menu.add_monitor ((menu) => {
-
-            debug ("Apps menu tree changed. Updating…");
-            index_changed = true;
-            update_app_system ();
-            changed ();
-
-        });
-
-        apps_menu.set_sort_key (GMenu.TreeSortKey.DISPLAY_NAME);
+        apps_menu = new GMenu.Tree ("pantheon-applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED | GMenu.TreeFlags.SORT_DISPLAY_NAME);
+        apps_menu.changed.connect (update_app_system);
+        
+        apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
+        categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
+
         update_app_system ();
 
     }
 
     private void update_app_system () {
 
+        debug ("Updating Applications menu tree...");
 #if HAVE_ZEITGEIST
         rl_service.refresh_popularity ();
 #endif
 
+        apps_menu.load_sync ();
+
         update_categories_index ();
         update_apps ();
 
+        changed ();
+
     }
 
     private void update_categories_index () {
 
-        var root_tree = apps_menu.get_root_directory ();
-
-        if (categories == null || index_changed) {
-            categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
-
-            foreach (GMenu.TreeItem item in root_tree.get_contents ()) {
-                if (item.get_type () == GMenu.TreeItemType.DIRECTORY)
-                    if (((GMenu.TreeDirectory) item).get_is_nodisplay () == false)
-                        categories.add ((GMenu.TreeDirectory) item);
+        categories.clear ();
+
+        var iter = apps_menu.get_root_directory ().iter ();
+        GMenu.TreeItemType type;
+        while ((type = iter.next ()) != GMenu.TreeItemType.INVALID) {
+            if (type == GMenu.TreeItemType.DIRECTORY) {
+                var dir = iter.get_directory ();
+                if (!dir.get_is_nodisplay ())
+                    categories.add (dir);
             }
         }
 
@@ -89,21 +88,10 @@
 
     private void update_apps () {
 
-        if (index_changed) {
-            apps.clear ();
-            apps = null;
-            index_changed = false;
-        }
-
-        if (apps == null) {
-
-            apps = new Gee.HashMap<string, Gee.ArrayList<App>> ();
-
-            foreach (GMenu.TreeDirectory cat in categories) {
-                apps.set (cat.get_name (), get_apps_by_category (cat));
-            }
-
-        }
+        apps.clear ();
+
+        foreach (var cat in categories)
+            apps.set (cat.get_name (), get_apps_by_category (cat));
 
     }
 
@@ -117,39 +105,27 @@
 
         var app_list = new Gee.ArrayList<App> ();
 
-        foreach (GMenu.TreeItem item in category.get_contents ()) {
-            App app;
-            switch (item.get_type ()) {
+        var iter = category.iter ();
+        GMenu.TreeItemType type;
+        while ((type = iter.next ()) != GMenu.TreeItemType.INVALID) {
+            switch (type) {
                 case GMenu.TreeItemType.DIRECTORY:
-                    app_list.add_all (get_apps_by_category ((GMenu.TreeDirectory) item));
+                    app_list.add_all (get_apps_by_category (iter.get_directory ()));
                     break;
                 case GMenu.TreeItemType.ENTRY:
-                    if (is_entry ((GMenu.TreeEntry) item)) {
-                        app = new App ((GMenu.TreeEntry) item);
+                    var app = new App (iter.get_entry ());
 #if HAVE_ZEITGEIST
-                        app.launched.connect (rl_service.app_launched);
+                    app.launched.connect (rl_service.app_launched);
 #endif
-                        app_list.add (app);
-                    }
+                    app_list.add (app);
                     break;
             }
         }
+
         return app_list;
 
     }
 
-    private bool is_entry (GMenu.TreeEntry entry) {
-
-        if (entry.get_launch_in_terminal () == false
-            && entry.get_is_excluded () == false
-            && entry.get_is_nodisplay () == false) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
     public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {
 
         return apps;