Merge lp:~donadigo/appcenter/uninstall-progress into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Show progress on uninstalling apps.
* Show correct buttons after action.

This branch fixes not having feedback on uninstalling apps.
It also fixes some of the troubles with current updating the action_button visibility.

[Danielle Foré (danrabbit)]

It seems like if you install from the PackageRow that the AppInfo View is not updated anymore and the other way around also

[lp:~donadigo/appcenter/uninstall-progress]

227. By Adam Bieńkowski on 2016-06-29

Show uninstall progress

[Danielle Foré (danrabbit)]

Works as expected :)

review: Approve

=== modified file 'src/Core/ChangeInformation.vala'
--- src/Core/ChangeInformation.vala	2015-12-14 00:01:37 +0000
+++ src/Core/ChangeInformation.vala	2016-06-29 21:41:03 +0000
@@ -26,7 +26,7 @@
     public Gee.TreeSet<Pk.Details> details { public get; private set; }
     public bool can_cancel { public get; private set; default=true; }
     private Gee.HashMap<string, double?> change_progress;
-    private Pk.Status status;
+    public Pk.Status status;
     private double progress;
     public ChangeInformation () {
         

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-06-24 17:12:09 +0000
+++ src/Core/Package.vala	2016-06-29 21:41:03 +0000
@@ -104,10 +104,13 @@
         changing = true;
         changed ();
         try {
-            yield AppCenterCore.Client.get_default ().remove_package (this, (progress, type) => {}, action_cancellable);
-            changing = false;
+            yield AppCenterCore.Client.get_default ().remove_package (this, (progress, type) => {change_information.ProgressCallback (progress, type);}, action_cancellable);
+            installed_packages.clear ();
+            change_information.clear ();
             installed = false;
+            changing = false;
         } catch (Error e) {
+            change_information.reset ();
             changing = false;
             throw e;
         }

=== modified file 'src/Views/AppInfoView.vala'
--- src/Views/AppInfoView.vala	2016-06-28 22:48:28 +0000
+++ src/Views/AppInfoView.vala	2016-06-29 21:41:03 +0000
@@ -78,29 +78,8 @@
             uninstall_button.hide ();
         }
 
-        package.notify["update-available"].connect (() => {
-            if (package.update_available) {
-                action_button.label = _("Update");
-            } else {
-                action_button.no_show_all = true;
-                action_button.hide ();
-            }
-        });
-
-        package.notify["installed"].connect (() => {
-            if (package.installed && package.update_available) {
-                action_button.label = _("Update");
-                action_button.no_show_all = false;
-            } else if (package.installed) {
-                action_button.hide ();
-                action_button.no_show_all = true;
-            } else {
-                action_button.label = _("Install");
-                action_button.no_show_all = false;
-                uninstall_button.no_show_all = true;
-                uninstall_button.hide ();
-            }
-        });
+        package.notify["installed"].connect (() => update_buttons ());
+        package.notify["update-available"].connect (() => update_buttons ());
 
         package.change_information.bind_property ("can-cancel", cancel_button, "sensitive", GLib.BindingFlags.SYNC_CREATE);
         package.change_information.progress_changed.connect (() => update_progress ());
@@ -278,6 +257,11 @@
 
     private void update_status () {
         progress_bar.text = package.change_information.get_status ();
+        if (package.change_information.status == Pk.Status.FINISHED) {
+            action_stack.set_visible_child_name ("buttons");
+        } else {
+            action_stack.set_visible_child_name ("progress");
+        }         
     }
 
     private void update_progress () {
@@ -290,6 +274,25 @@
         }
     }
 
+    private void update_buttons () {
+        if (package.installed) {
+            if (package.update_available) {
+                action_button.label = _("Update");
+                action_button.no_show_all = false;
+                action_button.show_all ();                
+            } else {
+                action_button.no_show_all = true;
+                action_button.hide ();                   
+                uninstall_button.no_show_all = false;
+                uninstall_button.show_all ();                
+            }
+        } else {
+            action_button.label = _("Install");
+            action_button.no_show_all = false;
+            action_button.show_all ();
+        }
+    }
+
     private void action_cancelled () {
         package.action_cancellable.cancel ();
     }
@@ -306,7 +309,7 @@
                 action_button.hide ();
                 if (package.component.id != "xxx-os-updates") {
                     uninstall_button.no_show_all = false;
-                    uninstall_button.show ();
+                    uninstall_button.show_all ();
                 }
                 
                 // Add this app to the Installed Apps View

=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2016-06-28 22:48:28 +0000
+++ src/Widgets/PackageRow.vala	2016-06-29 21:41:03 +0000
@@ -47,33 +47,8 @@
             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 ();
-        });
+        package.notify["installed"].connect (() => update_buttons ());
+        package.notify["update-available"].connect (() => update_buttons ());
 
         package.change_information.bind_property ("can-cancel", cancel_button, "sensitive", GLib.BindingFlags.SYNC_CREATE);
         package.change_information.progress_changed.connect (() => update_progress ());
@@ -142,6 +117,13 @@
 
     private void update_status () {
         progress_bar.text = package.change_information.get_status ();
+        if (package.change_information.status == Pk.Status.FINISHED) {
+            action_stack.set_visible_child_name ("buttons");
+        } else {
+            action_stack.set_visible_child_name ("progress");   
+            action_stack.no_show_all = false;
+            action_stack.show_all ();   
+        }        
     }
 
     private void update_progress () {
@@ -149,11 +131,38 @@
         if (progress < 1.0f) {
             action_stack.set_visible_child_name ("progress");
             progress_bar.fraction = progress;
+            action_stack.no_show_all = false;
+            action_stack.show_all ();               
         } else {
             action_stack.set_visible_child_name ("buttons");
         }
     }
 
+    private void update_buttons () {
+        if (package.installed) {
+            if (package.update_available) {
+                action_button.label = _("Update");
+                action_button.no_show_all = false;
+                action_button.show_all ();    
+
+                action_stack.no_show_all = false;
+                action_stack.show_all ();
+            } else {
+                action_stack.no_show_all = true;
+                action_stack.hide ();
+            }
+        } else {
+            action_button.label = _("Install");
+            action_button.no_show_all = false;
+            action_button.show_all ();
+
+            action_stack.no_show_all = false;
+            action_stack.show_all ();                
+        }
+
+        changed ();        
+    }
+
     private void action_cancelled () {
         package.action_cancellable.cancel ();
     }