From 51edd8828c07bdef7f149d5894ac040f4e6a8efd Mon Sep 17 00:00:00 2001 From: tatiana Date: Fri, 9 Apr 2010 13:12:31 +0000 Subject: [PATCH] FIX: Cancel button on save project dialog (fix #239) --- invesalius/control.py | 4 +++- invesalius/gui/frame.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/invesalius/control.py b/invesalius/control.py index 4898f5e..2f4a05e 100755 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -170,6 +170,7 @@ class Controller(): ps.Publisher().sendMessage("Enable state project", False) ps.Publisher().sendMessage('Set project name') ps.Publisher().sendMessage("Stop Config Recording") + ps.Publisher().sendMessage("Exit") elif answer == 1: self.ShowDialogSaveProject() debug("Save changes and close") @@ -177,7 +178,7 @@ class Controller(): ps.Publisher().sendMessage("Enable state project", False) ps.Publisher().sendMessage('Set project name') ps.Publisher().sendMessage("Stop Config Recording") - + ps.Publisher().sendMessage("Exit") elif answer == -1: debug("Cancel") else: @@ -185,6 +186,7 @@ class Controller(): ps.Publisher().sendMessage("Enable state project", False) ps.Publisher().sendMessage('Set project name') ps.Publisher().sendMessage("Stop Config Recording") + ps.Publisher().sendMessage("Exit") else: ps.Publisher().sendMessage('Stop Config Recording') diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index 12f7f19..ea53f66 100755 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -93,6 +93,7 @@ class Frame(wx.Frame): sub(self._ShowImportPanel, 'Show import panel in frame') sub(self._ShowTask, 'Show task panel') sub(self._UpdateAUI, 'Update AUI') + sub(self._Exit, 'Exit') def __bind_events_wx(self): """ @@ -194,7 +195,7 @@ class Frame(wx.Frame): #no matching wxBeginBusyCursor() for wxEndBusyCursor() pass - def _Exit(self): + def _Exit(self, pubsub_evt): """ Exit InVesalius. """ @@ -281,7 +282,7 @@ class Frame(wx.Frame): Close all project data. """ ps.Publisher().sendMessage('Close Project') - self._Exit() + #/self._Exit() def OnMenuClick(self, evt): """ -- libgit2 0.21.2