screenkey (screenkey-1.4) | : | screenkey (screenkey-1.5) | ||
---|---|---|---|---|
skipping to change at line 46 | skipping to change at line 46 | |||
ap = ArgumentParser(description=APP_DESC) | ap = ArgumentParser(description=APP_DESC) | |||
ap.add_argument("-d", "--debug", action="store_true", | ap.add_argument("-d", "--debug", action="store_true", | |||
help=_("enable debugging")) | help=_("enable debugging")) | |||
ap.add_argument("--no-systray", action="store_true", | ap.add_argument("--no-systray", action="store_true", | |||
help=_("do not create system tray icon")) | help=_("do not create system tray icon")) | |||
ap.add_argument("-t", "--timeout", type=float, help=_("timeout in seconds")) | ap.add_argument("-t", "--timeout", type=float, help=_("timeout in seconds")) | |||
ap.add_argument("-p", "--position", choices=POSITIONS, | ap.add_argument("-p", "--position", choices=POSITIONS, | |||
help=_("set vertical position")) | help=_("set vertical position")) | |||
ap.add_argument("--persist", action='store_true', default=None, | ap.add_argument("--persist", action='store_true', default=None, | |||
help=_("make window persistent")) | help=_("make window persistent")) | |||
ap.add_argument("--window", action='store_true', default=None, | ||||
help=_("use a regular window for display (implies --persist) | ||||
")) | ||||
ap.add_argument("-s", "--font-size", choices=FONT_SIZES, | ap.add_argument("-s", "--font-size", choices=FONT_SIZES, | |||
help=_("set font size")) | help=_("set font size")) | |||
ap.add_argument("-g", "--geometry", type=geometry, | ap.add_argument("-g", "--geometry", type=geometry, | |||
help=_("set fixed area/window geometry")) | help=_("set fixed area/window geometry")) | |||
ap.add_argument("--key-mode", choices=KEY_MODES, | ap.add_argument("--key-mode", choices=KEY_MODES, | |||
help=_("set key processing mode")) | help=_("set key processing mode")) | |||
ap.add_argument("--bak-mode", choices=BAK_MODES, | ap.add_argument("--bak-mode", choices=BAK_MODES, | |||
help=_("backspace processing mode")) | help=_("backspace processing mode")) | |||
ap.add_argument("--mods-mode", choices=MODS_MODES, | ap.add_argument("--mods-mode", choices=MODS_MODES, | |||
help=_("modifiers visualization mode")) | help=_("modifiers visualization mode")) | |||
skipping to change at line 92 | skipping to change at line 94 | |||
ap.add_argument('--version', action='version', version=VERSION, | ap.add_argument('--version', action='version', version=VERSION, | |||
help=_("show version of screenkey")) | help=_("show version of screenkey")) | |||
ap.add_argument("-M", "--mouse", action="store_true", default=None, | ap.add_argument("-M", "--mouse", action="store_true", default=None, | |||
help=_("show the mouse buttons")) | help=_("show the mouse buttons")) | |||
ap.add_argument("--mouse-fade", type=float, dest='button_hide_duration', | ap.add_argument("--mouse-fade", type=float, dest='button_hide_duration', | |||
help=_("Mouse buttons fade duration in seconds")) | help=_("Mouse buttons fade duration in seconds")) | |||
args = ap.parse_args() | args = ap.parse_args() | |||
# Set options | # Set options | |||
options = Options() | options = Options() | |||
for arg in ['timeout', 'position', 'persist', 'font_desc', 'font_color', 'bg | for arg in ['timeout', 'position', 'persist', 'window', 'font_desc', | |||
_color', | 'font_color', 'bg_color', 'font_size', 'geometry', | |||
'font_size', 'geometry', 'key_mode', 'bak_mode', 'mods_mode', 'm | 'key_mode', 'bak_mode', 'mods_mode', 'mods_only', | |||
ods_only', | 'multiline', 'vis_shift', 'vis_space', 'screen', | |||
'multiline', 'vis_shift', 'vis_space', 'screen', 'no_systray', | 'no_systray', 'opacity', 'ignore', 'compr_cnt', | |||
'opacity', 'ignore', 'compr_cnt', 'start_disabled', 'mouse', 'bu | 'start_disabled', 'mouse', 'button_hide_duration']: | |||
tton_hide_duration']: | ||||
if getattr(args, arg) is not None: | if getattr(args, arg) is not None: | |||
options[arg] = getattr(args, arg) | options[arg] = getattr(args, arg) | |||
# Initialize logger | # Initialize logger | |||
if args.debug: | if args.debug: | |||
logging.basicConfig(level=logging.DEBUG) | logging.basicConfig(level=logging.DEBUG) | |||
else: | else: | |||
logging.basicConfig(level=logging.INFO) | logging.basicConfig(level=logging.INFO) | |||
logger = logging.getLogger(APP_NAME) | logger = logging.getLogger(APP_NAME) | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 9 lines changed or added |