From 5ed312402389b9882512f09a7a740e850ce446c3 Mon Sep 17 00:00:00 2001 From: dbosst Date: Wed, 28 Mar 2018 12:30:47 -0400 Subject: use offset and pos to shift tabs: offset will shift the tab number as seen pos will shift the tab to the tav number given preserves as much as possible the tab numbers --- ranger/config/rc.conf | 4 ++-- ranger/core/actions.py | 57 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf index 8ac83cd3..53171112 100644 --- a/ranger/config/rc.conf +++ b/ranger/config/rc.conf @@ -478,8 +478,8 @@ map tab_open 6 map tab_open 7 map tab_open 8 map tab_open 9 -map tab_shift 1 -map tab_shift -1 +map tab_shift 1 +map tab_shift -1 # Sorting map or set sort_reverse! diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 68551775..55226434 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -1191,31 +1191,56 @@ class Actions( # pylint: disable=too-many-instance-attributes,too-many-public-m return self.tab_open(i, path) return None - def tab_shift(self, offset): + def tab_shift(self, offset=0, pos=None): """Shift the tab left/right - Shift the current tab to the left or right + Shift the current tab to the left or right by either: + offset - changes the tab number by offset + pos - shifts the tab to the specified tab number """ - assert isinstance(offset, int) - tablist = self.get_tab_list() + oldtab_index = self.current_tab - old_index = tablist.index(oldtab_index) - new_index = (old_index + offset) - if new_index < 0: - return None - if new_index > (len(tablist)-1): - return None - newtab_index = tablist[new_index] + if pos is None: + assert isinstance(offset, int) + # enumerated index (1 to 9) + newtab_index = oldtab_index + offset + if newtab_index < 1: + newtab_index = 1 + if newtab_index > 9: + newtab_index = 9 + else: + assert isinstance(pos, int) + if pos < 1 or pos > 9: + return None + newtab_index = pos + # shift tabs without enumerating, preserve tab numbers when can if newtab_index != oldtab_index: + # the other tabs shift in the opposite direction + if (newtab_index - oldtab_index) > 0: + direction = -1 + else: + direction = 1 + + def tabshiftreorder(source_index): + # shift the tabs to make source_index empty + if source_index in self.tabs: + target_index = source_index + direction + # make the target_index empty recursively + tabshiftreorder(target_index) + # shift the source to target + source_tab = self.tabs[source_index] + self.tabs[target_index] = source_tab + del self.tabs[source_index] + + # first remove the current tab from the dict oldtab = self.tabs[oldtab_index] - newtab = self.tabs[newtab_index] - self.tabs[oldtab_index] = newtab + del self.tabs[oldtab_index] + # make newtab_index empty by shifting + tabshiftreorder(newtab_index) self.tabs[newtab_index] = oldtab self.current_tab = newtab_index self.thistab = oldtab - self.change_mode('normal') - self.signal_emit('tab.change', old=oldtab, new=newtab) - self.signal_emit('tab.change', old=newtab, new=oldtab) + self.ui.titlebar.request_redraw() self.signal_emit('tab.layoutchange') return None -- cgit 1.4.1-2-gfad0 '>^ 
b589f25a ^

b3707a6f ^

da388212 ^

b589f25a ^

b31aaa21 ^

72d7e2d0 ^

b31aaa21 ^


72d7e2d0 ^

1
2

3

4

5

6

7

8

9

10
11

12