about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-29 21:47:39 +0200
committerhut <hut@lavabit.com>2010-04-29 21:47:39 +0200
commit9a248482ca96bc354dbde644fd3f3b6f5292222b (patch)
treee9fb86be01e201c665d9a8d2585f427e34e8956e
parent5fab6bc0c6f26d01571dc38f1a6da07c9b7d93dc (diff)
downloadranger-9a248482ca96bc354dbde644fd3f3b6f5292222b.tar.gz
Added documentation for remaining key combinations (excluding z*, g*,...)
-rw-r--r--ranger/defaults/keys.py8
-rw-r--r--ranger/help/console.py5
-rw-r--r--ranger/help/movement.py20
3 files changed, 29 insertions, 4 deletions
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index 4dd7f280..29a63df9 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -180,8 +180,8 @@ map('E', fm.edit_file())
 map('du', fm.execute_command('du --max-depth=1 -h | less'))
 
 # -------------------------------------------------- toggle options
-map('z<bg>', fm.hint("show_*h*idden *p*review_files *P*review_dirs " \
-	"*d*irs_first flush*i*nput *m*ouse"))
+map('z<bg>', fm.hint("[*cdfhimpPs*] show_*h*idden *p*review_files "\
+		"*P*review_dirs *f*ilter flush*i*nput *m*ouse"))
 map('zh', fm.toggle_boolean_option('show_hidden'))
 map('zp', fm.toggle_boolean_option('preview_files'))
 map('zP', fm.toggle_boolean_option('preview_directories'))
@@ -190,6 +190,7 @@ map('zd', fm.toggle_boolean_option('sort_directories_first'))
 map('zc', fm.toggle_boolean_option('collapse_preview'))
 map('zs', fm.toggle_boolean_option('sort_case_insensitive'))
 map('zm', fm.toggle_boolean_option('mouse_enabled'))
+map('zf', fm.open_console(cmode.COMMAND, 'filter '))
 
 # ------------------------------------------------------------ sort
 map('o<bg>', 'O<bg>', fm.hint("*s*ize *b*ase*n*ame *m*time" \
@@ -220,7 +221,6 @@ def append_to_filename(arg):
 map('cw', fm.open_console(cmode.COMMAND, 'rename '))
 map('cd', fm.open_console(cmode.COMMAND, 'cd '))
 map('f', fm.open_console(cmode.COMMAND_QUICK, 'find '))
-map('bf', fm.open_console(cmode.COMMAND, 'filter '))
 map('d<bg>', fm.hint('d*u* (disk usage) d*d* (cut)'))
 map('@', fm.open_console(cmode.OPEN, '@'))
 map('#', fm.open_console(cmode.OPEN, 'p!'))
@@ -258,7 +258,7 @@ map('ct', fm.search(order='tag'))
 map('cc', fm.search(order='ctime'))
 map('cm', fm.search(order='mimetype'))
 map('cs', fm.search(order='size'))
-map('c<bg>', fm.hint('*c*time *m*imetype *s*ize'))
+map('c<bg>', fm.hint('*c*time *m*imetype *s*ize *t*ag'))
 
 # ------------------------------------------------------- bookmarks
 for key in ALLOWED_BOOKMARK_KEYS:
diff --git a/ranger/help/console.py b/ranger/help/console.py
index e1aa2d2a..6efc6425 100644
--- a/ranger/help/console.py
+++ b/ranger/help/console.py
@@ -189,6 +189,11 @@ Those two can be combinated:
 !d!@mplayer    will open the selection with a detached mplayer
                (again, this is equivalent to !d!mplayer %s)
 
+This keys open the console with a predefined text:
+	@	"!@"	Good for things like "@mount"
+	#	"!p!"	For commands with output.
+			Note: A plain "!p!" will be translated to "!p!cat %f"
+
 For a list of other flags than "d", check chapter 2.5 of the documentation
 
 
diff --git a/ranger/help/movement.py b/ranger/help/movement.py
index e85bf336..8b52ce8b 100644
--- a/ranger/help/movement.py
+++ b/ranger/help/movement.py
@@ -64,6 +64,15 @@ These keys work like in vim:
 	^B      move up by one screen
 	^F      move down by one screen
 
+This keys can be used to make movements beyond the current directory
+
+	]	move down in the parent directory
+	[	move up in the parent directory
+
+	}	traverse the directory tree, visiting each directory
+	{	traverse in the other direction. (not implemented yet,
+		currently this only moves back in history)
+
 
 ==============================================================================
 1.2. Browser control
@@ -172,5 +181,16 @@ Clicking into the preview window will usually run the file. |2?|
 
 
 ==============================================================================
+1.8 Misc Keys
+
+	^P	Display the message log
+	du	Display the disk usage of the current directory
+	cd	Open the console with ":cd "
+	cw	Open the console with ":rename "
+	A	Open the console with ":rename <current filename>"
+	I	Same as A, put the cursor at the beginning of the filename
+
+
+==============================================================================
 """
 # vim:tw=78:sw=4:sts=8:ts=8:ft=help