diff options
| author | hut <hut@lavabit.com> | 2010-04-14 16:35:06 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-14 16:35:06 +0200 |
| commit | 1d3d94aac68790581e1e4027d0ecc868c516fea1 (patch) | |
| tree | 96b254d3c17b14571c4bc30f29b44538f9058db0 | |
| parent | 7327aab14542763cdd1e135ed5317fccab1d51d4 (diff) | |
| download | ranger-1d3d94aac68790581e1e4027d0ecc868c516fea1.tar.gz | |
widget.browsercolumn: display "?" in info in a different color
| -rw-r--r-- | ranger/colorschemes/default.py | 5 | ||||
| -rw-r--r-- | ranger/gui/context.py | 2 | ||||
| -rw-r--r-- | ranger/gui/widgets/browsercolumn.py | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ranger/colorschemes/default.py b/ranger/colorschemes/default.py index 335fdf53..317e8258 100644 --- a/ranger/colorschemes/default.py +++ b/ranger/colorschemes/default.py @@ -71,6 +71,11 @@ class Default(ColorScheme): if context.marked: attr |= bold fg = yellow + if context.badinfo: + if attr & reverse: + bg = magenta + else: + fg = magenta elif context.in_titlebar: attr |= bold diff --git a/ranger/gui/context.py b/ranger/gui/context.py index 585dd674..1e127a2e 100644 --- a/ranger/gui/context.py +++ b/ranger/gui/context.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -CONTEXT_KEYS = ['reset', 'error', +CONTEXT_KEYS = ['reset', 'error', 'badinfo', 'in_browser', 'in_statusbar', 'in_titlebar', 'in_console', 'in_pager', 'in_taskview', 'directory', 'file', 'hostname', diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py index 7d38576d..c0b60a2e 100644 --- a/ranger/gui/widgets/browsercolumn.py +++ b/ranger/gui/widgets/browsercolumn.py @@ -20,6 +20,7 @@ from time import time from . import Widget from .pager import Pager +from ranger.fsobject import BAD_INFO # Don't even try to preview files which mach this regular expression: PREVIEW_BLACKLIST = re.compile(r""" @@ -252,6 +253,7 @@ class BrowserColumn(Pager): except IndexError: break + 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 @@ -306,6 +308,8 @@ class BrowserColumn(Pager): 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 x > self.x: self.win.addstr(line, x, str(info) + ' ') except: @@ -314,6 +318,9 @@ class BrowserColumn(Pager): pass self.color_at(line, 0, self.wid, this_color) + if bad_info_color: + start, wid = bad_info_color + self.color_at(line, start, wid, this_color, 'badinfo') if self.main_column and tagged and self.wid > 2: this_color.append('tag_marker') |