Reorganization of gui/widget hierarchy and directory structure

1 files changed, 18 insertions, 18 deletions

diff --git a/ranger/gui/defaultui.py b/ranger/gui/defaultui.py
index 547f20ff..8d9f7ded 100644
--- a/ranger/gui/defaultui.py
+++ b/ranger/gui/defaultui.py
@@ -4,28 +4,29 @@ RATIO = ( 0.15, 0.15, 0.4, 0.3 )
 from ranger.gui.ui import UI as SuperClass
 class DefaultUI(SuperClass):
 	def setup(self):
-		from ranger.gui.wdisplay import WDisplay
-		from ranger.gui.wtitlebar import WTitleBar
-		from ranger.gui.wconsole import WConsole
-		self.titlebar = WTitleBar(self.win, self.colorscheme)
-		self.add_widget(self.titlebar)
+		from ranger.gui.widgets.filelist import FileList
+		from ranger.gui.widgets.titlebar import TitleBar
+		from ranger.gui.widgets.console import Console
+		self.titlebar = TitleBar(self.win)
+		self.add_obj(self.titlebar)
 
 		self.displays = [
-				WDisplay(self.win, self.colorscheme, -2),
-				WDisplay(self.win, self.colorscheme, -1),
-				WDisplay(self.win, self.colorscheme, 0),
-				WDisplay(self.win, self.colorscheme, 1) ]
+				FileList(self.win, -2),
+				FileList(self.win, -1),
+				FileList(self.win, 0),
+				FileList(self.win, 1) ]
 		self.main_display = self.displays[2]
 		self.displays[2].display_infostring = True
 		self.displays[2].main_display = True
 		for disp in self.displays:
-			self.add_widget(disp)
+			self.add_obj(disp)
 
-		self.console = WConsole(self.win, self.colorscheme)
-		self.add_widget(self.console)
+		self.console = Console(self.win)
+		self.add_obj(self.console)
 
-	def resize(self):
-		SuperClass.resize(self)
+	def update_size(self):
+		"""resize all widgets"""
+		SuperClass.update_size(self)
 		y, x = self.win.getmaxyx()
 
 		leftborder = 0
@@ -34,16 +35,15 @@ class DefaultUI(SuperClass):
 		for ratio in RATIO:
 			wid = int(ratio * x)
 			try:
-				self.displays[i].setdim(1, leftborder, y-2, wid - 1)
+				self.displays[i].resize(1, leftborder, y-2, wid - 1)
 			except KeyError:
 				pass
 			leftborder += wid
 			i += 1
 
-		self.titlebar.setdim(0, 0, 1, x)
-		self.console.setdim(y-1, 0, 1, x)
+		self.titlebar.resize(0, 0, 1, x)
+		self.console.resize(y-1, 0, 1, x)
 
-	# ---specials---
 	def open_console(self, mode):
 		if self.console.open(mode):
 			self.console.on_close = self.close_console