[meld] Initial pass at actually setting labels
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Initial pass at actually setting labels
- Date: Wed, 23 Apr 2014 22:00:54 +0000 (UTC)
commit 6c43148b9afbf699b81c0c839d1fa3ba43aefafc
Author: Kai Willadsen <kai willadsen gmail com>
Date: Wed Apr 23 14:27:37 2014 +1000
Initial pass at actually setting labels
meld/filediff.py | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index ffb6a72..ed146a8 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -175,7 +175,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
"diffmap", "file_save_button", "file_toolbar", "fileentry",
"linkmap", "msgarea_mgr", "readonlytoggle",
"scrolledwindow", "selector_hbox", "textview", "vbox",
- "dummy_toolbar_linkmap"
+ "dummy_toolbar_linkmap", "filelabel_toolitem", "filelabel",
+ "fileentry_toolitem",
]
self.map_widgets_into_lists(widget_lists)
@@ -1082,6 +1083,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
self.file_save_button[i].props.stock_id = (
Gtk.STOCK_SAVE if buf.data.writable else Gtk.STOCK_SAVE_AS)
+ # FIXME: Account for meta label information
+
self.label_text = (" — ").decode('utf8').join(shortnames)
self.tooltip_text = self.label_text
self.label_changed()
@@ -1252,6 +1255,13 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
def set_meta(self, meta):
self.meta = meta
+ labels = meta.get('labels', ())
+ if labels:
+ for i, l in enumerate(labels):
+ if l:
+ self.filelabel[i].set_text(l)
+ self.filelabel_toolitem[i].set_visible(True)
+ self.fileentry_toolitem[i].set_visible(False)
def notify_file_changed(self, data):
try:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]