Merge lp:~vinod-khare/pithos/appindicator into lp:~kevin-mehall/pithos/trunk

[Vinod Khare]

Adds appindicator support for Ubuntu. Also adds a monochrome icon for the same.

[Kevin Mehall (kevin-mehall)]

Can this share any code with the recently-merged notification area icon patch? Sorry to merge that just as you were about to submit...

See http://bazaar.launchpad.net/~gtg/gtg/trunk/annotate/head:/GTG/plugins/notification_area/notification_area.py
for an example of a notification area plugin that combines appindicator and the legacy notification area

Then it can use the same enable/disable mechanism I implemented for the existing icon.

Also, it looks like this branch sets the execute bit on every file in the repository. Is there anything you can do about this?

review: Needs Resubmitting

[Vinod Khare (vinod-khare)]

> Can this share any code with the recently-merged notification area icon patch?
> Sorry to merge that just as you were about to submit...
>
> See http://bazaar.launchpad.net/~gtg/gtg/trunk/annotate/head:/GTG/plugins/noti
> fication_area/notification_area.py
> for an example of a notification area plugin that combines appindicator and
> the legacy notification area
>
> Then it can use the same enable/disable mechanism I implemented for the
> existing icon.
>
> Also, it looks like this branch sets the execute bit on every file in the
> repository. Is there anything you can do about this?

Yeah, just saw the merge, I'm pulling the changes to see if I can merge the two things.

[lp:~vinod-khare/pithos/appindicator]

69. By Vinod Khare <email address hidden> on 2010-07-22

Merging appindicator with notification area icon

70. By Vinod Khare <email address hidden> on 2010-07-22

