Fix the toolbar buttons file path to be relative to the python file instead of the...

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 7e614e3deae764b15884a16a316dbde97ce265b9..dc990319f2f440de24c989d54fac20b1af63a026 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -28,14 +28,15 @@ from util import stl
 from util import util3d\r
 \r
 class ToggleButton(buttons.GenBitmapToggleButton):\r
-       def __init__(self, parent, popupParent, profileSetting, bitmapOn, bitmapOff,\r
+       def __init__(self, parent, popupParent, profileSetting, bitmapFilenameOn, bitmapFilenameOff,\r
                                 helpText='', id=-1, size=(20,20)):\r
-               buttons.GenBitmapToggleButton.__init__(self, parent, id, bitmapOff, size=size)\r
+               self.bitmapOn = wx.Bitmap(os.path.join(os.path.split(__file__)[0], "../images", bitmapFilenameOn))\r
+               self.bitmapOff = wx.Bitmap(os.path.join(os.path.split(__file__)[0], "../images", bitmapFilenameOff))\r
+\r
+               buttons.GenBitmapToggleButton.__init__(self, parent, id, self.bitmapOff, size=size)\r
 \r
                self.popupParent = popupParent\r
                self.profileSetting = profileSetting\r
-               self.bitmapOn = bitmapOn\r
-               self.bitmapOff = bitmapOff\r
                self.helpText = helpText\r
 \r
                self.bezelWidth = 1\r
@@ -131,21 +132,21 @@ class previewPanel(wx.Panel):
                self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER )\r
                self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )\r
 \r
-               self.mirrorX = ToggleButton(self.toolbar2, self, 'flip_x', wx.Bitmap('Cura/images/object-mirror-x-on.png'), wx.Bitmap('Cura/images/object-mirror-x-off.png'), 'Mirror X')\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
-               self.mirrorY = ToggleButton(self.toolbar2, self, 'flip_y', wx.Bitmap('Cura/images/object-mirror-y-on.png'), wx.Bitmap('Cura/images/object-mirror-y-off.png'), 'Mirror Y')\r
+               self.mirrorY = ToggleButton(self.toolbar2, self, 'flip_y', 'object-mirror-y-on.png', 'object-mirror-y-off.png', 'Mirror Y')\r
                self.toolbar2.AddControl(self.mirrorY)\r
 \r
-               self.mirrorZ = ToggleButton(self.toolbar2, self, 'flip_z', wx.Bitmap('Cura/images/object-mirror-z-on.png'), wx.Bitmap('Cura/images/object-mirror-z-off.png'), 'Mirror Z')\r
+               self.mirrorZ = ToggleButton(self.toolbar2, self, 'flip_z', 'object-mirror-z-on.png', 'object-mirror-z-off.png', 'Mirror Z')\r
                self.toolbar2.AddControl(self.mirrorZ)\r
 \r
                self.toolbar2.AddSeparator()\r
 \r
-               self.swapXZ = ToggleButton(self.toolbar2, self, 'swap_xz', wx.Bitmap('Cura/images/object-swap-xz-on.png'), wx.Bitmap('Cura/images/object-swap-xz-off.png'), 'Swap XZ')\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', wx.Bitmap('Cura/images/object-swap-yz-on.png'), wx.Bitmap('Cura/images/object-swap-yz-off.png'), 'Swap YZ')\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