From: Ferdi van der Werf <efcm@vdwerf.eu>
Date: Tue, 17 Apr 2012 13:19:15 +0000 (+0200)
Subject: Merge upstream, fixed conflicts, showing complete toolbar at bottom of preview
X-Git-Tag: RC3~68^2~3^2^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e25d5cb3007f9f223b611e9e0b315e9baca44311;p=cura.git

Merge upstream, fixed conflicts, showing complete toolbar at bottom of preview
---

e25d5cb3007f9f223b611e9e0b315e9baca44311
diff --cc Cura/gui/preview3d.py
index 3d91b9b7,14ef6b60..966b2258
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@@ -74,99 -63,65 +74,103 @@@ class previewPanel(wx.Panel)
  		self.toolbar.AddControl(self.layerSpin)
  		self.Bind(wx.EVT_SPINCTRL, self.OnLayerNrChange, self.layerSpin)
  		
 -		self.toolbar2 = wx.ToolBar( self, -1 )
 +		self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER )
  		self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )
 -		self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Flip'))
 -
 -		self.flipX = wx.CheckBox(self.toolbar2, -1, "X")
 -		self.flipX.SetValue(profile.getProfileSetting('flip_x') == 'True')
 -		self.toolbar2.AddControl(self.flipX)
 -		self.Bind(wx.EVT_CHECKBOX, self.OnFlipXClick, self.flipX)
 -		self.flipY = wx.CheckBox(self.toolbar2, -1, "Y")
 -		self.flipY.SetValue(profile.getProfileSetting('flip_y') == 'True')
 -		self.toolbar2.AddControl(self.flipY)
 -		self.Bind(wx.EVT_CHECKBOX, self.OnFlipYClick, self.flipY)
 -		self.flipZ = wx.CheckBox(self.toolbar2, -1, "Z")
 -		self.flipZ.SetValue(profile.getProfileSetting('flip_z') == 'True')
 -		self.toolbar2.AddControl(self.flipZ)
 -		self.Bind(wx.EVT_CHECKBOX, self.OnFlipZClick, self.flipZ)
 -
 -		self.swapXZ = wx.CheckBox(self.toolbar2, -1, "XZ")
 +		self.toolbar2.AddSeparator()
 +
 +
 +		self.mirrorX = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-x-off.png'), style=0, size=(20,20))
 +		self.mirrorX.SetBezelWidth(1)
 +		self.mirrorX.SetUseFocusIndicator(False)
 +		self.mirrorX.SetValue(profile.getProfileSetting('flip_x') == 'True')
 +		if self.mirrorX.GetValue():
 +			self.mirrorX.SetBitmapLabel(wx.Bitmap('Cura/images/object-mirror-x-on.png'))
 +		self.mirrorX.helpText = 'Mirror X'
 +		self.mirrorX.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)
 +		self.mirrorX.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)
 +		self.mirrorX.Bind(wx.EVT_BUTTON, self.OnFlipXClick)
 +		self.toolbar2.AddControl(self.mirrorX)
 +
 +		self.mirrorY = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-y-off.png'), size=(20,20))
 +		self.mirrorY.SetBezelWidth(1)
 +		self.mirrorY.SetUseFocusIndicator(False)
 +		self.mirrorY.SetValue(profile.getProfileSetting('flip_y') == 'True')
 +		if self.mirrorY.GetValue():
 +			self.mirrorY.SetBitmapLabel(wx.Bitmap('Cura/images/object-mirror-x-on.png'))
 +		self.mirrorY.helpText = 'Mirror Y'
 +		self.mirrorY.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)
 +		self.mirrorY.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)
 +		self.mirrorY.Bind(wx.EVT_BUTTON, self.OnFlipYClick)
 +		self.toolbar2.AddControl(self.mirrorY)
 +
 +		self.mirrorZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-z-off.png'), size=(20,20))
 +		self.mirrorZ.SetBezelWidth(1)
 +		self.mirrorZ.SetUseFocusIndicator(False)
 +		self.mirrorZ.SetValue(profile.getProfileSetting('flip_z') == 'True')
 +		if self.mirrorZ.GetValue():
 +			self.mirrorZ.SetBitmapLabel(wx.Bitmap('Cura/images/object-mirror-z-on.png'))
 +		self.mirrorZ.helpText = 'Mirror Z'
 +		self.mirrorZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)
 +		self.mirrorZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)
 +		self.mirrorZ.Bind(wx.EVT_BUTTON, self.OnFlipZClick)
 +		self.toolbar2.AddControl(self.mirrorZ)
 +
 +		self.toolbar2.AddSeparator()
 +
 +		self.swapXZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-swap-xz-off.png'), size=(20,20))
 +		self.swapXZ.SetBezelWidth(1)
 +		self.swapXZ.SetUseFocusIndicator(False)
 +		if self.swapXZ.GetValue():
 +			self.swapXZ.SetBitmapLabel(wx.Bitmap('Cura/images/object-swap-xz-on.png'))
 +		self.swapXZ.helpText = 'Swap XZ'
 +		self.swapXZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)
 +		self.swapXZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)
  		self.swapXZ.SetValue(profile.getProfileSetting('swap_xz') == 'True')
  		self.toolbar2.AddControl(self.swapXZ)
 -		self.Bind(wx.EVT_CHECKBOX, self.OnSwapXZClick, self.swapXZ)
 +		self.Bind(wx.EVT_BUTTON, self.OnSwapXZClick, self.swapXZ)
  
 -		self.swapYZ = wx.CheckBox(self.toolbar2, -1, "YZ")
 +		self.swapYZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-swap-yz-off.png'), size=(20,20))
 +		self.swapYZ.SetBezelWidth(1)
 +		self.swapYZ.SetUseFocusIndicator(False)
 +		self.swapYZ.helpText = 'Swap YZ'
 +		self.swapYZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)
 +		self.swapYZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)
  		self.swapYZ.SetValue(profile.getProfileSetting('swap_yz') == 'True')
  		self.toolbar2.AddControl(self.swapYZ)
 -		self.Bind(wx.EVT_CHECKBOX, self.OnSwapYZClick, self.swapYZ)
 +		self.Bind(wx.EVT_BUTTON, self.OnSwapYZClick, self.swapYZ)
  		
