Added optional toolbar to OpenGLWindow
Added toolbar to WaveformView
tweaks to test script