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 6d23ba9bfdb975cab6b5d384fa860e43a02e691b..d193bd4692a846ffb0c103c0d8f3421b0629bbba 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -35,11 +35,13 @@ class mainWindow(wx.Frame):
 
                # 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'):
-                       import Cocoa
-                       import objc
-                       nswindow = objc.objc_object(c_void_p=self.MacGetTopLevelWindowRef())
-                       view = nswindow.contentView()
-                       view.registerForDraggedTypes_([Cocoa.NSFilenamesPboardType])
+                       try:
+                               import objc
+                               nswindow = objc.objc_object(c_void_p=self.MacGetTopLevelWindowRef())
+                               view = nswindow.contentView()
+                               view.registerForDraggedTypes_([u'NSFilenamesPboardType'])
+                       except:
+                               pass
 
                self.normalModeOnlyItems = []
 
@@ -64,6 +66,8 @@ 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)