Merge lp:~bilalakhtar/update-manager/unity-quicklist into lp:update-manager

[Bilal Akhtar]

This branch adds unity dynamic quicklist support for update-manager. Would need a UIFe before the merge.

[lp:~bilalakhtar/update-manager/unity-quicklist]

2095. By Bilal Akhtar on 2011-04-12

Minor changes to make signal callbacks suit both those of Gtk and Dbusmenu

2096. By Bilal Akhtar on 2011-04-12

Disable/enable the install menu item as per the update status

2097. By Bilal Akhtar on 2011-04-12

Move dbusmenu and Unity declaration to the top of script

[Bilal Akhtar (bilalakhtar)]

Hi Michael,

I tested this, and it should work provided that Unity is built from this branch: https://code.launchpad.net/~ken-vandine/unity/make-quicklists-work-again/+merge/57386

Its a bug in Unity, and another bug which makes Unity crash if the dbusmenu contains a hidden item. So we have 2 options:

1) Get this fix in after those bugs are fixed in Unity.
2) Ignore this for Natty, we'll add it in Oneiric (I prefer this for now; taking into consideration the fact that UIF is in place).

What do you think?

[Michael Vogt (mvo)]

Thanks a bunch I merged this into my "for-unity" branch and will push it out once natty is released. I like it a lot but it arrived a little bit late.

[Michael Vogt (mvo)]

review: Approve

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2011-04-06 07:43:01 +0000
+++ UpdateManager/UpdateManager.py	2011-04-12 20:25:47 +0000
@@ -85,6 +85,8 @@
 from HelpViewer import HelpViewer
 from MetaReleaseGObject import MetaRelease
 
+from gi.repository import Dbusmenu, Unity
+
 #import pdb
 
 # FIXME:
@@ -297,6 +299,29 @@
     self.alert_watcher.connect("battery-alert", self._on_battery_alert)
     self.alert_watcher.connect("network-3g-alert", self._on_network_3g_alert)
 
+    # Create Unity launcher quicklist
+    um_launcher_entry = Unity.LauncherEntry.get_for_desktop_id ("update-manager.desktop")
+    quicklist = Dbusmenu.Menuitem.new()
+
+    update_dbusmenuitem = Dbusmenu.Menuitem.new()
+    update_dbusmenuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Check for Updates"))
+    update_dbusmenuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True)
+    update_dbusmenuitem.connect ("item-activated", self.on_button_reload_clicked, None)
+    quicklist.child_append(update_dbusmenuitem)
+
+    self.install_dbusmenuitem = Dbusmenu.Menuitem.new()
+    self.install_dbusmenuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                                 _("Install All Available Updates"))
+    self.install_dbusmenuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True)
+    self.install_dbusmenuitem.connect ("item-activated", self.install_all_updates, None)
+    quicklist.child_append (self.install_dbusmenuitem)
+
+    um_launcher_entry.set_property ("quicklist", quicklist)
+
+  def install_all_updates (self, menu, menuitem, data):
+    self.select_all_updgrades (None)
+    self.on_button_install_clicked (None)
+
   def on_initial_focus_in(self, widget, event):
       """callback run on initial focus-in (if started unmapped)"""
       widget.unstick()
@@ -550,14 +575,17 @@
               #else:
               #    self.button_install.set_sensitive(True)
               self.button_install.set_sensitive(True)
+              self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, True)
           else:
               if inst_count > 0:
                   download_str = 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)
+                  self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, True)
               else:
                   download_str = _("There are no updates to install")
                   self.button_install.set_sensitive(False)
+                  self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, False)
               self.image_downsize.set_sensitive(False)
           # TRANSLATORS: this allows to switch the order of the count of
           #              updates and the download size string (if needed)
@@ -640,6 +668,7 @@
               self.notebook_details.set_sensitive(False)
               self.treeview_update.set_sensitive(False)
           self.button_install.set_sensitive(False)
+          self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, False)
           self.button_close.grab_default()
           self.textview_changes.get_buffer().set_text("")
           self.textview_descr.get_buffer().set_text("")
@@ -685,7 +714,7 @@
     if expanded:
       self.on_treeview_update_cursor_changed(self.treeview_update)
 
-  def on_button_reload_clicked(self, widget):
+  def on_button_reload_clicked(self, widget, menuitem = None, data = None):
     #print "on_button_reload_clicked"
     self.check_metarelease()
     self.invoke_manager(UPDATE)