Slingshot

Merge lp:~parnold-x/slingshot/recent-apps into lp:~elementary-pantheon/slingshot/trunk

recent-apps
Merge into trunk

Proposed by Djax on 2014-10-05

Status:

Work in progress

Proposed branch:

lp:~parnold-x/slingshot/recent-apps

Merge into:

lp:~elementary-pantheon/slingshot/trunk

Diff against target:

630 lines (+279/-33)

10 files modified

lib/synapse-core/desktop-file-service.vala (+3/-0)
src/Backend/App.vala (+13/-2)
src/Backend/AppSystem.vala (+32/-6)
src/Backend/RelevancyService.vala (+17/-0)
src/SlingshotView.vala (+28/-3)
src/Widgets/CategoryView.vala (+70/-11)
src/Widgets/Grid.vala (+67/-6)
src/Widgets/SearchView.vala (+3/-3)
src/Widgets/Sidebar.vala (+1/-1)
src/Widgets/Switcher.vala (+45/-1)

To merge this branch:

bzr merge lp:~parnold-x/slingshot/recent-apps

Wishlist

Confirmed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Cody Garver		2015-09-01	Resubmit on 2016-02-23
Daniel Fore		2014-10-05	Approve on 2015-09-01
Sam Hewitt (community)	ux	2014-10-05	Approve on 2014-10-05
Review via email: mp+237186@code.launchpad.net

Description of the change

https://bugs.launchpad.net/slingshot/+bug/1375069
Add a page for most recently used applications. The page only shows up when data is available.
To also show hidden apps, etc. I used Synapse as DataSource. (By the way there are a couple of classes in synapse and slingshot that have basically the same functionality...)
If this is not wanted then we can also use the standard GMenu.Tree as source, but then we can only show apps that are also grouped in the categories in the recent used page...

Sam Hewitt (snwh) wrote on 2014-10-05:

All well and good, but perhaps instead of referring to "face-cool" refer to "document-recent-symbolic" which would be the appropriate icon –the hourglass is a from a non-default theme. :)

Sam Hewitt (snwh) wrote on 2014-10-05:

Correction: document-open-recent-symbolic

Djax (parnold-x) wrote on 2014-10-05:

I thought "face-cool" is a good placeholder till someone tells me what icon I should use :)
Changed to document-open-recent-symbolic

Daniel Fore (danrabbit) wrote on 2014-10-05:

Can we have a tooltip for the tab button? Something like "Recently used apps"

Sam Hewitt (snwh) wrote on 2014-10-05:

Looks good to me!

review: Approve (ux)

lp:~parnold-x/slingshot/recent-apps updated on 2014-10-15

457. By Cody Garver on 2014-10-05: No longer whitelist ibus-setup.desktop. It's bloody frightful. Whatever feature is needed from here should be added to lp:switchboard-plug-keyboard or something.
458. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-12: Launchpad automatic translations update.
459. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-13: Launchpad automatic translations update.
460. By Daniel Fore on 2014-10-14: no ellipsis
461. By Corentin Noël on 2014-10-15: * Get a consistent search entry.
* Do search asynchronously.
* Animate the view change with recent Gtk technology.
* Simplify the code regarding the addition of margins.
462. By Corentin Noël on 2014-10-15: Fixes RTL positionning
463. By Corentin Noël on 2014-10-15: Switch margin_left and margin_right to margin_start and margin_end.
464. By Corentin Noël on 2014-10-15: Updated translation template.

Daniel Fore (danrabbit) wrote on 2014-10-15:

Hm I get a Gtk-Critical with this branch that I don't get from trunk:

[23:25:52.955918 Gtk-Critical] gtk_container_remove: assertion 'GTK_IS_WIDGET (widget)' failed
[23:25:52.959185 Gtk-Critical] gtk_container_remove: assertion 'GTK_IS_WIDGET (widget)' failed

Cassidy James Blaede (cassidyjames) wrote on 2014-10-15:

I feel like I should be able to scroll to the recents view; I can scroll away from it and as of now I can only get there by clicking the little icon. :P

Cassidy James Blaede (cassidyjames) wrote on 2014-10-16:

Cody Garver had a genius thought: Could we make it a new view, switchable with the view switcher (View as Icons, View in Categories, View Recent)?

Cassidy James Blaede (cassidyjames) wrote on 2014-10-16:

