Merge lp:~donadigo/appcenter/drivers-2 into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Add ability to install drivers from the installed page

This branch fixes bug #1469733: "A sane place for Additional Drivers".

This is a follow-up drivers-new branch which was abandoned due to the changes that appcenter had back then. Unfortunately, I had to change more code than expected because of some conflicts:

* get_can_launch uses Component.get_desktop_id which apparently returns a desktop id *even if it's not valid*, this had to be reworked in order to not show "Open" button in a driver page

* assigning headers to rows is now a header function, unlike previously, sorting them manually; furthermore the UpdatesHeaderRow class is now gone since it was no longer based on an AppListRow, the headers are created on demand and are no longer updated every 20 miliseconds

[Danielle Foré (danrabbit)]

You're the man! I can confirm that drivers show here :)

[Neal Gompa (ngompa13)]

Is this code supposed to be Ubuntu specific? If so, it needs to be guarded so it can be disabled.

review: Needs Fixing (code and portability)

[Jeremy Wootten (jeremywootten)]

Is it possible to use an async function rather than an explicit thread? Does it need to be cancellable?

[Adam Bieńkowski (donadigo)]

jeremywootten: I disscussed the change with Neal in the Slack channel. The functionality of getting drivers is already implemented in AppStream (using ComponentKind.DRIVER) and hence why I put the merge to WIP, thoguh I need some data to test that and make sure it works.

[Rico Tzschichholz (ricotz)]

When using threads then better make it thread-safe.

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:appcenter failed due to conflicts:

text conflict in src/CMakeLists.txt
text conflict in src/Views/AppListView.vala
text conflict in src/Widgets/UpdateHeaderRow.vala

Unmerged revisions

406. By Adam Bieńkowski on 2017-02-16

Remove unneded action button visible assignment; decrease task cout when parsing driver output actually ended

405. By Adam Bieńkowski on 2017-02-15

Fix codestyle: added space

404. By Adam Bieńkowski on 2017-02-15

Drivers -> Device Drivers

403. By Adam Bieńkowski on 2017-02-15

Remove unneded errordomain

402. By Adam Bieńkowski on 2017-02-15

Remove unneded UpdatesHeaderGrid class

401. By Adam Bieńkowski on 2017-02-15

Removed unneded code

400. By Adam Bieńkowski on 2017-02-15

Show drivers in the installed page

=== modified file 'src/AbstractAppContainer.vala'
--- src/AbstractAppContainer.vala	2017-02-04 17:18:30 +0000
+++ src/AbstractAppContainer.vala	2017-02-16 12:35:38 +0000
@@ -23,6 +23,12 @@
             }
         }
 
