From d923d8d3b80acc739d09eb9b20a1f177f7cd662a Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Wed, 21 Mar 2012 15:53:29 +0100
Subject: [PATCH] Move flip option to 3D preview window

---
 SkeinPyPy/newui/mainWindow.py |  7 -------
 SkeinPyPy/newui/preview3d.py  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/SkeinPyPy/newui/mainWindow.py b/SkeinPyPy/newui/mainWindow.py
index 84f025af..d8688c4a 100644
--- a/SkeinPyPy/newui/mainWindow.py
+++ b/SkeinPyPy/newui/mainWindow.py
@@ -163,13 +163,6 @@ class mainWindow(configBase.configWindowBase):
 		c = configBase.SettingRow(left, "Scale", 'model_scale', '1.0', '')
 		validators.validFloat(c, 0.01)
 		configBase.settingNotify(c, self.preview3d.updateModelTransform)
-		configBase.TitleRow(left, "Flip")
-		c = configBase.SettingRow(left, "Flip X", 'flip_x', False, '')
-		configBase.settingNotify(c, self.preview3d.updateModelTransform)
-		c = configBase.SettingRow(left, "Flip Y", 'flip_y', False, '')
-		configBase.settingNotify(c, self.preview3d.updateModelTransform)
-		c = configBase.SettingRow(left, "Flip Z", 'flip_z', False, '')
-		configBase.settingNotify(c, self.preview3d.updateModelTransform)
 		configBase.TitleRow(right, "Rotate")
 		c = configBase.SettingRow(right, "Rotate (deg)", 'model_rotate_base', '0', '')
 		validators.validFloat(c)
diff --git a/SkeinPyPy/newui/preview3d.py b/SkeinPyPy/newui/preview3d.py
index 25250bb5..4941a8f6 100644
--- a/SkeinPyPy/newui/preview3d.py
+++ b/SkeinPyPy/newui/preview3d.py
@@ -56,13 +56,43 @@ class previewPanel(wx.Panel):
 		self.layerSpin = wx.SpinCtrl(self.toolbar, -1, '', size=(21*4,21), style=wx.SP_ARROW_KEYS)
 		self.toolbar.AddControl(self.layerSpin)
 		self.Bind(wx.EVT_SPINCTRL, self.OnLayerNrChange, self.layerSpin)
+
+		self.toolbar2 = wx.ToolBar( self, -1 )
+		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.updateToolbar()
 		
 		sizer = wx.BoxSizer(wx.VERTICAL)
 		sizer.Add(self.toolbar, 0, flag=wx.EXPAND|wx.TOP|wx.LEFT|wx.RIGHT, border=1)
 		sizer.Add(self.glCanvas, 1, flag=wx.EXPAND)
+		sizer.Add(self.toolbar2, 0, flag=wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, border=1)
 		self.SetSizer(sizer)
+	
+	def OnFlipXClick(self, e):
+		profile.putProfileSetting('flip_x', str(self.flipX.GetValue()))
+		self.updateModelTransform()
+		
+	def OnFlipYClick(self, e):
+		profile.putProfileSetting('flip_y', str(self.flipY.GetValue()))
+		self.updateModelTransform()
+
+	def OnFlipZClick(self, e):
+		profile.putProfileSetting('flip_z', str(self.flipZ.GetValue()))
+		self.updateModelTransform()
 
 	def On3DClick(self, e):
 		self.glCanvas.yaw = 30
-- 
2.30.2