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

Conflicts:
	SkeinPyPy_NewUI/newui/mainWindow.py

diff --cc SkeinPyPy_NewUI/newui/mainWindow.py
index 8f2c2dae9989085180397d2ae7114d58d9bf8735,18cea32de8aa9276a98aff837a167ababe21b993..ec6f1b65883ece446aa12252307801f09b06bcef
--- 1/SkeinPyPy_NewUI/newui/mainWindow.py
--- 2/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()