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

special support for configuring dpi

This commit is contained in:
Daniel Pavel 2012-12-07 19:40:32 +02:00
parent f49ced2d92
commit 205d25e341
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/solaar.py
View File

@ -24,7 +24,7 @@ def _parse_arguments():
import argparse
arg_parser = argparse.ArgumentParser(prog=NAME.lower())
arg_parser.add_argument('-S', '--no-systray', action='store_false', dest='systray',
help='don\'t embed the application window into the systray')
help='do not place an icon in the desktop\'s systray')
arg_parser.add_argument('-N', '--no-notifications', action='store_false', dest='notifications',
help='disable desktop notifications (shown only when in systray)')
arg_parser.add_argument('-d', '--debug', action='count', default=0,

33
app/solaar_cli.py
View File

@ -57,12 +57,12 @@ def _find_device(receiver, name):
_fail("need at least 3 characters to match a device")
name = name.lower()
if 'receiver'.startswith(name) or name == receiver.serial:
if 'receiver'.startswith(name) or name.upper() == receiver.serial:
return receiver
dev = None
for d in receiver:
if name == d.serial or name in d.name.lower() or name in d.codename.lower():
if name.upper() == d.serial or name in d.name.lower() or name in d.codename.lower():
if dev is None:
dev = d
else:
@ -253,7 +253,7 @@ def config_device(receiver, args):
print ("# possible values: [%s]" % ', '.join(str(v) for v in s.choices))
value = s.read()
if value is None:
print ("# !! failed to read '%s'" % s.name)
print ("# ! failed to read '%s'" % s.name)
else:
print ("%s=%s" % (s.name, value))
return
@ -286,11 +286,34 @@ def config_device(receiver, args):
value = False
else:
_fail("don't know how to interpret '%s' as boolean" % value)
elif setting.choices:
value = args.value.lower()
if value not in setting.choices:
if value in ['higher', 'lower']:
old_value = setting.read()
if old_value is None:
_fail("could not read current value of '%s'" % setting.name)
old_index = setting.choices.index(old_value)
if value == 'lower':
if old_index == 0:
sys.stderr.write("'%s' already at the lowest value")
return
value = setting.choices[old_index - 1:old_index][0]
elif value == 'higher':
if old_index == len(setting.choices) - 1:
sys.stderr.write("'%s' already at the highest value")
return
value = setting.choices[old_index + 1:old_index + 2][0]
elif value in ('highest', 'max'):
value = setting.choices[-1:][0]
elif value in ('lowest', 'min'):
value = setting.choices[:1][0]
elif value not in setting.choices:
_fail("possible values for '%s' are: [%s]" % (setting.name, ', '.join(str(v) for v in setting.choices)))
value = setting.choices[setting.choices.index(value)]
value = setting.choices[value]
else:
raise NotImplemented