move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration

1 files changed, 50 insertions, 9 deletions

diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h
index b6e9595174..427f2cd7be 100644
--- a/gtk2_ardour/ui_config_vars.h
+++ b/gtk2_ardour/ui_config_vars.h
@@ -17,16 +17,57 @@
 
 */
 
-UI_CONFIG_VARIABLE(std::string, icon_set, "icon-set", "default")
-UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "clearlooks.rc")
-UI_CONFIG_VARIABLE(std::string, color_file, "color-file", "dark")
-UI_CONFIG_VARIABLE(bool, flat_buttons, "flat-buttons", false)
-UI_CONFIG_VARIABLE(bool, blink_rec_arm, "blink-rec-arm", false)
-UI_CONFIG_VARIABLE(float, waveform_gradient_depth, "waveform-gradient-depth", 0)
-UI_CONFIG_VARIABLE(float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 0.5)
-UI_CONFIG_VARIABLE(bool, all_floating_windows_are_dialogs, "all-floating-windows-are-dialogs", false)
+UI_CONFIG_VARIABLE (std::string, icon_set, "icon-set", "default")
+UI_CONFIG_VARIABLE (std::string, ui_rc_file, "ui-rc-file", "clearlooks.rc")
+UI_CONFIG_VARIABLE (std::string, color_file, "color-file", "dark")
+UI_CONFIG_VARIABLE (bool, flat_buttons, "flat-buttons", false)
+UI_CONFIG_VARIABLE (bool, blink_rec_arm, "blink-rec-arm", false)
+UI_CONFIG_VARIABLE (float, waveform_gradient_depth, "waveform-gradient-depth", 0)
+UI_CONFIG_VARIABLE (float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 0.5)
+UI_CONFIG_VARIABLE (bool, all_floating_windows_are_dialogs, "all-floating-windows-are-dialogs", false)
 UI_CONFIG_VARIABLE (bool, color_regions_using_track_color, "color-regions-using-track-color", false)
 UI_CONFIG_VARIABLE (bool, show_waveform_clipping, "show-waveform-clipping", true)
 UI_CONFIG_VARIABLE (uint32_t, lock_gui_after_seconds, "lock-gui-after-seconds", 0)
 UI_CONFIG_VARIABLE (bool, draggable_playhead, "draggable-playhead", true)
-
+UI_CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
+UI_CONFIG_VARIABLE (std::string, keyboard_layout_name, "keyboard-layout-name", "ansi")
+UI_CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")
+UI_CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false)
+UI_CONFIG_VARIABLE (bool, keep_tearoffs, "keep-tearoffs", false)
+UI_CONFIG_VARIABLE (bool, default_narrow_ms, "default-narrow_ms", false)
+UI_CONFIG_VARIABLE (bool, name_new_markers, "name-new-markers", false)
+UI_CONFIG_VARIABLE (bool, rubberbanding_snaps_to_grid, "rubberbanding-snaps-to-grid", false)
+UI_CONFIG_VARIABLE (long, font_scale, "font-scale", 81920)
+UI_CONFIG_VARIABLE (bool, show_waveforms, "show-waveforms", true)
+UI_CONFIG_VARIABLE (bool, show_waveforms_while_recording, "show-waveforms-while-recording", true)
+UI_CONFIG_VARIABLE (ARDOUR::WaveformScale, waveform_scale, "waveform-scale", Linear)
+UI_CONFIG_VARIABLE (ARDOUR::WaveformShape, waveform_shape, "waveform-shape", Traditional)
+UI_CONFIG_VARIABLE (bool, update_editor_during_summary_drag, "update-editor-during-summary-drag", true)
+UI_CONFIG_VARIABLE (bool, never_display_periodic_midi, "never-display-periodic-midi", true)
+UI_CONFIG_VARIABLE (bool, sound_midi_notes, "sound-midi-notes", false)
+UI_CONFIG_VARIABLE (bool, show_plugin_scan_window, "show-plugin-scan-window", false)
+UI_CONFIG_VARIABLE (bool, show_zoom_tools, "show-zoom-tools", true)
+UI_CONFIG_VARIABLE (bool, widget_prelight, "widget-prelight", true)
+UI_CONFIG_VARIABLE (bool, use_tooltips, "use-tooltips", true)
+UI_CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-element-visibility", "Input,PhaseInvert,RecMon,SoloIsoLock,Output,Comments")
+UI_CONFIG_VARIABLE (bool, allow_non_quarter_pulse, "allow-non-quarter-pulse", false)
+UI_CONFIG_VARIABLE (bool, show_region_gain, "show-region-gain", false)
+UI_CONFIG_VARIABLE (bool, show_name_highlight, "show-name-highlight", false)
+UI_CONFIG_VARIABLE (bool, primary_clock_delta_edit_cursor, "primary-clock-delta-edit-cursor", false)
+UI_CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta-edit-cursor", false)
+UI_CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true)
+UI_CONFIG_VARIABLE (bool, follow_edits, "follow-edits", false)
+UI_CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", false)
+UI_CONFIG_VARIABLE (bool, autoscroll_editor, "autoscroll-editor", true)
+UI_CONFIG_VARIABLE (bool, link_region_and_track_selection, "link-region-and-track-selection", false)  // DEPRECATED
+UI_CONFIG_VARIABLE (bool, link_editor_and_mixer_selection, "link-editor-and-mixer-selection", false)
+UI_CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f)
+UI_CONFIG_VARIABLE (ARDOUR::VUMeterStandard, meter_vu_standard, "meter-vu-standard", ARDOUR::MeteringVUstandard)
+UI_CONFIG_VARIABLE (ARDOUR::MeterLineUp, meter_line_up_level, "meter-line-up-level", ARDOUR::MeteringLineUp18)
+UI_CONFIG_VARIABLE (ARDOUR::MeterLineUp, meter_line_up_din, "meter-line-up-din", ARDOUR::MeteringLineUp15)
+UI_CONFIG_VARIABLE (float, meter_peak, "meter-peak", 0.0f)
+UI_CONFIG_VARIABLE (bool, meter_style_led, "meter-style-led", true)
+UI_CONFIG_VARIABLE (bool, show_editor_meter, "show-editor-meter", true)
+UI_CONFIG_VARIABLE (double, waveform_clip_level, "waveform-clip-level", -0.0933967) /* units of dB */
+UI_CONFIG_VARIABLE (bool, hiding_groups_deactivates_groups, "hiding-groups-deactivates-groups", true)
+UI_CONFIG_VARIABLE (bool, no_new_session_dialog, "no-new-session-dialog", false)