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

Merge pull request #314 from alexmohr/master

Browse source 
Fixed status for unknown charge state, added option to weather to hide city
This commit is contained in:
tobi-wan-kenobi 2018-11-03 18:13:13 +01:00 committed by GitHub
commit 453f7f2b54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bumblebee/modules/battery.py
View file

@ -112,6 +112,8 @@ class Module(bumblebee.engine.Module):
pass pass
if charge == "Discharging": if charge == "Discharging":
state.append("discharging-{}".format(min([10, 25, 50, 80, 100], key=lambda i: abs(i-capacity)))) state.append("discharging-{}".format(min([10, 25, 50, 80, 100], key=lambda i: abs(i-capacity))))
elif charge == "Unknown":
state.append("unknown")
else: else:
if capacity > 95: if capacity > 95:
state.append("charged") state.append("charged")

2
bumblebee/modules/datetime.py
View file

@ -30,6 +30,8 @@ class Module(bumblebee.engine.Module):
def __init__(self, engine, config): def __init__(self, engine, config):
super(Module, self).__init__(engine, config, super(Module, self).__init__(engine, config,
bumblebee.output.Widget(full_text=self.get_time)) bumblebee.output.Widget(full_text=self.get_time))
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
cmd=self._app)
self._fmt = self.parameter("format", default_format(self.name)) self._fmt = self.parameter("format", default_format(self.name))
l = locale.getdefaultlocale() l = locale.getdefaultlocale()
if not l or l == (None, None): if not l or l == (None, None):

6
bumblebee/modules/weather.py
View file

@ -32,6 +32,7 @@ class Module(bumblebee.engine.Module):
self._apikey = self.parameter("apikey", "af7bfe22287c652d032a3064ffa44088") self._apikey = self.parameter("apikey", "af7bfe22287c652d032a3064ffa44088")
self._location = self.parameter("location", "auto") self._location = self.parameter("location", "auto")
self._city = self.parameter("location", "") self._city = self.parameter("location", "")
self._showcity = bumblebee.util.asbool(self.parameter("showcity", True))
self._unit = self.parameter("unit", "metric") self._unit = self.parameter("unit", "metric")
self._valid = False self._valid = False
self.interval(15) self.interval(15)
@ -55,7 +56,10 @@ class Module(bumblebee.engine.Module):
def output(self, widget): def output(self, widget):
if not self._valid: if not self._valid:
return u"?" return u"?"
return self.city() + self.temperature() if self._showcity:
return self.city() + self.temperature()
else:
return self.temperature()
def state(self, widget): def state(self, widget):
if self._valid: if self._valid: