diff options
Diffstat (limited to 'ranger/gui/widgets/browsercolumn.py')
| -rw-r--r-- | ranger/gui/widgets/browsercolumn.py | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py index d617e64e..c0d22658 100644 --- a/ranger/gui/widgets/browsercolumn.py +++ b/ranger/gui/widgets/browsercolumn.py @@ -28,6 +28,7 @@ class BrowserColumn(Pager): target = None tagged_marker = '*' last_redraw_time = -1 + ellipsis = "~" old_dir = None old_cf = None @@ -81,7 +82,11 @@ class BrowserColumn(Pager): elif event.pressed(3): try: clicked_file = self.target.files[index] - self.fm.enter_dir(clicked_file.path) + if clicked_file.is_directory: + self.fm.enter_dir(clicked_file.path) + elif self.level == 0: + self.fm.env.cwd.move_to_obj(clicked_file) + self.fm.execute_file(clicked_file) except: pass @@ -108,6 +113,8 @@ class BrowserColumn(Pager): def poke(self): Widget.poke(self) self.target = self.env.at_level(self.level) + if self.target and self.target.is_file and self.has_preview(): + self.visible = True def draw(self): """Call either _draw_file() or _draw_directory()""" @@ -155,8 +162,9 @@ class BrowserColumn(Pager): return try: - f = self.target.get_preview_source() + f = self.target.get_preview_source(self.wid, self.hei) except: + raise # XXX Pager.close(self) else: if f is None: @@ -198,6 +206,8 @@ class BrowserColumn(Pager): self._set_scroll_begin() + copied = [f.path for f in self.env.copy] + selected_i = self.target.pointer for line in range(self.hei): i = line + self.scroll_begin @@ -207,11 +217,24 @@ class BrowserColumn(Pager): except IndexError: break + if self.display_infostring and drawn.infostring \ + and self.settings.display_size_in_main_column: + infostring = str(drawn.infostring) + " " + else: + infostring = "" + bad_info_color = None this_color = base_color + list(drawn.mimetype_tuple) text = drawn.basename tagged = self.fm.tags and drawn.realpath in self.fm.tags + space = self.wid - len(infostring) + if self.main_column: + space -= 2 + + if len(text) > space: + text = text[:space-1] + self.ellipsis + if i == selected_i: this_color.append('selected') @@ -241,7 +264,7 @@ class BrowserColumn(Pager): if drawn.is_device: this_color.append('device') - if self.env.copy and drawn in self.env.copy: + if drawn.path in copied: this_color.append('cut' if self.env.cut else 'copied') if drawn.is_link: @@ -257,14 +280,12 @@ class BrowserColumn(Pager): else: self.addnstr(line, 0, text, self.wid) - if self.display_infostring and drawn.infostring \ - and self.settings.display_size_in_main_column: - info = drawn.infostring - x = self.wid - 1 - len(info) - if info is BAD_INFO: - bad_info_color = (x, len(str(info))) + if infostring: + x = self.wid - 1 - len(infostring) + if infostring is BAD_INFO: + bad_info_color = (x, len(infostring)) if x > 0: - self.addstr(line, x, str(info) + ' ') + self.addstr(line, x, infostring) self.color_at(line, 0, self.wid, this_color) if bad_info_color: |