summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/defaults/apps.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index 026ff271..44e209a1 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -55,29 +55,29 @@ class CustomApplications(Applications):
 		f = c.file
 
 		if f.basename.lower() == 'makefile':
-			return self.app_make(c)
+			return self.either(c, 'make')
 
 		if f.extension is not None:
 			if f.extension in ('pdf', ):
 				c.flags += 'd'
 				return self.either(c, 'evince', 'zathura', 'apvlv')
 			if f.extension in ('xml', ):
-				return self.app_editor(c)
+				return self.either(c, 'editor')
 			if f.extension in ('html', 'htm', 'xhtml'):
 				return self.either(c, 'firefox', 'opera', 'elinks')
 			if f.extension in ('swf', ):
 				return self.either(c, 'firefox', 'opera')
 			if f.extension == 'nes':
-				return self.app_fceux(c)
+				return self.either(c, 'fceux')
 			if f.extension in ('swc', 'smc'):
-				return self.app_zsnes(c)
+				return self.either(c, 'zsnes')
 
 		if f.mimetype is not None:
 			if INTERPRETED_LANGUAGES.match(f.mimetype):
-				return self.app_edit_or_run(c)
+				return self.either(c, 'edit_or_run')
 
 		if f.container:
-			return self.app_aunpack(c)
+			return self.either(c, 'aunpack')
 
 		if f.video or f.audio:
 			if f.video:
@@ -85,10 +85,10 @@ class CustomApplications(Applications):
 			return self.either(c, 'mplayer', 'totem')
 
 		if f.image:
-			return self.either(c, 'feh', 'eye_of_gnome', 'mirage')
+			return self.either(c, 'feh', 'eog', 'mirage')
 
 		if f.document or f.filetype.startswith('text'):
-			return self.app_editor(c)
+			return self.either(c, 'editor')
 
 
 	# ----------------------------------------- application definitions
@@ -140,8 +140,8 @@ class CustomApplications(Applications):
 
 		if c.mode in arg:
 			return tup('feh', arg[c.mode], c.file.path)
-		if c.mode is 4:
-			return self.app_gimp(c)
+		if c.mode is 4:		# Note: mode 4 wouldn't need to depend on 'feh'
+			return self.either(c, 'gimp')
 		if c.mode is 11:
 			if len(c.files) > 1:
 				return tup('feh', *c)
>8e7b4429 ^
f918675c ^




8e7b4429 ^

cd9bb850 ^


d059fe74 ^
cd9bb850 ^
f918675c ^


cd9bb850 ^

f918675c ^

cd9bb850 ^
f918675c ^
cd9bb850 ^




d059fe74 ^
f918675c ^
cd9bb850 ^
f918675c ^


cd9bb850 ^

f918675c ^

cd9bb850 ^
f918675c ^
cd9bb850 ^




d059fe74 ^
f918675c ^

cd9bb850 ^


f918675c ^


cd9bb850 ^

f918675c ^



cd9bb850 ^

f918675c ^

cd9bb850 ^


d059fe74 ^
cd9bb850 ^

f918675c ^

cd9bb850 ^
f918675c ^
cd9bb850 ^
f918675c ^
cd9bb850 ^

f918675c ^
cd9bb850 ^
8e7b4429 ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131