Merge branch 'master' into newkey

Conflicts:
	ranger/api/keys.py
	ranger/container/commandlist.py
	ranger/core/actions.py
	ranger/defaults/keys.py
	ranger/gui/ui.py
	ranger/gui/widgets/browserview.py

1 files changed, 23 insertions, 0 deletions

diff --git a/doc/print_colors.py b/doc/print_colors.py
new file mode 100755
index 00000000..7ffd6500
--- /dev/null
+++ b/doc/print_colors.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+"""
+You can use this tool to display all supported colors and their color number.
+It will exit after a keypress.
+"""
+
+import curses
+from curses import *
+
+@wrapper
+def main(win):
+	def print_all_colors(attr):
+		for c in range(0, curses.COLORS):
+			init_pair(c, c, -1)
+			win.addstr(str(c) + ' ', color_pair(c) | attr)
+	use_default_colors()
+	win.addstr("available colors: %d\n\n" % curses.COLORS)
+	print_all_colors(0)
+	win.addstr("\n\n")
+	print_all_colors(A_BOLD)
+	win.refresh()
+	win.getch()
+