diff options
| author | hut <hut@lavabit.com> | 2011-09-29 04:16:59 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-09-29 04:16:59 +0200 |
| commit | f59cd305c79351930bc0105d9aebb547dddb3fd6 (patch) | |
| tree | 92d116e969440a115dd12d73b49203ba533c4672 | |
| parent | 7b6fab79ff289aa8f11a974d9eea421fa1910ca7 (diff) | |
| download | ranger-f59cd305c79351930bc0105d9aebb547dddb3fd6.tar.gz | |
gui.ui: de-bloating
| -rw-r--r-- | ranger/core/actions.py | 7 | ||||
| -rw-r--r-- | ranger/gui/ui.py | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 05f81330..b61e514b 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -70,8 +70,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): bad = True text = str(text) self.log.appendleft(text) - if hasattr(self.ui, 'notify'): - self.ui.notify(text, duration=duration, bad=bad) + self.ui.status.notify(text, duration=duration, bad=bad) def redraw_window(self): """Redraw the window""" @@ -244,8 +243,8 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): def scroll(self, relative): """Scroll down by <relative> lines""" - if hasattr(self.ui, 'scroll'): - self.ui.scroll(relative) + if self.ui.browser and self.ui.browser.main_column: + self.ui.browser.main_column.scroll(relative) self.env.cf = self.env.cwd.pointed_obj def enter_dir(self, path, remember=False, history=True): diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py index 2ace09a3..128a3434 100644 --- a/ranger/gui/ui.py +++ b/ranger/gui/ui.py @@ -209,9 +209,6 @@ class UI(DisplayableContainer): if not self.fm.input_is_blocked(): self.handle_key(key) - def notify(self, *a, **k): - return self.status.notify(*a, **k) - def setup(self): """Build up the UI by initializing widgets.""" from ranger.gui.widgets.browserview import BrowserView @@ -353,10 +350,6 @@ class UI(DisplayableContainer): self.browser.visible = True self.taskview.focused = False - def scroll(self, relative): - if self.browser and self.browser.main_column: - self.browser.main_column.scroll(relative) - def throbber(self, string='.', remove=False): if remove: self.titlebar.throbber = type(self.titlebar).throbber |