Moved some code for consistency, fixed swapXY button

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index a307e2464cfd59092ade440ce6ef907e83cde359..093306e6696eac1c073d129ce98ee2db7048a160 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -118,24 +118,26 @@ class previewPanel(wx.Panel):
                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
+               self.swapXZ.SetValue(profile.getProfileSetting('swap_xz') == 'True')\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_BUTTON, self.OnSwapXZClick, self.swapXZ)\r
+               self.toolbar2.AddControl(self.swapXZ)\r
 \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.SetValue(profile.getProfileSetting('swap_yz') == 'True')\r
+               if self.swapYZ.GetValue():\r
+                       self.swapYZ.SetBitmapLabel(wx.Bitmap('Cura/images/object-swap-yz-on.png'))\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_BUTTON, self.OnSwapYZClick, self.swapYZ)\r
+               self.toolbar2.AddControl(self.swapYZ)\r
                \r
                self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())\r
                self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))\r