From 1ec07665871fd590bdf86996d21ed3fea59c78a0 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 18 May 2014 08:04:27 +0200 Subject: [PATCH] Rename CurCommandDispatcher to CommandDispatcher --- qutebrowser/browser/{curcommand.py => commands.py} | 2 +- qutebrowser/widgets/_tabbedbrowser.py | 4 ++-- qutebrowser/widgets/statusbar/bar.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) rename qutebrowser/browser/{curcommand.py => commands.py} (99%) diff --git a/qutebrowser/browser/curcommand.py b/qutebrowser/browser/commands.py similarity index 99% rename from qutebrowser/browser/curcommand.py rename to qutebrowser/browser/commands.py index 29c906895..2c7e16e46 100644 --- a/qutebrowser/browser/curcommand.py +++ b/qutebrowser/browser/commands.py @@ -39,7 +39,7 @@ from qutebrowser.utils.misc import shell_escape from qutebrowser.commands.exceptions import CommandError -class CurCommandDispatcher(QObject): +class CommandDispatcher(QObject): """Command dispatcher for TabbedBrowser. diff --git a/qutebrowser/widgets/_tabbedbrowser.py b/qutebrowser/widgets/_tabbedbrowser.py index b8c7d0a39..0cb29cfb8 100644 --- a/qutebrowser/widgets/_tabbedbrowser.py +++ b/qutebrowser/widgets/_tabbedbrowser.py @@ -29,7 +29,7 @@ import qutebrowser.commands.utils as cmdutils from qutebrowser.widgets._tabwidget import TabWidget, EmptyTabIcon from qutebrowser.widgets.webview import WebView from qutebrowser.browser.signalfilter import SignalFilter -from qutebrowser.browser.curcommand import CurCommandDispatcher +from qutebrowser.browser.commands import CommandDispatcher class TabbedBrowser(TabWidget): @@ -94,7 +94,7 @@ class TabbedBrowser(TabWidget): self._tabs = [] self.url_stack = [] self._filter = SignalFilter(self) - self.cmd = CurCommandDispatcher(self) + self.cmd = CommandDispatcher(self) self.last_focused = None self.now_focused = None # FIXME adjust this to font size diff --git a/qutebrowser/widgets/statusbar/bar.py b/qutebrowser/widgets/statusbar/bar.py index 1d1721266..3fd51731d 100644 --- a/qutebrowser/widgets/statusbar/bar.py +++ b/qutebrowser/widgets/statusbar/bar.py @@ -170,6 +170,7 @@ class StatusBar(QWidget): def _show_cmd_widget(self): """Show command widget instead of temporary text.""" + self.error = False self._text_pop_timer.stop() self._stack.setCurrentWidget(self.cmd)