diff options
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | doc/HACKING | 6 | ||||
| -rw-r--r-- | doc/ranger.pod | 6 | ||||
| -rw-r--r-- | ranger/config/__init__.py (renamed from ranger/defaults/__init__.py) | 0 | ||||
| -rw-r--r-- | ranger/config/commands.py (renamed from ranger/defaults/commands.py) | 0 | ||||
| -rw-r--r-- | ranger/config/options.py (renamed from ranger/defaults/options.py) | 0 | ||||
| -rw-r--r-- | ranger/config/rc.conf (renamed from ranger/defaults/rc.conf) | 0 | ||||
| -rw-r--r-- | ranger/config/rifle.conf (renamed from ranger/defaults/rifle.conf) | 0 | ||||
| -rw-r--r-- | ranger/core/fm.py | 10 | ||||
| -rw-r--r-- | ranger/core/helper.py | 6 | ||||
| -rw-r--r-- | ranger/core/main.py | 2 | ||||
| -rw-r--r-- | ranger/core/shared.py | 2 | ||||
| -rwxr-xr-x | ranger/ext/rifle.py | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/README b/README index 0688030d..c0a1abb3 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ open your files with. This file describes ranger and how to get it to run. For instructions on the usage, please read the man page. See doc/HACKING for development specific -information. For configuration, check the files in ranger/defaults/. They -are usually installed to /usr/lib/python*/site-packages/ranger/defaults/ +information. For configuration, check the files in ranger/config/. They +are usually installed to /usr/lib/python*/site-packages/ranger/config/ and can be obtained with ranger's --copy-config option. A note to packagers: Versions meant for packaging are listed in the changelog @@ -92,5 +92,5 @@ directory. Ranger can automatically copy default configuration files to ~/.config/ranger if you run it with the switch --copy-config. (see ranger --help for a -description of that switch.) Also check ranger/defaults/ for the default +description of that switch.) Also check ranger/config/ for the default configuration. diff --git a/doc/HACKING b/doc/HACKING index f6d5d064..89452398 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -46,7 +46,7 @@ In ranger/fsobject/file.py the constant PREVIEW_BLACKLIST * Adding options: -In ranger/defaults/options.py +In ranger/config/options.py add the default value, like: my_option = True In ranger/container/settingobject.py add the name of your option to the constant ALLOWED_SETTINGS @@ -58,12 +58,12 @@ assuming <self> is a "SettingsAware" object. Copy ranger/colorschemes/default.py to ranger/colorschemes/myscheme.py and modify it according to your needs. Alternatively, mimic the jungle colorscheme. It subclasses the default scheme and just modifies a few things. -In ranger/defaults/options.py (or ~/.config/ranger/options.py), change +In ranger/config/options.py (or ~/.config/ranger/options.py), change colorscheme = 'default' to: colorscheme = 'myscheme' * Change the file type => application associations: -In ranger/defaults/apps.py +In ranger/config/apps.py modify the method app_default. The variable "f" is a filesystem-object with attributes like mimetype, extension, etc. For a full list, check ranger/fsobject/fsobject.py diff --git a/doc/ranger.pod b/doc/ranger.pod index 9f8b4f04..2a3a345b 100644 --- a/doc/ranger.pod +++ b/doc/ranger.pod @@ -24,8 +24,8 @@ open your files with. This manual mainly contains information on the usage of ranger. Refer to the F<README> for install instructions and to F<doc/HACKING> for development -specific information. For configuration, see the files in F<ranger/defaults>. -They are usually installed to F</usr/lib/python*/site-packages/ranger/defaults> +specific information. For configuration, see the files in F<ranger/config>. +They are usually installed to F</usr/lib/python*/site-packages/ranger/config> and can be obtained with ranger's --copy-config option. Inside ranger, you can press I<1?> for a list of key bindings, I<2?> for a list @@ -229,7 +229,7 @@ and modes. =head1 KEY BINDINGS -Key bindings are defined in the file F<ranger/defaults/rc.conf>. Check this +Key bindings are defined in the file F<ranger/config/rc.conf>. Check this file for a list of all key bindings. You can copy it to your local configuration directory with the --copy-config=rc option. diff --git a/ranger/defaults/__init__.py b/ranger/config/__init__.py index 71df3cb3..71df3cb3 100644 --- a/ranger/defaults/__init__.py +++ b/ranger/config/__init__.py diff --git a/ranger/defaults/commands.py b/ranger/config/commands.py index db411436..db411436 100644 --- a/ranger/defaults/commands.py +++ b/ranger/config/commands.py diff --git a/ranger/defaults/options.py b/ranger/config/options.py index 681feabc..681feabc 100644 --- a/ranger/defaults/options.py +++ b/ranger/config/options.py diff --git a/ranger/defaults/rc.conf b/ranger/config/rc.conf index a347d116..a347d116 100644 --- a/ranger/defaults/rc.conf +++ b/ranger/config/rc.conf diff --git a/ranger/defaults/rifle.conf b/ranger/config/rifle.conf index 039344bd..039344bd 100644 --- a/ranger/defaults/rifle.conf +++ b/ranger/config/rifle.conf diff --git a/ranger/core/fm.py b/ranger/core/fm.py index 50c22067..1ba0e187 100644 --- a/ranger/core/fm.py +++ b/ranger/core/fm.py @@ -56,7 +56,7 @@ class FM(Actions, SignalDispatcher): if not ranger.arg.clean and os.path.isfile(self.confpath('rifle.conf')): rifleconf = self.confpath('rifle.conf') else: - rifleconf = self.relpath('defaults/rifle.conf') + rifleconf = self.relpath('config/rifle.conf') self.rifle = Rifle(rifleconf) self.rifle.reload_config() @@ -130,13 +130,13 @@ class FM(Actions, SignalDispatcher): except Exception as e: sys.stderr.write(" ERROR: %s\n" % str(e)) if which == 'rifle' or which == 'all': - copy('defaults/rifle.conf', 'rifle.conf') + copy('config/rifle.conf', 'rifle.conf') if which == 'commands' or which == 'all': - copy('defaults/commands.py', 'commands.py') + copy('config/commands.py', 'commands.py') if which == 'rc' or which == 'all': - copy('defaults/rc.conf', 'rc.conf') + copy('config/rc.conf', 'rc.conf') if which == 'options' or which == 'all': - copy('defaults/options.py', 'options.py') + copy('config/options.py', 'options.py') if which == 'scope' or which == 'all': copy('data/scope.sh', 'scope.sh') os.chmod(self.confpath('scope.sh'), diff --git a/ranger/core/helper.py b/ranger/core/helper.py index 2487875d..e46e686d 100644 --- a/ranger/core/helper.py +++ b/ranger/core/helper.py @@ -74,7 +74,7 @@ def load_settings(fm, clean): from ranger.core.actions import Actions import ranger.core.shared import ranger.api.commands - from ranger.defaults import commands + from ranger.config import commands # Load default commands fm.commands = ranger.api.commands.CommandContainer() @@ -95,7 +95,7 @@ def load_settings(fm, clean): # Load rc.conf custom_conf = fm.confpath('rc.conf') - default_conf = fm.relpath('defaults', 'rc.conf') + default_conf = fm.relpath('config', 'rc.conf') load_default_rc = fm.settings.load_default_rc if load_default_rc: @@ -129,7 +129,7 @@ def load_settings(fm, clean): allow_access_to_confdir(ranger.arg.confdir, False) else: - fm.source(fm.relpath('defaults', 'rc.conf')) + fm.source(fm.relpath('config', 'rc.conf')) def allow_access_to_confdir(confdir, allow): diff --git a/ranger/core/main.py b/ranger/core/main.py index 37cdc586..961bbb8c 100644 --- a/ranger/core/main.py +++ b/ranger/core/main.py @@ -77,7 +77,7 @@ def main(): if not arg.clean and os.path.isfile(fm.confpath('rifle.conf')): rifleconf = fm.confpath('rifle.conf') else: - rifleconf = fm.relpath('defaults/rifle.conf') + rifleconf = fm.relpath('config/rifle.conf') rifle = Rifle(rifleconf) rifle.reload_config() rifle.execute(targets, number=ranger.arg.mode, flags=ranger.arg.flags) diff --git a/ranger/core/shared.py b/ranger/core/shared.py index dae83b78..26023e43 100644 --- a/ranger/core/shared.py +++ b/ranger/core/shared.py @@ -71,7 +71,7 @@ class SettingsAware(Awareness): settings._setting_sources.append(my_options) del sys.path[0] - from ranger.defaults import options as default_options + from ranger.config import options as default_options settings._setting_sources.append(default_options) assert all(hasattr(default_options, setting) \ for setting in ALLOWED_SETTINGS), \ diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py index b9cdf712..16de09f3 100755 --- a/ranger/ext/rifle.py +++ b/ranger/ext/rifle.py @@ -339,7 +339,7 @@ def main(): conf_path = os.path.expanduser('~/.config/ranger/rifle.conf') if not os.path.isfile(conf_path): conf_path = os.path.normpath(os.path.join(os.path.dirname(__file__), - '../defaults/rifle.conf')) + '../config/rifle.conf')) # Evaluate arguments from optparse import OptionParser |