Merge lp:~mbudde/earcandy/reorganization into lp:earcandy

[Michael Budde]

[Michael Budde (mbudde)]

In this branch the tree has been reorganized to make the application a package (earcandylib). ear_candy.py has been moved to earcandylib/EarCandy.py and a earcandy script for running the application has been created. Data files have been moved to data/.

A distutils script (setup.py) has also been added. A tar ball can now be created with ./setup.py sdist.

A .desktop file has been added for easily running the application when it has been installed.

[David D Lowe (flimm)]

Hello Michael Budde! It seems like we were working on the same bug #379266 in parallel, so a lot of our work is similar, if not identical (earcandy.desktop has the exact same comment!).
So I'm going to comment on the changes you've made versus what's now in the trunk (lp:earcandy revision 50).

I find your approach to the runnable script earcandy interesting. You basically moved the code under if __name__ == "__main__" from the EarCandy.py to the script. Theoretically, this is the best method, practically, I've found from my personal experience with Epidermis that it makes namespaces rather confusing. The other approach which I took calls the script by running subprocess.call(['python', ear_candy.py']), creating two python processes one depending on the other, which is a bit of a waste but makes the result in System Monitor prettier. The final approach (that I can think of) is to launch it by running subprocess.Popen(['earcandy.py']) which is lighter on resources but less pretty in System Monitor.

Since you're using distutils, the data files will be separated from the .py files, so you created a function called find_data_file, similar to my find_program_file. You check to see in which directory of /usr/ or /usr/local/ the files are installed. This actually superfluous, they're always going to be under sys.prefix, according to the distutils documentation.

Having a seperate EarCandyInfo.py file for the application's metadata is certainly interesting. Having one place to modify the program's version number is nice, but do you really need it for things like APPNAME?

I'm going to go ahead and comment on your Ubuntu packaging branch too, lp:~mbudde/earcandy/ubuntu revision 59 if you don't mind. You included a dependency which I somehow forgot: pulseaudio, well done! Having the Ubuntu packaging in a separate branch from the trunk is an interesting idea, and one which a lot of projects go by. I personally prefer having the debian/ folder in the original source, keeps the developers responsible for the packaging and things like dependencies.

Obviously, I'm not the developer of EarCandy, it'll be up to KillerKiwi to decide what to take and what to keep. Thanks for contributing!

[Michael Budde (mbudde)]

> Hello Michael Budde! It seems like we were working on the same bug #379266 in
> parallel, so a lot of our work is similar, if not identical (earcandy.desktop
> has the exact same comment!).
> So I'm going to comment on the changes you've made versus what's now in the
> trunk (lp:earcandy revision 50).
>

Yeah, I noticed your branch the day after I started my branch. I've certainly
got some inspiration from your branch, hope you don't mind that ;)

