summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-07 00:57:16 +0200
committerhut <hut@lavabit.com>2010-04-07 00:57:16 +0200
commit43d4c88cfae47d1726a2ab9ad78d16bbbedc9a9a (patch)
treecbb4394068e3913f7d721dfbc93bc60153e36717
parente1ebec54b79b911c0f1ef2b5f429e2c9829ec63e (diff)
downloadranger-43d4c88cfae47d1726a2ab9ad78d16bbbedc9a9a.tar.gz
replace fm.move_pointer/move_right with fm.move
-rw-r--r--ranger/core/actions.py12
-rw-r--r--ranger/defaults/commands.py2
-rw-r--r--ranger/gui/widgets/browsercolumn.py4
3 files changed, 9 insertions, 9 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index de4a8a5d..cce2cd75 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -208,16 +208,16 @@ class Actions(EnvironmentAware, SettingsAware):
 			self.enter_dir(cf.path)
 		elif cwd.pointer >= len(cwd) - 1:
 			while True:
-				self.enter_dir('..')
+				self.move(left=1)
 				cwd = self.env.cwd
 				if cwd.pointer < len(cwd) - 1:
 					break
 				if cwd.path == '/':
 					break
-			self.move_pointer(1)
+			self.move(down=1)
 			self.traverse()
 		else:
-			self.move_pointer(1)
+			self.move(down=1)
 			self.traverse()
 
 	# --------------------------
@@ -298,7 +298,7 @@ class Actions(EnvironmentAware, SettingsAware):
 						cwd.mark_item(item, val)
 
 		if movedown:
-			self.move_pointer(relative=narg)
+			self.move(down=narg)
 
 		if hasattr(self.ui, 'redraw_main_column'):
 			self.ui.redraw_main_column()
@@ -374,7 +374,7 @@ class Actions(EnvironmentAware, SettingsAware):
 		if movedown is None:
 			movedown = len(sel) == 1
 		if movedown:
-			self.move_pointer(relative=1)
+			self.move(down=1)
 
 		if hasattr(self.ui, 'redraw_main_column'):
 			self.ui.redraw_main_column()
@@ -391,7 +391,7 @@ class Actions(EnvironmentAware, SettingsAware):
 		if movedown is None:
 			movedown = len(sel) == 1
 		if movedown:
-			self.move_pointer(relative=1)
+			self.move(down=1)
 
 		if hasattr(self.ui, 'redraw_main_column'):
 			self.ui.redraw_main_column()
diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py
index c0e1ccf1..b12540de 100644
--- a/ranger/defaults/commands.py
+++ b/ranger/defaults/commands.py
@@ -202,7 +202,7 @@ class find(Command):
 		self.fm.search_method = 'search'
 
 		if self.count == 1:
-			self.fm.move_right()
+			self.fm.move(right=0)
 			self.fm.block_input(0.5)
 
 	def quick_open(self):
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py
index d8bfeb69..0d46ee06 100644
--- a/ranger/gui/widgets/browsercolumn.py
+++ b/ranger/gui/widgets/browsercolumn.py
@@ -102,7 +102,7 @@ class BrowserColumn(Pager):
 					self.fm.enter_dir(self.target.path)
 
 				if index < len(self.target):
-					self.fm.move_pointer(absolute = index)
+					self.fm.move(to=index)
 			elif event.pressed(3):
 				try:
 					clicked_file = self.target.files[index]
@@ -112,7 +112,7 @@ class BrowserColumn(Pager):
 
 		else:
 			if self.level > 0:
-				self.fm.move_right()
+				self.fm.move(right=0)
 
 		return True