l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core/theme] Add ~/.config/bumblebee-status/themes to theme directories

Browse source 
Allow users to create themes outside the main theme tree.

see #203
This commit is contained in:
Tobias Witek 2017-11-05 09:08:01 +01:00
parent 760cc4252f
commit f72ac0ca99
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bumblebee/theme.py
View file

@ -12,12 +12,16 @@ import bumblebee.error
def theme_path():
"""Return the path of the theme directory"""
return os.path.dirname("{}/../themes/".format(os.path.dirname(os.path.realpath(__file__))))
return [
os.path.dirname("{}/../themes/".format(os.path.dirname(os.path.realpath(__file__)))),
os.path.dirname(os.path.expanduser("~/.config/bumblebee-status/themes/")),
]
def themes():
result = []
for filename in glob.iglob("{}/*.json".format(theme_path())):
for path in theme_path():
for filename in glob.iglob("{}/*.json".format(path)):
if "test" not in filename:
result.append(os.path.basename(filename).replace(".json", ""))
return result
@ -119,12 +123,17 @@ class Theme(object):
def _load_icons(self, name):
"""Load icons for a theme"""
path = "{}/icons/".format(theme_path())
return self.load(name, path=path)
result = {}
for path in theme_path():
self._merge(result, self.load(name, path="{}/icons/".format(path)))
return result
def load(self, name, path=theme_path()):
"""Load and parse a theme file"""
themefile = "{}/{}.json".format(path, name)
if not isinstance(path, list):
path = [path]
for p in path:
themefile = "{}/{}.json".format(p, name)
if os.path.isfile(themefile):
try:
@ -132,8 +141,8 @@ class Theme(object):
return json.load(data)
except ValueError as exception:
raise bumblebee.error.ThemeLoadError("JSON error: {}".format(exception))
else:
raise bumblebee.error.ThemeLoadError("no such theme: {}".format(name))
return {}
def _get(self, widget, name, default=None):
"""Return the config value 'name' for 'widget'"""