> I find your approach to the runnable script earcandy interesting. You
> basically moved the code under if __name__ == "__main__" from the EarCandy.py
> to the script. Theoretically, this is the best method, practically, I've found
> from my personal experience with Epidermis that it makes namespaces rather
> confusing. The other approach which I took calls the script by running
> subprocess.call(['python', ear_candy.py']), creating two python processes one
> depending on the other, which is a bit of a waste but makes the result in
> System Monitor prettier. The final approach (that I can think of) is to launch
> it by running subprocess.Popen(['earcandy.py']) which is lighter on resources
> but less pretty in System Monitor.

I'm not sure what you mean when you say that it "makes namespaces rather confusing".
Do you have any examples where your method would be prefered to mine?

> Since you're using distutils, the data files will be separated from the .py
> files, so you created a function called find_data_file, similar to my
> find_program_file. You check to see in which directory of /usr/ or /usr/local/
> the files are installed. This actually superfluous, they're always going to be
> under sys.prefix, according to the distutils documentation.

Running setup.py in the source tree gives me this:
$ ./setup.py -n install
running install
[..snip..]
running install_data
creating /usr/local/share/earcandy
copying data/earsLabel.png -> /usr/local/share/earcandy
copying data/pulseoptions.glade -> /usr/local/share/earcandy
copying data/settings.xml -> /usr/local/share/earcandy
copying data/earsLabelOff.png -> /usr/local/share/earcandy
copying earcandy.desktop -> /usr/local/share/applications
creating /usr/local/share/pixmaps
copying data/earsLabel.png -> /usr/local/share/pixmaps
running install_egg_info
Writing /usr/local/lib/python2.6/dist-packages/earcandy-0.5.egg-info

Also I don't quite like how you've copied find_program_file() to every source file
that needs it. Right now it's a pain to edit that function as you have to do it in three
places. Why not put it in a separate file and import it?

> Having a seperate EarCandyInfo.py file for the application's metadata is
> certainly interesting. Having one place to modify the program's version number
> is nice, but do you really need it for things like APPNAME?

You're right. That probably is overkill.

> I'm going to go ahead and comment on your Ubuntu packaging branch too,
> lp:~mbudde/earcandy/ubuntu revision 59 if you don't mind. You included a
> dependency which I somehow forgot: pulseaudio, well done! Having the Ubuntu
> packaging in a separate branch from the trunk is an interesting idea, and one
> which a lot of projects go by. I personally ...

[KillerKiwi (killerkiwi2005)]

review: Approve

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2009-05-23 12:12:46 +0000
@@ -0,0 +1,2 @@
+include earcandy earcandy.desktop MANIFEST.in
+recursive-include data *
 
=== added directory 'data'
=== renamed file 'earsLabel.png' => 'data/earsLabel.png'
=== renamed file 'earsLabelOff.png' => 'data/earsLabelOff.png'
=== renamed file 'pulseoptions.glade' => 'data/pulseoptions.glade'
=== renamed file 'settings.xml' => 'data/settings.xml'
=== added file 'earcandy'
--- earcandy	1970-01-01 00:00:00 +0000
+++ earcandy	2009-05-22 14:09:54 +0000
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from earcandylib.EarCandy import EarCandy
+
+if __name__ == '__main__':
+    ec = EarCandy()
+    ec.run()
+    ec.save()
 
=== added file 'earcandy.desktop'
--- earcandy.desktop	1970-01-01 00:00:00 +0000
+++ earcandy.desktop	2009-05-23 12:12:46 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Ear Candy
+Comment=Gracefully fade applications' volume in and out
+Generic Name=Sound level manager
+Terminal=false
+Icon=earsLabel
+Type=Application
+Exec=earcandy
+Categories=Utility;
+StartupNotify=True
 
=== added directory 'earcandylib'
=== renamed file 'Client.py' => 'earcandylib/Client.py'
--- Client.py	2009-05-21 19:43:15 +0000
+++ earcandylib/Client.py	2009-05-22 15:58:21 +0000
@@ -17,7 +17,7 @@
         self.category = "" # music | video | phone
         self.window_position_fade = False
 
-        self.volume_step = 2        
+        self.volume_step = 2
         self.has_focus = False
         self.fullscreen = False
         self.icon = None
@@ -60,7 +60,7 @@
         # check meter levels on others
         for sink in self.sinks.values():
             if sink.volume_meter > 0: return True
-            
+
             # HACK: Check how long its been inactive... and if more than a second count as expired
             if timestamp - sink.volume_meter_last_non_zero < 1:
                 return True
@@ -107,7 +107,7 @@
 
     def __fade_mute(self):
         self.volume_target = self.volume_step # if we goto 0 than our volume meter will never register a value
-    
+
     def set_primary(self, value):
         if value or self.category == "default":
             self.__fade_in()
@@ -127,7 +127,7 @@
         el.setAttribute("category",self.category)
         el.setAttribute("window_position_fade", str(self.window_position_fade))
         el.setAttribute("icon_name", str(self.icon_name))
-    
+
     def from_xml(self, el):
 
         self.name = el.getAttribute("name")
 
=== renamed file 'DesktopFiles.py' => 'earcandylib/DesktopFiles.py'
=== renamed file 'ear_candy' => 'earcandylib/EarCandy.py' (properties changed: +x to -x)
--- ear_candy	2009-05-21 19:43:15 +0000
+++ earcandylib/EarCandy.py	2009-05-22 15:58:21 +0000
@@ -16,19 +16,20 @@
 from xml.dom.minidom import *
 
 from window.WindowWatcher import WindowWatcher
-from pulseaudio.PulseAudio import PulseAudio 
+from pulseaudio.PulseAudio import PulseAudio
 from Client import Client
 from Sink import Sink
 from Threads import threaded
 from TrayIcon import EarCandyStatusIcon
-from EarCandyPrefs import EarCandayPref 
-from VolumeSlider import EarCandyVolumeSlider 
+from EarCandyPrefs import EarCandayPref
+from VolumeSlider import EarCandyVolumeSlider
 from EarCandyDBus import EarCandyDBusClient
+from Paths import get_data_path
 
 # Turn on gtk threading
 gtk.gdk.threads_init()
 
-gtk.window_set_default_icon_from_file(os.path.join(os.path.dirname(__file__), "earsLabel.png"))
+gtk.window_set_default_icon_from_file(get_data_path("earsLabel.png"))
 
 # hack to get around 0.2 not have alsaaudio.cards()
 def reset_alsa_volumes(value=100):
@@ -50,7 +51,7 @@
 
 
         for track in mixer.list_tracks():
-          
+
             if track.flags & gst.interfaces.MIXER_TRACK_OUTPUT and track.num_channels > 0:
                 print "|", track.label
 
@@ -85,7 +86,7 @@
                 rules.appendChild(el)
                 client.to_xml(el)
                 skip.append(client.name)
-        
+
 
         doc.documentElement.setAttribute("fade_timer_speed", str(self.fade_timer_speed))
         doc.documentElement.setAttribute("mute_level", str(self.mute_level))
@@ -146,8 +147,8 @@
         self.active = True
         self.display = {"": "[ unknown ]", "phone" : "Phone (VoIP)", "video" : "Video Player", "music" : "Music Player", "default" : "Notification" }
         self.ignore = ["EsounD client (UNIX socket client)", "ear-candy", "Native client (UNIX socket client)"]
-        self.config_file = os.path.expanduser("~/.config/Ear Candy/settings.xml")     
-        self.default_config_file = os.path.join(os.path.dirname(__file__),"settings.xml")
+        self.config_file = os.path.expanduser("~/.config/Ear Candy/settings.xml")
+        self.default_config_file = get_data_path("settings.xml")
 
         self.pa_clients = {}        # clients by name
         self.pa_clients_by_id = {}  # clients by id
@@ -161,13 +162,11 @@
 
         self.pref = None
 
-        self.fade_timer_speed = 0.1 
+        self.fade_timer_speed = 0.1
         self.mute_level = 20
         self.follow_new_outputs = True
 
-        self.priority = { "" : [], "phone" : [], "video" : [], "music" : [] }      
-
-        pass
+        self.priority = { "" : [], "phone" : [], "video" : [], "music" : [] }
 
     def run(self):
         self.ecb = EarCandyDBusClient(self)
@@ -179,7 +178,7 @@
         else:
 
             self.tray = EarCandyStatusIcon(self)
-            
+
             self.slider = EarCandyVolumeSlider(self)
 
             self.ecb.start_service()
@@ -187,7 +186,7 @@
             self.pa = PulseAudio( self.on_new_pa_client, self.on_remove_pa_client, self.on_new_pa_sink, self.on_remove_pa_sink, self.on_new_pa_output, self.on_remove_pa_output, self.on_volume_change, self.pa_volume_meter)
             self.ww = WindowWatcher(self.on_active_window_change)
             self.fade_timer()
-            
+
             gtk.main()
 
 
@@ -207,7 +206,7 @@
     def fade_timer(self):
         while True:
             time.sleep(self.fade_timer_speed)
-            gobject.idle_add(self.adjust_volumes)      
+            gobject.idle_add(self.adjust_volumes)
 
     def adjust_volumes(self):
 
@@ -217,11 +216,11 @@
         for sink in self.pa_sinks.values():
             if sink.set_volume():
                 # set pa volume
-                self.pa.set_sink_volume(sink.index, sink.volume, sink.channels)  
+                self.pa.set_sink_volume(sink.index, sink.volume, sink.channels)
 
     def __set_primary_client(self):
         # Apply fade rules
- 
+
         if self.active:
             for client in self.pa_clients.values():
                 # self.pref.update_client( client )
@@ -256,7 +255,7 @@
             flagFound = False
             for key in self.priority.keys():
                 if key:
-                    for client in self.priority[key]:         
+                    for client in self.priority[key]:
 
                         if not flagFound and self.active and client.is_active():
                             # Toggle old client to inactive
@@ -271,7 +270,7 @@
                     # all clients with no category should be treated as active for volume
                     for client in self.priority[key]:
                         client.set_primary(True)
-                     
+
 
     def on_volume_change(self, level):
         self.slider.set_volume( level )
@@ -281,7 +280,7 @@
         # /desktop/gnome/sound/default_mixer_device
 
         del( self.pa_outputs[index] )
-        
+
         # fall back to previous value...
         for value in self.pa_outputs.values():
             self.set_last_output(value)
@@ -289,7 +288,7 @@
 
     def set_last_output(self, name):
         self.last_output_name = name
-        
+
         # Update gconf key that governs multimedia key controls
         gconf_key =  "/desktop/gnome/sound/default_mixer_device"
         prefix = "pulsemixer:"
@@ -299,12 +298,12 @@
             print
             print "== Change gnome default sound device =="
             client.set_string(gconf_key, prefix + name)
-        
+
 
     def on_new_pa_output(self, index, output_name, startup):
         self.pa_outputs[index] = output_name
         self.save()
-       
+
         if self.follow_new_outputs and (self.last_output_name == "" or output_name.lower().count("usb") > 0):
             self.set_last_output(output_name)
             # Move all streams to the new output ;)
@@ -318,7 +317,7 @@
     def on_new_pa_sink(self, index, name, client_index, volume, sink, channels):
 
         if not self.pa_sinks.has_key(index):
-            print 
+            print
             print "== pa sink input =="
             print "sink:", index, name
             if self.pa_clients_by_id.has_key(client_index):
@@ -329,13 +328,13 @@
                 client.sinks[index] = sink
                 self.pa_sinks[index] = sink
                 # insure the sink input is on the correct output..
-                if self.follow_new_outputs and self.last_output_name: 
+                if self.follow_new_outputs and self.last_output_name:
                     self.pa.move_sink(sink.index, self.last_output_name)
             else:
                 return
         else:
             self.pa_sinks[index].volume = volume
-        
+
         if self.pref:
             self.pref.update_client( self.pa_clients_by_id[client_index] )
         self.on_active_window_change( self.last_application, "pa")
@@ -344,10 +343,11 @@
         if self.pa_sinks.has_key(index):
             sink = self.pa_sinks[index]
             sink.volume_meter = level
-            if(level > sink.client.volume_step): sink.volume_meter_last_non_zero = time.mktime(datetime.datetime.now().timetuple())
+            if (level > sink.client.volume_step):
+                sink.volume_meter_last_non_zero = time.mktime(datetime.datetime.now().timetuple())
 
     def on_remove_pa_sink(self, index):
-        print 
+        print
         print "== pa remove sink input =="
         print index
         if self.pa_sinks.has_key(index):
@@ -357,7 +357,7 @@
             if self.pref:
                 self.pref.update_client( client )
             self.on_active_window_change( self.last_application, "pa")
-        
+
 
     def get_unregistered_clients(self):
         clients = []
@@ -371,11 +371,11 @@
         return clients
 
     def on_new_pa_client(self, index, name):
-        print 
+        print
         print "== pa sink client =="
         print name
         # Link all clients with same name into same object
-        if not self.pa_clients.has_key(index) or not self.pa_clients[index].name == name: 
+        if not self.pa_clients.has_key(index) or not self.pa_clients[index].name == name:
             if not self.pa_clients.has_key(name):
                 client = Client(self, name)
                 self.pa_clients[name] = client
@@ -419,10 +419,10 @@
             self.last_application = application
 
     def match_client_to_application(self, client, application, index=0):
-        if client.test_focus_window(application.window_name, application.command, application.name): 
+        if client.test_focus_window(application.window_name, application.command, application.name):
             #print "MATCH pa client:", client.name, index
 
-            client.fullscreen = application.fullscreen  
+            client.fullscreen = application.fullscreen
             client.icon = application.icon
             client.icon_name = application.icon_name
             client.description = application.description
@@ -447,13 +447,3 @@
         if name.startswith(alsa_plugin):
             name = name[len(alsa_plugin): -1]
         return name
-
-
-if __name__ == '__main__':
-
-    os.chdir(os.path.dirname(sys.argv[0]))
-
-    ec = EarCandy()
-    ec.run()
-    ec.save()
-    
 
=== renamed file 'EarCandyAppSelect.py' => 'earcandylib/EarCandyAppSelect.py'
--- EarCandyAppSelect.py	2009-02-20 02:08:20 +0000
+++ earcandylib/EarCandyAppSelect.py	2009-05-22 15:58:21 +0000
@@ -16,14 +16,15 @@
 from glade_window import GladeWindow
 from window.WindowWatcher import WindowWatcher
 from Client import Client
+from Paths import get_data_path
 
 class EarCandyAppSelect(GladeWindow):
     def __init__(self, core):
-        
+
         self.core = core
-        
-        GladeWindow.__init__(self, "pulseoptions.glade", "dialog_select")
-        
+
+        GladeWindow.__init__(self, get_data_path("pulseoptions.glade"), "dialog_select")
+
         self.combobox_clients = self.wtree.get_widget("combobox_clients")
         self.treeview_applications = self.wtree.get_widget("treeview_applications")
         self.combobox_category = self.wtree.get_widget("combobox_category")
@@ -33,7 +34,7 @@
             "on_button_cancel_clicked" : self.on_button_cancel_clicked
         }
         self.wtree.signal_autoconnect(signals)
-         
+
         # Setup tree
         column = gtk.TreeViewColumn((''))
         column.set_spacing(4)
@@ -48,8 +49,8 @@
         column.set_attributes(cell, markup=1)
         self.treeview_applications.append_column(column)
         self.store = gtk.ListStore(gtk.gdk.Pixbuf, str, object)
-        self.treeview_applications.set_model(self.store) 
-        self.store.set_sort_column_id(1, gtk.SORT_ASCENDING) 
+        self.treeview_applications.set_model(self.store)
+        self.store.set_sort_column_id(1, gtk.SORT_ASCENDING)
 
         self.update()
 
@@ -65,8 +66,8 @@
             if self.store.get_value(iter, 1) == app_name: return
             iter = self.store.iter_next(iter)
 
-        self.store.append(([icon, app_name, client])) 
-        
+        self.store.append(([icon, app_name, client]))
+
     def update(self):
 
         icon_theme = gtk.icon_theme_get_default()
@@ -76,7 +77,7 @@
             self.combobox_clients.append_text(client.name)
 
         for app in self.core.ww.applications.values():
-            self.store.append(([app.icon, app.name, app])) 
+            self.store.append(([app.icon, app.name, app]))
 
         self.combobox_clients.set_active(0)
 
@@ -88,7 +89,7 @@
     def on_button_add_clicked(self, widget):
 
         client = self.core.pa_clients[self.combobox_clients.get_active_text()]
-        
+
 
         # override with selected app
         model, iter =  self.treeview_applications.get_selection().get_selected()
@@ -107,6 +108,6 @@
 
         self.core.pref.update_client( client )
         self.stop()
-    
+
     def on_button_cancel_clicked(self, widget):
         self.stop()
 
=== renamed file 'EarCandyDBus.py' => 'earcandylib/EarCandyDBus.py'
--- EarCandyDBus.py	2009-05-19 04:28:48 +0000
+++ earcandylib/EarCandyDBus.py	2009-05-22 15:58:21 +0000
@@ -6,10 +6,9 @@
 DBUS_KEY = "org.earCandy.EarCandyDBus2"
 
 class EarCandyDBusClient(dbus.service.Object):
-    
+
     def __init__(self, core):
         self.core = core
-    
 
     def is_running(self):
         dbus.mainloop.glib.DBusGMainLoop (set_as_default=True)
@@ -34,7 +33,7 @@
         dbus.mainloop.glib.DBusGMainLoop (set_as_default=True)
         bus = dbus.SessionBus ()
         dbus.service.Object.__init__(self, bus, "/", DBUS_KEY)
-        print    
+        print
         print "registered as dbus service..."
         print
 
 
=== added file 'earcandylib/EarCandyInfo.py'
--- earcandylib/EarCandyInfo.py	1970-01-01 00:00:00 +0000
+++ earcandylib/EarCandyInfo.py	2009-05-23 11:53:46 +0000
@@ -0,0 +1,8 @@
+NAME         = "Ear Candy"
+APPNAME      = "earcandy"
+VERSION      = "0.5"
+DESC         = "A PulseAudio volume manager"
+WEBSITE      = "http://edge.launchpad.net/earcandy"
+AUTHOR       = "Jason Taylor"
+AUTHOR_EMAIL = "[e-mail]"
+LICENSE      = "GNU GPL v2"
 
=== renamed file 'EarCandyPrefs.py' => 'earcandylib/EarCandyPrefs.py'
--- EarCandyPrefs.py	2009-05-19 04:28:48 +0000
+++ earcandylib/EarCandyPrefs.py	2009-05-22 15:58:21 +0000
@@ -17,15 +17,16 @@
 from Threads import threaded
 from glade_window import GladeWindow
 from EarCandyAppSelect import EarCandyAppSelect
+from Paths import get_data_path
 
 class EarCandayPref(GladeWindow):
     def __init__(self, core):
-        
+
         self.core = core
 
         self.vals = {"" : 0, "music" : 1, "video" : 2, "phone": 3}
 
-        GladeWindow.__init__(self, "pulseoptions.glade", "dialog_options")
+        GladeWindow.__init__(self, get_data_path("pulseoptions.glade"), "dialog_options")
 
         self.treeview_pulse_clients = self.wtree.get_widget("treeview_pulse_clients")
         self.label_pulse_client = self.wtree.get_widget("label_pulse_client")
@@ -63,9 +64,9 @@
             "on_comboboxentry_window_match_changed" : self.on_comboboxentry_window_match_changed,
             "on_entry_pulse_client_description_changed" : self.on_entry_pulse_client_description_changed,
             "on_toolbutton_delete_clicked" : self.on_toolbutton_delete_clicked,
-            
-            "on_hscale_mute_level_value_changed" : self.on_hscale_mute_level_value_changed,   
-            "on_hscale_fade_value_changed" : self.on_hscale_fade_value_changed,         
+
+            "on_hscale_mute_level_value_changed" : self.on_hscale_mute_level_value_changed,
+            "on_hscale_fade_value_changed" : self.on_hscale_fade_value_changed,
 
             "on_close_button_clicked" : self.on_close_button_clicked,
             "on_button_add_new_clicked" : self.on_button_add_new_clicked,
@@ -74,7 +75,7 @@
             "on_checkbutton_output_toggled" : self.on_checkbutton_output_toggled
         }
         self.wtree.signal_autoconnect(signals)
