Merge lp:~ilidrissi.amine/update-manager/window-main-alerts into lp:update-manager

[Mohamed Amine Ilidrissi]

This branch introduces alerts handling for the update manager, as described in https://wiki.ubuntu.com/SoftwareUpdateHandling#alert.

[lp:~ilidrissi.amine/update-manager/window-main-alerts]

1879. By Mohamed Amine Ilidrissi on 2010-08-02

merge with trunk

1880. By Mohamed Amine Ilidrissi on 2010-08-02

modified debian/changelog

1881. By Mohamed Amine Ilidrissi on 2010-08-02

included another bug in debian/changelog

[Michael Vogt (mvo)]

Thanks a lot for the branch.

I looked over it and discovered some small issues. If I start update-manager and
I'm not on AC power then I don't get a battery warning. This is because there is
no "change" signal emit (nothing in the power state has changed). So we need to
add a additional check for this on startup.

There is also the lines:
137 if inst_count > 1:
138 + t = _("The updates have already been downloaded, but not installed")
139 + self.button_install.set_sensitive(True)
140 + elif inst_count == 1:
141 + t = _("The update has already been downloaded, but not installed")
142 + self.button_install.set_sensitive(True)
143 + else:
144 + t = _("There is no updates to install")

Those are better written with ngettext, so:
t = ngettext("The update has already been downloaded, but not installed",
             "The updates have already been downloaded, but not installed",
             inst_count)
This will ensure the text can be translated into languages with different plural forms
(there are eg languages that have a different on for one, below 10, more than 10).

I also like the display "Nr items selected" :) I guess its not very important, but it
would be cool to have it back.

All minor nitpicks, if you could address them, that would be very nice.

Thanks,
 Michael

[Michael Vogt (mvo)]

review: Needs Fixing

[lp:~ilidrissi.amine/update-manager/window-main-alerts]

1882. By Mohamed Amine IL Idrissi <devildante@devildante-laptop> on 2010-08-09

merge with trunk

1883. By Mohamed Amine IL Idrissi <devildante@devildante-laptop> on 2010-08-09

Fixed a bunch of things at mvo's request.

1884. By Mohamed Amine IL Idrissi <devildante@devildante-laptop> on 2010-08-10

Enums. I like enums.

=== added file 'UpdateManager/Core/AlertWatcher.py'
--- UpdateManager/Core/AlertWatcher.py	1970-01-01 00:00:00 +0000
+++ UpdateManager/Core/AlertWatcher.py	2010-08-10 10:01:00 +0000
@@ -0,0 +1,73 @@
+# AlertWatcher.py 
+#
+#  Copyright (c) 2010 Mohamed Amine IL Idrissi
+#  
+#  Author: Mohamed Amine IL Idrissi <[e-mail]>
+# 
+#  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 2 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, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+#  USA
+
+import gobject
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+class AlertWatcher(gobject.GObject):
+    """ a class that checks for alerts and reports them, like a battery
+    or network warning """
+    
+    __gsignals__ = {"network-alert": (gobject.SIGNAL_RUN_FIRST,
+                                      gobject.TYPE_NONE,
+                                      (gobject.TYPE_INT,)),
+                    "battery-alert": (gobject.SIGNAL_RUN_FIRST,
+                                      gobject.TYPE_NONE,
+                                      (gobject.TYPE_BOOLEAN,))
+                    }
+    
+    def __init__(self):
+        gobject.GObject.__init__(self)
+        DBusGMainLoop(set_as_default=True)
+        self.bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
+        self.network_state = 3 # make it always connected if NM isn't available
+        
+    def check_alert_state(self):
+		try:
+			obj = self.bus.get_object("org.freedesktop.NetworkManager", \
+									  "/org/freedesktop/NetworkManager")
+			obj.connect_to_signal("StateChanged", self._network_alert, \
+						dbus_interface="org.freedesktop.NetworkManager")
+			interface = dbus.Interface(obj, "org.freedesktop.DBus.Properties")
+			self.network_state = interface.Get("org.freedesktop.NetworkManager", "State")
+			self._network_alert(self.network_state)
+		
+			obj = self.bus.get_object('org.freedesktop.UPower',
+									  '/org/freedesktop/UPower')
+			obj.connect_to_signal("Changed", self._power_changed,
+						dbus_interface="org.freedesktop.UPower")
+			self._power_changed()
+		except dbus.exceptions.DBusException, e:
+			pass
+    
+    def _network_alert(self, state):
+        self.network_state = state
+        self.emit("network-alert", state)
+        
+    def _power_changed(self):
+        obj = self.bus.get_object("org.freedesktop.UPower", \
+                                "/org/freedesktop/UPower")
+        interface = dbus.Interface(obj, "org.freedesktop.DBus.Properties")
+        on_battery = interface.Get("org.freedesktop.UPower", "OnBattery")
+        self.emit("battery-alert", on_battery)
+        
+    

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2010-07-28 13:57:54 +0000
+++ UpdateManager/UpdateManager.py	2010-08-10 10:01:00 +0000
@@ -3,10 +3,12 @@
 #  Copyright (c) 2004-2008 Canonical
 #                2004 Michiel Sikkes
 #                2005 Martin Willemoes Hansen
