From f62166f36f9e31edd7d1bdb9ce9bc7c1d12025c7 Mon Sep 17 00:00:00 2001
From: lllucius <lllucius@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Fri, 8 Nov 2013 14:12:24 +0000
Subject: [PATCH] Bug 679 - Incorrect keyboard preferences for "Snap To"

http://bugzilla.audacityteam.org/show_bug.cgi?id=679
---
 src/Menus.cpp | 25 ++++++++++++++++---------
 src/Menus.h   |  3 ++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 348a8f63c..6773b7ab5 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -113,6 +113,7 @@ simplifies construction of menu items.
 #include "DeviceManager.h"
 
 #include "CaptureEvents.h"
+#include "Snap.h"
 
 #ifdef EXPERIMENTAL_SCOREALIGN
 #include "effects/ScoreAlignDialog.h"
@@ -1157,11 +1158,12 @@ void AudacityProject::CreateMenusAndCommands()
    c->AddCommand(wxT("TrackSolo"), _("Solo/Unsolo focused track"), FN(OnTrackSolo), wxT("Shift+S"));
    c->AddCommand(wxT("TrackClose"), _("Close focused track"), FN(OnTrackClose), wxT("Shift+C"));
 
-   c->AddCommand(wxT("SnapToOn"), _("Snap To On"), FN(OnSnapToOn));
-   c->AddCommand(wxT("SnapToOff"), _("Snap To Off"), FN(OnSnapToOff));
-
    c->SetDefaultFlags(AlwaysEnabledFlag, AlwaysEnabledFlag);
 
+   c->AddCommand(wxT("SnapToOff"), _("Snap To Off"), FN(OnSnapToOff));
+   c->AddCommand(wxT("SnapToNearest"), _("Snap To Nearest"), FN(OnSnapToNearest));
+   c->AddCommand(wxT("SnapToPrior"), _("Snap To Prior"), FN(OnSnapToPrior));
+
    c->AddCommand(wxT("FullScreenOnOff"), _("Full screen on/off"), FN(OnFullScreen), 
 #ifdef __WXMAC__      
       wxT("Ctrl+/"));
@@ -5952,14 +5954,19 @@ void AudacityProject::OnResample()
    FinishAutoScroll();
 }
 
-void AudacityProject::OnSnapToOn()
-{
-   SetSnapTo(true);
-}
-
 void AudacityProject::OnSnapToOff()
 {
-   SetSnapTo(false);
+   SetSnapTo(SNAP_OFF);
+}
+
+void AudacityProject::OnSnapToNearest()
+{
+   SetSnapTo(SNAP_NEAREST);
+}
+
+void AudacityProject::OnSnapToPrior()
+{
+   SetSnapTo(SNAP_PRIOR);
 }
 
 void AudacityProject::OnFullScreen()
diff --git a/src/Menus.h b/src/Menus.h
index f3b94fe8f..11beef8a5 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -165,8 +165,9 @@ double GetTime(Track *t);
 void OnSortTime();
 void OnSortName();
 
-void OnSnapToOn();
 void OnSnapToOff();
+void OnSnapToNearest();
+void OnSnapToPrior();
 void OnFullScreen();
 
         // File Menu