diff --git a/fsl/data/strings.py b/fsl/data/strings.py
index 186590cfa26248d242be8bcc5958a11f871949ff..380858cfe9449efae0dbbaf21cba4daa27a60b4f 100644
--- a/fsl/data/strings.py
+++ b/fsl/data/strings.py
@@ -636,14 +636,17 @@ choices = TypeDict({
'VolumeOpts.displayRange.min' : 'Min.',
'VolumeOpts.displayRange.max' : 'Max.',
+ 'MaskOpts.threshold.min' : 'Min.',
+ 'MaskOpts.threshold.max' : 'Max.',
+
'VectorOpts.displayType.line' : 'Lines',
'VectorOpts.displayType.rgb' : 'RGB',
'VectorOpts.modulateImage.none' : 'No modulation',
'VectorOpts.clipImage.none' : 'No clipping',
- 'VectorOpts.clippingRange.min' : 'Min.',
- 'VectorOpts.clippingRange.max' : 'Max.',
+ 'VectorOpts.clippingRange.min' : 'Clip min.',
+ 'VectorOpts.clippingRange.max' : 'Clip max.',
'ModelOpts.refImage.none' : 'No reference image',
diff --git a/fsl/fsleyes/controls/orthoedittoolbar.py b/fsl/fsleyes/controls/orthoedittoolbar.py
index dfbddb7a36d7f2afe2b88a2d0a6f959592efb685..ff4eb3d8ce3b79339db7567f84ef6043339eb7d4 100644
--- a/fsl/fsleyes/controls/orthoedittoolbar.py
+++ b/fsl/fsleyes/controls/orthoedittoolbar.py
@@ -184,8 +184,10 @@ controls. It is referenced in the :attr:`_TOOLBAR_SPECS` dictionary.
_ICONS = {
- 'view' : fslicons.findImageFile('eye24'),
- 'edit' : fslicons.findImageFile('pencil24'),
+ 'view' : [fslicons.findImageFile('eyeHighlight24'),
+ fslicons.findImageFile('eye24')],
+ 'edit' : [fslicons.findImageFile('pencilHighlight24'),
+ fslicons.findImageFile('pencil24')],
'selectionIs3D' : [fslicons.findImageFile('selection3D24'),
fslicons.findImageFile('selection2D24')],
'clearSelection' : fslicons.findImageFile('clear24'),
diff --git a/fsl/fsleyes/controls/overlaydisplaytoolbar.py b/fsl/fsleyes/controls/overlaydisplaytoolbar.py
index e2aa17903f835f261cff2464497579941d53517c..5bc7e5eeb665f6c761a6c489afc3134f99837db2 100644
--- a/fsl/fsleyes/controls/overlaydisplaytoolbar.py
+++ b/fsl/fsleyes/controls/overlaydisplaytoolbar.py
@@ -221,7 +221,8 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
infoSpec = actions.ToggleActionButton(
'toggleOverlayInfo',
actionKwargs={'floatPane' : True},
- icon=icons.findImageFile('information24'),
+ icon=[icons.findImageFile('informationHighlight24'),
+ icons.findImageFile('information24')],
tooltip=fsltooltips.actions[viewPanel, 'toggleOverlayInfo'])
# Name/overlay type and brightness/contrast
@@ -407,10 +408,7 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
of the given :class:`.TensorOpts` instance.
"""
lightingSpec = _TOOLBAR_PROPS[opts]['lighting']
-
lightingWidget = props.buildGUI(self, opts, lightingSpec)
- lightingWidget = self.MakeLabelledTool(
- lightingWidget, strings.properties[opts, 'lighting'])
return self.__makeVectorOptsTools(opts) + [lightingWidget]
@@ -517,7 +515,9 @@ _TOOLBAR_PROPS = td.TypeDict({
'threshold',
showLimits=False,
spin=False,
- tooltip=_TOOLTIPS['MaskOpts.threshold']),
+ tooltip=_TOOLTIPS['MaskOpts.threshold'],
+ labels=[strings.choices['MaskOpts.threshold.min'],
+ strings.choices['MaskOpts.threshold.max']]),
'colour' : props.Widget(
'colour',
size=(24, 24),
@@ -556,6 +556,8 @@ _TOOLBAR_PROPS = td.TypeDict({
slider=True,
spin=False,
tooltip=_TOOLTIPS['VectorOpts.clippingRange'],
+ labels=[strings.choices['VectorOpts.clippingRange.min'],
+ strings.choices['VectorOpts.clippingRange.max']],
dependencies=['clipImage'],
enabledWhen=lambda o, ci: ci is not None)},
@@ -574,6 +576,8 @@ _TOOLBAR_PROPS = td.TypeDict({
slider=True,
spin=False,
tooltip=_TOOLTIPS['VectorOpts.clippingRange'],
+ labels=[strings.choices['VectorOpts.clippingRange.min'],
+ strings.choices['VectorOpts.clippingRange.max']],
dependencies=['clipImage'],
enabledWhen=lambda o, ci: ci is not None),
'lineWidth' : props.Widget(
@@ -603,6 +607,8 @@ _TOOLBAR_PROPS = td.TypeDict({
'TensorOpts' : {
'lighting' : props.Widget(
'lighting',
+ icon=[icons.findImageFile('lightbulbHighlight24'),
+ icons.findImageFile('lightbulb24')],
tooltip=_TOOLTIPS['TensorOpts.lighting']),
'modulateImage' : props.Widget(
'modulateImage',
@@ -618,6 +624,8 @@ _TOOLBAR_PROPS = td.TypeDict({
slider=True,
spin=False,
tooltip=_TOOLTIPS['VectorOpts.clipImage'],
+ labels=[strings.choices['VectorOpts.clippingRange.min'],
+ strings.choices['VectorOpts.clippingRange.max']],
dependencies=['clipImage'],
enabledWhen=lambda o, ci: ci is not None)}
})
diff --git a/fsl/fsleyes/controls/overlaylistpanel.py b/fsl/fsleyes/controls/overlaylistpanel.py
index 9cc95bedf8282cfb025d24d66dd53150c7de140b..e891f67b37c723894f78d89b79cde93b53ff5ac8 100644
--- a/fsl/fsleyes/controls/overlaylistpanel.py
+++ b/fsl/fsleyes/controls/overlaylistpanel.py
@@ -15,6 +15,8 @@ import wx
import props
+import pwidgets.bitmaptoggle as bmptoggle
+
import pwidgets.elistbox as elistbox
import fsl.fsleyes.panel as fslpanel
@@ -319,17 +321,19 @@ class ListItemWidget(wx.Panel):
if wx.Platform == '__WXMAC__': btnStyle = wx.BU_EXACTFIT
else: btnStyle = wx.BU_EXACTFIT | wx.BU_NOTEXT
- self.__saveButton = wx.Button( self, style=btnStyle)
- self.__lockButton = wx.ToggleButton(self, style=btnStyle)
+ self.__saveButton = wx.Button( self, style=btnStyle)
+ self.__lockButton = bmptoggle.BitmapToggleButton(self, style=btnStyle)
self.__saveButton.SetBitmap(icons.loadBitmap('floppydisk16'))
- self.__lockButton.SetBitmap(icons.loadBitmap('chainlink16'))
+ self.__lockButton.SetBitmap(icons.loadBitmap('chainlinkHighlight16'),
+ icons.loadBitmap('chainlink16'))
self.__visibility = props.makeWidget(
self,
display,
'enabled',
- icon=icons.findImageFile('eye16'))
+ icon=[icons.findImageFile('eyeHighlight16'),
+ icons.findImageFile('eye16')])
self.__sizer = wx.BoxSizer(wx.HORIZONTAL)
diff --git a/fsl/fsleyes/icons/chainlinkHighlight16.png b/fsl/fsleyes/icons/chainlinkHighlight16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d37dd8cddf5203827604e6af7fa27549e159ded5
Binary files /dev/null and b/fsl/fsleyes/icons/chainlinkHighlight16.png differ
diff --git a/fsl/fsleyes/icons/chainlinkHighlight16@2x.png b/fsl/fsleyes/icons/chainlinkHighlight16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0206b190550fbe09edef5ba2d0746a4ab1d54e12
Binary files /dev/null and b/fsl/fsleyes/icons/chainlinkHighlight16@2x.png differ
diff --git a/fsl/fsleyes/icons/eyeHighlight16.png b/fsl/fsleyes/icons/eyeHighlight16.png
new file mode 100644
index 0000000000000000000000000000000000000000..be847b4c8f23eff06ff805a8173ac81b941cbe16
Binary files /dev/null and b/fsl/fsleyes/icons/eyeHighlight16.png differ
diff --git a/fsl/fsleyes/icons/eyeHighlight16@2x.png b/fsl/fsleyes/icons/eyeHighlight16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d01b44521dd50a574ec0a342dbe6162460750ab2
Binary files /dev/null and b/fsl/fsleyes/icons/eyeHighlight16@2x.png differ
diff --git a/fsl/fsleyes/icons/eyeHighlight24.png b/fsl/fsleyes/icons/eyeHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..701b0dfada6874334611410d7442e8c6f4d6dbcf
Binary files /dev/null and b/fsl/fsleyes/icons/eyeHighlight24.png differ
diff --git a/fsl/fsleyes/icons/eyeHighlight24@2x.png b/fsl/fsleyes/icons/eyeHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..90d06fbde8df00f12cc0e4059e935a8b2cf4a149
Binary files /dev/null and b/fsl/fsleyes/icons/eyeHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/informationHighlight24.png b/fsl/fsleyes/icons/informationHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..1717d7142a498ab36ec0b1f721d7a9600549bf4f
Binary files /dev/null and b/fsl/fsleyes/icons/informationHighlight24.png differ
diff --git a/fsl/fsleyes/icons/informationHighlight24@2x.png b/fsl/fsleyes/icons/informationHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c46796bbc50f65eae706645dab4843113d2d619c
Binary files /dev/null and b/fsl/fsleyes/icons/informationHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/lightbulb24.png b/fsl/fsleyes/icons/lightbulb24.png
new file mode 100644
index 0000000000000000000000000000000000000000..bae983eaa7cb195dd5beda36f5ac02e55af10f5d
Binary files /dev/null and b/fsl/fsleyes/icons/lightbulb24.png differ
diff --git a/fsl/fsleyes/icons/lightbulb24@2x.png b/fsl/fsleyes/icons/lightbulb24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..46ebe6c903ea9edca3f6e3a43d1fcfa533c43c1a
Binary files /dev/null and b/fsl/fsleyes/icons/lightbulb24@2x.png differ
diff --git a/fsl/fsleyes/icons/lightbulbHighlight24.png b/fsl/fsleyes/icons/lightbulbHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..6925f7295b73290a99cdd04baad9c0e22214b4f7
Binary files /dev/null and b/fsl/fsleyes/icons/lightbulbHighlight24.png differ
diff --git a/fsl/fsleyes/icons/lightbulbHighlight24@2x.png b/fsl/fsleyes/icons/lightbulbHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a26a2d10b9cf5798b6b431960e574158dbcf90f8
Binary files /dev/null and b/fsl/fsleyes/icons/lightbulbHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/pencilHighlight24.png b/fsl/fsleyes/icons/pencilHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8b2869131c4c0d2ae0aef3911da2134c90a9137
Binary files /dev/null and b/fsl/fsleyes/icons/pencilHighlight24.png differ
diff --git a/fsl/fsleyes/icons/pencilHighlight24@2x.png b/fsl/fsleyes/icons/pencilHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcaa0aaf4e8d6ccd51b2e244a991b60f69d43d32
Binary files /dev/null and b/fsl/fsleyes/icons/pencilHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/sources/chainlinkHighlight.xcf b/fsl/fsleyes/icons/sources/chainlinkHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..fde22e0cf5f766baa40c0e56083774d4be1ce8ec
Binary files /dev/null and b/fsl/fsleyes/icons/sources/chainlinkHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/eyeHighlight.xcf b/fsl/fsleyes/icons/sources/eyeHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..384c25c555fc0343197e813057df232fbd1997fd
Binary files /dev/null and b/fsl/fsleyes/icons/sources/eyeHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/informationHighlight.xcf b/fsl/fsleyes/icons/sources/informationHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..254818f60c83e067df5808d4cf2d51e3ace64617
Binary files /dev/null and b/fsl/fsleyes/icons/sources/informationHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/lightbulb.xcf b/fsl/fsleyes/icons/sources/lightbulb.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..7766551e70cf7598bd8f58169fa15fbcd3646ec6
Binary files /dev/null and b/fsl/fsleyes/icons/sources/lightbulb.xcf differ
diff --git a/fsl/fsleyes/icons/sources/lightbulbHighlight.xcf b/fsl/fsleyes/icons/sources/lightbulbHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..386d2344a0faf496c8512b45e6c6331e3d41e5b0
Binary files /dev/null and b/fsl/fsleyes/icons/sources/lightbulbHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/pencilHighlight.xcf b/fsl/fsleyes/icons/sources/pencilHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..d7400d0b7e7ac07682a3cd84ee7a38d34dfe0f7f
Binary files /dev/null and b/fsl/fsleyes/icons/sources/pencilHighlight.xcf differ