Add preference option for Stem Plot

Tracks 'behaviors' preferences split to sub-page to avoid over-long
page for Tracks preferences.

src/prefs/PrefsDialog.cpp

@@ -59,6 +59,7 @@
 #include "SpectrumPrefs.h"
 #include "ThemePrefs.h"
 #include "TracksPrefs.h"
+#include "TracksBehaviorsPrefs.h"
 #include "WarningsPrefs.h"
 // #include "WaveformPrefs.h"
 #include "WaveformSettings.h"
@@ -141,6 +142,7 @@ PrefsDialog::Factories
    static LibraryPrefsFactory libraryPrefsFactory;
 #endif
    // static WaveformPrefsFactory waveformPrefsFactory;
+   static TracksBehaviorsPrefsFactory tracksBehaviorsPrefsFactory;
    static SpectrumPrefsFactory spectrumPrefsFactory;
    static DirectoriesPrefsFactory directoriesPrefsFactory;
    static WarningsPrefsFactory warningsPrefsFactory;
@@ -166,8 +168,9 @@ PrefsDialog::Factories
       &guiPrefsFactory,
 
       // Group other page(s)
-      PrefsNode(&tracksPrefsFactory, 1),
+      PrefsNode(&tracksPrefsFactory, 2),
       // &waveformPrefsFactory,
+      &tracksBehaviorsPrefsFactory,
       &spectrumPrefsFactory,
 
       // Group one other page

src/prefs/TracksPrefs.cpp

@@ -20,10 +20,9 @@
 #include "../Audacity.h"
 #include "TracksPrefs.h"
 
-#include <algorithm>
-#include <wx/defs.h>
+//#include <algorithm>
+//#include <wx/defs.h>
 
-#include "../Experimental.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"
@@ -60,23 +59,8 @@ TracksPrefs::~TracksPrefs()
 {
 }
 
-const wxChar *TracksPrefs::ScrollingPreferenceKey()
-{
-   static auto string = wxT("/GUI/ScrollBeyondZero");
-   return string;
-}
-
 void TracksPrefs::Populate()
 {
-   mSoloCodes.Add(wxT("Simple"));
-   mSoloCodes.Add(wxT("Multi"));
-   mSoloCodes.Add(wxT("None"));
-
-   mSoloChoices.Add(_("Simple"));
-   mSoloChoices.Add(_("Multi-track"));
-   mSoloChoices.Add(_("None"));
-
-
    // Keep view choices and codes in proper correspondence --
    // we don't display them by increasing integer values.
 
@@ -153,48 +137,6 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
                   false);
    }
    S.EndStatic();
-
-   S.StartStatic(_("Behaviors"));
-   {
-      S.TieCheckBox(_("&Select then act on entire project, if no audio selected"),
-                    wxT("/GUI/SelectAllOnNone"),
-                    true);
-      /* i18n-hint: cut-lines are a lines indicating where to cut.*/
-      S.TieCheckBox(_("Enable cut &lines"),
-                    wxT("/GUI/EnableCutLines"),
-                    false);
-      S.TieCheckBox(_("Enable &dragging of left and right selection edges"),
-                    wxT("/GUI/AdjustSelectionEdges"),
-                    true);
-      S.TieCheckBox(_("\"Move track focus\" c&ycles repeatedly through tracks"),
-                    wxT("/GUI/CircularTrackNavigation"),
-                    false);
-      S.TieCheckBox(_("Editing a clip can &move other clips"),
-                    wxT("/GUI/EditClipCanMove"),
-                    true);
-      S.TieCheckBox(_("&Type to create a label"),
-                    wxT("/GUI/TypeToCreateLabel"),
-                    true);
-#ifdef EXPERIMENTAL_SCROLLING_LIMITS
-      S.TieCheckBox(_("Enable scrolling left of &zero"),
-                    ScrollingPreferenceKey(),
-                    ScrollingPreferenceDefault());
-#endif
-
-      S.AddSpace(10);
-
-      S.StartMultiColumn(2);
-      {
-         S.TieChoice(_("Solo &Button:"),
-                     wxT("/GUI/Solo"),
-                     wxT("Standard"),
-                     mSoloChoices,
-                     mSoloCodes);
-         S.SetSizeHints(mSoloChoices);
-      }
-      S.EndMultiColumn();
-   }
-   S.EndStatic();
 }
 
 bool TracksPrefs::GetPinnedHeadPreference()

src/prefs/TracksPrefs.h

@@ -13,10 +13,10 @@
 #ifndef __AUDACITY_TRACKS_PREFS__
 #define __AUDACITY_TRACKS_PREFS__
 
-#include <wx/defs.h>
+//#include <wx/defs.h>
 
-#include <wx/arrstr.h>
-#include <wx/window.h>
+//#include <wx/arrstr.h>
+//#include <wx/window.h>
 
 #include "PrefsPanel.h"
 
@@ -31,16 +31,13 @@ class TracksPrefs final : public PrefsPanel
 
    static bool GetPinnedHeadPreference();
    static void SetPinnedHeadPreference(bool value, bool flush = false);
-   static const wxChar *ScrollingPreferenceKey();
-   static inline bool ScrollingPreferenceDefault() { return false; }
 
  private:
    void Populate();
    void PopulateOrExchange(ShuttleGui & S);
 
    static int iPreferencePinned;
-   wxArrayString mSoloCodes;
-   wxArrayString mSoloChoices;
+
    wxArrayInt    mViewCodes;
    wxArrayString mViewChoices;
    wxArrayInt    mSampleDisplayCodes;