-                
+
         # Setup tree
         #column = gtk.TreeViewColumn('Target', gtk.CellRendererProgress(), value=4)
         #self.treeview_pulse_clients.append_column(column)
@@ -145,7 +146,7 @@
 
         self.selected_client = model.get_value(iter, 5)
         self.selected_client.window_position_fade = model[path][3]
-        
+
     def on_hscale_mute_level_value_changed(self, widget):
         self.core.mute_level = self.hscale_mute_level.get_value()
         print "Mute Level ", self.core.mute_level
@@ -170,7 +171,8 @@
         model, iter =  self.treeview_pulse_clients.get_selection().get_selected()
         if not iter: return
         self.selected_client = model.get_value(iter, 2)
-        md = gtk.MessageDialog(None, flags=0, type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_YES_NO, message_format="Are you sure you want to delete this rule?") 
+        md = gtk.MessageDialog(None, flags=0, type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_YES_NO,
+                               message_format="Are you sure you want to delete this rule?")
         result = md.run()
         md.destroy()
         if result == gtk.RESPONSE_YES:
@@ -179,17 +181,20 @@
                     del self.core.pa_clients[ key ]
             self.store.remove(iter)
         self.core.save()
-        
+
     def on_button_add_new_clicked(self, widget):
-        
+
         if len(self.core.get_unregistered_clients()) > 0:
