From 159f0263f3c03d1547e6dc1902ef5b6582fae8d4 Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Sat, 16 Jan 2016 15:39:39 +0000 Subject: [PATCH] Update solo button defaults As agreed by QA, the 'simple' behavior becomes the out-of-the-box default, and 'standard' renamed as 'multi-track'. --- src/Project.cpp | 5 ++++- src/TrackPanel.cpp | 2 +- src/prefs/TracksPrefs.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Project.cpp b/src/Project.cpp index 52d22269f..ed9b6a9e8 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -1103,7 +1103,10 @@ void AudacityProject::UpdatePrefsVariables() gPrefs->Read(wxT("/GUI/Help"), &mHelpPref, wxT("InBrowser") ); gPrefs->Read(wxT("/GUI/SelectAllOnNone"), &mSelectAllOnNone, true); gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &mShowSplashScreen, true); - gPrefs->Read(wxT("/GUI/Solo"), &mSoloPref, wxT("Standard") ); + gPrefs->Read(wxT("/GUI/Solo"), &mSoloPref, wxT("Simple")); + // Update the old default to the new default. + if (mSoloPref == wxT("Standard")) + mSoloPref = wxT("Simple"); gPrefs->Read(wxT("/GUI/TracksFitVerticallyZoomed"), &mTracksFitVerticallyZoomed, false); // gPrefs->Read(wxT("/GUI/UpdateSpectrogram"), &mViewInfo.bUpdateSpectrogram, true); diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 66d25220c..b9b9a1b51 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -863,7 +863,7 @@ void TrackPanel::UpdatePrefs() true); gPrefs->Read(wxT("/GUI/CircularTrackNavigation"), &mCircularTrackNavigation, false); - gPrefs->Read(wxT("/GUI/Solo"), &mSoloPref, wxT("Standard") ); + gPrefs->Read(wxT("/GUI/Solo"), &mSoloPref, wxT("Simple")); #ifdef EXPERIMENTAL_OUTPUT_DISPLAY bool temp = WaveTrack::mMonoAsVirtualStereo; diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index 57c811bd5..6b5ea159b 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -49,12 +49,12 @@ TracksPrefs::~TracksPrefs() void TracksPrefs::Populate() { - mSoloCodes.Add(wxT("Standard")); mSoloCodes.Add(wxT("Simple")); + mSoloCodes.Add(wxT("Multi")); mSoloCodes.Add(wxT("None")); - mSoloChoices.Add(_("Standard")); mSoloChoices.Add(_("Simple")); + mSoloChoices.Add(_("Multi-track")); mSoloChoices.Add(_("None"));