From 25daebbaf2e914ff9cf483926bc216d9597f9711 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 11 Sep 2023 10:23:18 -0500 Subject: [PATCH] remove snap-to-grid option (subsumed by SnapTarget preference) --- gtk2_ardour/rc_option_editor.cc | 8 -------- gtk2_ardour/ui_config_vars.h | 1 - 2 files changed, 9 deletions(-) diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 35acfe5488..6c1bd478f8 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3481,14 +3481,6 @@ These settings will only take effect after %1 is restarted.\n\ sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_end) )); - add_option (_("Editor/Snap"), - new BoolOption ( - "snap-to-grid", - _("Grid"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_grid), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_grid) - )); - add_option (_("Editor/Modifiers"), new OptionEditorHeading (_("Keyboard Modifiers"))); add_option (_("Editor/Modifiers"), new KeyboardOptions); add_option (_("Editor/Modifiers"), new OptionEditorBlank ()); diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index fcd2995b12..55d3b50925 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -140,7 +140,6 @@ UI_CONFIG_VARIABLE (bool, snap_to_playhead, "snap-to-playhead", true) UI_CONFIG_VARIABLE (bool, snap_to_region_sync, "snap-to-region-sync", true) UI_CONFIG_VARIABLE (bool, snap_to_region_start, "snap-to-region-start", true) UI_CONFIG_VARIABLE (bool, snap_to_region_end, "snap-to-region-end", true) -UI_CONFIG_VARIABLE (bool, snap_to_grid, "snap-to-grid", true) UI_CONFIG_VARIABLE (bool, show_selection_marker, "show-selection-marker", true) UI_CONFIG_VARIABLE (bool, show_grids_ruler, "show-grids-ruler", true) UI_CONFIG_VARIABLE (bool, rulers_follow_grid, "rulers-follow-grid", false)