Merge remote-tracking branch 'origin/pr/3900'
This commit is contained in:
commit
70c7a42a63
@ -38,7 +38,7 @@ show it.
|
|||||||
*-h*, *--help*::
|
*-h*, *--help*::
|
||||||
show this help message and exit
|
show this help message and exit
|
||||||
|
|
||||||
*--basedir* 'BASEDIR'::
|
*-B*, *--basedir* 'BASEDIR'::
|
||||||
Base directory for all storage.
|
Base directory for all storage.
|
||||||
|
|
||||||
*-V*, *--version*::
|
*-V*, *--version*::
|
||||||
@ -72,7 +72,7 @@ show it.
|
|||||||
*--loglines* 'LOGLINES'::
|
*--loglines* 'LOGLINES'::
|
||||||
How many lines of the debug log to keep in RAM (-1: unlimited).
|
How many lines of the debug log to keep in RAM (-1: unlimited).
|
||||||
|
|
||||||
*--debug*::
|
*-d*, *--debug*::
|
||||||
Turn on debugging options.
|
Turn on debugging options.
|
||||||
|
|
||||||
*--json-logging*::
|
*--json-logging*::
|
||||||
@ -87,7 +87,7 @@ show it.
|
|||||||
*--nowindow*::
|
*--nowindow*::
|
||||||
Don't show the main window.
|
Don't show the main window.
|
||||||
|
|
||||||
*--temp-basedir*::
|
*-T*, *--temp-basedir*::
|
||||||
Use a temporary basedir.
|
Use a temporary basedir.
|
||||||
|
|
||||||
*--no-err-windows*::
|
*--no-err-windows*::
|
||||||
@ -99,7 +99,7 @@ show it.
|
|||||||
*--qt-flag* 'QT_FLAG'::
|
*--qt-flag* 'QT_FLAG'::
|
||||||
Pass an argument to Qt as flag.
|
Pass an argument to Qt as flag.
|
||||||
|
|
||||||
*--debug-flag* 'DEBUG_FLAGS'::
|
*-D*, *--debug-flag* 'DEBUG_FLAGS'::
|
||||||
Pass name of debugging feature to be turned on.
|
Pass name of debugging feature to be turned on.
|
||||||
// QUTE_OPTIONS_END
|
// QUTE_OPTIONS_END
|
||||||
|
|
||||||
|
@ -61,7 +61,8 @@ def get_argparser():
|
|||||||
"""Get the argparse parser."""
|
"""Get the argparse parser."""
|
||||||
parser = argparse.ArgumentParser(prog='qutebrowser',
|
parser = argparse.ArgumentParser(prog='qutebrowser',
|
||||||
description=qutebrowser.__description__)
|
description=qutebrowser.__description__)
|
||||||
parser.add_argument('--basedir', help="Base directory for all storage.")
|
parser.add_argument('-B', '--basedir', help="Base directory for all "
|
||||||
|
"storage.")
|
||||||
parser.add_argument('-V', '--version', help="Show version and quit.",
|
parser.add_argument('-V', '--version', help="Show version and quit.",
|
||||||
action='store_true')
|
action='store_true')
|
||||||
parser.add_argument('-s', '--set', help="Set a temporary setting for "
|
parser.add_argument('-s', '--set', help="Set a temporary setting for "
|
||||||
@ -102,7 +103,7 @@ def get_argparser():
|
|||||||
help="How many lines of the debug log to keep in RAM "
|
help="How many lines of the debug log to keep in RAM "
|
||||||
"(-1: unlimited).",
|
"(-1: unlimited).",
|
||||||
default=2000, type=int)
|
default=2000, type=int)
|
||||||
debug.add_argument('--debug', help="Turn on debugging options.",
|
debug.add_argument('-d', '--debug', help="Turn on debugging options.",
|
||||||
action='store_true')
|
action='store_true')
|
||||||
debug.add_argument('--json-logging', action='store_true', help="Output log"
|
debug.add_argument('--json-logging', action='store_true', help="Output log"
|
||||||
" lines in JSON format (one object per line).")
|
" lines in JSON format (one object per line).")
|
||||||
@ -112,8 +113,8 @@ def get_argparser():
|
|||||||
action='store_true')
|
action='store_true')
|
||||||
debug.add_argument('--nowindow', action='store_true', help="Don't show "
|
debug.add_argument('--nowindow', action='store_true', help="Don't show "
|
||||||
"the main window.")
|
"the main window.")
|
||||||
debug.add_argument('--temp-basedir', action='store_true', help="Use a "
|
debug.add_argument('-T', '--temp-basedir', action='store_true', help="Use "
|
||||||
"temporary basedir.")
|
"a temporary basedir.")
|
||||||
debug.add_argument('--no-err-windows', action='store_true', help="Don't "
|
debug.add_argument('--no-err-windows', action='store_true', help="Don't "
|
||||||
"show any error windows (used for tests/smoke.py).")
|
"show any error windows (used for tests/smoke.py).")
|
||||||
debug.add_argument('--qt-arg', help="Pass an argument with a value to Qt. "
|
debug.add_argument('--qt-arg', help="Pass an argument with a value to Qt. "
|
||||||
@ -123,9 +124,9 @@ def get_argparser():
|
|||||||
action='append')
|
action='append')
|
||||||
debug.add_argument('--qt-flag', help="Pass an argument to Qt as flag.",
|
debug.add_argument('--qt-flag', help="Pass an argument to Qt as flag.",
|
||||||
nargs=1, action='append')
|
nargs=1, action='append')
|
||||||
debug.add_argument('--debug-flag', type=debug_flag_error, default=[],
|
debug.add_argument('-D', '--debug-flag', type=debug_flag_error,
|
||||||
help="Pass name of debugging feature to be turned on.",
|
default=[], help="Pass name of debugging feature to be"
|
||||||
action='append', dest='debug_flags')
|
" turned on.", action='append', dest='debug_flags')
|
||||||
parser.add_argument('command', nargs='*', help="Commands to execute on "
|
parser.add_argument('command', nargs='*', help="Commands to execute on "
|
||||||
"startup.", metavar=':command')
|
"startup.", metavar=':command')
|
||||||
# URLs will actually be in command
|
# URLs will actually be in command
|
||||||
|
Loading…
Reference in New Issue
Block a user