This will hopefully resolve the execute bit problem :(

71. By Vinod Khare <email address hidden> on 2010-07-22

Code cleanup

Unmerged revisions

=== modified file '.bzrignore' (properties changed: -x to +x)
=== modified file '.quickly' (properties changed: -x to +x)
=== added file 'bin/PithosAppIndicator.py'
--- bin/PithosAppIndicator.py	1970-01-01 00:00:00 +0000
+++ bin/PithosAppIndicator.py	2010-07-22 22:24:47 +0000
@@ -0,0 +1,58 @@
+import appindicator
+import os
+import sys
+import gtk
+
+# Check if we are working in the source tree or from the installed 
+# package and mangle the python path accordingly
+if os.path.dirname(sys.argv[0]) != ".":
+    if sys.argv[0][0] == "/":
+        fullPath = os.path.dirname(sys.argv[0])
+    else:
+        fullPath = os.getcwd() + "/" + os.path.dirname(sys.argv[0])
+else:
+    fullPath = os.getcwd()
+sys.path.insert(0, os.path.dirname(fullPath))
+
+from pithos import AboutPithosDialog, PreferencesPithosDialog, StationsDialog
+from pithos.pithosconfig import getdatapath, getmediapath
+from pithos.gobject_worker import GObjectWorker
+
+class PithosAppIndicator:
+	def __init__(self,window):
+		# App Indicator
+		self.ind = appindicator.Indicator("example-simple-client","pithos-mono",appindicator.CATEGORY_APPLICATION_STATUS,getmediapath())
+		self.ind.set_status (appindicator.STATUS_ACTIVE)
+
+		# create a menu
+		menu = gtk.Menu()
+
+		# Play/Pause menu item
+		PlayPauseMenuItem = gtk.ImageMenuItem("Play/Pause")
+		PlayPauseMenuItem.connect("activate",window.playpause)
+		PlayPauseMenuItem.show()
+
+		skipMenuItem = gtk.MenuItem("Skip")
+		skipMenuItem.connect("activate",window.next_song)
+		skipMenuItem.show();
+
+		showhideMenuItem = gtk.MenuItem("Show/Hide")
+		showhideMenuItem.connect("activate",window.showhide)
+		showhideMenuItem.show();
+
+		quitMenuItem = gtk.MenuItem("Quit")
+		quitMenuItem.connect("activate",window.quit)
+		quitMenuItem.show()
+		
+		menu.append(PlayPauseMenuItem)
+		menu.append(skipMenuItem)
+		menu.append(showhideMenuItem)
+		menu.append(quitMenuItem)
+
+		# this is where you would connect your menu item up with a function:
+		
+		# menu_items.connect("activate", self.menuitem_response, buf)
+
+		# show the items
+		
+		self.ind.set_menu(menu)

=== modified file 'bin/pithos'
--- bin/pithos	2010-07-22 22:00:40 +0000
+++ bin/pithos	2010-07-22 22:24:47 +0000
@@ -35,6 +35,8 @@
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
+import appindicator
+from PithosAppIndicator import PithosAppIndicator
 
 # Check if we are working in the source tree or from the installed 
 # package and mangle the python path accordingly
@@ -48,7 +50,7 @@
 sys.path.insert(0, os.path.dirname(fullPath))
 
 from pithos import AboutPithosDialog, PreferencesPithosDialog, StationsDialog
-from pithos.pithosconfig import getdatapath
+from pithos.pithosconfig import getdatapath, getmediapath
 from pithos.gobject_worker import GObjectWorker
 from pithos.notification_icon import PithosNotificationIcon
 
@@ -234,6 +236,8 @@
 
         aa = gtk.gdk.pixbuf_new_from_file(os.path.join(getdatapath(), 'media', 'album_default.png'))
         self.default_album_art = aa.scale_simple(ALBUM_ART_SIZE, ALBUM_ART_SIZE, gtk.gdk.INTERP_BILINEAR)
+
+        self.showing = True
         
         if self.preferences.get('show_icon', False):
             self.notification_icon = PithosNotificationIcon(self)
@@ -241,6 +245,7 @@
             self.notification_icon = None
         
         self.piano_connect()
+
     
     def worker_run(self, fn, args=(), callback=None, context=None, message=None):
         if context: self.statusbar.push(self.statusbar.get_context_id(context), message)
@@ -630,6 +635,7 @@
         self.preferences['last_station_id'] = self.current_station_id
         self.prefs_dlg.save()
         gtk.main_quit()
+        
 
 def NewPithosWindow(pandora_class):
     """NewPithosWindow - returns a fully instantiated
@@ -648,6 +654,7 @@
     window.finish_initializing(builder, pandora_class)
     return window
 
+
 if __name__ == "__main__":
     #support for command line options
     import logging, optparse
@@ -669,5 +676,6 @@
     #run the application
     window = NewPithosWindow(PianoPandora)
     window.show()
-    gtk.main()
+	
+	gtk.main()
 

=== modified file 'data/media/album_default.png' (properties changed: -x to +x)
=== modified file 'data/media/album_default.svg' (properties changed: -x to +x)
=== modified file 'data/media/icon.png' (properties changed: -x to +x)
=== modified file 'data/media/icon.svg' (properties changed: -x to +x)
=== added file 'data/media/pithos-mono.png'
Binary files data/media/pithos-mono.png	1970-01-01 00:00:00 +0000 and data/media/pithos-mono.png	2010-07-22 22:24:47 +0000 differ
=== modified file 'data/media/rate_bg.png' (properties changed: -x to +x)
=== modified file 'data/media/rate_bg.svg' (properties changed: -x to +x)
=== modified file 'data/ui/AboutPithosDialog.ui' (properties changed: -x to +x)
=== modified file 'data/ui/PithosWindow.ui' (properties changed: -x to +x)
=== modified file 'data/ui/PreferencesPithosDialog.ui' (properties changed: -x to +x)
=== modified file 'data/ui/SearchDialog.ui' (properties changed: -x to +x)
=== modified file 'data/ui/StationsDialog.ui' (properties changed: -x to +x)
=== modified file 'data/ui/about_pithos_dialog.xml' (properties changed: -x to +x)
=== modified file 'data/ui/pithos_window.xml' (properties changed: -x to +x)
=== modified file 'data/ui/preferences_pithos_dialog.xml' (properties changed: -x to +x)
=== modified file 'data/ui/search_dialog.xml' (properties changed: -x to +x)
=== modified file 'data/ui/stations_dialog.xml' (properties changed: -x to +x)
=== modified file 'debian/changelog' (properties changed: -x to +x)
=== modified file 'debian/compat' (properties changed: -x to +x)
=== modified file 'debian/control' (properties changed: -x to +x)
=== modified file 'debian/copyright' (properties changed: -x to +x)
=== modified file 'pithos.desktop.in' (properties changed: -x to +x)
=== modified file 'pithos/AboutPithosDialog.py' (properties changed: -x to +x)
=== modified file 'pithos/PreferencesPithosDialog.py' (properties changed: -x to +x)
=== modified file 'pithos/SearchDialog.py' (properties changed: -x to +x)
=== modified file 'pithos/StationsDialog.py' (properties changed: -x to +x)
=== modified file 'pithos/__init__.py' (properties changed: -x to +x)
=== modified file 'pithos/fakepiano.py' (properties changed: -x to +x)
=== modified file 'pithos/gobject_worker.py' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/Makefile' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/README' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/__init__.py' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/config.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/crypt.c' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/crypt.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/crypt_key_input.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/crypt_key_output.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/ezxml.c' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/ezxml.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/http.c' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/http.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/piano.c' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/piano.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/piano.i' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/piano_private.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/waitress.c' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/waitress.h' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/xml.c' (properties changed: -x to +x)
=== modified file 'pithos/libpiano/xml.h' (properties changed: -x to +x)
=== modified file 'pithos/notification_icon.py' (properties changed: -x to +x)
--- pithos/notification_icon.py	2010-07-22 20:46:37 +0000
+++ pithos/notification_icon.py	2010-07-22 22:24:47 +0000
@@ -18,20 +18,53 @@
 import gtk
 import pithosconfig
 
+# Check if appindicator is available on the system
+try:
+	import appindicator
+	indicator_capable = True
+except:
+    indicator_capable = False
+
 class PithosNotificationIcon:
+    class Borg:
+        """Application indicator can be instantiated only
+           once. The plugin api, when toggling the activation
+           state of a plugin, instantiates different instances
+           of the plugin class. Therefore, we need to keep
+           a reference to the indicator object. This class does that."""
+        __shared_state = {}
+        def __init__(self):
+            self.__dict__ = self.__shared_state
+            if not hasattr(self, "indicator"):
+                self.indicator = appindicator.Indicator("pithos", \
+                                  "pithos-mono", \
+                                   appindicator.CATEGORY_APPLICATION_STATUS, \
+                                   pithosconfig.getmediapath())
+                self.indicator.set_status(appindicator.STATUS_ACTIVE)
+
+        def get_indicator(self):
+            return self.indicator	
+	
 	def __init__(self, window):
+		
 		self.window = window
 		
 		self.delete_callback_handle = self.window.connect("delete-event", self.window.hide_on_delete)
 		self.state_callback_handle = self.window.connect("play-state-changed", self.play_state_changed)
 		self.song_callback_handle = self.window.connect("song-changed", self.song_changed)
 		
-		self.statusicon = gtk.status_icon_new_from_file(pithosconfig.get_data_file('media', 'icon.png'))
-		self.statusicon.connect('activate', self.statusicon_clicked )
+		if indicator_capable:
+			self.ind = self.Borg().get_indicator()
+			
+		else:
+			self.statusicon = gtk.status_icon_new_from_file(pithosconfig.get_data_file('media', 'icon.png'))
+			self.statusicon.connect('activate', self.statusicon_clicked )
+		
 		self.build_context_menu()
 	   
 	def build_context_menu(self):
-		""" build context menu for the right click menu on the status icon """
+		""" build context menu for the right click menu on the status icon 
+			of for the appindicator """
 
 		def icon(image):
 			""" create an icon from a stock image """
@@ -54,11 +87,21 @@
 			item.connect('activate', button[1])
 			if len(button) > 2:
 				item.set_image(button[2])
+			item.show()
 			menu.append(item)
 			self.buttons[button[0]] = item
 
-		# connect our new menu to the statusicon
-		self.statusicon.connect('popup-menu', self.context_menu, menu)
+		# connect our new menu to the statusicon or the appindicator
+		if indicator_capable:
+			# We have to add another entry for show / hide Pithos window
+			item = gtk.ImageMenuItem("Show/Hide Pithos");
+			item.connect('activate',self.statusicon_clicked); # since self.statusicon_clicked shows and hides
+			item.show()
+			menu.append(item)
+			self.buttons["Show/Hide Pithos"] = item
+			self.ind.set_menu(menu)
+		else:
+			self.statusicon.connect('popup-menu', self.context_menu, menu)
 
 
 	def play_state_changed(self, window, playing):
@@ -74,7 +117,8 @@
 			button.set_image(gtk.image_new_from_stock(gtk.STOCK_MEDIA_PAUSE, gtk.ICON_SIZE_MENU))
 
     def song_changed(self, window, song):
-        self.statusicon.set_tooltip("%s by %s"%(song.title, song.artist))
+		if not indicator_capable:
+			self.statusicon.set_tooltip("%s by %s"%(song.title, song.artist))
         
 	def statusicon_clicked(self, status):
 		""" hide/unhide the window 
@@ -94,8 +138,15 @@
 			   data.popup(None, None, None, 3, time)
     
     def remove(self):
-        self.statusicon.set_visible(False)
+		if indicator_capable:
+			self.ind.set_status(appindicator.STATUS_PASSIVE)
+		else:
+			self.statusicon.set_visible(False)
+			
         self.window.disconnect(self.delete_callback_handle)
         self.window.disconnect(self.state_callback_handle)
         self.window.disconnect(self.song_callback_handle)
+        
+        # Pithos window needs to be reconnected to on_destro()
+        self.window.connect('delete-event',self.window.on_destroy)
 

=== modified file 'pithos/pithosconfig.py' (properties changed: -x to +x)
--- pithos/pithosconfig.py	2010-07-22 19:56:55 +0000
+++ pithos/pithosconfig.py	2010-07-22 22:24:47 +0000
@@ -53,4 +53,7 @@
         return abs_data_path
     else:
         raise project_path_not_found
+        
+def getmediapath():
+    return getdatapath() + "/media"
 

=== modified file 'setup.py' (properties changed: -x to +x)