Merge lp:~benwaffle/appcenter/buttons into lp:~elementary-apps/appcenter/appcenter

[Ben]

Fix only update buttons showing up in search results

Fix bug 1593609. Now, the search results have the same buttons as the App Info view (most of the code was copied from there). Perhaps we should consider creating a new widget for the install/update/uninstall/progressbar group in the future.

[lp:~benwaffle/appcenter/buttons]

211. By Ben on 2016-06-21

Don't offer to uninstall OS updates

[Adam Bieńkowski (donadigo)]

It seems good to me, but "Update all" button is not the same width as the other buttons in the list. Also I wouldn't throw criticals in these catch () statements, warning should be enough.

review: Needs Fixing (testing)

[lp:~benwaffle/appcenter/buttons]

212. By Ben on 2016-06-21

remove uninstall button in search and update views

213. By Ben on 2016-06-21

Remove suggested-action from individual update button

214. By Ben on 2016-06-21

fix margins for update button sizegroup

[Danielle Foré (danrabbit)]

Please merge trunk

I feel like using a symbolic cancel icon is a regression from trunk. Using the label button keeps the UI from shifting and is also a clearer and larger click target

Currently in trunk, after installing the button with change to "uninstall". In your branch it remains as "install"

review: Needs Fixing

[lp:~benwaffle/appcenter/buttons]

215. By Ben on 2016-06-26

Merge trunk

[Danielle Foré (danrabbit)]

As mentioned previously, please use the cancel label button instead of process-stop-symbolic

review: Needs Fixing

[lp:~benwaffle/appcenter/buttons]

216. By Ben on 2016-06-26

Use text cancel button

[Danielle Foré (danrabbit)]

* Doesn't look like the Cancel button has been added to the sizegroup
* Also looks like there is no column_spacing in progress_grid

review: Needs Fixing

[lp:~benwaffle/appcenter/buttons]

217. By Ben on 2016-06-26

make cancel button look better

218. By Ben on 2016-06-26

make sure cancel button is exactly the same as the install

