Add NormalButton for toolbars, which has tooltip support, and proper image loading...

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index dc990319f2f440de24c989d54fac20b1af63a026..371e3b80e9a908b85b9ac9707767bad350759db4 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -83,6 +83,29 @@ class ToggleButton(buttons.GenBitmapToggleButton):
                self.popupParent.OnPopupHide(event)\r
                event.Skip()\r
 \r
+class NormalButton(buttons.GenBitmapButton):\r
+       def __init__(self, parent, popupParent, bitmapFilename,\r
+                                helpText='', id=-1, size=(20,20)):\r
+               self.bitmap = wx.Bitmap(os.path.join(os.path.split(__file__)[0], "../images", bitmapFilename))\r
+               buttons.GenBitmapButton.__init__(self, parent, id, self.bitmap, size=size)\r
+\r
+               self.popupParent = popupParent\r
+               self.helpText = helpText\r
+\r
+               self.bezelWidth = 1\r
+               self.useFocusInd = False\r
+\r
+               self.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)\r
+               self.Bind(wx.EVT_LEAVE_WINDOW, self.OnMouseLeave)\r
+\r
+       def OnMouseEnter(self, event):\r
+               self.popupParent.OnPopupDisplay(event)\r
+               event.Skip()\r
+\r
+       def OnMouseLeave(self, event):\r
+               self.popupParent.OnPopupHide(event)\r
+               event.Skip()\r
+\r
 class previewPanel(wx.Panel):\r
        def __init__(self, parent):\r
                wx.Panel.__init__(self, parent,-1)\r
@@ -178,7 +201,7 @@ class previewPanel(wx.Panel):
                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.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

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