1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-06 07:09:39 +02:00

Record on same track is now the default.

Record new track is now accessed by SHIFT+R and is so named in the menu and tool tip.
This commit is contained in:
James Crook 2017-03-22 16:42:40 +00:00
parent 5f6a013a87
commit 1dce83006f
2 changed files with 13 additions and 11 deletions

View File

@ -784,17 +784,19 @@ void AudacityProject::CreateMenusAndCommands()
AudioIONotBusyFlag | CanStopAudioStreamFlag);
/* i18n-hint: (verb)*/
c->AddItem(wxT("Record"), _("&Record"), FN(OnRecord), wxT("R"));
c->AddItem(wxT("TimerRecord"), _("&Timer Record..."), FN(OnTimerRecord), wxT("Shift+T"));
// The RecordBelow function is actually 'record-other', i.e. if normal record record beside,
// it records below, if normal record records below, it records beside.
// TODO: fix the naming, and also check we do 'the right thing' with other options like
// TimerRecord.
#ifdef EXPERIMENTAL_DA
c->AddItem(wxT("RecordBelow"), _("Record Below"), FN(OnRecordBelow), wxT("Shift+R"));
// The RecordBelow function is actually 'record-other', i.e. if normal record records beside,
// it records below, if normal record records below, it records beside.
// TODO: fix the naming, and also check we do 'the right thing' with other options like
// TimerRecord.
// PREFER_NEW_TRACKS is defined if we want the old behaviour of by default adding a new track on
// every new recording.
#ifndef PREFER_NEW_TRACKS
c->AddItem(wxT("RecordBelow"), _("Record New Track"), FN(OnRecordBelow), wxT("Shift+R"));
#else
c->AddItem(wxT("RecordBelow"), _("Record Beside"), FN(OnRecordBelow), wxT("Shift+R"));
#endif
c->AddItem(wxT("TimerRecord"), _("&Timer Record..."), FN(OnTimerRecord), wxT("Shift+T"));
// JKC: I decided to duplicate this between play and record, rather than put it
// at the top level. AddItem can now cope with simple duplicated items.
c->AddItem(wxT("Pause"), _("&Pause"), FN(OnPause), wxT("P"));

View File

@ -224,11 +224,11 @@ void ControlToolBar::RegenerateTooltips()
break;
case ID_RECORD_BUTTON:
commands.push_back(wxT("Record"));
#ifndef EXPERIMENTAL_DA
#ifdef PREFER_NEW_TRACKS
commands.push_back(_("Append Record"));
commands.push_back(wxT("RecordAppend"));
#else
commands.push_back(_("Record Below"));
commands.push_back(_("Record New Track"));
commands.push_back(wxT("RecordBelow"));
#endif
break;
@ -874,7 +874,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
bool success = false;
bool shifted = mRecord->WasShiftDown();
#ifdef EXPERIMENTAL_DA
#ifndef PREFER_NEW_TRACKS
shifted = !shifted;
#endif