Also something I've noticed while using: it doesn't seem to add new apps right away (when they're launched). How often does it add apps to the Recent view?

Cassidy James Blaede (cassidyjames) wrote on 2014-10-16:

And one last (related) item: Clearing usage data from the Security & Privacy plug does not clear the recent view, which I feel like it should. I'm not completely sure how that works. :P

lp:~parnold-x/slingshot/recent-apps updated on 2014-10-16

465. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-16: Launchpad automatic translations update.

Djax (parnold-x) wrote on 2014-10-16:

@danrabbit
fixed
@cassidyjames
scroll should be fixed (no scroll mouse here)

It adds recent apps here without any problem. But I just noticed zeitgeist only updates the most recent apps if the toggle in the privacy plug called in german "data privacy" is on???

I still get data from zeitgeist after clearing with the plug, so this is another issue. But the data is sometimes shortly kind of corrupted and then reappears?!

I will make another branch with the view switcher idea to compare.

Djax (parnold-x) wrote on 2014-10-16:

Mhh, also noticed that searched apps don't update the relevancyservice from slingshot. Any thought how this should be solved? Best way would be perhaps to switch everything to the slingshot backend but this is propably a isis+1 thing.
Otherwise it will be kind of a hack I think.

Djax (parnold-x) wrote on 2014-10-16:

And here a branch with the recent apps as view switcher.
Just quick n dirty as prototype so the switcher will show always and so on.
https://code.launchpad.net/~parnold-x/+junk/slingshot-recent-apps-view-switcher

Djax (parnold-x) wrote on 2014-10-16:

added recent update for searched apps but it is a bit of a hack. If anyone knows a better approach...

lp:~parnold-x/slingshot/recent-apps updated on 2014-10-16

466. By Corentin Noël on 2014-10-16: Adapt to category bar size.

Cody Garver (codygarver) wrote on 2014-10-16:

The recent apps view switcher branch does not compile

SlingshotView.vala: error: The name `scrolled_normal' does not exist in the context of `Slingshot.SlingshotView.setup_ui'

lp:~parnold-x/slingshot/recent-apps updated on 2014-10-17

467. By meese on 2014-10-17: adds a popover context menu used for showing quicklist items on right click (lp:1294917)
468. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-17: Launchpad automatic translations update.

Djax (parnold-x) wrote on 2014-10-17:

@codygarver
Strange. Compiles just fine here with vala 0.24.

Cody Garver (codygarver) wrote on 2014-10-18:

Djax, it happens when you merge the code with trunk e.g.

bzr branch lp:slingshot s

cd s

bzr merge lp:~parnold-x/+junk/slingshot-recent-apps-view-switcher

# compile and run

Daniel Fore (danrabbit) wrote on 2014-10-18:

I don't think I like the view switcher solution. With the other two buttons, you're viewing the same data but in a different format. With the history view, you're viewing totally different data. It feels weird to me.

lp:~parnold-x/slingshot/recent-apps updated on 2015-02-24

469. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-19: Launchpad automatic translations update.
470. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-20: Launchpad automatic translations update.
471. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-22: Launchpad automatic translations update.
472. By meese on 2014-10-23: fix quicklist icons showing up when they are not supposed to
473. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-24: Launchpad automatic translations update.
474. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-25: Launchpad automatic translations update.
475. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-28: Launchpad automatic translations update.
476. By Corentin Noël on 2014-10-28: Fixed regression triggered by rev 466, now the category view has always an item selected
477. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-04: Launchpad automatic translations update.
478. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-05: Launchpad automatic translations update.
479. By Djax on 2014-11-08: Support dragging apps in search view (lp:1008352)
480. By Corentin Noël on 2014-11-09: Simplify and fix layout size detection
481. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-12: Launchpad automatic translations update.
482. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-13: Launchpad automatic translations update.
483. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-14: Launchpad automatic translations update.
484. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-25: Launchpad automatic translations update.
485. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-26: Launchpad automatic translations update.
486. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-28: Launchpad automatic translations update.
487. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-29: Launchpad automatic translations update.
488. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-30: Launchpad automatic translations update.
489. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-01: Launchpad automatic translations update.
490. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-06: Launchpad automatic translations update.
491. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-08: Launchpad automatic translations update.
492. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-12: Launchpad automatic translations update.
493. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-13: Launchpad automatic translations update.
494. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-23: Launchpad automatic translations update.
495. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-24: Launchpad automatic translations update.
496. By Cody Garver on 2014-12-29: Blacklist htop.desktop
497. By Launchpad Translations on behalf of elementary-pantheon on 2015-01-05: Launchpad automatic translations update.
498. By Launchpad Translations on behalf of elementary-pantheon on 2015-01-09: Launchpad automatic translations update.
499. By Launchpad Translations on behalf of elementary-pantheon on 2015-01-10: Launchpad automatic translations update.
500. By Corentin Noël on 2015-02-01: Make use of Gtk.Popover instead of Granite.Popover.
Animates the view change from the edges.
Use real size of App Buttons (removed useless and wrong code)
501. By Corentin Noël on 2015-02-01: Fixed grab loss after Drag'n'Drop.
502. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-03: Launchpad automatic translations update.
503. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-10: Launchpad automatic translations update.
504. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-12: Launchpad automatic translations update.
505. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-17: Launchpad automatic translations update.
506. By Rico Tzschichholz on 2015-02-17: appentry: Use one Gtk.Menu which gets created on demand
507. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-19: Launchpad automatic translations update.
508. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-20: Launchpad automatic translations update.
509. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-23: Launchpad automatic translations update.
510. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-24: Launchpad automatic translations update.

Daniel Fore (danrabbit) wrote on 2015-02-25:

Needs trunk merged.

I still feel this view should be in a list. Grid view doesn't make sense to me for something that's supposed to be in chronological order.

review: Needs Fixing

Djax (parnold-x) wrote on 2015-02-26:

Merged the trunk and switched to list view. Search View style.
Unfortunatly no up/down keyboard support. I think to enable this a lot of changes are needed.

Daniel Fore (danrabbit) wrote on 2015-02-27:

Hmm seems we have a small problem. Vertical scrolling will eventually switch pages. Any way we can stop that from happening for this recent page? If not maybe we should revert to being a grid view for now then.

I also feel like we should add "Recent" as a category in category view so that you can access this in both views.

Djax (parnold-x) wrote on 2015-02-27:

Ok, now that I have a normal scroll mouse I also noticed this. With my Trackpoint it scrolls just fine the focused widgets. I enable the scrolling.
To also scroll away from the recent apps list it scrolls the page switche if the bottom is reached. But I am not sure if this is good. What do you think?
We could also restrict to 9 entries so that no scrolling is needed.
The "Recent" category as first entry, last or in alphabetic order?
Also as a list view or the normal grid?

Daniel Fore (danrabbit) wrote on 2015-02-28:

> To also scroll away from the recent apps list it scrolls the page switcher if the bottom is reached. But I am not sure if this is good. What do you think?

Yep that's what I was saying that I don't think is good behavior. This shouldn't happen.

We should probably have the "Recent" category as first as it's first in the grid view

Djax (parnold-x) wrote on 2015-02-28:

Yeah, I changed it to the Recent list view scrolls till the bottom and then snaps there for a moment and then when you scroll futher it scrolls away. Ok?
As list view in the category section?

lp:~parnold-x/slingshot/recent-apps updated on 2015-03-10

511. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-03: Launchpad automatic translations update.
512. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-05: Launchpad automatic translations update.
513. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-10: Launchpad automatic translations update.

Djax (parnold-x) wrote on 2015-03-12:

Could you review again?

lp:~parnold-x/slingshot/recent-apps updated on 2015-09-01

514. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-21

Launchpad automatic translations update.

515. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-22

Launchpad automatic translations update.

516. By Viko Adi Rahmawan on 2015-03-24

* clear state flags before turning PRELIGHT on
* dont clear() on every category changes

517. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-25

Launchpad automatic translations update.

518. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-06

Launchpad automatic translations update.

519. By Cody Garver on 2015-04-06

Release 0.8

520. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-09

Launchpad automatic translations update.

521. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-25

Launchpad automatic translations update.

522. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-29

Launchpad automatic translations update.

523. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-30

Launchpad automatic translations update.

524. By Rory on 2015-05-08

appentry: Add 'Add to/Remove from Dock' menuitem using Plank DBusManager

525. By Cody Garver on 2015-05-08

Updated translation template

526. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-09

Launchpad automatic translations update.

527. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-10

Launchpad automatic translations update.

528. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-14

Launchpad automatic translations update.

529. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-17

Launchpad automatic translations update.

530. By Cody Garver on 2015-05-17

Bump required Gtk version to 3.12

531. By Cody Garver on 2015-05-17

Updated INSTALL dependency list

532. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-18

Launchpad automatic translations update.

533. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-19

Launchpad automatic translations update.

534. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-26

Launchpad automatic translations update.

535. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-27

Launchpad automatic translations update.

536. By Rico Tzschichholz on 2015-05-28

Adapt to gtk+ binding change of Gtk.Label to fix build with valac >= 0.28

537. By Djax on 2015-05-29

Reset search highlight to first result when search entry is empty (lp:1455991)

538. By kay van der Zander on 2015-05-29

desktop-files-plugin: fallback to possible matches if available (lp:1029612)

When user types srcatch it will still show scratch

539. By Djax on 2015-05-29

Add session actions plugin (lp:1380794)

540. By Cody Garver on 2015-05-29

Updated translation template

541. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-29

Launchpad automatic translations update.

542. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-30

Launchpad automatic translations update.

543. By Cody Garver on 2015-05-30

Release 0.8.1

544. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-01

Launchpad automatic translations update.

545. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-02

Launchpad automatic translations update.

546. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-05

Launchpad automatic translations update.

547. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-06

Launchpad automatic translations update.

548. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-07

Launchpad automatic translations update.

549. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-08

Launchpad automatic translations update.

550. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-09

Launchpad automatic translations update.

551. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-10

Launchpad automatic translations update.

552. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-14

Launchpad automatic translations update.

553. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-19

Launchpad automatic translations update.

554. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-24

Launchpad automatic translations update.

555. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-25

Launchpad automatic translations update.

556. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-26

Launchpad automatic translations update.

557. By Launchpad Translations on behalf of elementary-pantheon on 2015-07-06

Launchpad automatic translations update.

558. By Launchpad Translations on behalf of elementary-pantheon on 2015-07-13

Launchpad automatic translations update.

559. By Launchpad Translations on behalf of elementary-pantheon on 2015-07-28

Launchpad automatic translations update.

560. By Launchpad Translations on behalf of elementary-pantheon on 2015-08-07

Launchpad automatic translations update.

561. By Launchpad Translations on behalf of elementary-pantheon on 2015-08-09

Launchpad automatic translations update.

562. By Launchpad Translations on behalf of elementary-pantheon on 2015-08-14

Launchpad automatic translations update.

563. By Launchpad Translations on behalf of elementary-pantheon on 2015-08-20

Launchpad automatic translations update.

564. By Cody Garver on 2015-08-20

Release 0.8.1.1

565. By Launchpad Translations on behalf of elementary-pantheon on 2015-08-28

Launchpad automatic translations update.

566. By Launchpad Translations on behalf of elementary-pantheon on 2015-08-30

Launchpad automatic translations update.

567. By Djax on 2015-09-01

add recent apps category

Daniel Fore (danrabbit) wrote on 2015-09-01:

Looks good to me :) Just needs code review

