Merge pull request #65 from PyroMani/master

Added icons for top toolbar of preview panel

Cura/gui/preview3d.py

@@ -47,16 +47,16 @@ class previewPanel(wx.Panel):
 		self.toolbar = toolbarUtil.Toolbar(self)
 
 		group = []
-		toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', '3D view', callback=self.On3DClick)
-		toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Topdown view', callback=self.OnTopClick)
+		toolbarUtil.RadioButton(self.toolbar, group, 'object-3d-on.png', 'object-3d-off.png', '3D view', callback=self.On3DClick)
+		toolbarUtil.RadioButton(self.toolbar, group, 'object-top-on.png', 'object-top-off.png', 'Topdown view', callback=self.OnTopClick)
 		self.toolbar.AddSeparator()
 
 		group = []
-		self.normalViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Normal model view', callback=self.OnViewChange)
-		self.transparentViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Transparent model view', callback=self.OnViewChange)
-		self.xrayViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'X-Ray view', callback=self.OnViewChange)
-		self.gcodeViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'GCode view', callback=self.OnViewChange)
-		self.mixedViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Mixed model/GCode view', callback=self.OnViewChange)
+		self.normalViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-normal-on.png', 'view-normal-off.png', 'Normal model view', callback=self.OnViewChange)
+		self.transparentViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-transparent-on.png', 'view-transparent-off.png', 'Transparent model view', callback=self.OnViewChange)
+		self.xrayViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-xray-on.png', 'view-xray-off.png', 'X-Ray view', callback=self.OnViewChange)
+		self.gcodeViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-gcode-on.png', 'view-gcode-off.png', 'GCode view', callback=self.OnViewChange)
+		self.mixedViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-mixed-on.png', 'view-mixed-off.png', 'Mixed model/GCode view', callback=self.OnViewChange)
 		self.OnViewChange()
 		self.toolbar.AddSeparator()
 

Cura/gui/toolbarUtil.py

@@ -101,10 +101,14 @@ class ToggleButton(buttons.GenBitmapToggleButton):
 
 	def OnMouseEnter(self, event):
 		self.GetParent().OnPopupDisplay(event)
+		self.SetBitmap(True)
+		self.Refresh()
 		event.Skip()
 
 	def OnMouseLeave(self, event):
 		self.GetParent().OnPopupHide(event)
+		self.SetBitmap(self.GetValue())
+		self.Refresh()
 		event.Skip()
 
 class RadioButton(buttons.GenBitmapButton):
@@ -159,10 +163,14 @@ class RadioButton(buttons.GenBitmapButton):
 
 	def OnMouseEnter(self, event):
 		self.GetParent().OnPopupDisplay(event)
+		self.SetBitmap(True)
+		self.Refresh()
 		event.Skip()
 
 	def OnMouseLeave(self, event):
 		self.GetParent().OnPopupHide(event)
+		self.SetBitmap(self.GetValue())
+		self.Refresh()
 		event.Skip()
 
 class NormalButton(buttons.GenBitmapButton):