=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2016-06-25 15:34:25 +0000
+++ src/Views/AppListView.vala	2016-06-26 23:17:14 +0000
@@ -71,7 +71,7 @@
 
     public void add_package (AppCenterCore.Package package) {
         var row = new Widgets.PackageRow (package);
-        update_button_group.add_widget (row.update_button);
+        update_button_group.add_widget (row.action_button);
         update_button_group.add_widget (row.cancel_button);
         row.show_all ();
         list_box.add (row);
@@ -126,7 +126,6 @@
     [CCode (instance_pos = -1)]
     private void package_row_update_header (Widgets.PackageRow row, Widgets.PackageRow? before) {
         bool update_available = row.package.update_available;
-        row.action_stack.visible = row.package.update_available;
         if (before == null && update_available) {
             var updates_grid = get_updates_grid ();
             row.set_header (updates_grid);
@@ -142,7 +141,6 @@
         var updated_grid = new Gtk.Grid ();
         updated_grid.orientation = Gtk.Orientation.HORIZONTAL;
         updated_grid.column_spacing = 12;
-        updated_grid.margin = 6;
         if (updating_cache) {
             updated_grid.halign = Gtk.Align.CENTER;
             var updating_label = new Gtk.Label (_("Searching for updates…"));

=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2016-06-21 18:28:52 +0000
+++ src/Widgets/PackageRow.vala	2016-06-26 23:17:14 +0000
@@ -27,12 +27,12 @@
     Gtk.Label package_name;
     Gtk.Label package_summary;
 
-    public Gtk.Button update_button;
+    // The action button covers Install and Update
+    public Gtk.Button action_button;
+    Gtk.ProgressBar progress_bar;
+    Gtk.Label progress_label;
     public Gtk.Button cancel_button;
-    public Gtk.Stack action_stack;
-    Gtk.Grid update_grid;
-    Gtk.ProgressBar update_progressbar;
-    Gtk.Label update_label;
+    Gtk.Stack action_stack;
 
     public PackageRow (Package package) {
         this.package = package;
@@ -41,11 +41,38 @@
         package_summary.ellipsize = Pango.EllipsizeMode.END;
         image.gicon = package.get_icon ();
 
+        if (package.update_available) {
+            action_button.label = _("Update");
+        } else if (package.installed) {
+            action_stack.no_show_all = true;
+            action_stack.hide ();
+        }
+
         package.notify["installed"].connect (() => {
+            if (package.installed && package.update_available) {
+                action_button.label = _("Update");
+                action_stack.no_show_all = false;
+                action_stack.show ();
+            } else if (package.installed) {
+                action_stack.no_show_all = true;
+                action_stack.hide ();
+            } else {
+                action_button.label = _("Install");
+                action_stack.no_show_all = false;
+                action_stack.show ();
+            }
             changed ();
         });
 
         package.notify["update-available"].connect (() => {
+            if (package.update_available) {
+                action_button.label = _("Update");
+                action_stack.no_show_all = false;
+                action_stack.show_all ();
+            } else {
+                action_stack.no_show_all = true;
+                action_stack.hide ();
+            }
             changed ();
         });
 
@@ -81,28 +108,32 @@
         ((Gtk.Misc) package_summary).xalign = 0;
 
         action_stack = new Gtk.Stack ();
-
-        update_button = new Gtk.Button.with_label (_("Update"));
-        update_button.halign = Gtk.Align.END;
-        update_button.valign = Gtk.Align.CENTER;
-        update_button.margin_end = 6;
-        update_button.clicked.connect (() => update_package.begin ());
-
-        update_label = new Gtk.Label (null);
-        update_progressbar = new Gtk.ProgressBar ();
-        update_progressbar.margin_end = 12;
+        action_stack.transition_type = Gtk.StackTransitionType.CROSSFADE;
+        action_stack.hhomogeneous = false;
+
+        progress_bar = new Gtk.ProgressBar ();
+
+        progress_label = new Gtk.Label (null);
 
         cancel_button = new Gtk.Button.with_label (_("Cancel"));
+        cancel_button.margin_end = 6;
         cancel_button.valign = Gtk.Align.CENTER;
-        cancel_button.margin_end = 6;
-
-        update_grid = new Gtk.Grid ();
-        update_grid.attach (update_label, 0, 0, 1, 1);
-        update_grid.attach (update_progressbar, 0, 1, 1, 1);
-        update_grid.attach (cancel_button, 1, 0, 1, 2);
-
-        action_stack.add (update_button);
-        action_stack.add (update_grid);
+
+        action_button = new Gtk.Button.with_label (_("Install"));
+        action_button.margin_end = 6;
+        action_button.valign = Gtk.Align.CENTER;
+        action_button.clicked.connect (() => action_clicked.begin ());
+
+        var progress_grid = new Gtk.Grid ();
+        progress_grid.valign = Gtk.Align.CENTER;
+        progress_grid.row_spacing = 6;
+        progress_grid.column_spacing = 6;
+        progress_grid.attach (progress_label, 0, 0, 1, 1);
+        progress_grid.attach (progress_bar, 0, 1, 1, 1);
+        progress_grid.attach (cancel_button, 1, 0, 1, 2);
+
+        action_stack.add_named (action_button, "buttons");
+        action_stack.add_named (progress_grid, "progress");
 
         grid.attach (image, 0, 0, 1, 2);
         grid.attach (package_name, 1, 0, 1, 1);
@@ -115,28 +146,32 @@
         });
     }
 
-    private async void update_package () {
-        try {
-            update_button.sensitive = false;
-            yield package.update ();
-        } catch (Error e) {
-            critical (e.message);
-        }
-
-        update_button.sensitive = true;
-    }
-
     private void update_status () {
-        update_label.label = package.change_information.get_status ();
+        progress_label.label = package.change_information.get_status ();
     }
 
     private void update_progress () {
         var progress = package.change_information.get_progress ();
         if (progress < 1.0f) {
-            action_stack.set_visible_child (update_grid);
-            update_progressbar.fraction = progress;
+            action_stack.set_visible_child_name ("progress");
+            progress_bar.fraction = progress;
         } else {
-            action_stack.set_visible_child (update_button);
+            action_stack.set_visible_child_name ("buttons");
+        }
+    }
+
+    private async void action_clicked () {
+        try {
+            if (package.update_available) {
+                yield package.update ();
+            } else {
+                yield package.install ();
+            }
+            action_stack.no_show_all = true;
+            action_stack.hide ();
+        } catch (Error e) {
+            critical (e.message);
+            action_stack.set_visible_child_name ("buttons");
         }
     }
 }