added trigger spinboxes
trigger spinboxes now reflect trigger state
renamed trig_level widget to trig_amp, disabled lineEdits of spinboxes
connected plot trigger lines to spin boxes
fixed merge
fixed missing flag assignment
Merge branch 'trigger_spinbox' into development
fixed bad merging
fixed tab
fixed another bad tab