[meld] filediff: Fix interaction between set labels and save-as action
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Fix interaction between set labels and save-as action
- Date: Wed, 23 Apr 2014 22:01:04 +0000 (UTC)
commit 157760ef6d2409951b0e9ac28f88a3d0ae268195
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Apr 24 07:31:33 2014 +1000
filediff: Fix interaction between set labels and save-as action
When setting fixed labels, we don't expect the user to change the
file, and there's no UI for doing so. However, it's still possible
(and reasonable) to change the file path by saving a labelled pane as
a different path. In this case, we already correctly set the path on
the file selector, so we just need to re-show it, in case the pane is
actually labelled.
meld/filediff.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index ed146a8..fee2bca 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1653,6 +1653,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
bufdata.filename = bufdata.label = os.path.abspath(filename)
bufdata.savefile = None
self.fileentry[pane].set_filename(bufdata.filename)
+ self.filelabel_toolitem[pane].set_visible(False)
+ self.fileentry_toolitem[pane].set_visible(True)
else:
return False
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]