changed a few names

in colorschemes:
in_display -> in_browser
in BrowserColumn
self.main_display -> self.main_column

6 files changed, 15 insertions, 15 deletions

diff --git a/ranger/colorschemes/default.py b/ranger/colorschemes/default.py
index c92e1635..ca799595 100644
--- a/ranger/colorschemes/default.py
+++ b/ranger/colorschemes/default.py
@@ -8,7 +8,7 @@ class Default(ColorScheme):
 		if context.reset:
 			pass
 
-		elif context.in_display:
+		elif context.in_browser:
 			if context.selected:
 				attr = reverse
 			else:
@@ -47,7 +47,7 @@ class Default(ColorScheme):
 				else:
 					fg = red
 
-			if context.maindisplay:
+			if context.main_column:
 				if context.selected:
 					attr |= bold
 				if context.marked:
diff --git a/ranger/colorschemes/jungle.py b/ranger/colorschemes/jungle.py
index c70d95c7..5b7c5a8b 100644
--- a/ranger/colorschemes/jungle.py
+++ b/ranger/colorschemes/jungle.py
@@ -8,7 +8,7 @@ class Default(ColorScheme):
 		if context.reset:
 			pass
 
-		elif context.in_display:
+		elif context.in_browser:
 			if context.selected:
 				attr = reverse
 			else:
@@ -33,7 +33,7 @@ class Default(ColorScheme):
 			if context.link:
 				fg = context.good and cyan or magenta
 
-			if context.maindisplay and context.selected:
+			if context.main_column and context.selected:
 				attr |= bold
 
 		elif context.in_titlebar:
diff --git a/ranger/colorschemes/snow.py b/ranger/colorschemes/snow.py
index 8e7da043..13d6f413 100644
--- a/ranger/colorschemes/snow.py
+++ b/ranger/colorschemes/snow.py
@@ -8,7 +8,7 @@ class Snow(ColorScheme):
 		if context.reset:
 			pass
 
-		elif context.in_display:
+		elif context.in_browser:
 			if context.selected:
 				attr = reverse
 			else:
diff --git a/ranger/gui/colorscheme.py b/ranger/gui/colorscheme.py
index 7db72d0a..54d9571e 100644
--- a/ranger/gui/colorscheme.py
+++ b/ranger/gui/colorscheme.py
@@ -1,10 +1,10 @@
 CONTEXT_KEYS = [ 'reset', 'error',
-		'in_display', 'in_statusbar', 'in_titlebar', 'in_console',
+		'in_browser', 'in_statusbar', 'in_titlebar', 'in_console',
 		'in_notify', 'in_taskview',
 		'directory', 'file', 'hostname',
 		'executable', 'media', 'link',
 		'video', 'audio', 'image', 'media', 'document', 'container',
-		'selected', 'empty', 'maindisplay', 'message', 'background',
+		'selected', 'empty', 'main_column', 'message', 'background',
 		'good', 'bad',
 		'space', 'permissions', 'owner', 'group', 'mtime', 'nlink',
 		'scroll', 'all', 'bot', 'top', 'percentage',
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py
index 5427d958..c05473e2 100644
--- a/ranger/gui/widgets/browsercolumn.py
+++ b/ranger/gui/widgets/browsercolumn.py
@@ -4,7 +4,7 @@ from .pager import Pager
 from ranger import log
 
 class BrowserColumn(Pager, Widget):
-	main_display = False
+	main_column = False
 	display_infostring = False
 	scroll_begin = 0
 	target = None
@@ -36,7 +36,7 @@ class BrowserColumn(Pager, Widget):
 			index = self.scroll_begin + event.y - self.y
 
 			if event.pressed(1):
-				if not self.main_display:
+				if not self.main_column:
 					self.fm.enter_dir(self.target.path)
 
 				if index < len(self.target):
@@ -125,7 +125,7 @@ class BrowserColumn(Pager, Widget):
 		from ranger.fsobject.directory import Directory
 		import stat
 
-		base_color = ['in_display']
+		base_color = ['in_browser']
 
 		self.target.use()
 
@@ -156,7 +156,7 @@ class BrowserColumn(Pager, Widget):
 				self.color_reset()
 				return
 
-		if self.main_display:
+		if self.main_column:
 			base_color.append('maindisplay')
 
 		if not self.target.accessible:
@@ -194,7 +194,7 @@ class BrowserColumn(Pager, Widget):
 
 			if tagged:
 				this_color.append('tagged')
-				if self.main_display:
+				if self.main_column:
 					text = self.tagged_marker + text
 
 			if isinstance(drawed, Directory):
@@ -211,7 +211,7 @@ class BrowserColumn(Pager, Widget):
 
 			string = drawed.basename
 			try:
-				if self.main_display:
+				if self.main_column:
 					if tagged:
 						self.win.addnstr(line, 0, text, self.wid - 2)
 					elif self.wid > 1:
@@ -231,7 +231,7 @@ class BrowserColumn(Pager, Widget):
 
 			self.color_at(line, 0, self.wid, this_color)
 
-			if self.main_display and tagged and self.wid > 2:
+			if self.main_column and tagged and self.wid > 2:
 				this_color.append('tag_marker')
 				self.color_at(line, 0, len(self.tagged_marker), this_color)
 
diff --git a/ranger/gui/widgets/browserview.py b/ranger/gui/widgets/browserview.py
index ff0854f9..ffca34c6 100644
--- a/ranger/gui/widgets/browserview.py
+++ b/ranger/gui/widgets/browserview.py
@@ -38,7 +38,7 @@ class BrowserView(Widget, DisplayableContainer):
 			self.main_column = None
 		else:
 			self.main_column.display_infostring = True
-			self.main_column.main_display = True
+			self.main_column.main_column = True
 
 		self.pager = Pager(self.win, embedded=True)
 		self.add_child(self.pager)