[meld] Fix referencing the main actiongroup before tab was swapped in
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Fix referencing the main actiongroup before tab was swapped in
- Date: Sat, 6 Apr 2013 20:35:49 +0000 (UTC)
commit 998563a30516390f480f5e52cef18cfbb6ee2efa
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Apr 7 06:15:44 2013 +1000
Fix referencing the main actiongroup before tab was swapped in
meld/dirdiff.py | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 141e333..e5b022e 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -285,6 +285,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
self.actiongroup.set_translation_domain("meld")
self.actiongroup.add_actions(actions)
self.actiongroup.add_toggle_actions(toggleactions)
+ self.main_actiongroup = None
+
self.name_filters = []
self.text_filters = []
self.create_name_filters()
@@ -904,7 +906,6 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
return
have_selection = bool(selection.count_selected_rows())
get_action = self.actiongroup.get_action
- get_main_action = self.main_actiongroup.get_action
if have_selection:
is_valid = True
@@ -920,12 +921,16 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
get_action("DirCopyLeft").set_sensitive(is_valid and pane > 0)
get_action("DirCopyRight").set_sensitive(
is_valid and pane + 1 < self.num_panes)
- get_main_action("OpenExternal").set_sensitive(is_valid)
+ if self.main_actiongroup:
+ act = self.main_actiongroup.get_action("OpenExternal")
+ act.set_sensitive(is_valid)
else:
for action in ("DirCompare", "DirCopyLeft", "DirCopyRight",
"DirDelete", "Hide"):
get_action(action).set_sensitive(False)
- get_main_action("OpenExternal").set_sensitive(False)
+ if self.main_actiongroup:
+ act = self.main_actiongroup.get_action("OpenExternal")
+ act.set_sensitive(False)
def on_treeview_cursor_changed(self, *args):
pane = self._get_focused_pane()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]