+        public bool is_os_driver {
+            get {
+                return package.is_os_driver;
+            }
+        }
+
         public bool update_available {
             get {
                 return package.update_available || package.is_updating;

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-10 20:15:32 +0000
+++ src/CMakeLists.txt	2017-02-16 12:35:38 +0000
@@ -23,6 +23,7 @@
     Widgets/AppListRow.vala
     Widgets/AppActionButton.vala
     Widgets/UpdateHeaderRow.vala
+    Widgets/DriversHeaderRow.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     appstream

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2017-02-04 17:18:30 +0000
+++ src/Core/Client.vala	2017-02-16 12:35:38 +0000
@@ -16,12 +16,14 @@
 
 public class AppCenterCore.Client : Object {
     public signal void updates_available ();
+    public signal void drivers_detected ();
 
     public bool connected { public get; private set; }
     public bool updating_cache { public get; private set; }
     public uint task_count { public get; private set; default = 0; }
 
-    public AppCenterCore.Package os_updates { public get; private set; }
+    public AppCenterCore.Package os_updates { get; construct; }
+    public Gee.ArrayList<AppCenterCore.Package> driver_list { get; construct; }
 
     private Gee.HashMap<string, AppCenterCore.Package> package_list;
     private AppStream.Pool appstream_pool;
@@ -41,6 +43,7 @@
 
     construct {
         package_list = new Gee.HashMap<string, AppCenterCore.Package> (null, null);
+        driver_list = new Gee.ArrayList<AppCenterCore.Package> ();
         cancellable = new GLib.Cancellable ();
 
         client = new Task ();
@@ -236,6 +239,62 @@
         updates_available ();
     }
 
+    public void get_drivers () {
+        task_count++;
+        if (driver_list.size > 0) {
+            drivers_detected ();
+            task_count--;
+            return;
+        }
+
+        var command = new Granite.Services.SimpleCommand ("/usr/bin", "ubuntu-drivers list");
+        command.done.connect ((command, status) => parse_drivers_output (command.standard_output_str, status));
+        command.run ();
+    }
+
+    private void parse_drivers_output (string output, int status) {
+        if (status != 0) {
+            task_count--;
+            return;
+        }
+
+        new Thread<void*> ("parse-drivers-output", () => {
+            string[] tokens = output.split ("\n");
+            for (int i = 0; i < tokens.length; i++) {
+                string package_name = tokens[i];
+                if (package_name.strip () == "") {
+                    continue;
+                }
+
+                var driver_component = new AppStream.Component ();
+                driver_component.set_pkgnames ({ package_name });
+                driver_component.id =  "%s-%i".printf (Package.OS_DRIVERS_ID, i);
+
+                var icon = new AppStream.Icon ();
+                icon.set_name ("application-x-firmware");
+                icon.set_kind (AppStream.IconKind.STOCK);
+                driver_component.add_icon (icon);
+
+                var package = new Package (driver_component);
+                var pk_package = package.find_package ();
+                if (pk_package != null && pk_package.get_info () == Pk.Info.INSTALLED) {
+                    package.installed_packages.add (pk_package);
+                    package.update_state ();
+                }
+
+                driver_list.add (package);
+            }
+
+            Idle.add (() => {
+                drivers_detected ();
+                return false;
+            });
+
+            task_count--;
+            return null;
+        });
+    }
+
     public async Gee.Collection<AppCenterCore.Package> get_installed_applications () {
         var packages = new Gee.TreeSet<AppCenterCore.Package> ();
         var installed = yield get_installed_packages ();

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2017-02-04 17:18:30 +0000
+++ src/Core/Package.vala	2017-02-16 12:35:38 +0000
@@ -19,7 +19,6 @@
  */
 
 public errordomain PackageLaunchError {
-    DESKTOP_ID_NOT_FOUND,
     APP_INFO_NOT_FOUND
 }
 
@@ -37,6 +36,7 @@
     }
 
     public const string OS_UPDATES_ID = "xxx-os-updates";
+    public const string OS_DRIVERS_ID = "xxx-os-drivers";
 
     public AppStream.Component component { get; construct; }
     public ChangeInformation change_information { public get; private set; }
@@ -76,7 +76,13 @@
 
     public bool is_os_updates {
         get {
-            return component.id == "xxx-os-updates";
+            return component.id == OS_UPDATES_ID;
+        }
+    }
+
+    public bool is_os_driver {
+        get {
+            return component.id.has_prefix (OS_DRIVERS_ID);
         }
     }
 
@@ -87,7 +93,10 @@
         private get { return _latest_version; }
         internal set { _latest_version = convert_version (value); }
     }
+
     private Pk.Package? pk_package = null;
+    private AppInfo? app_info;
+    private bool app_info_retrieved = false;
 
     construct {
         installed_packages = new Gee.TreeSet<Pk.Package> ();
@@ -154,14 +163,8 @@
     }
 
     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));
+            throw new PackageLaunchError.APP_INFO_NOT_FOUND ("AppInfo not found for package: %s".printf (get_name ()));
         }
 
         try {
@@ -332,10 +335,20 @@
     }
 
     public bool get_can_launch () {
-        return component.get_desktop_id () != null;
+        if (app_info_retrieved) {
+            return app_info != null;
+        }
+
+        string? desktop_id = component.get_desktop_id ();
+        if (desktop_id != null) {
+            app_info = new DesktopAppInfo (desktop_id);
+        }
+
+        app_info_retrieved = true;
+        return app_info != null;
     }
 
