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

ui: hide system tray icon when there are no devices to control

This commit is contained in:
Peter F. Patel-Schneider 2022-01-10 18:33:32 -05:00
parent 12779e7061
commit 1ace3ef4f4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/solaar/ui/tray.py
View File

@ -197,9 +197,12 @@ try:
return ind return ind
def _destroy(indicator): def _hide(indicator):
indicator.set_status(AppIndicator3.IndicatorStatus.PASSIVE) indicator.set_status(AppIndicator3.IndicatorStatus.PASSIVE)
def _show(indicator):
indicator.set_status(AppIndicator3.IndicatorStatus.ACTIVE)
def _update_tray_icon(): def _update_tray_icon():
if _picked_device and gtk.battery_icons_style != 'solaar': if _picked_device and gtk.battery_icons_style != 'solaar':
_ignore, _ignore, name, device_status = _picked_device _ignore, _ignore, name, device_status = _picked_device
@ -246,9 +249,12 @@ except ImportError:
return icon return icon
def _destroy(icon): def _hide(icon):
icon.set_visible(False) icon.set_visible(False)
def _show(icon):
icon.set_visible(True)
def _update_tray_icon(): def _update_tray_icon():
tooltip_lines = _generate_tooltip_lines() tooltip_lines = _generate_tooltip_lines()
tooltip = '\n'.join(tooltip_lines).rstrip('\n') tooltip = '\n'.join(tooltip_lines).rstrip('\n')
@ -463,13 +469,14 @@ def init(_quit_handler):
_menu = _create_menu(_quit_handler) _menu = _create_menu(_quit_handler)
assert _icon is None assert _icon is None
_icon = _create(_menu) _icon = _create(_menu)
update()
def destroy(): def destroy():
global _icon, _menu, _devices_info global _icon, _menu, _devices_info
if _icon is not None: if _icon is not None:
i, _icon = _icon, None i, _icon = _icon, None
_destroy(i) _hide(i)
i = None i = None
_icon = None _icon = None
@ -525,3 +532,9 @@ def update(device=None):
_picked_device = _pick_device_with_lowest_battery() _picked_device = _pick_device_with_lowest_battery()
_update_tray_icon() _update_tray_icon()
if _icon:
if not _devices_info:
_hide(_icon)
else:
_show(_icon)