Add missing checkbox: Snap to Marker.

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 84d062818342ec0f92c1945570a9ecb893c5cf48..31e8103f822fc9fbb1f645305758d3f13ab2c695 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2306,14 +2306,6 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Editor"), new OptionEditorHeading (_("General")));
 
-       add_option (_("Editor"),
-            new BoolOption (
-                    "rubberbanding-snaps-to-grid",
-                    _("Snap rubberband to grid"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
-                    ));
-
        bo = new BoolOption (
                     "name-new-markers",
                     _("Prompt for new marker names"),
@@ -2490,6 +2482,77 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Editor"), rsas);
 
+       add_option (_("Editor/Snap"), new OptionEditorHeading (_("General Snap options:")));
+       
+       add_option (_("Editor/Snap"),
+                   new SpinOption<uint32_t> (
+                           "snap-threshold",
+                           _("Snap Threshold (pixels)"),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_threshold),
+                           sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_threshold),
+                           10, 200,
+                           1, 10
+                           ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "show-snapped-cursor",
+                    _("Show \"snapped cursor\""),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_snapped_cursor),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_snapped_cursor)
+                    ));
+       
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "rubberbanding-snaps-to-grid",
+                    _("Snap rubberband selection to grid"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
+                    ));
+
+       add_option (_("Editor/Snap"), new OptionEditorHeading (_("When \"Snap\" is enabled, snap to:")));
+
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-marks",
+                    _("Markers"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_marks),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_marks)
+                    ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-region-sync",
+                    _("Region Sync Points"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_sync),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_sync)
+                    ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-region-start",
+                    _("Region Starts"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_start),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_snap_to_region_start)
+                    ));
+
+       add_option (_("Editor/Snap"),
+            new BoolOption (
+                    "snap-to-region-end",
+                    _("Region Ends"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_snap_to_region_end),
+                    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 ());
@@ -3796,14 +3859,6 @@ RCOptionEditor::RCOptionEditor ()
                                        ));
        }
 
-       add_option (_("Appearance/Toolbar"),
-            new BoolOption (
-                    "show-dsp-load-info",
-                    _("Display DSP Load Information"),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_dsp_load_info),
-                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_dsp_load_info)
-                    ));
-
        add_option (_("Appearance/Toolbar"),
             new BoolOption (
                     "show-mini-timeline",