From: Daid <daid303@gmail.com>
Date: Tue, 21 Feb 2012 17:20:23 +0000 (+0100)
Subject: Merge branch 'master' of github.com:daid/SkeinPyPy
X-Git-Tag: RC1~167
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=840998d9333e7ea7307b97bb3a56d3636ae78ee2;p=cura.git

Merge branch 'master' of github.com:daid/SkeinPyPy

Conflicts:
	SkeinPyPy_NewUI/newui/mainWindow.py
---

840998d9333e7ea7307b97bb3a56d3636ae78ee2
diff --cc SkeinPyPy_NewUI/newui/mainWindow.py
index 8f2c2dae,18cea32d..ec6f1b65
--- a/SkeinPyPy_NewUI/newui/mainWindow.py
+++ b/SkeinPyPy_NewUI/newui/mainWindow.py
@@@ -65,10 -68,9 +68,10 @@@ class mainWindow(wx.Frame)
  		self.AddSetting(configPanel, "Speed (mm/s)", self.plugins['dimension'].preferencesDict['Extruder_Retraction_Speed_mm/s'])
  		self.AddSetting(configPanel, "Distance (mm)", self.plugins['dimension'].preferencesDict['Retraction_Distance_millimeters'])
  		self.AddSetting(configPanel, "Extra length on start (mm)", self.plugins['dimension'].preferencesDict['Restart_Extra_Distance_millimeters'])
 +		self.AddSetting(configPanel, "Minimal travel (mm)", self.plugins['dimension'].preferencesDict['Minimum_Travel_for_Retraction_millimeters'])
  
  		configPanel = wx.Panel(nb);
- 		nb.AddPage(configPanel, "Machine")
+ 		nb.AddPage(configPanel, "Machine config")
  		sizer = wx.GridBagSizer(2, 2)
  		configPanel.SetSizer(sizer)
  		
@@@ -138,11 -143,22 +146,23 @@@
  			ctrl.setting = setting
  			self.controlList.append(ctrl)
  			sizer.Add(ctrl, (sizer.GetRows(),2), flag=wx.ALIGN_BOTTOM|wx.EXPAND)
+ 		helpButton = wx.Button(panel, -1, "?", style=wx.BU_EXACTFIT)
+ 		sizer.Add(helpButton, (sizer.GetRows(),3))
  		sizer.SetRows(sizer.GetRows()+1)
 +		return ctrl
+ 
+ 	def OnLoadProfile(self, e):
+ 		dlg=wx.FileDialog(self, "Select profile file to load", self.lastPath, style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
+ 		dlg.SetWildcard("ini files (*.ini)|*.ini")
+ 		if dlg.ShowModal() == wx.ID_OK:
+ 			profileFile = dlg.GetPath()
+ 			self.lastPath = os.path.split(profileFile)[0]
+ 			settings.loadGlobalConfig(profileFile)
+ 			self.updateConfigToControls()
+ 		dlg.Destroy()
  	
  	def OnSaveProfile(self, e):
- 		dlg=wx.FileDialog(self, "Select profile file to save", style=wx.FD_SAVE)
+ 		dlg=wx.FileDialog(self, "Select profile file to save", self.lastPath, style=wx.FD_SAVE)
  		dlg.SetWildcard("ini files (*.ini)|*.ini")
  		if dlg.ShowModal() == wx.ID_OK:
  			profileFile = dlg.GetPath()