diff --git a/src/Core/Job.vala b/src/Core/Job.vala index 5e0570d82..a2c9736ea 100644 --- a/src/Core/Job.vala +++ b/src/Core/Job.vala @@ -39,7 +39,34 @@ public class AppCenterCore.Job : Object { GET_PACKAGE_DETAILS, GET_PACKAGE_DEPENDENCIES, GET_PREPARED_PACKAGES, - REPAIR, + REPAIR; + + public string to_string () { + switch (this) { + case GET_DETAILS_FOR_PACKAGE_IDS: + case GET_PACKAGE_DEPENDENCIES: + case GET_PACKAGE_DETAILS: + case IS_PACKAGE_INSTALLED: + return _("Getting app information…"); + case GET_DOWNLOAD_SIZE: + return _("Getting download size…"); + case GET_PREPARED_PACKAGES: + case GET_INSTALLED_PACKAGES: + case GET_UPDATES: + case REFRESH_CACHE: + return _("Checking for updates…"); + case INSTALL_PACKAGE: + return _("Installing…"); + case UPDATE_PACKAGE: + return _("Installing updates…"); + case REMOVE_PACKAGE: + return _("Uninstalling…"); + case REPAIR: + return _("Repairing…"); + } + + return ""; + } } public Job (Type type) { diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 5cb7632c7..2f3bd0f70 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -16,7 +16,6 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { private Granite.Toast toast; - private Granite.OverlayBar overlaybar; private Adw.NavigationView navigation_view; private AppCenterCore.Package? last_installed_package; @@ -82,7 +81,7 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { }; overlay.add_overlay (toast); - overlaybar = new Granite.OverlayBar (overlay); + var overlaybar = new Granite.OverlayBar (overlay); overlaybar.bind_property ("active", overlaybar, "visible"); var network_info_bar_label = new Gtk.Label ("%s %s".printf ( @@ -149,10 +148,10 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { backend.bind_property ("working", overlaybar, "active", SYNC_CREATE); backend.notify ["job-type"].connect (() => { - update_overlaybar_label (backend.job_type); + overlaybar.label = backend.job_type.to_string (); }); - update_overlaybar_label (backend.job_type); + overlaybar.label = backend.job_type.to_string (); } public override bool close_request () { @@ -248,36 +247,4 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow { show_package (package); }); } - - private void update_overlaybar_label (AppCenterCore.Job.Type job_type) { - switch (job_type) { - case GET_DETAILS_FOR_PACKAGE_IDS: - case GET_PACKAGE_DEPENDENCIES: - case GET_PACKAGE_DETAILS: - case IS_PACKAGE_INSTALLED: - overlaybar.label = _("Getting app information…"); - break; - case GET_DOWNLOAD_SIZE: - overlaybar.label = _("Getting download size…"); - break; - case GET_PREPARED_PACKAGES: - case GET_INSTALLED_PACKAGES: - case GET_UPDATES: - case REFRESH_CACHE: - overlaybar.label = _("Checking for updates…"); - break; - case INSTALL_PACKAGE: - overlaybar.label = _("Installing…"); - break; - case UPDATE_PACKAGE: - overlaybar.label = _("Installing updates…"); - break; - case REMOVE_PACKAGE: - overlaybar.label = _("Uninstalling…"); - break; - case REPAIR: - overlaybar.label = _("Repairing…"); - break; - } - } }