Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22284
Modified Files:
Project.cpp Menus.cpp Menus.h Project.h
Log Message:
Put Snap To in the SelectionBar
Index: Project.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- Project.h 7 Jun 2007 20:27:31 -0000 1.120
+++ Project.h 17 Jun 2007 06:08:43 -0000 1.121
@@ -269,6 +269,8 @@
virtual void AS_SetRate(double rate);
virtual void AS_ModifySelection(double &start, double &end);
+ virtual void AS_SetSnapTo(bool state);
+ virtual bool AS_GetSnapTo();
void SetStateTo(unsigned int n);
Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- Menus.h 7 Jun 2007 20:27:31 -0000 1.103
+++ Menus.h 17 Jun 2007 06:08:43 -0000 1.104
@@ -114,6 +114,9 @@
void OnSortTime();
void OnSortName();
+void OnSnapToOn();
+void OnSnapToOff();
+
// File Menu
void OnNew();
@@ -194,7 +197,6 @@
void OnCollapseAllTracks();
void OnSelectionFormat(int index);
-void OnSnapTo();
void OnPlotSpectrum();
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- Menus.cpp 8 Jun 2007 12:26:28 -0000 1.325
+++ Menus.cpp 17 Jun 2007 06:08:42 -0000 1.326
@@ -162,8 +162,7 @@
AudioIOBusyFlag = 0x00040000, //lll
PlayRegionLockedFlag = 0x00080000, //msmeyer
PlayRegionNotLockedFlag= 0x00100000, //msmeyer
- CutCopyAvailableFlag = 0x00200000, //lll
- SnapToFlag = 0x00400000 //lll
+ CutCopyAvailableFlag = 0x00200000
};
#define FN(X) new AudacityProjectCommandFunctor(this, &AudacityProject:: X )
@@ -491,12 +490,6 @@
wxT("SelSave"), wxT("SelRestore"), NULL);
c->AddSeparator();
- /* i18n-hint: Set snap-to mode on or off */
- c->AddItem(wxT("Snap"), _("Snap To"),
FN(OnSnapTo), mSnapTo);
- c->SetCommandFlags(wxT("Snap"), TracksExistFlag, TracksExistFlag);
-
- c->AddSeparator();
-
c->BeginSubMenu(_("Play &Region..."));
c->AddItem(wxT("LockPlayRegion"), _("Lock"), FN(OnLockPlayRegion));
c->AddItem(wxT("UnlockPlayRegion"), _("Unlock"), FN(OnUnlockPlayRegion));
@@ -865,6 +858,9 @@
c->AddCommand(wxT("TrackSolo"), _("Solo/Unsolo focused
track\tShift+S"), FN(OnTrackSolo));
c->AddCommand(wxT("TrackClose"), _("Close focused track\tShift+C"),
FN(OnTrackClose));
+ c->AddCommand(wxT("SnapToOn"), _("Snap To On"),
FN(OnSnapToOn));
+ c->AddCommand(wxT("SnapToOff"), _("Snap To Off"),
FN(OnSnapToOff));
+
mLastFlags = 0;
mSel0save = 0;
@@ -1110,10 +1106,6 @@
flags |= GetFocusedFrame();
- if (mSnapTo) {
- flags |= SnapToFlag;
- }
-
if (IsPlayRegionLocked())
flags |= PlayRegionLockedFlag;
else
@@ -3339,12 +3331,6 @@
TP_ScrollWindow(mViewInfo.sel0);
}
-void AudacityProject::OnSnapTo()
-{
- SetSnapTo(!GetSnapTo());
- RedrawProject();
-}
-
void AudacityProject::OnPlotSpectrum()
{
int selcount = 0;
@@ -4394,6 +4380,16 @@
FinishAutoScroll();
}
+void AudacityProject::OnSnapToOn()
+{
+ SetSnapTo(true);
+}
+
+void AudacityProject::OnSnapToOff()
+{
+ SetSnapTo(false);
+}
+
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- Project.cpp 8 Jun 2007 05:40:13 -0000 1.313
+++ Project.cpp 17 Jun 2007 06:08:42 -0000 1.314
@@ -557,9 +557,9 @@
mProgressDialog[mProgressCurrent] = NULL;
}
- int widths[] = {-1, 130, 100};
- mStatusBar = CreateStatusBar(3);
- mStatusBar->SetStatusWidths(3, widths);
+ int widths[] = {-1, 130};
+ mStatusBar = CreateStatusBar(2);
+ mStatusBar->SetStatusWidths(2, widths);
// MM: DirManager is created dynamically, freed on demand via ref-counting
// MM: We don't need to Ref() here because it start with refcount=1
@@ -924,6 +924,17 @@
SetTitle( name );
}
+void AudacityProject::AS_SetSnapTo(bool state)
+{
+ SetSnapTo(state);
+ RedrawProject();
+}
+
+bool AudacityProject::AS_GetSnapTo()
+{
+ return GetSnapTo();
+}
+
void AudacityProject::AS_SetRate(double rate)
{
mRate = rate;
@@ -3421,15 +3432,9 @@
mCommandManager.Check(wxT("Snap"), mSnapTo);
gPrefs->Write(wxT("/SnapTo"), mSnapTo);
- wxString msg;
- if (mSnapTo) {
- msg.Printf(_("Snap To: On"));
- }
- else {
- msg.Printf(_("Snap To: Off"));
+ if (GetSelectionBar()) {
+ GetSelectionBar()->SetSnapTo(state);
}
-
- mStatusBar->SetStatusText(msg, 2);
}
bool AudacityProject::GetSnapTo()
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
