chiark / gitweb /
Add drag&drop support to quickprint.
authordaid303 <daid303@gmail.com>
Mon, 8 Oct 2012 08:06:41 +0000 (10:06 +0200)
committerdaid303 <daid303@gmail.com>
Mon, 8 Oct 2012 08:06:41 +0000 (10:06 +0200)
Cura/gui/firmwareInstall.py
Cura/gui/simpleMode.py

index c309fc5cfe6aa79edaadcdf1e3f99a1657027520..ddd11037f70376fbdf7437e7e7f87c9ec813f673 100644 (file)
@@ -75,7 +75,7 @@ class InstallFirmware(wx.Dialog):
                        wx.CallAfter(self.updateLabel, "Uploading firmware...")
                        try:
                                programmer.programChip(hexFile)
-                               wx.CallAfter(self.updateLabel, "Done!\nInstalled firmware: %s" % (os.path.basename(self.filename))
+                               wx.CallAfter(self.updateLabel, "Done!\nInstalled firmware: %s" % (os.path.basename(self.filename)))
                        except ispBase.IspError as e:
                                wx.CallAfter(self.updateLabel, "Failed to write firmware.\n" + str(e))
                                
index 3f39af326f01cec446130d4c33617708e362190d..4a7470b71b4d4a37231ef4318b23781d876b92bc 100644 (file)
@@ -9,6 +9,7 @@ from gui import sliceProgessPanel
 from gui import preferencesDialog
 from gui import configWizard
 from gui import firmwareInstall
+from gui import dropTarget
 from gui import printWindow
 from gui import icon
 from util import validators
@@ -24,6 +25,8 @@ class simpleModeWindow(configBase.configWindowBase):
                
                wx.EVT_CLOSE(self, self.OnClose)
                #self.SetIcon(icon.getMainIcon())
+
+               self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
                
                menubar = wx.MenuBar()
                fileMenu = wx.Menu()
@@ -142,6 +145,12 @@ class simpleModeWindow(configBase.configWindowBase):
                        self.preview3d.loadModelFiles(self.filelist, True)
                        self.preview3d.setViewMode("Normal")
                dlg.Destroy()
+
+       def OnDropFiles(self, filenames):
+               self.filelist = filenames
+               profile.putPreference('lastFile', ';'.join(self.filelist))
+               self.preview3d.loadModelFiles(self.filelist, True)
+               self.preview3d.setViewMode("Normal")
        
        def OnSlice(self, e):
                if len(self.filelist) < 1: