Merge lp:~ken-vandine/jockey/ubuntu into lp:~ubuntu-core-dev/jockey/ubuntu

[Ken VanDine]

[Ken VanDine (ken-vandine)]

Merged in patch adding support for the application indicator

Unmerged revisions

386. By Ken VanDine on 2010-01-08

* debian/control:
  - Recommend nvidia-common > 0.2.15 because of the new alternatives
    class.
* data/handlers/nvidia.py:
  - Add support for the new alternatives system by using the
    Alternatives class from nvidia-common.
* data/handlers/fglrx.py:
  - Keep fglrx disabled until AMD provides us with a driver that is
    compatible with Lucid's xserver.

385. By Ken VanDine on 2010-01-08

* debian/control
  - Added recommends for python-appindicator (>= 0.0.6) to jockey-gtk

384. By Ken VanDine on 2010-01-08

set released

383. By Ken VanDine on 2010-01-08

Added patch header

382. By Ken VanDine on 2010-01-08

set unreleased

381. By Ken VanDine on 2010-01-08

* debian/patches/01_app_indicator_integration.patch
  - Adds application indicator support (LP: #497879)
* debian/rules
  - added simple-patchsys.mk

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-05 11:08:07 +0000
+++ debian/changelog	2010-01-08 21:20:29 +0000
@@ -1,4 +1,4 @@
-jockey (0.5.5-0ubuntu5) UNRELEASED; urgency=low
+jockey (0.5.5-0ubuntu7) UNRELEASED; urgency=low
 
   * debian/control:
     - Recommend nvidia-common > 0.2.15 because of the new alternatives
@@ -12,6 +12,22 @@
 
  -- Alberto Milone <[e-mail]>  Tue, 05 Jan 2010 11:20:11 +0100
 
+jockey (0.5.5-0ubuntu6) lucid; urgency=low
+
+  * debian/control
+    - Added recommends for python-appindicator (>= 0.0.6) to jockey-gtk
+
+ -- Ken VanDine <[e-mail]>  Fri, 08 Jan 2010 16:10:41 -0500
+
+jockey (0.5.5-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/01_app_indicator_integration.patch
+    - Adds application indicator support (LP: #497879) 
+  * debian/rules
+    - added simple-patchsys.mk
+
+ -- Ken VanDine <[e-mail]>  Fri, 08 Jan 2010 15:13:20 -0500
+
 jockey (0.5.5-0ubuntu4) lucid; urgency=low
 
   * data/handlers/nvidia.py: Remove suppressing of driver version 71, it's not

=== modified file 'debian/control'
--- debian/control	2010-01-05 11:08:07 +0000
+++ debian/control	2010-01-08 21:20:29 +0000
@@ -28,6 +28,7 @@
 Depends: ${python:Depends}, jockey-common (= ${binary:Version}), 
  python-notify (>= 0.1.1-0ubuntu2), python-xdg, synaptic,
  policykit-1-gnome
+Recommends: python-appindicator (>= 0.0.6)
 Description: GNOME user interface and desktop integration for driver management
  Jockey provides a user interface for configuring third-party drivers,
  such as the Nvidia and ATI fglrx X.org and various Wireless LAN

=== added directory 'debian/patches'
=== added file 'debian/patches/01_app_indicator_integration.patch'
--- debian/patches/01_app_indicator_integration.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_app_indicator_integration.patch	2010-01-08 21:20:29 +0000
@@ -0,0 +1,117 @@
+Description: Adds support for the application indicator
+ .
+ This patch moves jockey out of the notification area, and into
+ the indicator-applet using libappindicator.
+
+Author: Conor Curran <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/jockey/+bug/497879
+Last-Update: 2010-01-08
+
+=== modified file 'gtk/jockey-gtk'
+--- gtk/jockey-gtk	2009-09-02 13:49:09 +0000
++++ gtk/jockey-gtk	2010-01-08 11:35:46 +0000
+@@ -165,30 +165,37 @@
+ 
+     def ui_notification(self, title, text):
+         '''Present a notification popup.
+-
+         This should preferably create a tray icon. Clicking on the tray icon or
+         notification should run the GUI.
+         '''
++        trayicon = jockey.ui.AbstractUI.ui_notification(self, None, None)
+         pynotify.init('jockey')
+ 
+-        trayicon = gtk.status_icon_new_from_icon_name('jockey')
+-        trayicon.connect('activate', lambda widget: self.ui_show_main())
+-        trayicon.set_visible(False)
+-        trayicon.set_tooltip(title)
+-        trayicon.set_visible(True)
+-
+-        self.ui_idle()
+-
+-        # creating the notification immediately causes the bubble to point into
+-        # the void; icon needs to settle first
+-        gobject.timeout_add (500, self.show_notification, 
+-            (title, text, trayicon))
++        if trayicon is not None:
++            menu = gtk.Menu()
++            item = gtk.MenuItem("Install Drivers")
++            menu.append(item)
++            item.show()
++            item.connect("activate", lambda widget: self.ui_show_main())
++            trayicon.set_menu(menu)
++            self.ui_idle()
++            gobject.timeout_add (500, self.show_notification, (title, text, None))
++            gtk.main()            
++        else:
++            trayicon = gtk.status_icon_new_from_icon_name('jockey')
++            trayicon.connect('activate', lambda widget: self.ui_show_main())
++            trayicon.set_visible(False)
++            trayicon.set_tooltip(title)
++            trayicon.set_visible(True)
++            self.ui_idle()
++            gobject.timeout_add (500, self.show_notification, (title, text, trayicon))
+ 
+     def show_notification(self, data):
+         (title, text, trayicon) = data
+         notify = pynotify.Notification(title, text, 'jockey')
+         notify.set_urgency(pynotify.URGENCY_NORMAL)
+-        notify.attach_to_status_icon(trayicon)
++        if trayicon is not None:
++           notify.attach_to_status_icon(trayicon)
+         notify.set_timeout(10000)
+         notify.show()
+ 
+@@ -196,7 +203,7 @@
+         '''Process pending UI events and return.
+ 
+         This is called while waiting for external processes such as package
+-        installers.
++        installer.
+         '''
+         while gtk.events_pending():
+             gtk.main_iteration(False)
+
+=== modified file 'jockey/ui.py'
+--- jockey/ui.py	2009-11-09 11:52:51 +0000
++++ jockey/ui.py	2010-01-08 11:32:39 +0000
+@@ -22,11 +22,17 @@
+ 
+ import gettext, optparse, urllib2, tempfile, sys, time, os, threading
+ 
++
+ import gobject
+ import dbus
+ import dbus.service
+ import dbus.mainloop.glib
+ 
++try:
++    import appindicator
++except:
++    pass
++
+ from oslib import OSLib
+ from backend import UnknownHandlerException, PermissionDeniedByPolicy, \
+     BackendCrashError, convert_dbus_exceptions, \
+@@ -889,11 +895,18 @@
+ 
+     def ui_notification(self, title, text):
+         '''Present a notification popup.
+-
+         This should preferably create a tray icon. Clicking on the tray icon or
+         notification should run the GUI.
++        This method will attempt to instantiate an appindicator to return to both the GTK and KDE children.
++        If whatever reason it fails (missing python-appindicator) then it should behave as it did before 
+         '''
+-        raise NotImplementedError, 'subclasses need to implement this'
++        try:
++            indicator = appindicator.Indicator("jockey", "jockey", appindicator.CATEGORY_HARDWARE)
++            indicator.set_status(appindicator.STATUS_ATTENTION)
++        except:
++            indicator = None    
++        
++        return indicator
+ 
+     def ui_idle(self):
+         '''Process pending UI events and return.
+

=== modified file 'debian/rules'
--- debian/rules	2009-06-29 14:11:58 +0000
+++ debian/rules	2010-01-08 21:20:28 +0000
@@ -6,6 +6,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/langpack.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp