summaryrefslogtreecommitdiffstats
path: root/pulsecaster
diff options
context:
space:
mode:
authorJürgen Geuter <tante@the-gay-bar.com>2010-02-20 01:15:03 +0100
committerJürgen Geuter <tante@the-gay-bar.com>2010-02-20 01:15:03 +0100
commit23e22eeb90bb095248d068e40f96ba8c34532a88 (patch)
tree25a35d99b0c3c7d6101afc9755cf8ac98310bb9f /pulsecaster
parent821887f1c3415adae5895477b7b46fd6d708fc1e (diff)
downloadpulsecaster-23e22eeb90bb095248d068e40f96ba8c34532a88.tar.gz
pulsecaster-23e22eeb90bb095248d068e40f96ba8c34532a88.tar.xz
pulsecaster-23e22eeb90bb095248d068e40f96ba8c34532a88.zip
Towards a working distutils setup
Diffstat (limited to 'pulsecaster')
-rw-r--r--pulsecaster/pulsecaster2
-rw-r--r--pulsecaster/ui.py19
2 files changed, 16 insertions, 5 deletions
diff --git a/pulsecaster/pulsecaster b/pulsecaster/pulsecaster
index 9ec286e..5964cbc 100644
--- a/pulsecaster/pulsecaster
+++ b/pulsecaster/pulsecaster
@@ -22,5 +22,5 @@
from pulsecaster import ui
import gtk
-pk = ui.PulseCasterUi()
+pk = ui.PulseCasterUI()
gtk.main()
diff --git a/pulsecaster/ui.py b/pulsecaster/ui.py
index 6e49f80..fc5431e 100644
--- a/pulsecaster/ui.py
+++ b/pulsecaster/ui.py
@@ -25,13 +25,14 @@ from pulseaudio.PulseObj import PulseObj
from listener import *
import gtk
import os
+import sys
+import glob
import gobject
import pygst
pygst.require('0.10')
import gst
-# FIXME
-fname = os.getcwd() + '/data/pulsecaster.glade'
+#fname = os.getcwd() + '/data/pulsecaster.glade'
_debug = True
def _debugPrint(text):
@@ -41,9 +42,19 @@ def _debugPrint(text):
class PulseCasterUI:
def __init__(self):
self.builder = gtk.Builder()
- self.builder.add_from_file(fname)
+ try:
+ self.builder.add_from_file(os.path.join(os.getcwd(),'data','pulsecaster.glade')
+)
+ _debugPrint("loading glade file from current subdir")
+ except:
+ try:
+ self.builder.add_from_file(os.path.join(sys.prefix,'share','pulsecaster','pulsecaster.glade'))
+ except Exception,e:
+ print(e)
+ raise SystemExit("Cannot load resources")
+
self.icontheme = gtk.icon_theme_get_default()
- self.icontheme.append_search_path(os.path.join('/usr/share', NAME))
+
# Convenience for developers
self.icontheme.append_search_path(os.path.join(os.getcwd(),
'data/icons/scalable'))