Merge lp:~mterry/update-manager/requires-restart into lp:update-manager

[Michael Terry]

Add label to warn the user when a selected update will need a restart.

From https://wiki.ubuntu.com/SoftwareUpdates#Presenting_installable_updates

(No packages currently have the right metadata -- so you'll have to manually edit pkg_requires_restart() to return True for a given package to test it.)

[Michael Vogt (mvo)]

Looks good to me, nice use of "nonlocal "

review: Approve

[Sebastien Bacher (seb128)]

hum, is there any reason that didn't get merged? it seems it needs to be rebased now, would be nice to get in for the LTS

[lp:~mterry/update-manager/requires-restart]

2618. By Michael Terry on 2013-12-31

Merge from trunk

[Michael Terry (mterry)]

I think it didn't get in because it was too close to release at the time.

I've updated this again for trunk. Merge it in if you still like it!

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2013-08-30 21:47:35 +0000
+++ UpdateManager/UpdatesAvailable.py	2013-12-31 19:08:39 +0000
@@ -261,6 +261,9 @@
         self.store = Gtk.TreeStore(str, GObject.TYPE_PYOBJECT, str, bool)
         self.treeview_update.set_model(None)
 
+        self.image_restart.set_from_gicon(self.get_restart_icon(),
+                                          Gtk.IconSize.BUTTON)
+
         restart_icon_renderer = Gtk.CellRendererPixbuf()
         restart_icon_renderer.set_property("xpad", 4)
         restart_icon_renderer.set_property("ypad", 2)
@@ -381,36 +384,39 @@
         self.select_all_upgrades(None)
         self.on_button_install_clicked()
 
+    def pkg_requires_restart(self, pkg):
+        if pkg is None or pkg.candidate is None:
+            return False
+        restart_condition = pkg.candidate.record.get('XB-Restart-Required')
+        return restart_condition == 'system'
+
+    def get_restart_icon(self):
+        # FIXME: Non-standard, incorrect icon name (from app category).
+        # Theme support for what we want seems to be lacking.
+        restart_icon_names = ['view-refresh-symbolic',
+                              'system-restart',
+                              'system-reboot']
+        return Gio.ThemedIcon.new_from_names(restart_icon_names)
+
     def restart_icon_renderer_data_func(self, cell_layout, renderer, model,
                                         iter, user_data):
-        def pkg_requires_restart(pkg):
-            if pkg is None or pkg.candidate is None:
-                return False
-            restart_condition = pkg.candidate.record.get(
-                'XB-Restart-Required')
-            return restart_condition == 'system'
-
         data = model.get_value(iter, LIST_UPDATE_DATA)
         path = model.get_path(iter)
 
         requires_restart = False
         if data.item and data.item.pkg:
-            requires_restart = pkg_requires_restart(data.item.pkg)
+            requires_restart = self.pkg_requires_restart(data.item.pkg)
         elif data.group:
             if not self.treeview_update.row_expanded(path):
                 # A package in the group requires restart
                 for group_item in data.group.items:
-                    if group_item.pkg and pkg_requires_restart(group_item.pkg):
+                    if group_item.pkg and self.pkg_requires_restart(
+                            group_item.pkg):
                         requires_restart = True
                         break
 
-        # FIXME: Non-standard, incorrect icon name (from app category).
-        # Theme support for what we want seems to be lacking.
         if requires_restart:
-            restart_icon_names = ['view-refresh-symbolic',
-                                  'system-restart',
-                                  'system-reboot']
-            gicon = Gio.ThemedIcon.new_from_names(restart_icon_names)
+            gicon = self.get_restart_icon()
         else:
             gicon = None
         renderer.set_property("gicon", gicon)
@@ -694,6 +700,26 @@
             model.set_value(iter, LIST_TOGGLE_ACTIVE, active)
         self.store.foreach(foreach_cb, None)
 
+    def _check_for_required_restart(self):
+        requires_restart = False
+
+        def foreach_cb(model, path, iter, data):
+            data = model.get_value(iter, LIST_UPDATE_DATA)
+            active = model.get_value(iter, LIST_TOGGLE_ACTIVE)
+            if not active:
+                return
+            pkg = None
+            if data.item:
+                pkg = data.item.pkg
+            elif data.group and data.group.core_item:
+                pkg = data.group.core_item.pkg
+            if pkg and self.pkg_requires_restart(pkg):
+                nonlocal requires_restart
+                requires_restart = True
+
+        self.store.foreach(foreach_cb, None)
+        self.hbox_restart.set_visible(requires_restart)
+
     def _refresh_updates_count(self):
         self.button_install.set_sensitive(self.cache.install_count)
         try:
@@ -737,6 +763,7 @@
 
     def updates_changed(self):
         self._mark_selected_updates()
+        self._check_for_required_restart()
         self._refresh_updates_count()
 
     def update_count(self):

=== modified file 'data/gtkbuilder/UpdateManager.ui'
--- data/gtkbuilder/UpdateManager.ui	2013-11-28 11:20:13 +0000
+++ data/gtkbuilder/UpdateManager.ui	2013-12-31 19:08:39 +0000
@@ -15,8 +15,8 @@
           <object class="GtkVBox" id="vbox4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="vexpand">True</property>
             <property name="spacing">6</property>
-            <property name="vexpand">True</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow_update">
                 <property name="visible">True</property>
@@ -37,6 +37,9 @@
                     </child>
                     <signal name="cursor-changed" handler="on_treeview_update_cursor_changed" swapped="no"/>
                     <signal name="row-activated" handler="on_treeview_update_row_activated" swapped="no"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -209,6 +212,43 @@
           </packing>
         </child>
         <child>
+          <object class="GtkHBox" id="hbox_restart">
+            <property name="can_focus">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image_restart">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">gtk-refresh</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_restart">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">The computer will need to restart.</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkHBox" id="hbox_roaming">
             <property name="can_focus">False</property>
             <property name="spacing">12</property>
@@ -242,7 +282,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -279,7 +319,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -316,7 +356,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
         <child>
@@ -352,7 +392,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">4</property>
+            <property name="position">5</property>
           </packing>
         </child>
       </object>