Experimental icons for flip x,y,z and swap xz,yz

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 92ce6db9fb7cd4e83bbc95a2ec180c4fdca7aae2..2091573c9bb994fbd1facf69bbfdfb2a186244ad 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -8,6 +8,7 @@ import time
 import os\r
 \r
 from wx import glcanvas\r
+from wx.lib import buttons\r
 import wx\r
 try:\r
        import OpenGL\r
@@ -63,32 +64,57 @@ class previewPanel(wx.Panel):
                self.toolbar.AddControl(self.layerSpin)\r
                self.Bind(wx.EVT_SPINCTRL, self.OnLayerNrChange, self.layerSpin)\r
                \r
-               self.toolbar2 = wx.ToolBar( self, -1 )\r
+               self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT )\r
                self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )\r
-               self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Flip'))\r
 \r
-               self.flipX = wx.CheckBox(self.toolbar2, -1, "X")\r
+               self.flipX = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-flip-x.png'), size=(20,20))\r
+               self.flipX.SetBezelWidth(1)\r
+               self.flipX.SetUseFocusIndicator(False)\r
+               self.flipX.SetToolTip(wx.ToolTip('Flip X'))\r
                self.flipX.SetValue(profile.getProfileSetting('flip_x') == 'True')\r
                self.toolbar2.AddControl(self.flipX)\r
-               self.Bind(wx.EVT_CHECKBOX, self.OnFlipXClick, self.flipX)\r
-               self.flipY = wx.CheckBox(self.toolbar2, -1, "Y")\r
+               self.Bind(wx.EVT_BUTTON, self.OnFlipXClick, self.flipX)\r
+               self.flipY = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-flip-y.png'), size=(20,20))\r
+               self.flipY.SetBezelWidth(1)\r
+               self.flipY.SetUseFocusIndicator(False)\r
+               self.flipY.SetToolTip(wx.ToolTip('Flip Y'))\r
                self.flipY.SetValue(profile.getProfileSetting('flip_y') == 'True')\r
                self.toolbar2.AddControl(self.flipY)\r
-               self.Bind(wx.EVT_CHECKBOX, self.OnFlipYClick, self.flipY)\r
-               self.flipZ = wx.CheckBox(self.toolbar2, -1, "Z")\r
+               self.Bind(wx.EVT_BUTTON, self.OnFlipYClick, self.flipY)\r
+               self.flipZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-flip-z.png'), size=(20,20))\r
+               self.flipZ.SetBezelWidth(1)\r
+               self.flipZ.SetUseFocusIndicator(False)\r
+               self.flipZ.SetToolTip(wx.ToolTip('Flip Z'))\r
                self.flipZ.SetValue(profile.getProfileSetting('flip_z') == 'True')\r
                self.toolbar2.AddControl(self.flipZ)\r
-               self.Bind(wx.EVT_CHECKBOX, self.OnFlipZClick, self.flipZ)\r
-\r
-               self.swapXZ = wx.CheckBox(self.toolbar2, -1, "XZ")\r
+               self.Bind(wx.EVT_BUTTON, self.OnFlipZClick, self.flipZ)\r
+\r
+               self.toolbar2.AddSeparator()\r
+\r
+               #self.swapXZ = wx.CheckBox(self.toolbar2, -1, "XZ")\r
+               #self.swapXZ.SetValue(profile.getProfileSetting('swap_xz') == 'True')\r
+               #self.toolbar2.AddControl(self.swapXZ)\r
+               #self.Bind(wx.EVT_CHECKBOX, self.OnSwapXZClick, self.swapXZ)\r
+               self.swapXZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-swap-xz.png'), size=(20,20))\r
+               self.swapXZ.SetBezelWidth(1)\r
+               self.swapXZ.SetUseFocusIndicator(False)\r
+               self.swapXZ.SetToolTip(wx.ToolTip('Swap XZ'))\r
                self.swapXZ.SetValue(profile.getProfileSetting('swap_xz') == 'True')\r
                self.toolbar2.AddControl(self.swapXZ)\r
-               self.Bind(wx.EVT_CHECKBOX, self.OnSwapXZClick, self.swapXZ)\r
+               self.Bind(wx.EVT_BUTTON, self.OnSwapXZClick, self.swapXZ)\r
 \r
-               self.swapYZ = wx.CheckBox(self.toolbar2, -1, "YZ")\r
+               self.swapYZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-swap-yz.png'), size=(20,20))\r
+               self.swapYZ.SetBezelWidth(1)\r
+               self.swapYZ.SetUseFocusIndicator(False)\r
+               self.swapYZ.SetToolTip(wx.ToolTip('Swap YZ'))\r
                self.swapYZ.SetValue(profile.getProfileSetting('swap_yz') == 'True')\r
                self.toolbar2.AddControl(self.swapYZ)\r
-               self.Bind(wx.EVT_CHECKBOX, self.OnSwapYZClick, self.swapYZ)\r
+               self.Bind(wx.EVT_BUTTON, self.OnSwapYZClick, self.swapYZ)\r
+\r
+               #self.swapYZ = wx.CheckBox(self.toolbar2, -1, "YZ")\r
+               #self.swapYZ.SetValue(profile.getProfileSetting('swap_yz') == 'True')\r
+               #self.toolbar2.AddControl(self.swapYZ)\r
+               #self.Bind(wx.EVT_CHECKBOX, self.OnSwapYZClick, self.swapYZ)\r
                \r
                self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\r
                self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))\r

diff --git a/Cura/images/object-flip-x.png b/Cura/images/object-flip-x.png
new file mode 100644 (file)
index 0000000..1edcb61
Binary files /dev/null and b/Cura/images/object-flip-x.png differ

diff --git a/Cura/images/object-flip-y.png b/Cura/images/object-flip-y.png
new file mode 100644 (file)
index 0000000..e0a0ab2
Binary files /dev/null and b/Cura/images/object-flip-y.png differ

diff --git a/Cura/images/object-flip-z.png b/Cura/images/object-flip-z.png
new file mode 100644 (file)
index 0000000..267251a
Binary files /dev/null and b/Cura/images/object-flip-z.png differ

diff --git a/Cura/images/object-swap-xz.png b/Cura/images/object-swap-xz.png
new file mode 100644 (file)
index 0000000..21f5676
Binary files /dev/null and b/Cura/images/object-swap-xz.png differ

diff --git a/Cura/images/object-swap-yz.png b/Cura/images/object-swap-yz.png
new file mode 100644 (file)
index 0000000..c7e8dd6
Binary files /dev/null and b/Cura/images/object-swap-yz.png differ