1. Highlighted versions of some icons, so they are easier to spot. More

to come. Related changes due to props refactoring (props@9bbc539d)

2. Little bugfix in lightbox canvas - was using getLimits instead of getRange.

fsl/fsleyes/actions/__init__.py

@@ -478,7 +478,7 @@ class ToggleActionButton(props.Toggle):
         elif isinstance(widget, wx.ToggleButton):
             ev = wx.EVT_TOGGLEBUTTON
         elif isinstance(widget, bmptoggle.BitmapToggleButton):
-            ev = bmptoggle.EVT_BITMAP_TOGGLE_EVENT
+            ev = bmptoggle.EVT_BITMAP_TOGGLE
             
         else:
             raise RuntimeError(

fsl/fsleyes/controls/lightboxtoolbar.py

@@ -56,13 +56,20 @@ class LightBoxToolBar(fsltoolbar.FSLEyesToolBar):
         
         icons = {
             'screenshot'                : fslicons.findImageFile('camera24'),
-            'movieMode'                 : fslicons.findImageFile('movie24'),
-            'toggleCanvasSettingsPanel' : fslicons.findImageFile('gear24'),
+            'movieMode'                 : [
+                fslicons.findImageFile('movieHighlight24'),
+                fslicons.findImageFile('movie24')],
+            'toggleCanvasSettingsPanel' : [
+                fslicons.findImageFile('gearHighlight24'),
+                fslicons.findImageFile('gear24')],
 
             'zax' : {
-                0 : fslicons.findImageFile('sagittalSlice24'),
-                1 : fslicons.findImageFile('coronalSlice24'),
-                2 : fslicons.findImageFile('axialSlice24'),
+                0 : [fslicons.findImageFile('sagittalSliceHighlight24'),
+                     fslicons.findImageFile('sagittalSlice24')],
+                1 : [fslicons.findImageFile('coronalSliceHighlight24'),
+                     fslicons.findImageFile('coronalSlice24')],
+                2 : [fslicons.findImageFile('axialSliceHighlight24'),
+                     fslicons.findImageFile('axialSlice24')],
             }
         }
 

fsl/fsleyes/controls/orthotoolbar.py

@@ -85,20 +85,35 @@ class OrthoToolBar(fsltoolbar.FSLEyesToolBar):
 
         icons = {
             'screenshot'       : fslicons.findImageFile('camera24'),
-            'movieMode'        : fslicons.findImageFile('movie24'),
-            'showXCanvas'      : fslicons.findImageFile('sagittalSlice24'),
-            'showYCanvas'      : fslicons.findImageFile('coronalSlice24'),
-            'showZCanvas'      : fslicons.findImageFile('axialSlice24'),
-            'toggleCanvasSettingsPanel' : fslicons.findImageFile('gear24'),
+            'movieMode'        : [
+                fslicons.findImageFile('movieHighlight24'),
+                fslicons.findImageFile('movie24')],
+            'showXCanvas'      : [
+                fslicons.findImageFile('sagittalSliceHighlight24'),
+                fslicons.findImageFile('sagittalSlice24')],
+            'showYCanvas'      : [
+                fslicons.findImageFile('coronalSliceHighlight24'),
+                fslicons.findImageFile('coronalSlice24')],
+            'showZCanvas'      : [
+                fslicons.findImageFile('axialSliceHighlight24'),
+                fslicons.findImageFile('axialSlice24')],
+            'toggleCanvasSettingsPanel' : [
+                fslicons.findImageFile('gearHighlight24'),
+                fslicons.findImageFile('gear24')],
 
             'resetZoom'    : fslicons.findImageFile('resetZoom24'),
             'centreCursor' : fslicons.findImageFile('centre24'),
 
             'layout' : {
-                'horizontal' : fslicons.findImageFile('horizontalLayout24'),
-                'vertical'   : fslicons.findImageFile('verticalLayout24'),
-                'grid'       : fslicons.findImageFile('gridLayout24'),
-            }
+                'horizontal' : [
+                    fslicons.findImageFile('horizontalLayoutHighlight24'),
+                    fslicons.findImageFile('horizontalLayout24')],
+                'vertical'   : [
+                    fslicons.findImageFile('verticalLayoutHighlight24'),
+                    fslicons.findImageFile('verticalLayout24')],
+                'grid'       : [
+                    fslicons.findImageFile('gridLayoutHighlight24'),
+                    fslicons.findImageFile('gridLayout24')]}
         }
 
         tooltips = {

fsl/fsleyes/gl/lightboxcanvas.py

@@ -242,7 +242,7 @@ class LightBoxCanvas(slicecanvas.SliceCanvas):
         displayCtx = self.displayCtx
         opts       = displayCtx.getOpts(overlay)
         overlay    = displayCtx.getReferenceImage(overlay)
-        zmin, zmax = opts.bounds.getLimits(self.zax)
+        zmin, zmax = opts.bounds.getRange(self.zax)
 
         # If the overlay does not have a
         # reference NIFTI1 image, choose