-        
+
             ecas = EarCandyAppSelect(self.core)
             client = ecas.run()
             if client:
                 self.update_client( client )
         else:
-            md = gtk.MessageDialog(self.window, flags=0, type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_OK, message_format="There are currently no pulseaudio streams unassigned,\n\nYou will need to start your sound application playing first") 
+            md = gtk.MessageDialog(self.window, flags=0,
+                                   type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_OK,
+                                   message_format="There are currently no PulseAudio streams assigned.\n\n"
+                                                  "You will need to start your sound application playing first")
             result = md.run()
             md.destroy()
 
@@ -201,9 +206,9 @@
 
     def on_entry_command_changed(self, widget):
         self.current_client.rule_re_command = re.compile(widget.get_text(), re.IGNORECASE)
-    
+
     def on_entry_window_title_changed(self, widget):
-        self.current_client.rule_re_window_title = re.compile(widget.get_text(), re.IGNORECASE)        
+        self.current_client.rule_re_window_title = re.compile(widget.get_text(), re.IGNORECASE)
 
     def on_combobox_profile_changed(self, widget):
         for key in self.vals.keys():
@@ -213,7 +218,7 @@
 
     def on_vscale_volume_change_value(self, widget, a, b):
         self.current_client.volume_default = self.vscale_volume.get_value()
