[meld] tree: Allow path state setting to take custom display text
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] tree: Allow path state setting to take custom display text
- Date: Sat, 16 Dec 2017 02:38:27 +0000 (UTC)
commit 1478bed1ab7cd9dda99c354822be8694a6cdfd7c
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Dec 16 10:39:59 2017 +1000
tree: Allow path state setting to take custom display text
This is for use anywhere that the plain path basename isn't enough,
although really it's only currently going to be used for showing symlink
targets.
meld/tree.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/meld/tree.py b/meld/tree.py
index 1784db90..4d0d67ed 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -133,10 +133,11 @@ class DiffTreeStore(SearchableTreeStore):
str(STATE_ERROR))
self.set_state(it, pane, STATE_ERROR, msg)
- def set_path_state(self, it, pane, state, isdir=0):
- fullname = self.get_value(it, self.column_index(COL_PATH, pane))
- name = GLib.markup_escape_text(os.path.basename(fullname))
- self.set_state(it, pane, state, name, isdir)
+ def set_path_state(self, it, pane, state, isdir=0, display_text=None):
+ if not display_text:
+ fullname = self.get_value(it, self.column_index(COL_PATH, pane))
+ display_text = GLib.markup_escape_text(os.path.basename(fullname))
+ self.set_state(it, pane, state, display_text, isdir)
def set_state(self, it, pane, state, label, isdir=0):
col_idx = self.column_index
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]