From 2df2fe0e4c23293de5996d6be018908b6daf7d66 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 2 Apr 2012 10:49:57 +1200 Subject: Move "M" shortcut key to global scope. You now don't have to be viewing a flow to change global default view. --- libmproxy/console/__init__.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libmproxy/console/__init__.py') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 1e5524d8..6940b482 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -154,6 +154,10 @@ class StatusBar(common.WWrap): r.append("[") r.append(("heading_key", "P")) r.append(":%s]"%utils.unparse_url(*self.master.server.config.reverse_proxy)) + if self.master.state.default_body_view != contentview.VIEW_AUTO: + r.append("[") + r.append(("heading_key", "M")) + r.append(":%s]"%contentview.VIEW_NAMES[self.master.state.default_body_view]) opts = [] if self.master.anticache: @@ -677,6 +681,12 @@ class ConsoleMaster(flow.FlowMaster): def set_intercept(self, txt): return self.state.set_intercept(txt) + def change_default_display_mode(self, t): + v = contentview.VIEW_SHORTCUTS.get(t) + self.state.default_body_view = v + if self.currentflow: + self.refresh_flow(self.currentflow) + def set_reverse_proxy(self, txt): if not txt: self.server.config.reverse_proxy = None @@ -769,6 +779,12 @@ class ConsoleMaster(flow.FlowMaster): ), self.quit, ) + elif k == "M": + self.prompt_onekey( + "Global default display mode", + contentview.VIEW_PROMPT, + self.change_default_display_mode + ) elif k == "P": if self.server.config.reverse_proxy: p = utils.unparse_url(*self.server.config.reverse_proxy) -- cgit v1.2.3