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

use consistent naming of offline state for devices

This commit is contained in:
Daniel Pavel 2013-06-20 14:18:36 +02:00
parent f8369e7c63
commit b2f1786eff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/solaar/cli.py
View File

@ -109,7 +109,7 @@ def _print_receiver(receiver, verbose=False):
def _print_device(dev, verbose=False): def _print_device(dev, verbose=False):
p = dev.protocol p = dev.protocol
state = '' if p > 0 else 'inactive' state = '' if p > 0 else 'offline'
if not verbose: if not verbose:
print ("%d: %s [%s:%s]" % (dev.number, dev.name, dev.codename, dev.serial), state) print ("%d: %s [%s:%s]" % (dev.number, dev.name, dev.codename, dev.serial), state)
@ -119,7 +119,7 @@ def _print_device(dev, verbose=False):
print (" Codename :", dev.codename) print (" Codename :", dev.codename)
print (" Kind :", dev.kind) print (" Kind :", dev.kind)
if p == 0: if p == 0:
print (" Protocol : unknown (device is inactive)") print (" Protocol : unknown (device is offline)")
else: else:
print (" Protocol : HID++ %1.1f" % p) print (" Protocol : HID++ %1.1f" % p)
print (" Polling rate :", dev.polling_rate, "ms") print (" Polling rate :", dev.polling_rate, "ms")
@ -167,7 +167,7 @@ def _print_device(dev, verbose=False):
else: else:
print (" Battery status unavailable.") print (" Battery status unavailable.")
else: else:
print (" Battery status is unknown (device is inactive).") print (" Battery status is unknown (device is offline).")
# #
# #

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

@ -88,7 +88,7 @@ try:
n = _notifications[summary] = Notify.Notification() n = _notifications[summary] = Notify.Notification()
message = reason or ('unpaired' if dev.status is None else message = reason or ('unpaired' if dev.status is None else
(str(dev.status) or ('connected' if dev.status else 'inactive'))) (str(dev.status) or ('connected' if dev.status else 'offline')))
# we need to use the filename here because the notifications daemon # we need to use the filename here because the notifications daemon
# is an external application that does not know about our icon sets # is an external application that does not know about our icon sets

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

@ -257,19 +257,19 @@ def _generate_tooltip_lines():
if serial is None: # receiver if serial is None: # receiver
continue continue
yield '<b>%s</b>' % name
p = str(status) p = str(status)
if p: # does it have any properties to print? if p: # does it have any properties to print?
yield '<b>%s</b>' % name
if status: if status:
yield '\t%s' % p yield '\t%s' % p
else: else:
yield '\t%s <small>(inactive)</small>' % p yield '\t%s <small>(offline)</small>' % p
else: else:
if status: if status:
yield '\t<small>no status</small>' yield '<b>%s</b> <small>no status</small>' % name
else: else:
yield '\t<small>(inactive)</small>' yield '<b>%s</b> <small>(offline)</small>' % name
yield '' yield ''