- 		#self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
- 		#self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))
- 		#self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21))
- 		#self.toolbar2.AddControl(self.scale)
- 		#self.Bind(wx.EVT_TEXT, self.OnScale, self.scale)
- 
- 		#self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
- 		#self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Copy'))
- 		#self.mulXsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))
- 		#self.toolbar2.AddControl(self.mulXsub)
- 		#self.Bind(wx.EVT_BUTTON, self.OnMulXSubClick, self.mulXsub)
- 		#self.mulXadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))
- 		#self.toolbar2.AddControl(self.mulXadd)
- 		#self.Bind(wx.EVT_BUTTON, self.OnMulXAddClick, self.mulXadd)
- 
- 		#self.mulYsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))
- 		#self.toolbar2.AddControl(self.mulYsub)
- 		#self.Bind(wx.EVT_BUTTON, self.OnMulYSubClick, self.mulYsub)
- 		#self.mulYadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))
- 		#self.toolbar2.AddControl(self.mulYadd)
- 		#self.Bind(wx.EVT_BUTTON, self.OnMulYAddClick, self.mulYadd)
+ 		self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
+ 		self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))
+ 		self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21))
+ 		self.toolbar2.AddControl(self.scale)
+ 		self.Bind(wx.EVT_TEXT, self.OnScale, self.scale)
+ 
+ 		self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
+ 		self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Copy'))
+ 		self.mulXsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))
+ 		self.toolbar2.AddControl(self.mulXsub)
+ 		self.Bind(wx.EVT_BUTTON, self.OnMulXSubClick, self.mulXsub)
+ 		self.mulXadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))
+ 		self.toolbar2.AddControl(self.mulXadd)
+ 		self.Bind(wx.EVT_BUTTON, self.OnMulXAddClick, self.mulXadd)
+ 
+ 		self.mulYsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))
+ 		self.toolbar2.AddControl(self.mulYsub)
+ 		self.Bind(wx.EVT_BUTTON, self.OnMulYSubClick, self.mulYsub)
+ 		self.mulYadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))
+ 		self.toolbar2.AddControl(self.mulYadd)
+ 		self.Bind(wx.EVT_BUTTON, self.OnMulYAddClick, self.mulYadd)
  		
- 		#self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
- 		#self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Rot'))
- 		#self.rotate = wx.SpinCtrl(self.toolbar2, -1, profile.getProfileSetting('model_rotate_base'), size=(21*3,21), style=wx.SP_WRAP|wx.SP_ARROW_KEYS)
- 		#self.rotate.SetRange(0, 360)
- 		#self.toolbar2.AddControl(self.rotate)
- 		#self.Bind(wx.EVT_SPINCTRL, self.OnRotate, self.rotate)
+ 		self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
+ 		self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Rot'))
+ 		self.rotate = wx.SpinCtrl(self.toolbar2, -1, profile.getProfileSetting('model_rotate_base'), size=(21*3,21), style=wx.SP_WRAP|wx.SP_ARROW_KEYS)
+ 		self.rotate.SetRange(0, 360)
+ 		self.toolbar2.AddControl(self.rotate)
+ 		self.Bind(wx.EVT_SPINCTRL, self.OnRotate, self.rotate)
+ 
+ 		self.scaleMax = wx.Button(self.toolbar, -1, 'Max size', size=(21*3.5,21))
+ 		self.toolbar.AddControl(self.scaleMax)
+ 		self.Bind(wx.EVT_BUTTON, self.OnScaleMax, self.scaleMax)
  
  		self.toolbar2.Realize()
  		self.updateToolbar()