Merge branch 'master' into SteamEngine

Conflicts:
	package.sh

diff --cc Cura/gui/mainWindow.py
index 91adfa299040a53b9eefc2102a2c2bc3848e385d,1c2aefbaa4083e74b63908f9a022928a25bcb58f..bd78aa4ac0b77bed77c2cfab6694f6350d2513e0
--- 1/Cura/gui/mainWindow.py
--- 2/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@@ -255,12 -272,87 +255,12 @@@ class mainWindow(wx.Frame)
        def OnPreferences(self, e):
                prefDialog = preferencesDialog.preferencesDialog(self)
                prefDialog.Centre()
-               prefDialog.Show(True)
+               prefDialog.Show()
  
 -      def _showOpenDialog(self, title, wildcard = meshLoader.wildcardFilter()):
 -              dlg=wx.FileDialog(self, title, os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
 -              dlg.SetWildcard(wildcard)
 -              if dlg.ShowModal() == wx.ID_OK:
 -                      filename = dlg.GetPath()
 -                      dlg.Destroy()
 -                      if not(os.path.exists(filename)):
 -                              return False
 -                      profile.putPreference('lastFile', filename)
 -                      return filename
 -              dlg.Destroy()
 -              return False
 -
 -      def _showModelLoadDialog(self, amount):
 -              filelist = []
 -              for i in xrange(0, amount):
 -                      filelist.append(self._showOpenDialog("Open file to print"))
 -                      if filelist[-1] == False:
 -                              return
 -              self._loadModels(filelist)
 -
 -      def _loadModels(self, filelist):
 -              self.filelist = filelist
 -              self.SetTitle('Cura - %s - %s' % (version.getVersion(), filelist[-1]))
 -              profile.putPreference('lastFile', ';'.join(self.filelist))
 -              self.preview3d.loadModelFiles(self.filelist, True)
 -              self.preview3d.setViewMode("Normal")
 -              
 -              # Update the Model MRU
 -              for idx in xrange(0, len(self.filelist)):
 -                      self.addToModelMRU(self.filelist[idx])
 -
        def OnDropFiles(self, files):
 -              profile.putProfileSetting('model_matrix', '1,0,0,0,1,0,0,0,1')
                profile.setPluginConfig([])
                self.updateProfileToControls()
 -              self._loadModels(files)
 -
 -      def OnLoadModel(self, e):
 -              self._showModelLoadDialog(1)
 -
 -      def OnLoadModel2(self, e):
 -              self._showModelLoadDialog(2)
 -
 -      def OnLoadModel3(self, e):
 -              self._showModelLoadDialog(3)
 -
 -      def OnLoadModel4(self, e):
 -              self._showModelLoadDialog(4)
 -
 -      def OnSlice(self, e):
 -              if len(self.filelist) < 1:
 -                      wx.MessageBox('You need to load a file before you can prepare it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
 -                      return
 -              isSimple = profile.getPreference('startMode') == 'Simple'
 -              if isSimple:
 -                      #save the current profile so we can put it back latter
 -                      oldProfile = profile.getGlobalProfileString()
 -                      self.simpleSettingsPanel.setupSlice()
 -              #Create a progress panel and add it to the window. The progress panel will start the Skein operation.
 -              spp = sliceProgressPanel.sliceProgressPanel(self, self, self.filelist)
 -              self.sizer.Add(spp, 0, flag=wx.EXPAND)
 -              self.sizer.Layout()
 -              newSize = self.GetSize()
 -              newSize.IncBy(0, spp.GetSize().GetHeight())
 -              if newSize.GetWidth() < wx.GetDisplaySize()[0]:
 -                      self.SetSize(newSize)
 -              self.progressPanelList.append(spp)
 -              if isSimple:
 -                      profile.loadGlobalProfileFromString(oldProfile)
 -
 -      def OnPrint(self, e):
 -              if len(self.filelist) < 1:
 -                      wx.MessageBox('You need to load a file and prepare it before you can print.', 'Print error', wx.OK | wx.ICON_INFORMATION)
 -                      return
 -              if not os.path.exists(sliceRun.getExportFilename(self.filelist[0])):
 -                      wx.MessageBox('You need to prepare a print before you can run the actual print.', 'Print error', wx.OK | wx.ICON_INFORMATION)
 -                      return
 -              printWindow.printFile(sliceRun.getExportFilename(self.filelist[0]))
 +              self.scene.loadScene(files)
  
        def OnModelMRU(self, e):
                fileNum = e.GetId() - self.ID_MRU_MODEL1

diff --cc Cura/gui/preferencesDialog.py
Simple merge