review: Approve

Daniel Fore (danrabbit) wrote on 2015-09-01:

Looks good to me :) Just needs code review

review: Approve

Rico Tzschichholz (ricotz) wrote on 2015-09-02:

*Reuse* results aka cache results in local *properly typed* fields to avoid refs/copies.

E.g. "Synapse.DesktopFileService.get_default ()" and "Synapse.DesktopFileService.get_default ().get_all_desktop_files ()"

lp:~parnold-x/slingshot/recent-apps updated on 2015-09-02

568. By Djax on 2015-09-02: cache result in local properties and codestyle

Cody Garver (codygarver) wrote on 2016-02-23:

Needs to be re-based on newer slingshot

review: Resubmit

Unmerged revisions

568. By Djax on 2015-09-02: cache result in local properties and codestyle
567. By Djax on 2015-09-01: add recent apps category

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Djax

Ezekiel Michael Angel

Giulio Collura

Jente

 === modified file 'lib/synapse-core/desktop-file-service.vala'
 --- lib/synapse-core/desktop-file-service.vala	2014-08-21 14:08:17 +0000
 +++ lib/synapse-core/desktop-file-service.vala	2015-09-02 08:29:49 +0000
@@ -237,6 +237,8 @@
        instance = null;
+     }
++    public signal void init_done ();
++
      public async void initialize ()
