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

[core/widget] Make module an attribute

Browse source 
Instead of having an artifical getter/setter method, just make module a
plain attribute.
This commit is contained in:
tobi-wan-kenobi 2020-04-30 12:46:57 +02:00
parent 9cd9ff626d
commit b27956071f
8 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/module.py
View file

@ -33,7 +33,7 @@ class Module(core.input.Object):
self.__config = config
self.__widgets = widgets if isinstance(widgets, list) else [ widgets ]
for widget in self.__widgets:
widget.module(self)
widget.module = self
self.__name = None
self.alias = self.__config.get('__alias__', None)
self.next_update = None

2
core/output.py
View file

@ -162,7 +162,7 @@ class i3(object):
def blocks(self, module):
blocks = []
for widget in module.widgets():
if widget.module() and self.__config.autohide(widget.module().name()):
if widget.module and self.__config.autohide(widget.module.name()):
if not any(state in widget.state() for state in [ 'warning', 'critical']):
continue
if module.hidden():

4
core/theme.py
View file

@ -114,8 +114,8 @@ class Theme(object):
value = merge_replace(value, self.__data.get(key, value), key)
if widget.module():
value = merge_replace(value, self.get(widget.module().name(), None, {}).get(key, value), key)
if widget.module:
value = merge_replace(value, self.get(widget.module.name(), None, {}).get(key, value), key)
if not key in widget.state():
for state in widget.state():

11
core/widget.py
View file

@ -6,7 +6,7 @@ class Widget(util.store.Store, core.input.Object):
def __init__(self, full_text='', name=None, module=None):
super(Widget, self).__init__()
self.__full_text = full_text
self.__module = module
self.module = module
self.name = name
def full_text(self, value=None):
@ -17,18 +17,13 @@ class Widget(util.store.Store, core.input.Object):
return self.__full_text(self)
return self.__full_text
def module(self, module=None):
if not module:
return self.__module
self.__module = module
def state(self):
rv = []
if self.get('state', None):
tmp = self.get('state')
rv = tmp[:] if isinstance(tmp, list) else [tmp]
if self.__module:
tmp = self.__module.state(self)
if self.module:
tmp = self.module.state(self)
rv.extend(tmp if isinstance(tmp, list) else [tmp])
return rv