Added multiply icons and buttons

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 371e3b80e9a908b85b9ac9707767bad350759db4..92a66491a5b40dc8f9ca9e4f444a687046577146 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -151,10 +151,15 @@ class previewPanel(wx.Panel):
                self.layerSpin = wx.SpinCtrl(self.toolbar, -1, '', size=(21*4,21), style=wx.SP_ARROW_KEYS)\r
                self.toolbar.AddControl(self.layerSpin)\r
                self.Bind(wx.EVT_SPINCTRL, self.OnLayerNrChange, self.layerSpin)\r
+\r
+               self.scaleMax = NormalButton(self.toolbar, self, 'object-max-size.png', 'Scale object to fix machine size')\r
+               self.scaleMax.Bind(wx.EVT_BUTTON, self.OnScaleMax)\r
+               self.toolbar.AddControl(self.scaleMax)\r
                \r
                self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER )\r
                self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )\r
 \r
+# Mirror\r
                self.mirrorX = ToggleButton(self.toolbar2, self, 'flip_x', 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Mirror X')\r
                self.toolbar2.AddControl(self.mirrorX)\r
 \r
@@ -166,45 +171,49 @@ class previewPanel(wx.Panel):
 \r
                self.toolbar2.AddSeparator()\r
 \r
+# Swap\r
                self.swapXZ = ToggleButton(self.toolbar2, self, 'swap_xz', 'object-swap-xz-on.png', 'object-swap-xz-off.png', 'Swap XZ')\r
                self.toolbar2.AddControl(self.swapXZ)\r
 \r
                self.swapYZ = ToggleButton(self.toolbar2, self, 'swap_yz', 'object-swap-yz-on.png', 'object-swap-yz-off.png', 'Swap YZ')\r
                self.toolbar2.AddControl(self.swapYZ)\r
                \r
-               self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\r
+               self.toolbar2.AddSeparator()\r
+\r
+# Scale\r
                self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))\r
                self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21))\r
                self.toolbar2.AddControl(self.scale)\r
                self.Bind(wx.EVT_TEXT, self.OnScale, self.scale)\r
 \r
-               self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\r
-               self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Copy'))\r
-               self.mulXsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))\r
-               self.toolbar2.AddControl(self.mulXsub)\r
-               self.Bind(wx.EVT_BUTTON, self.OnMulXSubClick, self.mulXsub)\r
-               self.mulXadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))\r
+               self.toolbar2.AddSeparator()\r
+\r
+# Multiply\r
+               self.mulXadd = NormalButton(self.toolbar2, self, 'object-mul-x-add.png', 'Increase number of models on X axis')\r
+               self.mulXadd.Bind(wx.EVT_BUTTON, self.OnMulXAddClick)\r
                self.toolbar2.AddControl(self.mulXadd)\r
-               self.Bind(wx.EVT_BUTTON, self.OnMulXAddClick, self.mulXadd)\r
 \r
-               self.mulYsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))\r
-               self.toolbar2.AddControl(self.mulYsub)\r
-               self.Bind(wx.EVT_BUTTON, self.OnMulYSubClick, self.mulYsub)\r
-               self.mulYadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))\r
+               self.mulXsub = NormalButton(self.toolbar2, self, 'object-mul-x-sub.png', 'Decrease number of models on X axis')\r
+               self.mulXsub.Bind(wx.EVT_BUTTON, self.OnMulXSubClick)\r
+               self.toolbar2.AddControl(self.mulXsub)\r
+\r
+               self.mulYadd = NormalButton(self.toolbar2, self, 'object-mul-y-add.png', 'Increase number of models on Y axis')\r
+               self.mulYadd.Bind(wx.EVT_BUTTON, self.OnMulYAddClick)\r
                self.toolbar2.AddControl(self.mulYadd)\r
-               self.Bind(wx.EVT_BUTTON, self.OnMulYAddClick, self.mulYadd)\r
-               \r
-               self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\r
+\r
+               self.mulYsub = NormalButton(self.toolbar2, self, 'object-mul-y-sub.png', 'Decrease number of models on Y axis')\r
+               self.mulYsub.Bind(wx.EVT_BUTTON, self.OnMulYSubClick)\r
+               self.toolbar2.AddControl(self.mulYsub)\r
+\r
+               self.toolbar2.AddSeparator()\r
+\r
+# Rotate\r
                self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Rot'))\r
                self.rotate = wx.SpinCtrl(self.toolbar2, -1, profile.getProfileSetting('model_rotate_base'), size=(21*3,21), style=wx.SP_WRAP|wx.SP_ARROW_KEYS)\r
                self.rotate.SetRange(0, 360)\r
                self.toolbar2.AddControl(self.rotate)\r
                self.Bind(wx.EVT_SPINCTRL, self.OnRotate, self.rotate)\r
 \r
-               self.scaleMax = NormalButton(self.toolbar, self, 'object-max-size.png', 'Scale object to fix machine size')\r
-               self.toolbar.AddControl(self.scaleMax)\r
-               self.Bind(wx.EVT_BUTTON, self.OnScaleMax, self.scaleMax)\r
-\r
                self.toolbar2.Realize()\r
                self.updateToolbar()\r
                \r

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

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

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

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