RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed battery icons in systray menu items

This commit is contained in:
Daniel Pavel 2013-06-02 01:11:04 +02:00
parent 16095544cb
commit 149758ccab
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/solaar/ui/icons.py
View File

@ -24,7 +24,7 @@ Gtk.IconSize.LARGE = Gtk.icon_size_register('large', _LARGE_SIZE, _LARGE_SIZE)
# print ("dnd", int(Gtk.IconSize.DND), Gtk.icon_size_lookup(Gtk.IconSize.DND))
# print ("dialog", int(Gtk.IconSize.DIALOG), Gtk.icon_size_lookup(Gtk.IconSize.DIALOG))
APP_ICON = { 1: 'solaar', 2: 'solaar-mask', 0: 'solaar-init', -1: 'solaar-fail' }
APP_ICON = ('solaar-init', 'solaar', 'solaar-fail')
_default_theme = Gtk.IconTheme.get_default()
_log.debug("icon theme paths: %s", _default_theme.get_search_path())

20
lib/solaar/ui/status_icon.py
View File

@ -137,12 +137,13 @@ def _generate_image(icon):
if battery_status is None:
return _icons.APP_ICON[1]
else:
charging = bool(battery_status.get(_status.BATTERY_CHARGING))
icon_name = _icons.battery(battery_level, charging)
if icon_name and 'missing' in icon_name:
icon_name = None
return icon_name or _icons.APP_ICON[1]
assert battery_level < 1000
charging = battery_status.get(_status.BATTERY_CHARGING)
icon_name = _icons.battery(battery_level, charging)
if icon_name and 'missing' in icon_name:
icon_name = None
return icon_name or _icons.APP_ICON[1]
#
#
@ -216,11 +217,10 @@ def _update_menu_item(icon, index, device_status):
menu_item = menu_items[index]
image = menu_item.get_image()
battery_level = device_status.get(_status.BATTERY_LEVEL)
# print ("device_status", dict(device_status), battery_level)
image.set_from_icon_name(_icons.battery(battery_level), _MENU_ICON_SIZE)
level = device_status.get(_status.BATTERY_LEVEL)
charging = device_status.get(_status.BATTERY_CHARGING)
image.set_from_icon_name(_icons.battery(level, charging), _MENU_ICON_SIZE)
image.set_sensitive(bool(device_status))
# menu_item.set_sensitive(bool(device_status))
#
#