From: daid303 <daid303@gmail.com>
Date: Fri, 29 Mar 2013 16:06:43 +0000 (+0100)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~141
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0212a8d3418ac36c1dd6b1356f587a206f2c3ada;p=cura.git

Merge branch 'master' into SteamEngine

Conflicts:
	Cura/gui/mainWindow.py
	Cura/slice/__main__.py
	Cura/util/profile.py
---

0212a8d3418ac36c1dd6b1356f587a206f2c3ada
diff --cc Cura/gui/mainWindow.py
index a9b79f67,1c143f61..5ec23fe5
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@@ -252,10 -265,8 +253,9 @@@ class mainWindow(wx.Frame)
  			self.splitter.SetSashSize(0)
  		else:
  			self.splitter.SetSashPosition(self.normalSashPos, True)
- 
  			# Enabled sash
  			self.splitter.SetSashSize(4)
 +		self.scene.updateProfileToControls()
  								
  	def OnPreferences(self, e):
  		prefDialog = preferencesDialog.preferencesDialog(self)
@@@ -479,20 -678,10 +479,24 @@@ class normalSettingsPanel(configBase.co
  
  		self.Bind(wx.EVT_SIZE, self.OnSize)
  
+ 		self.nb.SetSize(self.GetSize())
+ 		self.UpdateSize(self.printPanel)
+ 		self.UpdateSize(self.advancedPanel)
+ 
 +	def _addSettingsToPanels(self, category, left, right):
 +		count = len(profile.getSubCategoriesFor(category)) + len(profile.getSettingsForCategory(category))
 +
 +		p = left
 +		n = 0
 +		for title in profile.getSubCategoriesFor(category):
 +			n += 1 + len(profile.getSettingsForCategory(category, title))
 +			if n > count / 2:
 +				p = right
 +			configBase.TitleRow(p, title)
 +			for s in profile.getSettingsForCategory(category, title):
 +				if s.checkConditions():
 +					configBase.SettingRow(p, s.getName())
 +
  	def SizeLabelWidths(self, left, right):
  		leftWidth = self.getLabelColumnWidth(left)
  		rightWidth = self.getLabelColumnWidth(right)