-    private Pk.Package? find_package () {
+    public Pk.Package? find_package () {
         if (component.id == OS_UPDATES_ID) {
             return null;
         }

=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2017-02-15 18:02:21 +0000
+++ src/Views/AppListView.vala	2017-02-16 12:35:38 +0000
@@ -86,9 +86,7 @@
       * Does not show Uninstall Button **/
     public class AppListUpdateView : AbstractAppList {
         private bool updates_on_top;
-        private Widgets.UpdateHeaderRow updates_header;
-        private Widgets.UpdateHeaderRow updated_header;
-        private Widgets.AppActionButton update_all_button;
+        private Widgets.AppActionButton? update_all_button;
         private bool updating_all_apps = false;
         private bool apps_remaining_started = false;
         private GLib.Mutex update_mutex;
@@ -105,7 +103,7 @@
             set {
                 if (_updating_cache != value) {
                     _updating_cache = value;
-                    update_headers ();
+                    list_box.invalidate_headers ();
                 }
             }
         }
@@ -113,19 +111,7 @@
         construct {
             updates_on_top = true;
 
-            update_all_button = new Widgets.AppActionButton (_("Update All"));
-            update_all_button.set_suggested_action_header ();
-            update_all_button.clicked.connect (on_update_all);
-            update_all_button.no_show_all = true;
-            action_button_group.add_widget (update_all_button);
-
-            updates_header = new Widgets.UpdateHeaderRow.updates ();
-            updates_header.add_widget (update_all_button);
-
-            updated_header = new Widgets.UpdateHeaderRow.updated ();
-
-            list_box.add (updates_header);
-            list_box.add (updated_header);
+            list_box.set_header_func ((Gtk.ListBoxUpdateHeaderFunc) row_update_header);
 
             update_mutex = GLib.Mutex ();
             apps_to_update = new Gee.LinkedList<AppCenterCore.Package> ();
@@ -137,7 +123,7 @@
             _updating_cache = true;
         }
 
-        protected override void after_add_remove_change_row () {update_headers ();}
+        protected override void after_add_remove_change_row () { list_box.invalidate_headers (); }
 
         protected override Widgets.AppListRow make_row (AppCenterCore.Package package) {
             return (Widgets.AppListRow)(new Widgets.PackageRow.installed (package, action_button_group, false));
@@ -145,34 +131,91 @@
 
         protected override void on_package_changing (AppCenterCore.Package package, bool is_changing) {
             base.on_package_changing (package, is_changing);
-            update_all_button.sensitive = packages_changing == 0;
+
+            if (update_all_button != null) {
+                update_all_button.sensitive = packages_changing == 0;
+            }
         }
 
         [CCode (instance_pos = -1)]
         protected override int package_row_compare (Widgets.AppListRow row1, Widgets.AppListRow row2) {
-            bool a_is_header = !row1.has_package ();
-            bool b_is_header = !row2.has_package ();
-            bool a_has_updates = row1.get_update_available ();
-            bool b_has_updates = row2.get_update_available ();
-
-            if (a_is_header) {
-                return (a_has_updates || !b_has_updates) ? -1 : 1;
-            } else if (b_is_header) {
-                return (b_has_updates || !a_has_updates) ? 1 : -1;
-            }
-
             bool a_is_os = row1.get_is_os_updates ();
             bool b_is_os = row2.get_is_os_updates ();
 
             if (a_is_os || b_is_os) { /* OS update row sorts ahead of other update rows */
                 return a_is_os ? -1 : 1;
-            } else if ((a_has_updates && !b_has_updates) || (!a_has_updates && b_has_updates)) { /* Updates rows sort ahead of updated rows */
+            }
+
+            bool a_has_updates = row1.get_update_available ();
+            bool b_has_updates = row2.get_update_available ();
+
+            if ((a_has_updates && !b_has_updates) || (!a_has_updates && b_has_updates)) { /* Updates rows sort ahead of updated rows */
                 return a_has_updates ? -1 : 1;
             }
 
+            bool a_is_driver = row1.get_is_os_driver ();
+            bool b_is_driver = row2.get_is_os_driver ();
+
+            if ((a_is_driver && !b_is_driver) || (!a_is_driver && b_is_driver)) {
+                return a_is_driver ? -1 : 1;
+            }
+
             return row1.get_name_label ().collate (row2.get_name_label ()); /* Else sort in name order */
         }
 
+        [CCode (instance_pos = -1)]
+        private void row_update_header (Widgets.AppListRow row, Widgets.AppListRow? before) {
+            bool update_available = row.get_update_available ();
+            bool is_driver = row.get_is_os_driver ();
+            bool different = before != null && (update_available != before.get_update_available () || is_driver != before.get_is_os_driver ());
+
+            if (update_available) {
+                if (before == null || different) {
+                    var header = new Widgets.UpdatesGrid ();
+
+                    uint update_numbers = 0U;
+                    uint64 update_real_size = 0ULL;
+                    foreach (var package in get_packages ()) {
+                        if (package.update_available) {
+                            update_numbers++;
+                            update_real_size += package.change_information.get_size ();
+                        }
+                    }
+
+                    header.update (update_numbers, update_real_size, updating_cache);
+
+                    if (!updating_cache && update_numbers > 0) {
+                        update_all_button = new Widgets.AppActionButton (_("Update All"));
+                        update_all_button.set_suggested_action_header ();
+                        update_all_button.clicked.connect (on_update_all);
+                        action_button_group.add_widget (update_all_button);
+
+                        header.add_widget (update_all_button);   
+                    }
+
+                    header.show_all ();
+                    row.set_header (header);                
+                } else {
+                    row.set_header (null);
+                }
+            } else if (is_driver) {
+                if (before == null || different) {
+                    var header = new Widgets.DriversHeaderRow ();
+                    header.show_all ();
+                    row.set_header (header);
+                } else {
+                    row.set_header (null);
+                }
+            } else if ((before == null && !update_available) || different) {
+                var header = new Widgets.UpdatedGrid ();
+                header.update (0, 0, updating_cache);
+                header.show_all ();
+                row.set_header (header);              
+            } else {
+                row.set_header (null);
+            }
+        }
+
         private void on_update_all () {
             perform_all_updates.begin ();
         }
@@ -278,42 +321,5 @@
                 return GLib.Source.REMOVE;
             });
         }
