chiark / gitweb /
Change abort button into close button after slicing with project planner. Fixes #69
authorDaid <daid303@gmail.com>
Sat, 21 Apr 2012 19:27:53 +0000 (21:27 +0200)
committerDaid <daid303@gmail.com>
Sat, 21 Apr 2012 19:27:53 +0000 (21:27 +0200)
Cura/gui/projectPlanner.py

index e89ff36e106901936ea79e0cfb5870d3772bd8f9..f0a4984329d9eae69ec7990e7b92ef5cb4a7a1d9 100644 (file)
@@ -650,7 +650,11 @@ class ProjectSliceProgressWindow(wx.Frame):
                threading.Thread(target=self.OnRun).start()\r
 \r
        def OnAbort(self, e):\r
-               self.abort = True\r
+               if self.abort:\r
+                       self.Close()\r
+               else:\r
+                       self.abort = True\r
+                       self.abortButton.SetLabel('Close')\r
 \r
        def SetProgress(self, stepName, layer, maxLayer):\r
                if self.prevStep != stepName:\r
@@ -720,6 +724,8 @@ class ProjectSliceProgressWindow(wx.Frame):
                resultFile.write(';TYPE:CUSTOM\n')\r
                resultFile.write(profile.getAlterationFileContents('end.gcode'))\r
                resultFile.close()\r
+               self.abort = True\r
+               wx.CallAfter(self.abortButton.SetLabel, 'Close')\r
 \r
 def main():\r
        app = wx.App(False)\r