Merge lp:~bilalakhtar/aptdaemon/unity-integration into lp:aptdaemon

[Bilal Akhtar]

Check if the client is update-manager. If yes, then throw away progress stats to libunity. To make this work fully, lp:~bilalakhtar/update-manager/unity-launcher-progress should merge into lp:update-manager after this branch is merged into lp:aptdaemon.

This branch merge is a part of the blueprint https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-default-apps-unity-integration .

Merging this code into aptdaemon could facilitate unity integration in other apps using aptdaemon as well, in the future.

[Michael Vogt (mvo)]

Thanks for your branch! I merged this support in a slighly different way into update-manager.

As for a generic solution in aptdaemon I think this needs more generalization and ideally its own aptdaemon.unityprogress that just takes the transaction and a application name. This way its more generic then to include it in the gtkwidgets.

Feedback from Sebastian is also welcome on this.

review: Needs Fixing

[Bilal Akhtar (bilalakhtar)]

Well, the only purpose why I embedded this thing inside aptdaemon was because it was more closely tied to the progress bar. That isn't an efficient way to do this, and hence I guess it might be better to just leave things in aptdaemon as it is. I don't think any other app using aptdaemon would need launcher integration (except software-center, where it'll be implemented very differently).

[Sebastian Heinlein (glatzor)]

There are also other applications using aptdaemon which could make use of the progress bar:

sessioninstaller
language-selector-gnome
oem-config
gnome-codec-install

I am quite short on time. But I will have a look at this at Tuesday.

[Robert Roth (evfool)]

What's the status on this? Does update-manager have unity integration? I have checked the update-manager and aptdaemon source, and neither do have update-manager progress indication support, and the feature-freeze is close.

Sebastian, please provide some more feedback, do you agree with mvo on having a separate aptdaemon.unityprogress to have a general solution?

Just asking to find out what needs to be done to have this ready for oneiric.

[Michael Vogt (mvo)]

On Mon, Aug 01, 2011 at 08:21:15AM -0000, Robert Roth wrote:
> What's the status on this? Does update-manager have unity integration? I have checked the update-manager and aptdaemon source, and neither do have update-manager progress indication support, and the feature-freeze is close.
[..]

update-manager will use unity if its available and show progress
information and number of available updates. But having a more general
progress in aptdaemon would certainly be a good thing.

Cheers,
 Michael

Unmerged revisions

661. By Bilal Akhtar on 2011-06-07

If Update-Manager is running, export progress information to libunity. This code may also make it easier for other apps using aptdaemon to integrate with Unity, beginning with update-manager

=== modified file 'aptdaemon/gtkwidgets.py'
--- aptdaemon/gtkwidgets.py	2011-04-09 06:29:28 +0000
+++ aptdaemon/gtkwidgets.py	2011-06-07 10:16:34 +0000
@@ -43,6 +43,10 @@
 import pango
 import pygtk
 import vte
+try:
+    from gi.repository import Unity
+except ImportError:
+    pass
 
 import client
 from enums import *
@@ -287,6 +291,17 @@
             self.pulse()
         else:
             self.set_fraction(progress/100.0)
+            try:
+                self._unity_launcher_entry.set_property("progress", progress/100.0)
+                self._unity_launcher_entry.set_property("progress_visible", True)
+            except AttributeError: # _unity_launcher_entry isn't defined
+                if transaction.meta_data.get('unity_client_name') == "update-manager":
+                    try:
+                        self._unity_launcher_entry = Unity.LauncherEntry.get_for_desktop_id("update-manager.desktop")
+                    except NameError:
+                        return
+                    self._unity_launcher_entry.set_property("progress", progress/100.0)
+                    self._unity_launcher_entry.set_property("progress_visible", True)
 
     def _on_progress_details(self, transaction, items_done, items_total,
                              bytes_done, bytes_total, speed, eta):
@@ -309,6 +324,10 @@
     def _on_finished(self, transaction, exit):
         """Set the progress to 100% when the transaction is complete"""
         self.set_fraction(1)
+        try:
+            self._unity_launcher_entry.set_property("progress_visible", False)
+        except AttributeError:
+            pass
 
 
 class AptDetailsExpander(gtk.Expander):