[meld] Reinstate some incorrectly-unset sensitivity, and limit others
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Reinstate some incorrectly-unset sensitivity, and limit others
- Date: Sat, 22 Jun 2013 21:46:49 +0000 (UTC)
commit e1c616f5c780465b92827009c5d0ff170813adfa
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jun 22 12:31:19 2013 +1000
Reinstate some incorrectly-unset sensitivity, and limit others
meld/meldwindow.py | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 07a6dd6..1fd04b1 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -318,17 +318,25 @@ class MeldWindow(gnomeglade.Component):
self.actiongroup.get_action("MoveTabPrev").set_sensitive(have_prev_tab)
self.actiongroup.get_action("MoveTabNext").set_sensitive(have_next_tab)
- have_focus = current_page != -1
- self.actiongroup.get_action("Close").set_sensitive(have_focus)
+ if current_page != -1:
+ page = self.notebook.get_nth_page(
+ current_page).get_data("pyobject")
+ else:
+ page = None
- have_comparison_page = have_focus and isinstance(
- self.notebook.get_nth_page(current_page).get_data("pyobject"),
- melddoc.MeldDoc)
- if not have_comparison_page:
+ self.actiongroup.get_action("Close").set_sensitive(bool(page))
+ if not isinstance(page, melddoc.MeldDoc):
for action in ("PrevChange", "NextChange", "Cut", "Copy", "Paste",
"Find", "FindNext", "FindPrevious", "Replace",
"Refresh"):
self.actiongroup.get_action(action).set_sensitive(False)
+ else:
+ for action in ("Find", "Refresh"):
+ self.actiongroup.get_action(action).set_sensitive(True)
+ is_filediff = isinstance(page, filediff.FileDiff)
+ for action in ("Cut", "Copy", "Paste", "FindNext", "FindPrevious",
+ "Replace"):
+ self.actiongroup.get_action(action).set_sensitive(is_filediff)
def on_switch_page(self, notebook, page, which):
oldidx = notebook.get_current_page()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]