-        
+
     def on_vscale_mute_change_value(self, widget, a, b):
         self.current_client.volume_mute = self.vscale_mute.get_value()
 
@@ -222,24 +227,24 @@
         if cvh.description:
             text = cvh.description
         model.set_value(iter,1, text)
-        
-    def on_entry_pulse_client_description_changed(self, widget):       
+
+    def on_entry_pulse_client_description_changed(self, widget):
         model, iter =  self.treeview_pulse_clients.get_selection().get_selected()
-        cvh = model.get_value(iter, 5) 
+        cvh = model.get_value(iter, 5)
         #cvh.description = self.entry_pulse_client_description.get_text()
         self.update_label(cvh, model, iter)
-        
+
     def on_comboboxentry_window_match_changed(self, widget):
         model, iter =  self.treeview_pulse_clients.get_selection().get_selected()
-        cvh = model.get_value(iter, 5) 
+        cvh = model.get_value(iter, 5)
         cvh.window_name_rule = self.comboboxentry_window_match.get_text()
-        
+
     def on_treeview_pulse_clients_cursor_changed(self, widget):
         model, iter =  self.treeview_pulse_clients.get_selection().get_selected()
         if not iter: return
         self.selected_client = model.get_value(iter, 5)
         self.__update_detail( self.selected_client)
