summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--TODO13
-rw-r--r--ranger/defaults/apps.py9
-rw-r--r--ranger/gui/colorscheme.py1
3 files changed, 23 insertions, 0 deletions
diff --git a/TODO b/TODO
new file mode 100644
index 00000000..44ebe6e9
--- /dev/null
+++ b/TODO
@@ -0,0 +1,13 @@
+Console
+
+   ( ) #0   09/12/06  console commands
+   ( ) #1   09/12/06  quick find
+   ( ) #2   09/12/06  open with
+   ( ) #3   09/12/06  MVC for widgets
+   ( ) #4   09/12/06  history for console
+
+
+General
+
+   ( ) #5   09/12/06  move code from fm into objects
+   ( ) #6   09/12/06  move main to fm
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
137'>137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306