-
-        private void update_headers () {
-            /* Do not repeatedly update headers while rapidly adding packages to list */
-            schedule_header_update ();
-        }
-
-        uint grid_timeout_id = 0;
-        private void schedule_header_update () {
-            if (grid_timeout_id > 0) {
-                return;
-            }
-
-            grid_timeout_id = GLib.Timeout.add (20, () => {
-                update_updates_grid ();
-                update_updated_grid ();
-                grid_timeout_id = 0;
-                return false;
-            });
-        }
-
-        private void update_updates_grid () {
-            uint update_numbers = 0U;
-            uint64 update_real_size = 0ULL;
-            foreach (var package in get_packages ()) {
-                if (package.update_available) {
-                    update_numbers++;
-                    update_real_size += package.change_information.get_size ();
-                }
-            }
-
-            updates_header.update (update_numbers, update_real_size, updating_cache);
-            update_all_button.visible = !updating_cache && update_numbers > 0;
-        }
-
-        private void update_updated_grid () {
-            updated_header.update (0, 0, updating_cache);
-        }
     }
 }

=== modified file 'src/Views/InstalledView.vala'
--- src/Views/InstalledView.vala	2017-02-15 18:02:21 +0000
+++ src/Views/InstalledView.vala	2017-02-16 12:35:38 +0000
@@ -53,10 +53,16 @@
 
     public async void get_apps () {
         unowned Client client = Client.get_default ();
+        client.drivers_detected.connect (() => {
+            foreach (var driver in client.driver_list) {
+                app_list_view.add_package (driver);
+            }
+        });
 
         var installed_apps = yield client.get_installed_applications ();
         app_list_view.add_packages (installed_apps);
 
+        client.get_drivers ();
         yield client.get_updates ();
     }
 

=== modified file 'src/Widgets/AppListRow.vala'
--- src/Widgets/AppListRow.vala	2016-09-17 19:28:03 +0000
+++ src/Widgets/AppListRow.vala	2017-02-16 12:35:38 +0000
@@ -24,6 +24,7 @@
     public interface AppListRow : Gtk.ListBoxRow {
         public abstract bool get_update_available ();
         public abstract bool get_is_os_updates ();
+        public abstract bool get_is_os_driver ();
         public abstract string get_name_label ();
         public abstract bool has_package ();
         public abstract AppCenterCore.Package? get_package ();

=== added file 'src/Widgets/DriversHeaderRow.vala'
--- src/Widgets/DriversHeaderRow.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/DriversHeaderRow.vala	2017-02-16 12:35:38 +0000
@@ -0,0 +1,31 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2017 elementary LLC. (https://elementary.io)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+namespace AppCenter.Widgets {
+    public class DriversHeaderRow : Gtk.Grid {
+        construct {
+            var label = new Gtk.Label (_("Device Drivers"));
+            label.margin = 12;
+            label.halign = Gtk.Align.START;
+            label.get_style_context ().add_class ("h4");
+            add (label);
+        }
+    }
+}

=== modified file 'src/Widgets/PackageRow.vala'
--- src/Widgets/PackageRow.vala	2017-02-05 15:48:49 +0000
+++ src/Widgets/PackageRow.vala	2017-02-16 12:35:38 +0000
@@ -50,6 +50,10 @@
             return grid.is_os_updates;
         }
 
