about summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2009-12-06 18:56:21 +0100
committerhut <hut@lavabit.com>2009-12-06 18:56:21 +0100
commitaea67778ad2366b4e4171008af7b0dcd5d91f93b (patch)
tree1c5412c1cb2dcd00c268694ccf316cf306cda57a /ranger
parent9adf06de919e2e6b1de07054bb64145c1cde9b89 (diff)
downloadranger-aea67778ad2366b4e4171008af7b0dcd5d91f93b.tar.gz
random stuff
Diffstat (limited to 'ranger')
-rw-r--r--ranger/defaults/apps.py9
-rw-r--r--ranger/gui/colorscheme.py1
2 files changed, 10 insertions, 0 deletions
diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index 041b85c8..23b95537 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -47,6 +47,15 @@ class CustomApplications(SuperClass):
 			return run('mplayer', '-fs', *kw['files'], **kw)
 
 	def app_feh(self, **kw):
+		if kw['files']:
+			if kw['mode'] == 1:
+				return run('feh', '--bg-scale', kw['files'][0], **kw)
+			if kw['mode'] == 2:
+				return run('feh', '--bg-tile', kw['files'][0], **kw)
+			if kw['mode'] == 3:
+				return run('feh', '--bg-center', kw['files'][0], **kw)
+			if kw['mode'] == 4:
+				return run('gimp', *kw['files'], **kw)
 		return run('feh', *kw['files'], **kw)
 
 	def app_aunpack(self, **kw):
diff --git a/ranger/gui/colorscheme.py b/ranger/gui/colorscheme.py
index 3e28106b..6f3ef01f 100644
--- a/ranger/gui/colorscheme.py
+++ b/ranger/gui/colorscheme.py
@@ -43,6 +43,7 @@ class ColorScheme(object):
 			for key in CONTEXT_KEYS:
 				context[key] = (key in keys)
 
+			# add custom error messages for broken colorschemes
 			color = self.use(context)
 			self.cache[keys] = color
 			return color