+     {
        if (init_once.is_initialized ()) return;
@@ -251,6 +253,7 @@
        yield load_all_desktop_files ();
++      init_done ();
        init_once.leave (true);
+     }
 === modified file 'src/Backend/App.vala'
 --- src/Backend/App.vala	2014-10-18 01:57:49 +0000
 +++ src/Backend/App.vala	2015-09-02 08:29:49 +0000
@@ -115,7 +115,6 @@
+     }
      public App.from_synapse_match (Synapse.Match match, Synapse.Match? target = null) {
--
          app_type = AppType.SYNAPSE;
          name = match.title;
@@ -126,7 +125,19 @@
          this.target = target;
          update_icon ();
--
++    }
++
++     public App.from_synapse_info (Synapse.DesktopFileInfo info) {
++        app_type = AppType.APP;
++
++        name = info.name.dup ();
++        description = info.comment.dup () ?? name;
++        exec = info.exec.dup ();
++        desktop_id = info.desktop_id;
++        generic_name = info.generic_name;
++        icon_name = info.icon_name;
++
++        update_icon ();
+     }
      ~App () {
 === modified file 'src/Backend/AppSystem.vala'
 --- src/Backend/AppSystem.vala	2014-08-16 15:13:42 +0000
 +++ src/Backend/AppSystem.vala	2015-09-02 08:29:49 +0000
@@ -22,7 +22,7 @@
      const string SWITCHBOARD_PLUG_CATEGORY = "X-PANTHEON-Switchboard-Plug";
      private Gee.ArrayList<GMenu.TreeDirectory> categories = null;
--    private Gee.HashMap<string, Gee.ArrayList<App>> apps = null;
++    private Gee.TreeMap<string, Gee.ArrayList<App>> apps = null;
      private GMenu.Tree apps_menu = null;
  #if HAVE_ZEITGEIST
@@ -31,22 +31,24 @@
      public signal void changed ();
++    public signal void recent_apps_available (App[] most_popular);
++
      construct {
  #if HAVE_ZEITGEIST
          rl_service = new RelevancyService ();
--        rl_service.update_complete.connect (update_popularity);
++        rl_service.update_complete.connect (update_relevancy);
  #endif
          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>> ();
++        apps = new Gee.TreeMap<string, Gee.ArrayList<App>> ();
          categories = new Gee.ArrayList<GMenu.TreeDirectory> ();
          update_app_system ();
+     }
--    private void update_app_system () {
++    public void update_app_system () {
          debug ("Updating Applications menu tree...");
  #if HAVE_ZEITGEIST
          rl_service.refresh_popularity ();
@@ -78,10 +80,34 @@
+     }
  #if HAVE_ZEITGEIST
--    private void update_popularity () {
++    private void update_relevancy () {
          foreach (Gee.ArrayList<App> category in apps.values)
              foreach (App app in category)
                  app.popularity = rl_service.get_app_popularity (app.desktop_id);
++        update_recent_apps.begin ();
++    }
++
++    private async void update_recent_apps () {
++        // to get also hidden apps, etc. use synapse as data source
++        App[] recent_apps = new App[rl_service.recent_apps.size];
++        // wait for Synapse DesktopFileService to initialize on startup
++        var desktop_file_service = Synapse.DesktopFileService.get_default ();
++        var all_desktop_files = desktop_file_service.get_all_desktop_files ();
++
++        if (all_desktop_files.size == 0) {
++            desktop_file_service.init_done.connect (() => {
++                Idle.add(update_recent_apps.callback);
++            });
++            yield;
++        }
++        foreach (var d in all_desktop_files) {
++            if (rl_service.recent_apps.contains (d.desktop_id)) {
++                var app = new App.from_synapse_info (d);
++                app.launched.connect (rl_service.app_launched);
++                recent_apps[rl_service.recent_apps.index_of(d.desktop_id)] = app;
++            }
++        }
++        recent_apps_available (recent_apps);
+     }
  #endif
@@ -118,7 +144,7 @@
          return app_list;
+     }
--    public Gee.HashMap<string, Gee.ArrayList<App>> get_apps () {
++    public Gee.TreeMap<string, Gee.ArrayList<App>> get_apps () {
          return apps;
+     }
 === modified file 'src/Backend/RelevancyService.vala'
 --- src/Backend/RelevancyService.vala	2014-07-10 09:40:47 +0000
 +++ src/Backend/RelevancyService.vala	2015-09-02 08:29:49 +0000
@@ -20,9 +20,11 @@
  #if HAVE_ZEITGEIST
  public class Slingshot.Backend.RelevancyService : Object {
++    private const int recent_apps_count = 9;
      private Zeitgeist.Log zg_log;
      private Zeitgeist.DataSourceRegistry zg_dsr;
      private Gee.HashMap<string, int> app_popularity;
++    public Gee.ArrayList<string> recent_apps { get; private set; }
      private bool has_datahub_gio_module = false;
      private bool refreshing = false;
@@ -34,6 +36,7 @@
          zg_log = new Zeitgeist.Log ();
          app_popularity = new Gee.HashMap<string, int> ();
++        recent_apps = new Gee.ArrayList<string> ();
          refresh_popularity ();
          check_data_sources.begin ();
@@ -128,6 +131,20 @@
                  app_popularity[s.uri] = (int)(relevancy * MULTIPLIER);
                  index++;
+             }
++            // additional get most recent apps
++            Zeitgeist.ResultSet rs2 = yield zg_log.find_events (tr, ptr_arr,
++                    Zeitgeist.StorageState.ANY,
++                    recent_apps_count,
++                    Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
++                    null);
++            recent_apps.clear ();
++
++            foreach (Zeitgeist.Event e in rs2) {
++                if (e.num_subjects () <= 0) continue;
++                Zeitgeist.Subject s = e.get_subject (0);
++                recent_apps.add (s.uri.replace ("application://",""));
++            }
++
              update_complete ();
              refreshing = false;
          } catch (Error err) {
 === modified file 'src/SlingshotView.vala'
 --- src/SlingshotView.vala	2015-02-01 15:13:15 +0000
 +++ src/SlingshotView.vala	2015-09-02 08:29:49 +0000
@@ -47,7 +47,7 @@
          public Backend.AppSystem app_system;
          private Gee.ArrayList<GMenu.TreeDirectory> categories;
--        public Gee.HashMap<string, Gee.ArrayList<Backend.App>> apps;
++        public Gee.TreeMap<string, Gee.ArrayList<Backend.App>> apps;
          private Modality modality;
          private bool can_trigger_hotcorner = true;
@@ -322,7 +322,10 @@
              search_entry.grab_focus ();
              search_entry.activate.connect (search_entry_activated);
--            search_view.app_launched.connect (() => hide ());
++            search_view.app_launched.connect (() => {
++                app_system.update_app_system ();
++                hide ();
++            });
              // This function must be after creating the page switcher
              populate_grid_view ();
@@ -826,11 +829,33 @@
              grid_view.clear ();
              foreach (Backend.App app in app_system.get_apps_by_name ()) {
                  var app_entry = new Widgets.AppEntry (app);
--                app_entry.app_launched.connect (() => hide ());
++                app_entry.app_launched.connect (() => {
++                    app_system.update_app_system ();
++                    hide ();
++                });
                  grid_view.append (app_entry);
                  app_entry.show_all ();
+             }
++            app_system.recent_apps_available.connect ((list) => {
++                apps.set ("recent", new Gee.ArrayList<Backend.App>.wrap (list));
++                Gtk.Widget[] widgets = {};
++                foreach (var app in list) {
++                    var app_entry = new Widgets.SearchItem (app);
++                    app_entry.button_release_event.connect (() => {
++                        if (!app_entry.dragging) {
++                            app.launch ();
++                            app_system.update_app_system ();
++                            hide ();
++                        }
++                        return true;
++                    });
++                    widgets += app_entry;
++                }
++                grid_view.set_recent_apps (widgets);
++                category_view.setup_sidebar ();
++            });
++
              stack.set_visible_child_name ("normal");
+         }
 === modified file 'src/Widgets/CategoryView.vala'
 --- src/Widgets/CategoryView.vala	2015-01-17 23:56:32 +0000
 +++ src/Widgets/CategoryView.vala	2015-09-02 08:29:49 +0000
@@ -21,12 +21,15 @@
      private Gtk.Grid container;
      public Sidebar category_switcher;
      public Gtk.Separator separator;
--    public Widgets.Grid app_view;
++    public Widgets.Grid app_view;
++    private Gtk.Box recent_box;
++    private Gtk.Stack stack;
      private SlingshotView view;
      private const string ALL_APPLICATIONS = _("All Applications");
      private const string NEW_FILTER = _("Create a new Filter");
      private const string SWITCHBOARD_CATEGORY = "switchboard";
++    private const string RECENT_CATEGORY = _("Recent");
      private int current_position = 0;
@@ -48,13 +51,37 @@
          container.add (category_switcher);
          container.add (separator);
--        container.add (app_view);
++        stack = new Gtk.Stack ();
++        stack.add_named (create_recent_apps (), "list");
++        stack.add_named (app_view, "grid");
++        container.add (stack);
          add (container);
          connect_events ();
          setup_sidebar ();
+     }
++
++    private Gtk.Widget create_recent_apps () {
++        var recent_scroll_window = new Gtk.ScrolledWindow (null, null);
++        recent_scroll_window.hscrollbar_policy = Gtk.PolicyType.NEVER;
++        recent_scroll_window.margin_end = 6;
++        recent_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
++        recent_box.margin_start = 12;
++
++        var context_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
++        var context_fixed = new Gtk.Fixed ();
++        context_fixed.margin_start = 12;
++        context_fixed.put (context_box, 0, 0);
++
++        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
++        box.pack_start (recent_box, true);
++        box.pack_start (context_fixed, false);
++
++        recent_scroll_window.add_with_viewport (box);
++        return recent_scroll_window;
++    }
++
      public void setup_sidebar () {
          var old_selected = category_switcher.selected;
          category_ids.clear ();
@@ -62,14 +89,20 @@
          app_view.set_size_request (-1, -1);
          // Fill the sidebar
          int n = 0;
--        foreach (string cat_name in view.apps.keys) {
--            if (cat_name == SWITCHBOARD_CATEGORY)
++        if (view.apps.has_key ("recent") && view.apps["recent"].size > 0) {
++            category_ids.set (n, "recent");
++            category_switcher.add_category (RECENT_CATEGORY);
++            n++;
++        }
++        foreach (string cat_name in view.apps.ascending_keys) {
++            if (cat_name == SWITCHBOARD_CATEGORY || cat_name == "recent")
                  continue;
              category_ids.set (n, cat_name);
              category_switcher.add_category (GLib.dgettext ("gnome-menus-3.0", cat_name).dup ());
              n++;
+         }
++
          category_switcher.show_all ();
          int minimum_width;
@@ -82,8 +115,14 @@
          int columns = view.columns - removing_columns;
          app_view.resize (view.rows, columns);
--
++
++        //resize recent list view because first category entry determines layout
++        recent_box.set_size_request (columns * 125, -1);
          category_switcher.selected = old_selected;
++
++        // selected first non recent category like in grid view
++        if (view.apps.has_key ("recent") && view.apps["recent"].size > 0)
++            category_switcher.select_nth (1);
+     }
      private void connect_events () {
@@ -103,12 +142,32 @@
+     }
      public void show_filtered_apps (string category) {
--
--        app_view.clear ();
--        foreach (Backend.App app in view.apps[category])
--            add_app (app);
--
--        current_position = 0;
++        if (category == "recent") {
++            stack.set_visible_child_name ("list");
++            foreach (var w in recent_box.get_children ()) {
++                w.destroy ();
++            }
++            foreach (Backend.App app in view.apps[category]) {
++                var app_entry = new Widgets.SearchItem (app);
++                app_entry.button_release_event.connect (() => {
++                    if (!app_entry.dragging) {
++                        app.launch ();
++                        view.hide ();
++                    }
++                    return true;
++                });
++                recent_box.pack_start (app_entry, false, false);
++                app_entry.show_all ();
++            }
++        } else {
++            stack.set_visible_child_name ("grid");
++            app_view.clear ();
++            foreach (Backend.App app in view.apps[category]) {
++                add_app (app);
++            }
++
++            current_position = 0;
++        }
+     }
 === modified file 'src/Widgets/Grid.vala'
 --- src/Widgets/Grid.vala	2015-02-01 15:02:37 +0000
 +++ src/Widgets/Grid.vala	2015-09-02 08:29:49 +0000
@@ -31,12 +31,17 @@
          private Gtk.Stack stack;
          private Gtk.Grid current_grid;
          private Gee.HashMap<int, Gtk.Grid> grids;
++        private Gtk.Box recent_box;
++        private Gtk.ScrolledWindow recent_scroll_window;
          private uint current_row = 0;
          private uint current_col = 0;
          private Page page;
++        private bool recent_apps_toogle_set = false;
++        private bool recent_bottom_reached = false;
++
          public Grid (int rows, int columns) {
              page.rows = rows;
              page.columns = columns;
@@ -59,10 +64,32 @@
              add (main_grid);
              grids = new Gee.HashMap<int, Gtk.Grid> (null, null);
++            // recent apps at page 0
++            create_recent_apps ();
              create_new_grid ();
              go_to_number (1);
+         }
++        private void create_recent_apps () {
++            recent_scroll_window = new Gtk.ScrolledWindow (null, null);
++            recent_scroll_window.hscrollbar_policy = Gtk.PolicyType.NEVER;
++            recent_scroll_window.margin_end = 6;
++            recent_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
++            recent_box.margin_start = 12;
++
++            var context_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
++            var context_fixed = new Gtk.Fixed ();
++            context_fixed.margin_start = 12;
++            context_fixed.put (context_box, 0, 0);
++
++            var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
++            box.pack_start (recent_box, true);
++            box.pack_start (context_fixed, false);
++
++            recent_scroll_window.add_with_viewport (box);
++            stack.add_titled (recent_scroll_window, "0", "0");
++        }
++
          private void create_new_grid () {
              // Grid properties
              current_grid = new Gtk.Grid ();
@@ -107,13 +134,14 @@
                  foreach (Gtk.Widget widget in grid.get_children ()) {
                      widget.destroy ();
+                 }
--
                  grid.destroy ();
+             }
--
++            recent_scroll_window.destroy ();
              grids.clear ();
              current_row = 0;
              current_col = 0;
++            create_recent_apps ();
++            recent_apps_toogle_set = false;
              page.number = 1;
              create_new_grid ();
              stack.set_visible_child (current_grid);
@@ -147,17 +175,29 @@
+         }
          public void go_to_next () {
--            int page_number = get_current_page ()+1;
--            if (page_number <= get_n_pages ())
++            if (get_current_page () == 0 && !recent_bottom_reached) {
++                var v_adjust = recent_scroll_window.get_vadjustment ();
++                if ((v_adjust.upper - v_adjust.page_size) == v_adjust.value)
++                    GLib.Timeout.add(100, () => {
++                        recent_bottom_reached = true;
++                        return false;
++                    });
++                return;
++            }
++            int page_number = get_current_page () + 1;
++            if (page_number <= get_n_pages ()) {
                  stack.set_visible_child_name (page_number.to_string ());
++            }
              page_switcher.update_selected ();
+         }
          public void go_to_previous () {
--            int page_number = get_current_page ()-1;
--            if (page_number > 0)
++            recent_bottom_reached = false;
++            int page_number = get_current_page () - 1;
++            if (page_number > 0 || (page_number == 0 && recent_apps_toogle_set)) {
                  stack.set_visible_child_name (page_number.to_string ());
++            }
              page_switcher.update_selected ();
+         }
@@ -178,5 +218,26 @@
              page.columns = columns;
              page.number = 1;
+         }
++
++        public void set_recent_apps (Gtk.Widget[] recent_apps) {
++            // don't show if nothing to show
++            if (recent_apps.length == 0 && !recent_apps_toogle_set) {
++                return;
++            }
++            foreach (var w in recent_box.get_children ()) {
++                w.destroy ();
++            }
++            for (int i = 0; i < recent_apps.length; i++) {
++                var app_entry = recent_apps[i];
++                recent_box.pack_start (app_entry, false, false);
++                app_entry.show_all ();
++            }
++            recent_box.show ();
++            if (!recent_apps_toogle_set) {
++                page_switcher.add_recent_apps_toggle (recent_scroll_window);
++                recent_apps_toogle_set = true;
++            }
++            page_switcher.update_selected ();
++        }
+     }
+ }
 === modified file 'src/Widgets/SearchView.vala'
 --- src/Widgets/SearchView.vala	2015-05-29 00:40:47 +0000
 +++ src/Widgets/SearchView.vala	2015-09-02 08:29:49 +0000
