Changed surface type control in the instrument view

from combobox to a push button with a menu. This let me enable and disable the 'full 3d' option depending on the value of Use OpenGL. Re #7538
Merge branch 'feature/7538_opengl_issue' into develop