Merge branch 'master' into icon-themes
* separate color themes from icons * each theme can now use one or more icon themes * icons are chosen in a "first match" fashion fixes #17
This commit is contained in:
commit
a93fa4aa5c
45 changed files with 296 additions and 24 deletions
|
@ -51,8 +51,12 @@ class Output(bumblebee.output.Output):
|
|||
"separator_block_width": 0,
|
||||
})
|
||||
|
||||
sep = theme.default_separators(widget)
|
||||
sep = sep if sep else False
|
||||
width = theme.separator_block_width(widget)
|
||||
width = width if width else 0
|
||||
self._data.append({
|
||||
u"full_text": " {} {} {} ".format(
|
||||
u"full_text": " {} {} {}".format(
|
||||
theme.prefix(widget),
|
||||
widget.text(),
|
||||
theme.suffix(widget)
|
||||
|
@ -61,8 +65,8 @@ class Output(bumblebee.output.Output):
|
|||
"background": theme.background(widget),
|
||||
"name": widget.module(),
|
||||
"instance": widget.instance(),
|
||||
"separator": theme.default_separators(widget),
|
||||
"separator_block_width": theme.separator_block_width(widget),
|
||||
"separator": sep,
|
||||
"separator_block_width": width,
|
||||
})
|
||||
theme.next_widget()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue