Merge lp:~elementary-apps/appcenter/cancel-label into lp:~elementary-apps/appcenter/appcenter

[Danielle Foré]

Use label for cancel button and add it to the size group

[kay van der Zander (kay20)]

Looks great

review: Approve

=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2016-03-16 20:05:03 +0000
+++ src/Views/AppListView.vala	2016-03-20 00:35:13 +0000
@@ -72,6 +72,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.cancel_button);
         row.show_all ();
         list_box.add (row);
     }

=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2016-03-16 20:05:03 +0000
+++ src/Widgets/PackageRow.vala	2016-03-20 00:35:13 +0000
@@ -28,11 +28,11 @@
     Gtk.Label package_summary;
 
     public Gtk.Button update_button;
+    public Gtk.Button cancel_button;
     Gtk.Stack action_stack;
     Gtk.Grid update_grid;
     Gtk.ProgressBar update_progressbar;
     Gtk.Label update_label;
-    Gtk.Button cancel_button;
 
     public PackageRow (Package package) {
         this.package = package;
@@ -113,9 +113,11 @@
 
         update_label = new Gtk.Label (null);
         update_progressbar = new Gtk.ProgressBar ();
-        cancel_button = new Gtk.Button.from_icon_name ("process-stop-symbolic", Gtk.IconSize.MENU);
-        cancel_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
+        update_progressbar.margin_end = 12;
+
+        cancel_button = new Gtk.Button.with_label (_("Cancel"));
         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);