diff options
| -rw-r--r-- | ranger/config/rifle.conf | 4 | ||||
| -rw-r--r-- | ranger/core/fm.py | 7 | ||||
| -rw-r--r-- | ranger/gui/widgets/__init__.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/browsercolumn.py | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf index 1c59cd4c..31db35a4 100644 --- a/ranger/config/rifle.conf +++ b/ranger/config/rifle.conf @@ -108,9 +108,9 @@ ext php = php -- "$1" #-------------------------------------------- # Audio without X #------------------------------------------- -mime ^audio|ogg$, terminal, has mplayer = mplayer -- "$@" -mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@" mime ^audio|ogg$, terminal, has mpv = mpv -- "$@" +mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@" +mime ^audio|ogg$, terminal, has mplayer = mplayer -- "$@" ext midi?, terminal, has wildmidi = wildmidi -- "$@" #-------------------------------------------- diff --git a/ranger/core/fm.py b/ranger/core/fm.py index 0313639a..046eb788 100644 --- a/ranger/core/fm.py +++ b/ranger/core/fm.py @@ -136,7 +136,7 @@ class FM(Actions, SignalDispatcher): if self.settings.open_all_images and \ len(self.thisdir.marked_items) == 0 and \ - re.match(r'^(feh|sxiv) ', command): + re.match(r'^(feh|sxiv|imv) ', command): images = [f.relative_path for f in self.thisdir.files if f.image] escaped_filenames = " ".join(shell_quote(f) \ @@ -156,6 +156,11 @@ class FM(Actions, SignalDispatcher): "feh --start-at %s " % \ shell_quote(self.thisfile.relative_path), 1) + if command[0:4] == 'imv ': + number = images.index(self.thisfile.relative_path) + 1 + new_command = command.replace("imv ", + "imv -n %d " % number, 1) + if new_command: command = "set -- %s; %s" % (escaped_filenames, new_command) diff --git a/ranger/gui/widgets/__init__.py b/ranger/gui/widgets/__init__.py index f2e52c0a..bd0f2337 100644 --- a/ranger/gui/widgets/__init__.py +++ b/ranger/gui/widgets/__init__.py @@ -21,3 +21,5 @@ class Widget(Displayable): 'ahead': ('>', ["vcsahead"]), 'diverged': ('Y', ["vcsdiverged"]), 'unknown': ('?', ["vcsunknown"])} + + ellipsis = { False: '~', True: '…' } diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py index 0dc39a9b..52ef62b8 100644 --- a/ranger/gui/widgets/browsercolumn.py +++ b/ranger/gui/widgets/browsercolumn.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of ranger, the console file manager. # License: GNU GPL version 3, see the file "AUTHORS" for details. @@ -24,7 +23,6 @@ class BrowserColumn(Pager): scroll_begin = 0 target = None last_redraw_time = -1 - ellipsis = { False: '~', True: '…' } old_dir = None old_thisfile = None |