@@ -209,7 +209,6 @@
+         }
          private void show_app (Backend.App app, string search_term) {
--
              var search_item = new SearchItem (app, search_term);
              app.start_search.connect ((search, target) => start_search (search, target));
              search_item.button_release_event.connect (() => {
@@ -325,8 +324,9 @@
           * @return indicates whether slingshot should now be hidden
           */
          public bool launch_selected () {
--
--            return selected_app.launch_app ();
++            var tmp = selected_app.launch_app ();
++            app_launched ();
++            return tmp;
+         }
 === modified file 'src/Widgets/Sidebar.vala'
 --- src/Widgets/Sidebar.vala	2014-10-27 19:01:28 +0000
 +++ src/Widgets/Sidebar.vala	2015-09-02 08:29:49 +0000
@@ -52,7 +52,7 @@
      public Sidebar () {
          store = new Gtk.TreeStore (Columns.N_COLUMNS, typeof (int), typeof (string));
--        store.set_sort_column_id (1, Gtk.SortType.ASCENDING);
++        store.set_sort_column_id (0, Gtk.SortType.ASCENDING);
          set_model (store);
          set_headers_visible (false);
 === modified file 'src/Widgets/Switcher.vala'
 --- src/Widgets/Switcher.vala	2014-09-04 05:58:55 +0000
 +++ src/Widgets/Switcher.vala	2015-09-02 08:29:49 +0000
@@ -49,6 +49,10 @@
+     }
      private void add_child (Gtk.Widget widget) {
++        //skip recent_apps stack child
++        if (stack.get_children ().index (widget) == 0) {
++            return;
++        }
          var button = new Gtk.ToggleButton.with_label ((buttons.size +1).to_string ());
          button.width_request = 30;
          button.can_focus = false;
@@ -98,6 +102,9 @@
      private void on_stack_child_removed (Gtk.Widget widget) {
          var button = buttons.get (widget);
++        if (button == null) {
++            return;
++        }
          remove (button);
          buttons.unset (widget);
+     }
@@ -110,8 +117,9 @@
      public void clear_children () {
          foreach (weak Gtk.Widget button in get_children ()) {
              button.hide ();
--            if (button.get_parent () != null)
++            if (button.get_parent () != null) {
                  remove (button);
++            }
+         }
+     }
@@ -124,4 +132,40 @@
+             }
+         }
+     }
++
++    public void add_recent_apps_toggle (Gtk.Widget widget) {
++        var button = new Gtk.ToggleButton ();
++        button.set_image (new Gtk.Image.from_icon_name ("document-open-recent-symbolic", Gtk.IconSize.BUTTON));
++        button.set_tooltip_text (_("Recently used apps"));
++        button.width_request = 30;
++        button.can_focus = false;
++        button.get_style_context ().add_class ("switcher");
++        button.button_release_event.connect (() => {
++            foreach (var entry in buttons.entries) {
++                if (entry.value == button) {
++                    on_button_clicked (entry.key);
++                }
++                entry.value.active = false;
++            }
++            button.active = true;
++            return true;
++        });
++
++        // position recent apps toogle first
++        Gtk.Widget[] tmp = {};
++        foreach (var child in get_children ()) {
++            if (!(child is Gtk.ToggleButton)) continue;
++            tmp += child;
++            remove (child);
++        }
++
++        add (button);
++        foreach (var child in tmp) {
++            add (child);
++        }
++
++        buttons.set (widget, button);
++
++        show_all ();
++    }
+ }
 \ No newline at end of file

Slingshot

Merge lp:~parnold-x/slingshot/recent-apps into lp:~elementary-pantheon/slingshot/trunk

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers