Merge lp:~donadigo/appcenter/open-button into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Add open button to open apps from appcenter

This branch fixes bug #1628748: "Add "Open" button to installed listings".

If the app has a desktop ID and is installed or has an update available, the open button will be shown to open the app directly from the appcenter.

[lp:~donadigo/appcenter/open-button]

366. By Adam Bieńkowski on 2017-01-01

Do not show open button in installed view

[Jeremy Wootten (jeremywootten)]

LGTM :)

review: Approve (code, function)

=== modified file 'src/AbstractAppContainer.vala'
--- src/AbstractAppContainer.vala	2016-09-17 18:18:04 +0000
+++ src/AbstractAppContainer.vala	2017-01-01 16:06:44 +0000
@@ -9,11 +9,13 @@
         // The action button covers Install and Update
         protected Widgets.AppActionButton action_button;
         protected Widgets.AppActionButton uninstall_button;
+        protected Widgets.AppActionButton open_button;
         protected Gtk.ProgressBar progress_bar;
         protected Gtk.Button cancel_button;
         protected Gtk.SizeGroup action_button_group;
         protected Gtk.Stack action_stack;
-        protected bool show_uninstall;
+        protected bool show_uninstall = true;
+        protected bool show_open = true;
 
         public bool is_os_updates {
             get {
@@ -68,12 +70,17 @@
             uninstall_button = new Widgets.AppActionButton (_("Uninstall"));
             uninstall_button.clicked.connect (() => uninstall_clicked.begin ());
 
+            open_button = new Widgets.AppActionButton (_("Open"));
+            open_button.clicked.connect (launch_package_app);
+
             var button_grid = new Gtk.Grid ();
+            button_grid.column_spacing = 6;
             button_grid.halign = Gtk.Align.END;
             button_grid.valign = Gtk.Align.CENTER;
             button_grid.orientation = Gtk.Orientation.HORIZONTAL;
             button_grid.add (uninstall_button);
             button_grid.add (action_button);
+            button_grid.add (open_button);
 
             var progress_grid = new Gtk.Grid ();
             progress_grid.valign = Gtk.Align.CENTER;
@@ -89,6 +96,7 @@
             action_button_group.add_widget (action_button);
             action_button_group.add_widget (uninstall_button);
             action_button_group.add_widget (cancel_button);
+            action_button_group.add_widget (open_button);
 
             action_stack.add_named (button_grid, "buttons");
             action_stack.add_named (progress_grid, "progress");
@@ -115,7 +123,7 @@
             update_action ();
         }
 
-        protected void update_action (bool show_uninstall = true) {
+        protected void update_action () {
             uninstall_button.no_show_all = true;
             uninstall_button.hide ();
             progress_bar.no_show_all = true;
@@ -129,8 +137,10 @@
                     action_button.label = _("Install");
                     action_button.no_show_all = false;
                     action_button.show ();
+
+                    open_button.no_show_all = true;
+                    open_button.hide ();
                     break;
-
                 case AppCenterCore.Package.State.INSTALLED:
                     if (show_uninstall) {
                         /* Uninstall button will show */
@@ -148,10 +158,27 @@
                         action_stack.hide ();
                     }
 
+                    if (show_open && package.get_can_launch ()) {
+                        open_button.no_show_all = false;
+                        open_button.show ();
+                    } else {
+                        open_button.no_show_all = true;
+                        open_button.hide ();
+                    }
+
                     break;
 
                 case AppCenterCore.Package.State.UPDATE_AVAILABLE:
                     action_button.label = _("Update");
+
+                    if (show_open && package.get_can_launch ()) {
+                        open_button.no_show_all = false;
+                        open_button.show ();
+                    } else {
+                        open_button.no_show_all = true;
+                        open_button.hide ();
+                    }
+
                     break;
 
                 case AppCenterCore.Package.State.INSTALLING:
@@ -160,6 +187,9 @@
                     progress_bar.no_show_all = false;
                     progress_bar.show ();
                     action_stack.set_visible_child_name ("progress");
+
+                    open_button.no_show_all = true;
+                    open_button.hide ();                    
                     break;
 
                 default:
@@ -184,6 +214,14 @@
             package.action_cancellable.cancel ();
         }
 
+        private void launch_package_app () {
+            try {
+                package.launch ();
+            } catch (Error e) {
+                warning ("Failed to launch %s: %s".printf (package.get_name (), e.message));
+            }
+        }
+
         private async void action_clicked () {
              if (package.update_available) {
                  yield package.update ();

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-12-26 21:35:06 +0000
+++ src/Core/Package.vala	2017-01-01 16:06:44 +0000
@@ -18,6 +18,11 @@
  * Authored by: Corentin Noël <[e-mail]>
  */
 
+public errordomain PackageLaunchError {
+    DESKTOP_ID_NOT_FOUND,
+    APP_INFO_NOT_FOUND
+}
+
 public class AppCenterCore.Package : Object {
     public signal void changing (bool is_changing);
     public signal void info_changed (Pk.Status status);
@@ -144,6 +149,24 @@
         return yield perform_operation (State.REMOVING, State.NOT_INSTALLED, State.INSTALLED);
     }
 
+    public void launch () throws Error {
+        string desktop_id = component.get_desktop_id ();
+        if (desktop_id == null) {
+            throw new PackageLaunchError.DESKTOP_ID_NOT_FOUND ("desktop ID not found");
+        }
+
+        var app_info = new DesktopAppInfo (desktop_id);
+        if (app_info == null) {
+            throw new PackageLaunchError.APP_INFO_NOT_FOUND ("AppInfo not found for %s ID".printf (desktop_id));
+        }
+
+        try {
+            app_info.launch (null, null);
+        } catch (Error e) {
+            throw e;
+        }
+    }
+
     private async bool perform_operation (State performing, State after_success, State after_fail) {
         var exit_status = Pk.Exit.UNKNOWN;
         prepare_package_operation (performing);
@@ -300,6 +323,10 @@
         return version;
     }
 
+    public bool get_can_launch () {
+        return component.get_desktop_id () != null;
+    }
+
     private Pk.Package? find_package () {
         if (component.id == OS_UPDATES_ID) {
             return null;

=== modified file 'src/Views/AppInfoView.vala'
--- src/Views/AppInfoView.vala	2016-09-29 07:09:59 +0000
+++ src/Views/AppInfoView.vala	2017-01-01 16:06:44 +0000
@@ -138,11 +138,12 @@
 
             action_button.set_suggested_action_header ();
             uninstall_button.set_destructive_action_header ();
+            open_button.get_style_context ().add_class ("h3");
         }
 
         private async void load_extensions () {
             package.component.get_addons ().@foreach ((extension) => {
-                var row = new Widgets.PackageRow (new AppCenterCore.Package (extension), null, false);
+                var row = new Widgets.PackageRow (new AppCenterCore.Package (extension), null);
                 if (extension_box != null) {
                     extension_box.add (row);
                 }

=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2016-10-05 13:50:55 +0000
+++ src/Views/AppListView.vala	2017-01-01 16:06:44 +0000
@@ -26,7 +26,7 @@
         public AppListView () {}
 
         protected override Widgets.AppListRow make_row (AppCenterCore.Package package)  {
-            return (Widgets.AppListRow)(new Widgets.PackageRow (package, action_button_group, false));
+            return (Widgets.AppListRow)(new Widgets.PackageRow (package, action_button_group));
         }
     }
 
@@ -88,7 +88,7 @@
         protected override void after_add_remove_change_row () {update_headers ();}
 
         protected override Widgets.AppListRow make_row (AppCenterCore.Package package) {
-            return (Widgets.AppListRow)(new Widgets.PackageRow (package, action_button_group, false));
+            return (Widgets.AppListRow)(new Widgets.PackageRow (package, action_button_group));
         }
 
         protected override void on_package_changing (AppCenterCore.Package package, bool is_changing) {

=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2016-09-17 19:28:03 +0000
+++ src/Widgets/PackageRow.vala	2017-01-01 16:06:44 +0000
@@ -22,8 +22,8 @@
     public class PackageRow : Gtk.ListBoxRow, AppListRow {
         PackageRowGrid grid;
 
-        public PackageRow (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {
-            grid = new PackageRowGrid (package, size_group, show_uninstall);
+        public PackageRow (AppCenterCore.Package package, Gtk.SizeGroup? size_group) {
+            grid = new PackageRowGrid (package, size_group);
             add (grid);
             grid.changed.connect (() => {
                 changed ();
@@ -92,9 +92,10 @@
                 attach (action_stack, 2, 0, 1, 2);
             }
 
-            public PackageRowGrid (AppCenterCore.Package package, Gtk.SizeGroup? size_group, bool show_uninstall = true) {
+            public PackageRowGrid (AppCenterCore.Package package, Gtk.SizeGroup? size_group) {
                 this.package = package;
-                this.show_uninstall = show_uninstall;
+                this.show_uninstall = false;
+                this.show_open = false;
                 set_up_package ();
 
                 if (size_group != null) {
@@ -105,7 +106,7 @@
             }
 
             protected override void update_state () {
-                update_action (show_uninstall);
+                update_action ();
                 changed ();
             }
         }