diff options
| author | hut <hut@lavabit.com> | 2010-04-18 00:23:04 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-18 00:23:04 +0200 |
| commit | c2238598bfb590367f6c52c4fcbf43d02148a523 (patch) | |
| tree | 1f8a731d058077c3d5c87ace3c96cbfebcd3beb6 /ranger/gui | |
| parent | 7213292e490a4f6c73a915d2ea6b834c005dd424 (diff) | |
| download | ranger-c2238598bfb590367f6c52c4fcbf43d02148a523.tar.gz | |
main: added load_settings(). Store apps/keys in fm now.
Also, commands are now loaded from ~/.ranger/commands.py if available
Diffstat (limited to 'ranger/gui')
| -rw-r--r-- | ranger/gui/ui.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/console.py | 7 | ||||
| -rw-r--r-- | ranger/gui/widgets/pager.py | 4 | ||||
| -rw-r--r-- | ranger/gui/widgets/taskview.py | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py index cdaf6cde..2e2f5ada 100644 --- a/ranger/gui/ui.py +++ b/ranger/gui/ui.py @@ -59,7 +59,7 @@ class UI(DisplayableContainer): if commandlist is None: self.commandlist = CommandList() - self.settings.keys.initialize_commands(self.commandlist) + self.fm.keys.initialize_commands(self.commandlist) else: self.commandlist = commandlist self.win = curses.initscr() diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index 5f45c26f..22539e75 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -24,7 +24,6 @@ import re from collections import deque from . import Widget -from ranger.defaults import commands from ranger.gui.widgets.console_mode import is_valid_mode, mode_to_class from ranger import log, relpath_conf from ranger.core.runner import ALLOWED_FLAGS @@ -63,7 +62,7 @@ class Console(Widget): def __init__(self, win): Widget.__init__(self, win) self.commandlist = CommandList() - self.settings.keys.initialize_console_commands(self.commandlist) + self.fm.keys.initialize_console_commands(self.commandlist) self.clear() self.histories = [] # load histories from files @@ -341,7 +340,7 @@ class CommandConsole(ConsoleWithTab): return command_class(self.line, self.mode) def _get_cmd_class(self): - return commands.get_command(self.line.split()[0]) + return self.fm.commands.get_command(self.line.split()[0]) def _get_tab(self): if ' ' in self.line: @@ -351,7 +350,7 @@ class CommandConsole(ConsoleWithTab): else: return None - return commands.command_generator(self.line) + return self.fm.commands.command_generator(self.line) class QuickCommandConsole(CommandConsole): diff --git a/ranger/gui/widgets/pager.py b/ranger/gui/widgets/pager.py index 2fc8ecda..c0646cdf 100644 --- a/ranger/gui/widgets/pager.py +++ b/ranger/gui/widgets/pager.py @@ -44,9 +44,9 @@ class Pager(Widget): self.commandlist = CommandList() if embedded: - keyfnc = self.settings.keys.initialize_embedded_pager_commands + keyfnc = self.fm.keys.initialize_embedded_pager_commands else: - keyfnc = self.settings.keys.initialize_pager_commands + keyfnc = self.fm.keys.initialize_pager_commands keyfnc(self.commandlist) diff --git a/ranger/gui/widgets/taskview.py b/ranger/gui/widgets/taskview.py index 6e86465c..ec68cb1a 100644 --- a/ranger/gui/widgets/taskview.py +++ b/ranger/gui/widgets/taskview.py @@ -32,7 +32,7 @@ class TaskView(Widget, Accumulator): Accumulator.__init__(self) self.scroll_begin = 0 self.commandlist = CommandList() - self.settings.keys.initialize_taskview_commands(self.commandlist) + self.fm.keys.initialize_taskview_commands(self.commandlist) def draw(self): base_clr = deque() |