-    
+
     def on_checkbutton_channel_window_toggled(self, widget):
         self.current_client.window_position_fade = self.checkbutton_channel_window.get_active()
 
@@ -249,7 +254,6 @@
 
     def on_close_button_clicked(self,widget=None):
         self.stop()
-        
 
     def __get_title(self, client):
         text = client.name
@@ -262,15 +266,17 @@
             client.iter = None
 
         self.store = gtk.ListStore(gtk.gdk.Pixbuf, str, str, bool, int, object)
-        self.treeview_pulse_clients.set_model(self.store) 
+        self.treeview_pulse_clients.set_model(self.store)
 
         icon_theme = gtk.icon_theme_get_default()
         icon = icon_theme.lookup_icon("audio-volume-medium", 32, 0).load_icon()
         for client in self.core.pa_clients.values()  :
             if client.category and client.is_active() and not (client.name in self.core.ignore):
-                client.iter = self.store.append(([client.icon or icon, self.__get_title(client), self.core.display[client.category], client.window_position_fade, 50, client])) 
+                client.iter = self.store.append(([client.icon or icon, self.__get_title(client),
+                                                  self.core.display[client.category],
+                                                  client.window_position_fade, 50, client]))
 
-        self.store.set_sort_column_id(1, gtk.SORT_ASCENDING)  
+        self.store.set_sort_column_id(1, gtk.SORT_ASCENDING)
 
     def update_client(self, client):
 
@@ -303,12 +309,15 @@
             if client.has_rule() and not client.name in self.core.ignore:
                 icon_theme = gtk.icon_theme_get_default()
                 icon = icon_theme.lookup_icon("audio-volume-medium", 32, 0).load_icon()
-                client.iter = self.store.append(([client.icon or icon, self.__get_title(client), self.core.display[client.category], client.window_position_fade, client.get_volume(), client])) 
+                client.iter = self.store.append(([client.icon or icon, self.__get_title(client),
+                                                  self.core.display[client.category],
+                                                  client.window_position_fade, client.get_volume(),
+                                                  client]))
 
         self.store.set_sort_column_id(1,gtk.SORT_ASCENDING)
 
     def run(self):
-        self.window.show()  
+        self.window.show()
         self.hscale_mute_level.set_value(self.core.mute_level)
         self.hscale_fade.set_value(self.core.fade_timer_speed)
         self.checkbutton_tray.set_active( self.core.tray.get_visible() )
