diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-04-08 00:20:37 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-04-08 00:20:37 +0200 |
commit | e7b154c823af60c1aaf008858c637621ca562895 (patch) | |
tree | 9380432f9022389a814fe76a363d0d6dd6838329 /libmproxy/cmdline.py | |
parent | 2242c671fd53a5a5a864bcdc085a2207018fd5f0 (diff) | |
parent | b961f9e599453a6116b9b2dffb73dc5b45917f80 (diff) | |
download | mitmproxy-e7b154c823af60c1aaf008858c637621ca562895.tar.gz mitmproxy-e7b154c823af60c1aaf008858c637621ca562895.tar.bz2 mitmproxy-e7b154c823af60c1aaf008858c637621ca562895.zip |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/cmdline.py')
-rw-r--r-- | libmproxy/cmdline.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 28aa3ea6..7ea9be8c 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -575,12 +575,17 @@ def mitmproxy(): ) common_options(parser) parser.add_argument( - "--palette", type=str, default="dark", + "--palette", type=str, default=palettes.DEFAULT, action="store", dest="palette", choices=sorted(palettes.palettes.keys()), help="Select color palette: " + ", ".join(palettes.palettes.keys()) ) parser.add_argument( + "--palette-transparent", + action="store_true", dest="palette_transparent", default=False, + help="Set transparent background for palette." + ) + parser.add_argument( "-e", "--eventlog", action="store_true", dest="eventlog", help="Show event log." |