summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-01-14 00:22:43 +0100
committerhut <hut@lavabit.com>2010-01-14 00:22:43 +0100
commitb6e32668dd277f53a4a52451d9a3893a45baa3d7 (patch)
tree2ff47b68fa36fa2e0665071d736449cd2ed1d552
parent11ff42afa10b6335b7cf421e0c8bb645ae6840b4 (diff)
downloadranger-b6e32668dd277f53a4a52451d9a3893a45baa3d7.tar.gz
settings: removed (buggy) auto_load_preview
-rw-r--r--ranger/defaults/keys.py3
-rw-r--r--ranger/defaults/options.py1
-rw-r--r--ranger/gui/widgets/browsercolumn.py16
-rw-r--r--ranger/shared/settings.py2
4 files changed, 6 insertions, 16 deletions
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index ac909a6d..4cf5bc0f 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -91,11 +91,10 @@ def initialize_commands(command_list):
 
 	# -------------------------------------------------- toggle options
 	hint('t', "show_//h//idden //p//review_files //d//irectories_first " \
-			"//a//uto_load_preview //c//ollapse_preview")
+			"//c//ollapse_preview")
 	bind('th', fm.toggle_boolean_option('show_hidden'))
 	bind('tp', fm.toggle_boolean_option('preview_files'))
 	bind('td', fm.toggle_boolean_option('directories_first'))
-	bind('ta', fm.toggle_boolean_option('auto_load_preview'))
 	bind('tc', fm.toggle_boolean_option('collapse_preview'))
 
 	# ------------------------------------------------------------ sort
diff --git a/ranger/defaults/options.py b/ranger/defaults/options.py
index 5a977972..f8eb2b53 100644
--- a/ranger/defaults/options.py
+++ b/ranger/defaults/options.py
@@ -28,5 +28,4 @@ directories_first = True
 
 show_hidden = False
 collapse_preview = True
-auto_load_preview = True
 autosave_bookmarks = True
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py
index 2eb44112..8544da19 100644
--- a/ranger/gui/widgets/browsercolumn.py
+++ b/ranger/gui/widgets/browsercolumn.py
@@ -23,7 +23,6 @@ class BrowserColumn(Pager, Widget):
 	display_infostring = False
 	scroll_begin = 0
 	target = None
-	postpone_drawing = False
 	tagged_marker = '*'
 	last_redraw_time = -1
 
@@ -167,17 +166,10 @@ class BrowserColumn(Pager, Widget):
 				self.color_reset()
 				return
 
-			if self.settings.auto_load_preview:
-				self.color(base_color)
-				self.win.addnstr("...", self.wid)
-				self.postpone_drawing = True
-				self.color_reset()
-				return
-			else:
-				self.color(base_color, 'error')
-				self.win.addnstr("not loaded", self.wid)
-				self.color_reset()
-				return
+			self.color(base_color)
+			self.win.addnstr("...", self.wid)
+			self.color_reset()
+			return
 
 		if self.main_column:
 			base_color.append('main_column')
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 0bb00b61..705f8986 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -16,7 +16,7 @@ ALLOWED_SETTINGS = """
 show_hidden scroll_offset
 directories_first sort reverse
 preview_files max_history_size colorscheme
-collapse_preview auto_load_preview
+collapse_preview
 max_dirsize_for_autopreview autosave_bookmarks
 apps keys
 """.split()