@@ -320,19 +329,14 @@
         self.core.save()
         self.core.close_preferances()
         self.window.destroy()
-    
+
     @threaded
     def remove_client_on_timer(self, client):
         #time.sleep(60)
         #gobject.idle_add(self.remove_client, client) 
         return
-    
+
     def remove_client(self, client):
         if not client.is_active() and client.iter :
             self.store.remove(client.iter)
             client.iter = None
-
-
-
-
-
 
=== renamed file 'Freedesktop.py' => 'earcandylib/Freedesktop.py'
--- Freedesktop.py	2009-02-06 10:31:04 +0000
+++ earcandylib/Freedesktop.py	2009-05-22 15:58:21 +0000
@@ -81,7 +81,7 @@
 		items.sort()
 		for item in items:
 			file_object.write(item[0] + '=' + item[1] + '\n')
-	
+
 	# turn command into an array
 	def get_exec_array(self):
 		command = []
@@ -89,4 +89,3 @@
 		for r in re.finditer(p, self.get("Exec")):
 			command.append( str(r.group(0)) )
 		return command
-			
 
=== added file 'earcandylib/Paths.py'
--- earcandylib/Paths.py	1970-01-01 00:00:00 +0000
+++ earcandylib/Paths.py	2009-05-23 12:53:07 +0000
@@ -0,0 +1,27 @@
+
+from os.path import isdir, isfile, join, dirname, abspath
+
+
+DATA_DIR = None
+
+
+_path = abspath(join(dirname(__file__), '..', 'data'))
+if isdir(_path):
+    DATA_DIR = _path
+else:
+    # We are installed on the system
+    for prefix in ["/usr", "/usr/local"]:
+        _path = join(prefix, "share", "earcandy")
+        if isdir(_path):
+            DATA_DIR = _path
+
+if DATA_DIR == None:
+    raise IOError, "cannot find data directory"
+
+
+def get_data_path(filename):
+    path = join(DATA_DIR, filename)
+    if isfile(path):
+        return path
+    else:
+        raise IOError, "file not found"
 
=== renamed file 'Sink.py' => 'earcandylib/Sink.py'
--- Sink.py	2009-05-19 04:28:48 +0000
+++ earcandylib/Sink.py	2009-05-22 15:58:21 +0000
@@ -1,6 +1,6 @@
-import math  
+import math
 import time
-          
+
 class Sink():
     def __init__(self, index, name, volume, client, channels=1):
 
@@ -15,7 +15,7 @@
 
         self.__previous_left = 0
         self.__previous_right = 0
- 
+
     def set_volume(self):
 
         if len(self.volume) > 2:
@@ -26,9 +26,9 @@
             # Mono channel
             target_volume = round(self.volume[1])
 
-        if target_volume < self.client.volume_target:      
+        if target_volume < self.client.volume_target:
             target_volume = round(target_volume + self.client.volume_step)
-        elif target_volume > self.client.volume_target: 
+        elif target_volume > self.client.volume_target:
             target_volume = round(target_volume - self.client.volume_step)
 
         if len(self.volume) > 2:
@@ -38,7 +38,7 @@
             if len(self.volume) > 2:
                 if self.client.balance < 0: left = math.fabs(target_volume - (target_volume / 100 * self.client.balance))
                 if self.client.balance > 0: right = math.fabs(target_volume - (target_volume / 100 * self.client.balance))
-            
+
             if self.volume[1] < left:
                 self.volume[1] = round(self.volume[1]) + self.client.volume_step
             if self.volume[1] > left:
@@ -57,20 +57,20 @@
         else:
             self.volume[1] = round(target_volume)
             self.volume.append(target_volume) #FIXME: remove second channel volume
- 
+
         # we dont want to get stuck in a loop because volumes arn't exactly the same  
         result = math.fabs(self.volume[1] - self.__previous_left) > self.client.volume_step / 2
         result = result and (math.fabs(self.volume[2] - self.__previous_right) > self.client.volume_step /2)
-        
+
         # We never want a zero volume as we cant read meter levels from zero volume
         result = result and not self.volume[1] == self.client.volume_step
-        result = result and not self.volume[2] == self.client.volume_step    
+        result = result and not self.volume[2] == self.client.volume_step
         if result:
             print
             print "Adjust Volume", self.client.name, self.volume[1] , self.__previous_left
 
         self.__previous_left = self.volume[1]
         self.__previous_right =  self.volume[2]
-       
+
         return result
 
 
=== renamed file 'Threads.py' => 'earcandylib/Threads.py'
=== renamed file 'TrayIcon.py' => 'earcandylib/TrayIcon.py'
--- TrayIcon.py	2009-05-19 04:28:48 +0000
+++ earcandylib/TrayIcon.py	2009-05-22 15:58:21 +0000
@@ -1,15 +1,17 @@
 #!/usr/bin/env python
 
-import os
 import sys
 import gtk
 
+import EarCandyInfo
+from Paths import get_data_path
+
 
 class EarCandyStatusIcon(gtk.StatusIcon):
     def __init__(self, core):
         gtk.StatusIcon.__init__(self)
         self.core = core