+        public bool get_is_os_driver () {
+            return grid.is_os_driver;
+        }
+
         public string get_name_label () {
             return grid.name_label;
         }

=== modified file 'src/Widgets/UpdateHeaderRow.vala'
--- src/Widgets/UpdateHeaderRow.vala	2016-09-17 19:28:03 +0000
+++ src/Widgets/UpdateHeaderRow.vala	2017-02-16 12:35:38 +0000
@@ -19,152 +19,98 @@
  */
 
 namespace AppCenter.Widgets {
-    public class UpdateHeaderRow : Gtk.ListBoxRow, AppListRow {
-        AbstractHeaderGrid grid;
-        public bool is_updates_header {get; private set;}
+    /** Base class for Grids in Header Rows **/
+    public abstract class AbstractHeaderGrid : Gtk.Grid {
+        public uint update_numbers {get; protected set; default = 0;}
+        public uint64 update_real_size {get; protected set; default = 0;}
+        public bool is_updating {get; protected set; default = false;}
 
         construct {
-            set_activatable (false);
-            set_selectable (false);
-        }
-
-        public UpdateHeaderRow.updates () {
-            grid = new UpdatesGrid ();
-            add (grid);
-            is_updates_header = true;
-        }
-
-        public UpdateHeaderRow.updated () {
-            grid = new UpdatedGrid ();
-            add (grid);
-            is_updates_header = false;
-        }
-
-        /** AppListRow Interface methods **/
-
-        /** Updates header row reports it has updates in order to sort first in list **/
-        /** Updated header reports it has updates when updating in order to sort first in list **/
-        public bool get_update_available () {
-            return is_updates_header || grid.is_updating;
-        }
-
-        public bool get_is_os_updates () {
-            critical ("Must not attempt to get is_os_update from header row");
-            assert_not_reached ();
-        }
-
-        /* This indicates it is a header row, not a package row */
-        public bool has_package () {return false;}
-
-        public AppCenterCore.Package? get_package () {
-            critical ("Must not attempt to get package from header row");
-            assert_not_reached ();
-        }
-
-        public string get_name_label () {
-            critical ("Must not attempt to get package name from header row");
-            assert_not_reached ();
+            margin = 12;
+            column_spacing = 12;
+        }
+
+        protected void store_data (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
+            update_numbers = _update_numbers;
+            update_real_size = _update_real_size;
+            is_updating = _is_updating;
         }
 
         public void add_widget (Gtk.Widget widget) {
-            grid.add (widget);
-        }
-
-        public void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-            grid.update (_update_numbers, _update_real_size, _is_updating);
-            changed (); /* Triggers resort */
-        }
-        /** ---------------- **/
-
-        /** Base class for Grids in Header Rows **/
-        private abstract class AbstractHeaderGrid : Gtk.Grid {
-            public uint update_numbers {get; protected set; default = 0;}
-            public uint64 update_real_size {get; protected set; default = 0;}
-            public bool is_updating {get; protected set; default = false;}
-
-            construct {
-                margin = 12;
-                column_spacing = 12;
-            }
-
-            protected void store_data (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-                update_numbers = _update_numbers;
-                update_real_size = _update_real_size;
-                is_updating = _is_updating;
-            }
-
-            public abstract void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating);
-        }
-
-        /** Header to show at top of list if there are updates available **/
-        private class UpdatesGrid : AbstractHeaderGrid {
-            private Gtk.Label update_size_label;
-            private Gtk.Label updates_label;
-
-            construct {
-                margin_top = 18;
-                updates_label = new Gtk.Label (null);
-                ((Gtk.Misc) updates_label).xalign = 0;
-                updates_label.get_style_context ().add_class ("h4");
-                updates_label.hexpand = true;
-
-                update_size_label = new Gtk.Label (null);
-
-                add (updates_label);
-                add (update_size_label);
-            }
-
-            public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-                store_data (_update_numbers,  _update_real_size, _is_updating);
-
-                if (!is_updating) {
-                    updates_label.label = ngettext ("%u Update Available", "%u Updates Available", update_numbers).printf (update_numbers);
-                    update_size_label.label = _("Size: %s").printf (GLib.format_size (update_real_size));
-                    if (update_numbers > 0) {
-                        show_all ();
-                    } else {
-                        hide ();
-                    }
-                } else {
-                    hide (); /* Updated header shows updating spinner and message */
-                }
-            }
-        }
-
-        /** Header to show above first package that is up to date, or if the cache is updating **/
-        private class UpdatedGrid : AbstractHeaderGrid {
-            private Gtk.Label label;
-            private Gtk.Spinner spinner;
-
-            construct {
-                label = new Gtk.Label (""); /* Should not be displayed before being updated */
-                label.hexpand = true;
-                ((Gtk.Misc)label).xalign = 0;
-
-                spinner = new Gtk.Spinner ();
-
-                add (label);
-                add (spinner);
-            }
-
-            public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-                store_data (_update_numbers,  _update_real_size, _is_updating);
-
-                if (is_updating) {
-                    halign = Gtk.Align.CENTER;
-                    spinner.start ();
-                    spinner.no_show_all = false;
-                    spinner.show ();
-                    label.label = _("Searching for updates…");
-                    label.get_style_context ().remove_class ("h4");
-                } else {
-                    halign = Gtk.Align.START;
-                    spinner.stop ();
-                    spinner.no_show_all = true;
-                    spinner.hide ();
-                    label.label = _("Up to Date");
-                    label.get_style_context ().add_class ("h4");
-                }
+            add (widget);
+        }
+
+        public abstract void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating);
+    }
+
+    /** Header to show at top of list if there are updates available **/
+    public class UpdatesGrid : AbstractHeaderGrid {
+        private Gtk.Label update_size_label;
+        private Gtk.Label updates_label;
+
+        construct {
+            margin_top = 18;
+            updates_label = new Gtk.Label (null);
+            ((Gtk.Misc) updates_label).xalign = 0;
+            updates_label.get_style_context ().add_class ("h4");
+            updates_label.hexpand = true;
+
+            update_size_label = new Gtk.Label (null);
+
+            add (updates_label);
+            add (update_size_label);
+        }
+
+        public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
+            store_data (_update_numbers,  _update_real_size, _is_updating);
+
+            if (!is_updating) {
+                updates_label.label = ngettext ("%u Update Available", "%u Updates Available", update_numbers).printf (update_numbers);
+                update_size_label.label = _("Size: %s").printf (GLib.format_size (update_real_size));
+                if (update_numbers > 0) {
+                    show_all ();
+                } else {
+                    hide ();
+                }
+            } else {
+                hide (); /* Updated header shows updating spinner and message */
+            }
+        }
+    }
+
+    /** Header to show above first package that is up to date, or if the cache is updating **/
+    public class UpdatedGrid : AbstractHeaderGrid {
+        private Gtk.Label label;
+        private Gtk.Spinner spinner;
+
+        construct {
+            label = new Gtk.Label (""); /* Should not be displayed before being updated */
+            label.hexpand = true;
+            ((Gtk.Misc)label).xalign = 0;
+
+            spinner = new Gtk.Spinner ();
+
+            add (label);
+            add (spinner);
+        }
+
+        public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
+            store_data (_update_numbers,  _update_real_size, _is_updating);
+
+            if (is_updating) {
+                halign = Gtk.Align.CENTER;
+                spinner.start ();
+                spinner.no_show_all = false;
+                spinner.show ();
+                label.label = _("Searching for updates…");
+                label.get_style_context ().remove_class ("h4");
+            } else {
+                halign = Gtk.Align.START;
+                spinner.stop ();
+                spinner.no_show_all = true;
+                spinner.hide ();
+                label.label = _("Up to Date");
+                label.get_style_context ().add_class ("h4");
             }
         }
     }