mirror of
https://github.com/cookiengineer/audacity
synced 2025-07-24 08:28:04 +02:00
Merge branch 'master' into darkaudacity
I moved type to create labels under labels. I made the menu items for SaveAs MP3/WAV/Ogg mainstream. Introduced EXPERIMENTAL_DA2 to deal with some colour issues.
This commit is contained in:
commit
0aac05bd58
@ -325,7 +325,7 @@ void AudacityProject::CreateMenusAndCommands()
|
||||
AudioIONotBusyFlag | UnsavedChangesFlag);
|
||||
c->AddItem(wxT("SaveAs"), _("Save Project &As..."), FN(OnSaveAs));
|
||||
c->BeginSubMenu( _("Save Other") );
|
||||
#ifdef EXPERIMENTAL_DA
|
||||
//#ifdef EXPERIMENTAL_DA
|
||||
// Enable Export audio commands only when there are audio tracks.
|
||||
c->AddItem(wxT("ExportMp3"), _("Export as MP&3"), FN(OnExportMp3), wxT(""),
|
||||
AudioIONotBusyFlag | WaveTracksExistFlag,
|
||||
@ -338,7 +338,7 @@ void AudacityProject::CreateMenusAndCommands()
|
||||
c->AddItem(wxT("ExportOgg"), _("Export as &OGG"), FN(OnExportOgg), wxT(""),
|
||||
AudioIONotBusyFlag | WaveTracksExistFlag,
|
||||
AudioIONotBusyFlag | WaveTracksExistFlag);
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
c->AddItem(wxT("Export"), _("&Export Audio..."), FN(OnExportAudio), wxT("Ctrl+Shift+E"),
|
||||
AudioIONotBusyFlag | WaveTracksExistFlag,
|
||||
@ -556,6 +556,11 @@ void AudacityProject::CreateMenusAndCommands()
|
||||
c->AddItem(wxT("DisjoinLabels"), _("Detac&h at Silences"), FN(OnDisjoinLabels), wxT("Alt+Shift+J"));
|
||||
|
||||
c->AddSeparator();
|
||||
|
||||
// New in Audacity 2.1.3
|
||||
c->AddCheck(wxT("TypeToCreateLabel"), _("&Type to Create a Label (on/off)"),
|
||||
FN(OnToggleTypeToCreateLabel), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
|
||||
|
||||
c->EndSubMenu();
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -969,11 +974,6 @@ void AudacityProject::CreateMenusAndCommands()
|
||||
c->AddSeparator();
|
||||
#endif
|
||||
|
||||
// New in Audacity 2.1.3
|
||||
c->AddCheck(wxT("TypeToCreateLabel"), _("&Type to Create a Label (on/off)"),
|
||||
FN(OnToggleTypeToCreateLabel), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
c->BeginSubMenu(_("S&ort Tracks"));
|
||||
|
@ -922,7 +922,9 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
||||
mbLoadedFromAup( false )
|
||||
{
|
||||
|
||||
#ifdef EXPERIMENTAL_DA2
|
||||
SetBackgroundColour(theTheme.Colour( clrMedium ));
|
||||
#endif
|
||||
// Note that the first field of the status bar is a dummy, and it's width is set
|
||||
// to zero latter in the code. This field is needed for wxWidgets 2.8.12 because
|
||||
// if you move to the menu bar, the first field of the menu bar is cleared, which
|
||||
@ -981,7 +983,9 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
||||
wxSize{ this->GetSize().GetWidth(), -1 }
|
||||
};
|
||||
mTopPanel->SetAutoLayout(true);
|
||||
#ifdef EXPERIMENTAL_DA2
|
||||
mTopPanel->SetBackgroundColour(theTheme.Colour( clrMedium ));
|
||||
#endif
|
||||
|
||||
//
|
||||
// Create the ToolDock
|
||||
@ -1036,7 +1040,10 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
||||
//pPage->SetBackgroundColour( theTheme.Colour( clrDark ));
|
||||
#endif
|
||||
|
||||
#ifdef EXPERIMENTAL_DA2
|
||||
pPage->SetBackgroundColour(theTheme.Colour( clrMedium ));
|
||||
#endif
|
||||
|
||||
{
|
||||
auto ubs = std::make_unique<wxBoxSizer>(wxVERTICAL);
|
||||
ubs->Add(mToolManager->GetTopDock(), 0, wxEXPAND | wxALIGN_TOP);
|
||||
@ -1219,7 +1226,9 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
||||
|
||||
//Initialize the last selection adjustment time.
|
||||
mLastSelectionAdjustment = ::wxGetLocalTimeMillis();
|
||||
#ifdef EXPERIMENTAL_DA2
|
||||
ClearBackground();// For wxGTK.
|
||||
#endif
|
||||
}
|
||||
|
||||
AudacityProject::~AudacityProject()
|
||||
@ -1268,6 +1277,7 @@ void AudacityProject::UpdatePrefsVariables()
|
||||
gPrefs->Read(wxT("/AudioFiles/NormalizeOnLoad"),&mNormalizeOnLoad, false);
|
||||
gPrefs->Read(wxT("/GUI/AutoScroll"), &mViewInfo.bUpdateTrackIndicator, true);
|
||||
gPrefs->Read(wxT("/GUI/EmptyCanBeDirty"), &mEmptyCanBeDirty, true );
|
||||
// DA 2.1.3x did not ship with a manual, so default for DA is internet.
|
||||
#ifdef EXPERIMENTAL_DA
|
||||
gPrefs->Read(wxT("/GUI/Help"), &mHelpPref, wxT("FromInternet") );
|
||||
#else
|
||||
|
Loading…
x
Reference in New Issue
Block a user