Bring simple mode window up to speed with the rest

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index e760f7385138e00dae52089220b3b6398ec30998..d4b8f55f7003f9d9fff15712932282b089b673a7 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -41,7 +41,7 @@ class mainWindow(configBase.configWindowBase):
                menubar = wx.MenuBar()
                fileMenu = wx.Menu()
                i = fileMenu.Append(-1, 'Load model file...')
-               self.Bind(wx.EVT_MENU, self.OnLoadModel, i)
+               self.Bind(wx.EVT_MENU, lambda e: self._showModelLoadDialog(1), i)
                fileMenu.AppendSeparator()
                i = fileMenu.Append(-1, 'Open Profile...')
                self.Bind(wx.EVT_MENU, self.OnLoadProfile, i)
@@ -189,23 +189,23 @@ class mainWindow(configBase.configWindowBase):
                loadButton = wx.Button(self, -1, 'Load Model')
                sliceButton = wx.Button(self, -1, 'Slice to GCode')
                printButton = wx.Button(self, -1, 'Print GCode')
-               self.Bind(wx.EVT_BUTTON, self.OnLoadModel, loadButton)
+               self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(1), loadButton)
                self.Bind(wx.EVT_BUTTON, self.OnSlice, sliceButton)
                self.Bind(wx.EVT_BUTTON, self.OnPrint, printButton)
 
                extruderCount = int(profile.getPreference('extruder_amount'))
                if extruderCount > 1:
                        loadButton2 = wx.Button(self, -1, 'Load Dual')
-                       self.Bind(wx.EVT_BUTTON, self.OnLoadModel2, loadButton2)
+                       self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(2), loadButton2)
                if extruderCount > 2:
                        loadButton3 = wx.Button(self, -1, 'Load Tripple')
-                       self.Bind(wx.EVT_BUTTON, self.OnLoadModel3, loadButton3)
+                       self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(3), loadButton3)
                if extruderCount > 2:
                        loadButton4 = wx.Button(self, -1, 'Load Quad')
-                       self.Bind(wx.EVT_BUTTON, self.OnLoadModel4, loadButton4)
+                       self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(4), loadButton4)
 
                #Also bind double clicking the 3D preview to load an STL file.
-               self.preview3d.glCanvas.Bind(wx.EVT_LEFT_DCLICK, self.OnLoadModel, self.preview3d.glCanvas)
+               self.preview3d.glCanvas.Bind(wx.EVT_LEFT_DCLICK, lambda e: self._showModelLoadDialog(1), self.preview3d.glCanvas)
 
                #Main sizer, to position the preview window, buttons and tab control
                sizer = wx.GridBagSizer()

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 4f38ca952368e3af304bff08fc45e8467603f8cb..63928fd3ee55693d9762c59b3563e018ab5fa971 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -51,8 +51,11 @@ class simpleModeWindow(configBase.configWindowBase):
                menubar.Append(helpMenu, 'Help')
                self.SetMenuBar(menubar)
                
-               self.lastPath = ""
-               self.filename = profile.getPreference('lastFile')
+               if profile.getPreference('lastFile') != '':
+                       self.filelist = profile.getPreference('lastFile').split(';')
+                       self.SetTitle(self.filelist[-1] + ' - Cura - ' + version.getVersion())
+               else:
+                       self.filelist = []
                self.progressPanelList = []
 
                #Preview window
@@ -116,9 +119,8 @@ class simpleModeWindow(configBase.configWindowBase):
                sizer.Add(printButton, (1,3), flag=wx.RIGHT, border=5)
                self.sizer = sizer
 
-               if self.filename != "None":
-                       self.preview3d.loadModelFiles([self.filename])
-                       self.lastPath = os.path.split(self.filename)[0]
+               if len(self.filelist) > 0:
+                       self.preview3d.loadModelFiles(self.filelist)
 
                self.updateProfileToControls()
 
@@ -136,7 +138,7 @@ class simpleModeWindow(configBase.configWindowBase):
                machineCom.InstallFirmware(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/default.hex"))
 
        def OnCustomFirmware(self, e):
-               dlg=wx.FileDialog(self, "Open firmware to upload", self.lastPath, style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
+               dlg=wx.FileDialog(self, "Open firmware to upload", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
                dlg.SetWildcard("HEX file (*.hex)|*.hex;*.HEX")
                if dlg.ShowModal() == wx.ID_OK:
                        filename = dlg.GetPath()
@@ -150,20 +152,17 @@ class simpleModeWindow(configBase.configWindowBase):
                self.updateProfileToControls()
 
        def OnLoadModel(self, e):
-               dlg=wx.FileDialog(self, "Open file to print", self.lastPath, style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
+               dlg=wx.FileDialog(self, "Open file to print", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
                dlg.SetWildcard("STL files (*.stl)|*.stl;*.STL")
                if dlg.ShowModal() == wx.ID_OK:
-                       self.filename=dlg.GetPath()
-                       profile.putPreference('lastFile', self.filename)
-                       if not(os.path.exists(self.filename)):
-                               return
-                       self.lastPath = os.path.split(self.filename)[0]
-                       self.preview3d.loadModelFiles([self.filename])
+                       self.filelist = [dlg.GetPath()]
+                       profile.putPreference('lastFile', ';'.join(self.filelist))
+                       self.preview3d.loadModelFiles(self.filelist)
                        self.preview3d.setViewMode("Normal")
                dlg.Destroy()
        
        def OnSlice(self, e):
-               if self.filename == None:
+               if len(self.filelist) < 1:
                        wx.MessageBox('You need to load a file before you can slice it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
                        return
                #save the current profile so we can put it back latter
@@ -262,7 +261,7 @@ class simpleModeWindow(configBase.configWindowBase):
                        put('bottom_thickness', '0.0')
                
                #Create a progress panel and add it to the window. The progress panel will start the Skein operation.
-               spp = sliceProgessPanel.sliceProgessPanel(self, self, self.filename)
+               spp = sliceProgessPanel.sliceProgessPanel(self, self, self.filelist)
                self.sizer.Add(spp, (len(self.progressPanelList)+2,0), span=(1,4), flag=wx.EXPAND)
                self.sizer.Layout()
                newSize = self.GetSize();
@@ -274,13 +273,13 @@ class simpleModeWindow(configBase.configWindowBase):
                profile.loadGlobalProfileFromString(oldProfile)
        
        def OnPrint(self, e):
-               if self.filename == None:
+               if len(self.filelist) < 1:
                        wx.MessageBox('You need to load a file and slice it before you can print it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
                        return
-               if not os.path.exists(self.filename[: self.filename.rfind('.')] + "_export.gcode"):
+               if not os.path.exists(self.filelist[0][: self.filelist[0].rfind('.')] + "_export.gcode"):
                        wx.MessageBox('You need to slice the file to GCode before you can print it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
                        return
-               printWindow.printFile(self.filename[: self.filename.rfind('.')] + "_export.gcode")
+               printWindow.printFile(self.filelist[0][: self.filelist[0].rfind('.')] + "_export.gcode")
 
        def OnNormalSwitch(self, e):
                from gui import mainWindow