diff options
author | hut <hut@lavabit.com> | 2011-09-30 12:10:00 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2011-09-30 16:43:28 +0200 |
commit | f93725f5ff3890c99c65f5fa2998d9eeda6dd16b (patch) | |
tree | 17ea7d9a9057fef6a9d55d00d3fecef9b4391ee6 /ranger/core | |
parent | 41df56beff2785174b4b466c8cc39159a79eaedc (diff) | |
download | ranger-f93725f5ff3890c99c65f5fa2998d9eeda6dd16b.tar.gz |
Extended rc.conf
Diffstat (limited to 'ranger/core')
-rw-r--r-- | ranger/core/actions.py | 8 | ||||
-rw-r--r-- | ranger/core/helper.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 3427af7f..44b5eac8 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -269,7 +269,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): def history_go(self, relative): """Move back and forth in the history""" - self.env.history_go(relative) + self.env.history_go(int(relative)) def scroll(self, relative): """Scroll down by <relative> lines""" @@ -329,7 +329,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): def hint(self, text): self.ui.hint(text) - def toggle_boolean_option(self, string): + def toggle_option(self, string): """Toggle a boolean option named <string>""" if isinstance(self.env.settings[string], bool): self.env.settings[string] ^= True @@ -418,9 +418,9 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): except: return False self.env.last_search = text - self.search(order='search', offset=offset) + self.search_next(order='search', offset=offset) - def search(self, order=None, offset=1, forward=True): + def search_next(self, order=None, offset=1, forward=True): original_order = order if self.search_forward: direction = bool(forward) diff --git a/ranger/core/helper.py b/ranger/core/helper.py index 56b8e5ad..a02cb0c0 100644 --- a/ranger/core/helper.py +++ b/ranger/core/helper.py @@ -87,6 +87,7 @@ def parse_arguments(): def load_settings(fm, clean): + from ranger.core.actions import Actions import ranger.core.shared import ranger.api.commands import ranger.api.keys @@ -95,6 +96,7 @@ def load_settings(fm, clean): # Load commands comcont = ranger.api.commands.CommandContainer() + comcont.load_commands_from_object(fm, dir(Actions)) ranger.api.commands.alias = comcont.alias try: import commands @@ -149,8 +151,6 @@ def load_settings(fm, clean): else: comcont = ranger.api.commands.CommandContainer() ranger.api.commands.alias = comcont.alias - keymanager = ranger.core.shared.EnvironmentAware.env.keymanager - ranger.api.keys.keymanager = keymanager from ranger.defaults import commands, keys, apps comcont.load_commands_from_module(commands) fm.commands = comcont |