Skip to content

Commit 6c43148

Browse files
committed
Initial pass at actually setting labels
1 parent 6c5cc24 commit 6c43148

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

meld/filediff.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ def __init__(self, num_panes):
175175
"diffmap", "file_save_button", "file_toolbar", "fileentry",
176176
"linkmap", "msgarea_mgr", "readonlytoggle",
177177
"scrolledwindow", "selector_hbox", "textview", "vbox",
178-
"dummy_toolbar_linkmap"
178+
"dummy_toolbar_linkmap", "filelabel_toolitem", "filelabel",
179+
"fileentry_toolitem",
179180
]
180181
self.map_widgets_into_lists(widget_lists)
181182

@@ -1082,6 +1083,8 @@ def recompute_label(self):
10821083
self.file_save_button[i].props.stock_id = (
10831084
Gtk.STOCK_SAVE if buf.data.writable else Gtk.STOCK_SAVE_AS)
10841085

1086+
# FIXME: Account for meta label information
1087+
10851088
self.label_text = (" — ").decode('utf8').join(shortnames)
10861089
self.tooltip_text = self.label_text
10871090
self.label_changed()
@@ -1252,6 +1255,13 @@ def _set_files_internal(self, files):
12521255

12531256
def set_meta(self, meta):
12541257
self.meta = meta
1258+
labels = meta.get('labels', ())
1259+
if labels:
1260+
for i, l in enumerate(labels):
1261+
if l:
1262+
self.filelabel[i].set_text(l)
1263+
self.filelabel_toolitem[i].set_visible(True)
1264+
self.fileentry_toolitem[i].set_visible(False)
12551265

12561266
def notify_file_changed(self, data):
12571267
try:

0 commit comments

Comments
 (0)