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

diff --cc Cura/gui/preview3d.py
index 3d91b9b7c72f13dcb7e0bcabf8c29a05cbb63bc2,14ef6b6061fc8583387ae0cb37e3b00f02db4525..966b225810928f9827739c48c0100c8902486fde
--- 1/Cura/gui/preview3d.py
--- 2/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@@ -74,99 -63,65 +74,103 @@@ 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 )\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.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.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.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.toolbar2.AddSeparator()\r
 +\r
 +\r
 +              self.mirrorX = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-x-off.png'), style=0, size=(20,20))\r
 +              self.mirrorX.SetBezelWidth(1)\r
 +              self.mirrorX.SetUseFocusIndicator(False)\r
 +              self.mirrorX.SetValue(profile.getProfileSetting('flip_x') == 'True')\r
 +              if self.mirrorX.GetValue():\r
 +                      self.mirrorX.SetBitmapLabel(wx.Bitmap('Cura/images/object-mirror-x-on.png'))\r
 +              self.mirrorX.helpText = 'Mirror X'\r
 +              self.mirrorX.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)\r
 +              self.mirrorX.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)\r
 +              self.mirrorX.Bind(wx.EVT_BUTTON, self.OnFlipXClick)\r
 +              self.toolbar2.AddControl(self.mirrorX)\r
 +\r
 +              self.mirrorY = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-y-off.png'), size=(20,20))\r
 +              self.mirrorY.SetBezelWidth(1)\r
 +              self.mirrorY.SetUseFocusIndicator(False)\r
 +              self.mirrorY.SetValue(profile.getProfileSetting('flip_y') == 'True')\r
 +              if self.mirrorY.GetValue():\r
 +                      self.mirrorY.SetBitmapLabel(wx.Bitmap('Cura/images/object-mirror-x-on.png'))\r
 +              self.mirrorY.helpText = 'Mirror Y'\r
 +              self.mirrorY.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)\r
 +              self.mirrorY.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)\r
 +              self.mirrorY.Bind(wx.EVT_BUTTON, self.OnFlipYClick)\r
 +              self.toolbar2.AddControl(self.mirrorY)\r
 +\r
 +              self.mirrorZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-z-off.png'), size=(20,20))\r
 +              self.mirrorZ.SetBezelWidth(1)\r
 +              self.mirrorZ.SetUseFocusIndicator(False)\r
 +              self.mirrorZ.SetValue(profile.getProfileSetting('flip_z') == 'True')\r
 +              if self.mirrorZ.GetValue():\r
 +                      self.mirrorZ.SetBitmapLabel(wx.Bitmap('Cura/images/object-mirror-z-on.png'))\r
 +              self.mirrorZ.helpText = 'Mirror Z'\r
 +              self.mirrorZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)\r
 +              self.mirrorZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)\r
 +              self.mirrorZ.Bind(wx.EVT_BUTTON, self.OnFlipZClick)\r
 +              self.toolbar2.AddControl(self.mirrorZ)\r
 +\r
 +              self.toolbar2.AddSeparator()\r
 +\r
 +              self.swapXZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-swap-xz-off.png'), size=(20,20))\r
 +              self.swapXZ.SetBezelWidth(1)\r
 +              self.swapXZ.SetUseFocusIndicator(False)\r
 +              if self.swapXZ.GetValue():\r
 +                      self.swapXZ.SetBitmapLabel(wx.Bitmap('Cura/images/object-swap-xz-on.png'))\r
 +              self.swapXZ.helpText = 'Swap XZ'\r
 +              self.swapXZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)\r
 +              self.swapXZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)\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-off.png'), size=(20,20))\r
 +              self.swapYZ.SetBezelWidth(1)\r
 +              self.swapYZ.SetUseFocusIndicator(False)\r
 +              self.swapYZ.helpText = 'Swap YZ'\r
 +              self.swapYZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay)\r
 +              self.swapYZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide)\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.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\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.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.toolbar2.AddControl(self.mulYadd)\r
-               #self.Bind(wx.EVT_BUTTON, self.OnMulYAddClick, self.mulYadd)\r
+               self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\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.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.toolbar2.AddControl(self.mulYadd)\r
+               self.Bind(wx.EVT_BUTTON, self.OnMulYAddClick, self.mulYadd)\r
                \r
-               #self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\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
+               self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\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 = wx.Button(self.toolbar, -1, 'Max size', size=(21*3.5,21))\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