Merge pull request #601 from CapnBry/reloadscene

[cura.git] / Cura / gui / mainWindow.py

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 590252a53d3bc4adfbe1d1751e5894bcd36ce187..d193bd4692a846ffb0c103c0d8f3421b0629bbba 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -1,9 +1,10 @@
-from __future__ import absolute_import
 __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 
 import wx
 import os
 import webbrowser
+import sys
+
 
 from Cura.gui import configBase
 from Cura.gui import expertConfig
@@ -32,6 +33,16 @@ class mainWindow(wx.Frame):
                # allow dropping any file, restrict later
                self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles))
 
+               # TODO: wxWidgets 2.9.4 has a bug when NSView does not register for dragged types when wx drop target is set. It was fixed in 2.9.5
+               if sys.platform.startswith('darwin'):
+                       try:
+                               import objc
+                               nswindow = objc.objc_object(c_void_p=self.MacGetTopLevelWindowRef())
+                               view = nswindow.contentView()
+                               view.registerForDraggedTypes_([u'NSFilenamesPboardType'])
+                       except:
+                               pass
+
                self.normalModeOnlyItems = []
 
                mruFile = os.path.join(profile.getBasePath(), 'mru_filelist.ini')
@@ -55,16 +66,18 @@ class mainWindow(wx.Frame):
                self.Bind(wx.EVT_MENU, lambda e: self.scene.showLoadModel(), i)
                i = self.fileMenu.Append(-1, _("Save model...\tCTRL+S"))
                self.Bind(wx.EVT_MENU, lambda e: self.scene.showSaveModel(), i)
+               i = self.fileMenu.Append(-1, _("Reload platform\tF5"))
+               self.Bind(wx.EVT_MENU, lambda e: self.scene.reloadScene(e), i)
                i = self.fileMenu.Append(-1, _("Clear platform"))
                self.Bind(wx.EVT_MENU, lambda e: self.scene.OnDeleteAll(e), i)
 
                self.fileMenu.AppendSeparator()
                i = self.fileMenu.Append(-1, _("Print...\tCTRL+P"))
-               self.Bind(wx.EVT_MENU, lambda e: self.scene.showPrintWindow(), i)
+               self.Bind(wx.EVT_MENU, lambda e: self.scene.OnPrintButton(1), i)
                i = self.fileMenu.Append(-1, _("Save GCode..."))
                self.Bind(wx.EVT_MENU, lambda e: self.scene.showSaveGCode(), i)
                i = self.fileMenu.Append(-1, _("Show slice engine log..."))
-               self.Bind(wx.EVT_MENU, lambda e: self.scene._showSliceLog(), i)
+               self.Bind(wx.EVT_MENU, lambda e: self.scene._showEngineLog(), i)
 
                self.fileMenu.AppendSeparator()
                i = self.fileMenu.Append(-1, _("Open Profile..."))
@@ -321,12 +334,14 @@ class mainWindow(wx.Frame):
                if int(profile.getMachineSetting('extruder_amount')) < 2:
                        self.headOffsetWizardMenuItem.Enable(False)
                self.scene.updateProfileToControls()
+               self.scene._scene.pushFree()
 
        def onOneAtATimeSwitch(self, e):
                profile.putPreference('oneAtATime', self.oneAtATime.IsChecked())
                if self.oneAtATime.IsChecked() and profile.getMachineSettingFloat('extruder_head_size_height') < 1:
                        wx.MessageBox(_('For "One at a time" printing, you need to have entered the correct head size and gantry height in the machine settings'), _('One at a time warning'), wx.OK | wx.ICON_WARNING)
                self.scene.updateProfileToControls()
+               self.scene._scene.pushFree()
                self.scene.sceneUpdated()
 
        def OnPreferences(self, e):
@@ -344,7 +359,6 @@ class mainWindow(wx.Frame):
 
        def OnDropFiles(self, files):
                if len(files) > 0:
-                       profile.setPluginConfig([])
                        self.updateProfileToAllControls()
                self.scene.loadFiles(files)
 
@@ -554,7 +568,7 @@ class mainWindow(wx.Frame):
                aboutBox.Show()
 
        def OnClose(self, e):
-               profile.saveProfile(profile.getDefaultProfilePath())
+               profile.saveProfile(profile.getDefaultProfilePath(), True)
 
                # Save the window position, size & state from the preferences file
                profile.putPreference('window_maximized', self.IsMaximized())