+#                2010 Mohamed Amine IL Idrissi
 #  
 #  Author: Michiel Sikkes <[e-mail]>
 #          Michael Vogt <[e-mail]>
 #          Martin Willemoes Hansen <[e-mail]>
+#          Mohamed Amine IL Idrissi <[e-mail]>
 # 
 #  This program is free software; you can redistribute it and/or 
 #  modify it under the terms of the GNU General Public License as 
@@ -73,6 +75,7 @@
 from Core.UpdateList import UpdateList
 from Core.MyCache import MyCache, NotEnoughFreeSpaceError
 from Core.MetaRelease import Dist
+from Core.AlertWatcher import AlertWatcher
 from SafeGConfClient import SafeGConfClient
 
 from DistUpgradeFetcher import DistUpgradeFetcherGtk
@@ -95,6 +98,13 @@
 # file that signals if we need to reboot
 REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
 
+# NetworkManager enums
+NM_STATE_UNKNOWN = 0
+NM_STATE_ASLEEP = 1
+NM_STATE_CONNECTING = 2
+NM_STATE_CONNECTED = 3
+NM_STATE_DISCONNECTED = 4
+
 class UpdateManagerDbusControler(dbus.service.Object):
     """ this is a helper to provide the UpdateManagerIFace """
     def __init__(self, parent, bus_name,
@@ -224,15 +234,17 @@
         self.window_main.set_urgency_hint(True)
         self.initial_focus_id = self.window_main.connect(
             "focus-in-event", self.on_initial_focus_in)
-    else:
-        self.warn_on_battery()
+    
+    # Alert watcher
+    self.alert_watcher = AlertWatcher()
+    self.alert_watcher.connect("network-alert", self._on_network_alert)
+    self.alert_watcher.connect("battery-alert", self._on_battery_alert)
 
   def on_initial_focus_in(self, widget, event):
       """callback run on initial focus-in (if started unmapped)"""
       widget.unstick()
       widget.set_urgency_hint(False)
       self.window_main.disconnect(self.initial_focus_id)
-      self.warn_on_battery()
       return False
 
   def warn_on_battery(self):
@@ -458,12 +470,36 @@
       try:
           inst_count = self.cache.installCount
           self.dl_size = self.cache.requiredDownload
-          t = _("Download size: %s\n%s selected.") % (
-                                                      humanize_size(self.dl_size),inst_count)
+          t = ""
+          if inst_count >= 1:
+              t = ngettext("One update has been selected. ", 
+                           "%s updates have been selected. " % inst_count,
+                           inst_count)
+          if self.dl_size != 0:
+              t += _("%s will be downloaded.") % (humanize_size(self.dl_size))
+              self.image_downsize.set_sensitive(True)
+              if self.alert_watcher.network_state != NM_STATE_CONNECTED:
+                  self.button_install.set_sensitive(False)
+              else:
+                  self.button_install.set_sensitive(True)
+          else:
+              if inst_count >= 1:
+                  t += ngettext("The update has already been downloaded, but not installed",
+                  "The updates have already been downloaded, but not installed", inst_count)
+                  self.button_install.set_sensitive(True)
+              else:
+                  t += _("There is no updates to install")
+                  self.button_install.set_sensitive(False)
+              self.image_downsize.set_sensitive(False)
           self.label_downsize.set_text(t)
+          self.hbox_downsize.show()
+          self.vbox_alerts.show()
       except SystemError, e:
           print "requiredDownload could not be calculated: %s" % e
-          self.label_downsize.set_markup(_("Unknown download size"))
+          self.label_downsize.set_markup(_("Unknown download size."))
+          self.image_downsize.set_sensitive(False)
+          self.hbox_downsize.show()
+          self.vbox_alerts.show()
 
   def _get_last_apt_get_update_text(self):
       """
@@ -666,6 +702,31 @@
     self.window_main.set_sensitive(True)
     self.window_main.window.set_cursor(None)
 
+  def _on_network_alert(self, watcher, state):
+      if state == NM_STATE_CONNECTING:
+          self.label_offline.set_text(_("Connecting..."))
+          self.button_reload.set_sensitive(False)
+          self.refresh_updates_count()
+          self.hbox_offline.show()
+          self.vbox_alerts.show()
+      elif state == NM_STATE_CONNECTED:
+          self.button_reload.set_sensitive(True)
+          self.refresh_updates_count()
+          self.hbox_offline.hide()
+      else:
+          self.label_offline.set_text(_("You may not be able to check for updates or download new updates."))
+          self.button_reload.set_sensitive(False)
+          self.refresh_updates_count()
+          self.hbox_offline.show()
+          self.vbox_alerts.show()
+          
+  def _on_battery_alert(self, watcher, on_battery):
+      if on_battery:
+          self.hbox_battery.show()
+          self.vbox_alerts.show()
+      else:
+          self.hbox_battery.hide()    
+
   def row_activated(self, treeview, path, column):
       iter = self.store.get_iter(path)
       pkg = self.store.get_value(iter, LIST_PKG)
@@ -842,6 +903,7 @@
     self.update_count()
     self.setBusy(False)
     self.check_all_updates_installable()
+    self.refresh_updates_count()
     return False
 
   def dist_no_longer_supported(self, meta_release):
@@ -999,4 +1061,5 @@
 
     self.fillstore()
     self.check_auto_update()
+    self.alert_watcher.check_alert_state()
     gtk.main()

=== modified file 'data/glade/UpdateManager.ui'
--- data/glade/UpdateManager.ui	2010-06-10 14:42:23 +0000
+++ data/glade/UpdateManager.ui	2010-08-10 10:01:00 +0000
@@ -48,7 +48,7 @@
                         <property name="wrap">True</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1,000000"/>
+                          <attribute name="scale" value="1.000000"/>
                         </attributes>
                       </object>
                       <packing>
@@ -179,7 +179,6 @@
             <child>
               <object class="GtkVBox" id="vbox12">
                 <property name="visible">True</property>
-                <property name="spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow_update">
                     <property name="visible">True</property>
@@ -208,15 +207,106 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkVBox" id="vbox_alerts">
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox_downsize">
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="image_downsize">
+                            <property name="visible">True</property>
+                            <property name="icon_name">aptdaemon-download</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label_downsize">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label">
+</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox_battery">
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="image_battery">
+                            <property name="visible">True</property>
+                            <property name="icon_name">battery</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label_battery">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">It&#x2019;s safer to connect the computer to AC power before updating.</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox_offline">
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkImage" id="image_offline">
+                            <property name="visible">True</property>
+                            <property name="icon_name">network-offline</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label_offline">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">2</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="hbox15">
                     <property name="visible">True</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkLabel" id="label_downsize">
+                      <object class="GtkLabel" id="label_placeholder">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label">
-</property>
                       </object>
                       <packing>
                         <property name="position">0</property>
@@ -228,7 +318,7 @@
                         <property name="spacing">6</property>
                         <property name="homogeneous">True</property>
                         <child>
-                          <object class="GtkButton" id="button1">
+                          <object class="GtkButton" id="button_reload">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
@@ -326,9 +416,6 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -338,11 +425,12 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="padding">6</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -508,8 +596,8 @@
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
+                    <accelerator key="Q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                     <accelerator key="W" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-                    <accelerator key="Q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-05 20:55:55 +0000
+++ debian/changelog	2010-08-10 10:01:00 +0000
@@ -1,3 +1,10 @@
+update-manager (1:0.142.6) UNRELEASED; urgency=low
+
+  * Implemented battery and network alerts directly in the main window.
+    LP: #484249, #426708, #426710, #494772
+
+ -- Michael Vogt <[e-mail]>  Wed, 28 Jul 2010 15:18:20 +0200
+
 update-manager (1:0.142.5) maverick; urgency=low
 
   * more python-apt 0.8 porting