diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index c9bb5b7..8ec9585 100644 --- a/Cura/gui/preview3d.py +++ b/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() diff --git a/Cura/gui/toolbarUtil.py b/Cura/gui/toolbarUtil.py index 06cd72c..eba0a0b 100644 --- a/Cura/gui/toolbarUtil.py +++ b/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): diff --git a/Cura/images/object-3d-off.png b/Cura/images/object-3d-off.png new file mode 100644 index 0000000..b9361e4 Binary files /dev/null and b/Cura/images/object-3d-off.png differ diff --git a/Cura/images/object-3d-on.png b/Cura/images/object-3d-on.png new file mode 100644 index 0000000..9a8b1c1 Binary files /dev/null and b/Cura/images/object-3d-on.png differ diff --git a/Cura/images/object-top-off.png b/Cura/images/object-top-off.png new file mode 100644 index 0000000..70de029 Binary files /dev/null and b/Cura/images/object-top-off.png differ diff --git a/Cura/images/object-top-on.png b/Cura/images/object-top-on.png new file mode 100644 index 0000000..3e5c281 Binary files /dev/null and b/Cura/images/object-top-on.png differ diff --git a/Cura/images/view-gcode-off.png b/Cura/images/view-gcode-off.png new file mode 100644 index 0000000..714e92e Binary files /dev/null and b/Cura/images/view-gcode-off.png differ diff --git a/Cura/images/view-gcode-on.png b/Cura/images/view-gcode-on.png new file mode 100644 index 0000000..e8eb43e Binary files /dev/null and b/Cura/images/view-gcode-on.png differ diff --git a/Cura/images/view-mixed-off.png b/Cura/images/view-mixed-off.png new file mode 100644 index 0000000..7bc0942 Binary files /dev/null and b/Cura/images/view-mixed-off.png differ diff --git a/Cura/images/view-mixed-on.png b/Cura/images/view-mixed-on.png new file mode 100644 index 0000000..3aacec1 Binary files /dev/null and b/Cura/images/view-mixed-on.png differ diff --git a/Cura/images/view-normal-off.png b/Cura/images/view-normal-off.png new file mode 100644 index 0000000..268b737 Binary files /dev/null and b/Cura/images/view-normal-off.png differ diff --git a/Cura/images/view-normal-on.png b/Cura/images/view-normal-on.png new file mode 100644 index 0000000..674aa58 Binary files /dev/null and b/Cura/images/view-normal-on.png differ diff --git a/Cura/images/view-transparent-off.png b/Cura/images/view-transparent-off.png new file mode 100644 index 0000000..1482327 Binary files /dev/null and b/Cura/images/view-transparent-off.png differ diff --git a/Cura/images/view-transparent-on.png b/Cura/images/view-transparent-on.png new file mode 100644 index 0000000..1f63f2d Binary files /dev/null and b/Cura/images/view-transparent-on.png differ diff --git a/Cura/images/view-xray-off.png b/Cura/images/view-xray-off.png new file mode 100644 index 0000000..9e89835 Binary files /dev/null and b/Cura/images/view-xray-off.png differ diff --git a/Cura/images/view-xray-on.png b/Cura/images/view-xray-on.png new file mode 100644 index 0000000..8b7ff82 Binary files /dev/null and b/Cura/images/view-xray-on.png differ