nikdoof/oblogout
1
0
Fork 0
mirror of https://github.com/nikdoof/oblogout.git synced 2026-01-30 09:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganise theme loading to work correctly, fixes LP #324130

Browse Source
This commit is contained in:
Andrew Williams
2009-02-14 09:45:00 +00:00
parent db54167c52
commit bb49ab4195
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oblogout-dev.sh
View File

@@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
OBLOGOUT_PATH=`dirname $0` OBLOGOUT_PATH=`dirname $0`
PYTHONPATH="$PYTHONPATH:$OBLOGOUT_PATH" python $OBLOGOUT_PATH/data/oblogout -l $* PYTHONPATH="$PYTHONPATH:$OBLOGOUT_PATH" python $OBLOGOUT_PATH/data/oblogout -l -v $*

21
oblogout/oblogout.py
View File

@@ -181,11 +181,6 @@ class OpenboxLogout():
""" Load the configuration file and parse entries, when encountering a issue """ Load the configuration file and parse entries, when encountering a issue
change safe defaults """ change safe defaults """
if self.local_mode:
self.img_path = "data/themes"
else:
self.img_path = "%s/share/themes" % sys.prefix
self.parser = ConfigParser.SafeConfigParser() self.parser = ConfigParser.SafeConfigParser()
self.parser.read(config) self.parser.read(config)
@@ -218,12 +213,20 @@ class OpenboxLogout():
self.shortcut_keys = self.parser.items("shortcuts") self.shortcut_keys = self.parser.items("shortcuts")
self.logger.debug("Shortcut Options: %s" % self.shortcut_keys) self.logger.debug("Shortcut Options: %s" % self.shortcut_keys)
if self.local_mode:
self.theme_prefix = "./data/themes"
else:
self.theme_prefix = "%s/share/themes" % sys.prefix
self.img_path = "%s/%s/oblogout" % (self.theme_prefix, self.button_theme)
if os.path.exists("%s/.themes/%s/oblogout" % (os.environ['HOME'], self.button_theme)): if os.path.exists("%s/.themes/%s/oblogout" % (os.environ['HOME'], self.button_theme)):
# Found a valid theme folder in the userdir, use that # Found a valid theme folder in the userdir, use that
self.img_path = "%s/.themes/%s/oblogout" % (os.environ['HOME'], self.button_theme) self.img_path = "%s/.themes/%s/oblogout" % (os.environ['HOME'], self.button_theme)
self.logger.info("Using user theme at %s" % self.img_path) self.logger.info("Using user theme at %s" % self.img_path)
else: else:
if not os.path.exists('%s/%s/oblogout/' % (self.img_path, self.button_theme)): if not os.path.exists("%s/%s/oblogout" % (self.theme_prefix, self.button_theme)):
self.logger.warning("Button theme %s not found, reverting to default" % self.button_theme) self.logger.warning("Button theme %s not found, reverting to default" % self.button_theme)
self.button_theme = 'foom' self.button_theme = 'foom'
@@ -315,10 +318,10 @@ class OpenboxLogout():
box = gtk.VBox() box = gtk.VBox()
image = gtk.Image() image = gtk.Image()
if os.path.exists("%s/%s/oblogout/%s.svg" % (self.img_path, self.button_theme, name)): if os.path.exists("%s/%s.svg" % (self.img_path, name)):
image.set_from_file("%s/%s/oblogout/%s.svg" % (self.img_path, self.button_theme, name)) image.set_from_file("%s/%s.svg" % (self.img_path, name))
else: else:
image.set_from_file("%s/%s/oblogout/%s.png" % (self.img_path, self.button_theme, name)) image.set_from_file("%s/%s.png" % (self.img_path, name))
image.show() image.show()
button = gtk.Button() button = gtk.Button()