New spanner icon, so I can add the overlay display panel shortcut back in.

README

@@ -8,7 +8,7 @@ Dependencies:
  - matplotlib 1.3.1
  - nibabel    1.3.0
  - Pillow     2.5.3 (for screenshots of any type other than PNG)
-
+ - PyParsing  2.0.3
  - wxPython   3.0.0.0
 
  - OSMesa 6.5.3 (for off-screen rendering)
@@ -17,7 +17,11 @@ Dependencies:
    - OpenGL 1.4, with the following extensions:
      - ARB_vertex_program
      - ARB_fragment_program
-   - OpenGL 2.1
+     - EXT_framebuffer_object
+   - OpenGL 2.1, with the following extensions:
+     - EXT_framebuffer_object
+     - ARB_instanced_arrays
+     - ARB_draw_instanced
 
 Some of the icons are derived from the Freeline icon set, by Enes Dal,
 available at https://www.iconfinder.com/Enesdal, and released under the

fsl/fsleyes/controls/lightboxtoolbar.py

@@ -60,8 +60,8 @@ class LightBoxToolBar(fsltoolbar.FSLEyesToolBar):
                 fslicons.findImageFile('movieHighlight24'),
                 fslicons.findImageFile('movie24')],
             'toggleCanvasSettingsPanel' : [
-                fslicons.findImageFile('gearHighlight24'),
-                fslicons.findImageFile('gear24')],
+                fslicons.findImageFile('spannerHighlight24'),
+                fslicons.findImageFile('spanner24')],
 
             'zax' : {
                 0 : [fslicons.findImageFile('sagittalSliceHighlight24'),

fsl/fsleyes/controls/orthotoolbar.py

@@ -98,8 +98,8 @@ class OrthoToolBar(fsltoolbar.FSLEyesToolBar):
                 fslicons.findImageFile('axialSliceHighlight24'),
                 fslicons.findImageFile('axialSlice24')],
             'toggleCanvasSettingsPanel' : [
-                fslicons.findImageFile('gearHighlight24'),
-                fslicons.findImageFile('gear24')],
+                fslicons.findImageFile('spannerHighlight24'),
+                fslicons.findImageFile('spanner24')],
 
             'resetZoom'    : fslicons.findImageFile('resetZoom24'),
             'centreCursor' : fslicons.findImageFile('centre24'),

fsl/fsleyes/controls/overlaydisplaytoolbar.py

@@ -217,7 +217,15 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
         briSpec   = dispSpecs['brightness']
         conSpec   = dispSpecs['contrast']
 
-        # Button which toggles overlay info 
+        # Buttons which toggle overlay
+        # info and display panel
+        panelSpec = actions.ToggleActionButton(
+            'toggleDisplayPanel',
+            actionKwargs={'floatPane' : True},
+            icon=[icons.findImageFile('gearHighlight24'),
+                  icons.findImageFile('gear24')],
+            tooltip=fsltooltips.actions[viewPanel, 'toggleDisplayPanel'])
+ 
         infoSpec = actions.ToggleActionButton(
             'toggleOverlayInfo',
             actionKwargs={'floatPane' : True},
@@ -236,7 +244,8 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
 
         nameTypePanel.SetSizer(nameTypeSizer)
         briconPanel  .SetSizer(briconSizer)
-
+        
+        panelWidget = props.buildGUI(self,          viewPanel, panelSpec)
         infoWidget  = props.buildGUI(self,          viewPanel, infoSpec)
         nameWidget  = props.buildGUI(nameTypePanel, display,   nameSpec)
         typeWidget  = props.buildGUI(nameTypePanel, display,   typeSpec)
@@ -264,7 +273,11 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
         briconSizer.Add(conLabel)
         briconSizer.Add(conWidget)
 
-        return [infoWidget, nameTypePanel, alphaPanel, briconPanel]
+        return [panelWidget,
+                infoWidget,
+                nameTypePanel,
+                alphaPanel,
+                briconPanel]
 
 
     def __makeVolumeOptsTools(self, opts):