aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/options.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-05-02 22:38:21 +1200
committerAldo Cortesi <aldo@nullcube.com>2017-05-03 14:55:02 +1200
commit2659b522094c325f1ee4138f6cf793373d8c9c52 (patch)
treed5f0acd183e52397778ccfbcf42e9c1eaf72ece8 /mitmproxy/options.py
parent0f4d94b31c02171c1cc39bf90426b61e5c2a05e1 (diff)
downloadmitmproxy-2659b522094c325f1ee4138f6cf793373d8c9c52.tar.gz
mitmproxy-2659b522094c325f1ee4138f6cf793373d8c9c52.tar.bz2
mitmproxy-2659b522094c325f1ee4138f6cf793373d8c9c52.zip
console: add a two-pane layout
- Replace options.console_eventlog with options.console_layout - This can be "single", "vertical" and "horizontal" - At the base of the primary pane is the flowlist. At the base of the secondary pane is the event log. - Any of the other primary windows can be opened in each of the panes. For now, I've bound "-" to the flow layout switch, "shift tab" to the layout pane switch, and "P" to open the currently focused flow in whichever pane you're in. These are just temporary - we'll reassess the default bindings carefully once the keybindings work is complete.
Diffstat (limited to 'mitmproxy/options.py')
-rw-r--r--mitmproxy/options.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/mitmproxy/options.py b/mitmproxy/options.py
index e477bed5..5667f39f 100644
--- a/mitmproxy/options.py
+++ b/mitmproxy/options.py
@@ -21,6 +21,11 @@ view_orders = [
"url",
"size",
]
+console_layouts = [
+ "single",
+ "vertical",
+ "horizontal",
+]
APP_HOST = "mitm.it"
APP_PORT = 80
@@ -371,8 +376,9 @@ class Options(optmanager.OptManager):
# Console options
self.add_option(
- "console_eventlog", bool, False,
- "Show event log."
+ "console_layout", str, "single",
+ "Console layout.",
+ choices=sorted(console_layouts),
)
self.add_option(
"console_focus_follow", bool, False,