-        
+
         menu = '''
             <ui>
              <menubar name="Menubar">
@@ -44,7 +46,7 @@
         #
         #self.core.slider.window.present()
         self.core.slider.window.set_position(gtk.WIN_POS_MOUSE)
-        screen, rect, orin = self.get_geometry()           
+        screen, rect, orin = self.get_geometry()
         x, y = self.core.slider.window.get_position()
         if rect.y - rect.height/2 > y - rect.height:
             self.core.slider.window.move(x, y + rect.height)
@@ -58,24 +60,24 @@
 
     def on_about(self, data):
         dialog = gtk.AboutDialog()
-        dialog.set_name('Ear Candy')
-        dialog.set_version('0.4')
-        dialog.set_comments('A pulse audio ear candy manager')
-        dialog.set_website('http://edge.launchpad.net/eyecandy')
+        dialog.set_name(EarCandyInfo.NAME)
+        dialog.set_version(EarCandyInfo.VERSION)
+        dialog.set_comments(EarCandyInfo.DESC)
+        dialog.set_website(EarCandyInfo.WEBSITE)
         dialog.run()
         dialog.destroy()
-    
+
 
     def set_icon(self):
         if self.core.active:
-            icon_path = os.path.join(os.path.dirname(__file__),"earsLabel.png")
+            icon_path = get_data_path("earsLabel.png")
         else:
-            icon_path = os.path.join(os.path.dirname(__file__),"earsLabelOff.png")
+            icon_path = get_data_path("earsLabelOff.png")
         self.set_from_file( icon_path )
 
     def stop(self, data=None):
         gtk.main_quit()
-        
+
 if __name__ == '__main__':
     ts = TrackerStatusIcon()
     ts.run()
 
=== renamed file 'VolumeSlider.py' => 'earcandylib/VolumeSlider.py'
--- VolumeSlider.py	2009-05-19 04:28:48 +0000
+++ earcandylib/VolumeSlider.py	2009-05-22 15:58:21 +0000
@@ -16,13 +16,14 @@
 from glade_window import GladeWindow
 from window.WindowWatcher import WindowWatcher
 from Client import Client
+from Paths import get_data_path
 
 class EarCandyVolumeSlider(GladeWindow):
     def __init__(self, core):
         self.core = core
-            
-        GladeWindow.__init__(self, "pulseoptions.glade", "popup_volume_control")
-        
+
+        GladeWindow.__init__(self, get_data_path("pulseoptions.glade"), "popup_volume_control")
+
         self.vscale_volume = self.wtree.get_widget("vscale_volume")
         self.image_status = self.wtree.get_widget("image_status")
 
@@ -48,7 +49,7 @@
             self.image_status.set_from_stock("gtk-media-pause", 4)
         else:
             self.image_status.set_from_stock("gtk-media-play", 4)
-        
+
         self.core.tray.set_icon()
         self.stop()
 
 
=== added file 'earcandylib/__init__.py'
=== renamed file 'glade_window.py' => 'earcandylib/glade_window.py'
--- glade_window.py	2008-10-09 20:37:12 +0000
+++ earcandylib/glade_window.py	2009-05-22 15:58:21 +0000
@@ -18,9 +18,9 @@
         self.wtree = gtk.glade.XML(glade_file)
         self.window = self.wtree.get_widget(window_name)
         self.window.connect("destroy", self.on_destroy)
-        
+
     def run(self):
-        self.window.show()   
+        self.window.show()
         gtk.main()
         return self.return_value
 
 
=== renamed directory 'pulseaudio' => 'earcandylib/pulseaudio'
=== renamed directory 'window' => 'earcandylib/window'
=== modified file 'earcandylib/window/WindowWatcher.py'
--- window/WindowWatcher.py	2009-05-11 22:27:41 +0000
+++ earcandylib/window/WindowWatcher.py	2009-05-22 14:14:10 +0000
@@ -6,7 +6,7 @@
 import wnck
 import gobject
 import os
-from DesktopFiles import DesktopFiles
+from earcandylib.DesktopFiles import DesktopFiles
 
 class Application():
     def __init__(self, command, name, desktop_files, icon):
 
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2009-05-23 12:26:12 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+from glob import glob
+
+from earcandylib.EarCandyInfo import *
+
+DATA_FILES  = [('share/earcandy', glob('data/*'))]
+DATA_FILES += [('share/applications', ['earcandy.desktop'])]
+DATA_FILES += [('share/pixmaps', ['data/earsLabel.png'])]
+
+setup(name         = APPNAME,
+      version      = VERSION,
+      description  = DESC,
+      author       = AUTHOR,
+      author_email = AUTHOR_EMAIL,
+      url          = WEBSITE,
+      license      = LICENSE,
+      packages     = ['earcandylib', 'earcandylib.pulseaudio', 'earcandylib.window'],
+      data_files   = DATA_FILES,
+      scripts      = ['earcandy'])