New library for preferences...

... It mentions some wxWidgets types in its interface, but these are in the
acceptable utility subset of wxBase that we still consider GUI toolkit-neutral.

libraries/CMakeLists.txt

@@ -10,6 +10,7 @@ set( LIBRARIES
    lib-components
    lib-basic-ui
    lib-exceptions
+   lib-preferences
 )
 
 if ( ${_OPT}has_networking )

libraries/lib-preferences/CMakeLists.txt

@@ -0,0 +1,32 @@
+#[[
+Classes managing settings that persist between runs of the program.
+
+Settings objects for various types (boolean, numbers, strings, enumerations)
+that package a preference key path and a default value (so that literals are
+not duplicated in widely separated parts) and cache values in memory.
+
+PreferenceListener which is a callback notified of certain changes of
+preferences.
+
+PreferenceInitializer is a callback for the reinitialization of preferences.
+
+FileConfig decorates wxFileConfig, with a (pure virtual) member function to
+alert the user of failure to initialize it (as when the file is read-only).
+]]#
+
+set( SOURCES
+   FileConfig.cpp
+   FileConfig.h
+   Prefs.cpp
+   Prefs.h
+)
+set( LIBRARIES 
+   lib-utility-interface
+   lib-basic-ui-interface
+   lib-components-interface
+   PRIVATE
+   wxBase
+)
+audacity_library( lib-preferences "${SOURCES}" "${LIBRARIES}"
+   "" ""
+)

libraries/lib-preferences/FileConfig.cpp

@@ -8,17 +8,7 @@
 
 **********************************************************************/
 
-
-
 #include <errno.h>
-
-#include <wx/defs.h>
-#include <wx/app.h>
-#include <wx/bmpbuttn.h>
-#include <wx/button.h>
-#include <wx/filefn.h>
-#include <wx/fileconf.h>
-#include <wx/sizer.h>
 #include <wx/wfstream.h>
 
 #include "FileConfig.h"

libraries/lib-preferences/FileConfig.h

@@ -18,7 +18,7 @@
 
 #include "Identifier.h"
 
-class FileConfig : public wxConfigBase
+class PREFERENCES_API FileConfig : public wxConfigBase
 {
 public:
    FileConfig(const wxString& appName = wxEmptyString,

libraries/lib-preferences/Prefs.h

@@ -36,35 +36,34 @@
 
 #include <functional>
 
-#include "ComponentInterface.h"
 #include "ComponentInterfaceSymbol.h"
 #include "wxArrayStringEx.h"
-#include "widgets/FileConfig.h"
+#include "FileConfig.h"
 
 #include <memory>
 #include <wx/event.h> // to declare custom event types
 
 class wxFileName;
 
-void InitPreferences( std::unique_ptr<FileConfig> uPrefs );
+PREFERENCES_API void InitPreferences( std::unique_ptr<FileConfig> uPrefs );
 //! Call this to reset preferences to an (almost)-"new" default state
 /*!
  There is at least one exception to that: user preferences we want to make
  more "sticky."  Notably, whether automatic update checking is preferred.
  */
-void ResetPreferences();
-void FinishPreferences();
+PREFERENCES_API void ResetPreferences();
+PREFERENCES_API void FinishPreferences();
 
-extern AUDACITY_DLL_API FileConfig *gPrefs;
+extern PREFERENCES_API FileConfig *gPrefs;
 extern int gMenusDirty;
 
 
 struct ByColumns_t{};
-extern ByColumns_t ByColumns;
+extern PREFERENCES_API ByColumns_t ByColumns;
 
 //! Base class for settings objects.  It holds a configuration key path.
 /* The constructors are non-explicit for convenience */
-class AUDACITY_DLL_API SettingBase
+class PREFERENCES_API SettingBase
 {
 public:
    SettingBase( const char *path ) : mPath{ path } {}
@@ -231,10 +230,12 @@ public:
    using Setting::Setting;
 };
 
+using EnumValueSymbol = ComponentInterfaceSymbol;
+
 /// A table of EnumValueSymbol that you can access by "row" with
 /// operator [] but also allowing access to the "columns" of internal or
 /// translated strings, and also allowing convenient column-wise construction
-class AUDACITY_DLL_API EnumValueSymbols : public std::vector< EnumValueSymbol >
+class PREFERENCES_API EnumValueSymbols : public std::vector< EnumValueSymbol >
 {
 public:
    EnumValueSymbols() = default;
@@ -262,7 +263,7 @@ private:
 
 /// Packages a table of user-visible choices each with an internal code string,
 /// a preference key path, and a default choice
-class AUDACITY_DLL_API ChoiceSetting
+class PREFERENCES_API ChoiceSetting
 {
 public:
    ChoiceSetting(
@@ -312,7 +313,7 @@ protected:
 /// (generally not equal to their table positions),
 /// and optionally an old preference key path that stored integer codes, to be
 /// migrated into one that stores internal string values instead
-class AUDACITY_DLL_API EnumSettingBase : public ChoiceSetting
+class PREFERENCES_API EnumSettingBase : public ChoiceSetting
 {
 public:
    EnumSettingBase(
@@ -384,7 +385,7 @@ public:
 };
 
 //! A listener notified of changes in preferences
-class AUDACITY_DLL_API PrefsListener
+class PREFERENCES_API PrefsListener
 {
 public:
    //! Call this static function to notify all PrefsListener objects
@@ -418,14 +419,14 @@ private:
 /// Return the config file key associated with a warning dialog identified
 /// by internalDialogName.  When the box is checked, the value at the key
 /// becomes false.
-AUDACITY_DLL_API
+PREFERENCES_API
 wxString WarningDialogKey(const wxString &internalDialogName);
 
-/*
+/*!
  Meant to be statically constructed.  A callback to repopulate configuration
  files after a reset.
  */
-struct AUDACITY_DLL_API PreferenceInitializer {
+struct PREFERENCES_API PreferenceInitializer {
    PreferenceInitializer();
    virtual ~PreferenceInitializer();
    virtual void operator () () = 0;
@@ -434,6 +435,6 @@ struct AUDACITY_DLL_API PreferenceInitializer {
 };
 
 // Special extra-sticky settings
-extern AUDACITY_DLL_API BoolSetting DefaultUpdatesCheckingFlag;
+extern PREFERENCES_API BoolSetting DefaultUpdatesCheckingFlag;
 
 #endif

src/AudacityApp.cpp

@@ -109,7 +109,7 @@ It handles initialization and termination by subclassing wxApp.
 #include "prefs/DirectoriesPrefs.h"
 #include "prefs/GUIPrefs.h"
 #include "tracks/ui/Scrubbing.h"
-#include "widgets/FileConfig.h"
+#include "FileConfig.h"
 #include "widgets/FileHistory.h"
 #include "update/UpdateManager.h"
 #include "widgets/wxWidgetsBasicUI.h"

src/AudacityFileConfig.h

@@ -13,7 +13,7 @@ Paul Licameli split from Prefs.h
 #define __AUDACITY_FILE_CONFIG__
 
 #include <memory>
-#include "widgets/FileConfig.h" // to inherit
+#include "FileConfig.h" // to inherit
 
 /// \brief Our own specialisation of FileConfig.
 class AUDACITY_DLL_API AudacityFileConfig final : public FileConfig

src/CMakeLists.txt

@@ -200,8 +200,6 @@ list( APPEND SOURCES
       PluginManager.h
       PluginRegistrationDialog.cpp
       PluginRegistrationDialog.h
-      Prefs.cpp
-      Prefs.h
       Printing.cpp
       Printing.h
       Profiler.cpp
@@ -916,8 +914,6 @@ list( APPEND SOURCES
       widgets/ErrorDialog.h
       widgets/ExpandingToolBar.cpp
       widgets/ExpandingToolBar.h
-      widgets/FileConfig.cpp
-      widgets/FileConfig.h
       widgets/FileDialog/FileDialog.cpp
       widgets/FileDialog/FileDialog.h
       $<$<BOOL:${wxIS_WIN}>:

src/ProjectSettings.h

@@ -16,6 +16,7 @@ Paul Licameli split from AudacityProject.h
 
 #include "ClientData.h" // to inherit
 #include "Prefs.h" // to inherit
+#include "audacity/Types.h"
 
 class AudacityProject;
 

src/commands/CommandManager.h

@@ -20,7 +20,7 @@
 
 #include "Keyboard.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Registry.h"
 
 #include <vector>

src/commands/GetInfoCommand.cpp

@@ -192,7 +192,7 @@ bool GetInfoCommand::SendMenus(const CommandContext &context)
    return true;
 }
 
-#include "../Prefs.h"
+#include "Prefs.h"
 
 namespace {
 

src/commands/LoadCommands.cpp

@@ -18,7 +18,7 @@ modelled on BuiltinEffectsModule
 #include "AudacityCommand.h"
 #include "ModuleManager.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 
 namespace {
 bool sInitialized = false;

src/commands/PreferenceCommands.cpp

@@ -19,7 +19,7 @@ SetPreferenceCommand classes
 #include "PreferenceCommands.h"
 
 #include "LoadCommands.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../commands/CommandContext.h"

src/commands/ScreenshotCommand.cpp

@@ -37,7 +37,7 @@ small calculations of rectangles.
 #include "../TrackPanel.h"
 #include "../effects/Effect.h"
 #include "../toolbars/ToolManager.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectWindow.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/AutoDuck.cpp

@@ -29,7 +29,7 @@
 
 #include "../AColor.h"
 #include "../AllThemeResources.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../Theme.h"

src/effects/BassTreble.cpp

@@ -28,7 +28,7 @@
 #include <wx/sizer.h>
 #include <wx/slider.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"

src/effects/ChangeSpeed.cpp

@@ -24,7 +24,7 @@
 #include <wx/slider.h>
 
 #include "../LabelTrack.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Resample.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/ClickRemoval.cpp

@@ -34,7 +34,7 @@
 #include <wx/slider.h>
 #include <wx/valgen.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/AudacityMessageBox.h"

src/effects/Compressor.cpp

@@ -38,7 +38,7 @@
 #include <wx/stattext.h>
 
 #include "../AColor.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../Theme.h"

src/effects/Contrast.cpp

@@ -14,7 +14,7 @@
 
 #include "../CommonCommandFlags.h"
 #include "../WaveTrack.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectFileIO.h"
 #include "../ProjectSettings.h"

src/effects/Distortion.cpp

@@ -40,7 +40,7 @@
 #include <wx/slider.h>
 #include <wx/stattext.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"

src/effects/DtmfGen.cpp

@@ -23,7 +23,7 @@
 #include <wx/valtext.h>
 #include <wx/stattext.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/NumericTextCtrl.h"

src/effects/Equalization.cpp

@@ -95,7 +95,7 @@
 #include "../Envelope.h"
 #include "../EnvelopeEditor.h"
 #include "../FFT.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../Theme.h"
 #include "../TrackArtist.h"

src/effects/Generator.cpp

@@ -17,7 +17,7 @@
 #include "Generator.h"
 
 #include "../Project.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ViewInfo.h"
 #include "../WaveTrack.h"
 #include "../prefs/TracksBehaviorsPrefs.h"

src/effects/LoadEffects.cpp

@@ -14,7 +14,7 @@
 
 #include "LoadEffects.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 
 #include "Effect.h"
 #include "ModuleManager.h"

src/effects/Loudness.cpp

@@ -24,7 +24,7 @@
 #include <wx/valgen.h>
 
 #include "Internat.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectFileManager.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/Noise.cpp

@@ -24,7 +24,7 @@
 #include <wx/textctrl.h>
 #include <wx/valgen.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"

src/effects/NoiseReduction.cpp

@@ -45,7 +45,7 @@
 
 #include "../ShuttleGui.h"
 #include "../widgets/HelpSystem.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../RealFFTf.h"
 
 #include "../WaveTrack.h"

src/effects/Normalize.cpp

@@ -26,7 +26,7 @@
 #include <wx/stattext.h>
 #include <wx/valgen.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectFileManager.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/Paulstretch.cpp

@@ -31,7 +31,7 @@
 #include "../FFT.h"
 #include "../widgets/valnum.h"
 #include "../widgets/AudacityMessageBox.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 
 #include "../WaveTrack.h"
 

src/effects/Reverb.cpp

@@ -24,7 +24,7 @@
 #include <wx/slider.h>
 #include <wx/spinctrl.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"

src/effects/ScienFilter.cpp

@@ -55,7 +55,7 @@ a graph for EffectScienFilter.
 #include "../AColor.h"
 #include "../AllThemeResources.h"
 #include "../PlatformCompatibility.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/ScoreAlignDialog.cpp

@@ -42,7 +42,7 @@ It \TODO: description
 
 #include <fstream>
 #include <wx/dialog.h>
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../lib-src/header-substitutes/allegro.h"
 #include "audioreader.h"

src/effects/TruncSilence.cpp

@@ -28,7 +28,7 @@
 #include <wx/choice.h>
 #include <wx/valgen.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectSettings.h"
 #include "../Shuttle.h"

src/effects/nyquist/Nyquist.cpp

@@ -70,7 +70,7 @@ effects from this one class.
 #include "../../WaveTrack.h"
 #include "../../widgets/valnum.h"
 #include "../../widgets/AudacityMessageBox.h"
-#include "../../Prefs.h"
+#include "Prefs.h"
 #include "../../wxFileNameWrapper.h"
 #include "../../prefs/GUIPrefs.h"
 #include "../../tracks/playabletrack/wavetrack/ui/WaveTrackView.h"

src/export/Export.cpp

@@ -54,7 +54,7 @@
 #include "../src/AllThemeResources.h"
 #include "BasicUI.h"
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../prefs/ImportExportPrefs.h"
 #include "../Project.h"
 #include "../ProjectHistory.h"

src/export/ExportCL.cpp

@@ -31,7 +31,7 @@
 #include "Export.h"
 
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../Tags.h"
 #include "../Track.h"

src/export/ExportFLAC.cpp

@@ -32,7 +32,7 @@ and libvorbis examples, Monty <monty@xiph.org>
 #include "../float_cast.h"
 #include "../ProjectSettings.h"
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 #include "../Tags.h"

src/export/ExportMP2.cpp

@@ -49,7 +49,7 @@
 #include "Export.h"
 #include "../FileIO.h"
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectSettings.h"
 #include "../ShuttleGui.h"
 #include "../Tags.h"

src/export/ExportMP3.cpp

@@ -82,7 +82,7 @@
 #include "../FileNames.h"
 #include "../float_cast.h"
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectSettings.h"
 #include "../ProjectWindow.h"
 #include "../ShuttleGui.h"

src/export/ExportMultiple.cpp

@@ -43,7 +43,7 @@
 #include "../Project.h"
 #include "../ProjectSettings.h"
 #include "../ProjectWindow.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../SelectionState.h"
 #include "../ShuttleGui.h"
 #include "../Tags.h"

src/export/ExportOGG.cpp

@@ -30,7 +30,7 @@
 #include "../FileIO.h"
 #include "../ProjectSettings.h"
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 #include "../Tags.h"

src/export/ExportPCM.cpp

@@ -26,7 +26,7 @@
 
 #include "../FileFormats.h"
 #include "../Mix.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectSettings.h"
 #include "../ShuttleGui.h"
 #include "../Tags.h"

src/import/Import.cpp

@@ -55,7 +55,7 @@ ImportLOF.cpp, and ImportAUP.cpp.
 #include "../Project.h"
 #include "../WaveTrack.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 
 #include "../widgets/ProgressDialog.h"
 

src/import/ImportAUP.cpp

@@ -29,7 +29,7 @@
 #if defined(USE_MIDI)
 #include "../NoteTrack.h"
 #endif
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectFileIO.h"
 #include "../ProjectFileManager.h"

src/import/ImportFLAC.cpp

@@ -67,7 +67,7 @@ static Importer::RegisteredUnusableImportPlugin registered{
 
 #include "FLAC++/decoder.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../WaveTrack.h"
 #include "ImportPlugin.h"
 

src/import/ImportLOF.cpp

@@ -88,7 +88,7 @@
 #include "../ProjectHistory.h"
 #include "../ProjectManager.h"
 #include "../ProjectWindow.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ProgressDialog.h"
 

src/import/ImportMP3.cpp

@@ -62,7 +62,7 @@ static Importer::RegisteredUnusableImportPlugin registered
 #include <wx/file.h>
 #include <wx/string.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Tags.h"
 #include "../WaveTrack.h"
 #include "../widgets/AudacityMessageBox.h"

src/import/ImportOGG.cpp

@@ -39,7 +39,7 @@
 
 #include <wx/intl.h>
 #include "Import.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Tags.h"
 #include "../widgets/ProgressDialog.h"
 

src/import/ImportPCM.cpp

@@ -45,7 +45,7 @@
 #endif
 
 #include "../FileFormats.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 #include "ImportPlugin.h"

src/import/ImportRaw.cpp

@@ -28,7 +28,7 @@ and sample size to help you importing data of an unknown format.
 
 #include "../AudioIOBase.h"
 #include "../FileFormats.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ProjectSettings.h"
 #include "../ShuttleGui.h"
 #include "UserException.h"

src/menus/EditMenus.cpp

@@ -5,7 +5,7 @@
 #include "../LabelTrack.h"
 #include "../Menus.h"
 #include "../NoteTrack.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectHistory.h"
 #include "../ProjectSettings.h"

src/menus/ExtraMenus.cpp

@@ -1,6 +1,6 @@
 #include "../CommonCommandFlags.h"
 #include "../Menus.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../commands/CommandContext.h"
 #include "../commands/CommandManager.h"

src/menus/FileMenus.cpp

@@ -4,7 +4,7 @@
 #include "../FileNames.h"
 #include "../LabelTrack.h"
 #include "../NoteTrack.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Printing.h"
 #include "../Project.h"
 #include "../ProjectFileIO.h"

src/menus/HelpMenus.cpp

@@ -13,7 +13,7 @@
 #include "../FileNames.h"
 #include "../HelpText.h"
 #include "../Menus.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectSelectionManager.h"
 #include "../ShuttleGui.h"

src/menus/LabelMenus.cpp

@@ -3,7 +3,7 @@
 #include "../CommonCommandFlags.h"
 #include "../LabelTrack.h"
 #include "../Menus.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectAudioIO.h"
 #include "../ProjectHistory.h"

src/menus/NavigationMenus.cpp

@@ -1,7 +1,7 @@
 
 
 #include "../CommonCommandFlags.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectHistory.h"
 #include "../ProjectWindow.h"

src/menus/PluginMenus.cpp

@@ -7,7 +7,7 @@
 #include "../Menus.h"
 #include "../PluginManager.h"
 #include "../PluginRegistrationDialog.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectSettings.h"
 #include "../ProjectWindow.h"

src/menus/SelectMenus.cpp

@@ -4,7 +4,7 @@
 #include "../AudioIO.h"
 #include "../CommonCommandFlags.h"
 #include "../SpectrumAnalyst.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectAudioIO.h"
 #include "../ProjectAudioManager.h"

src/menus/TrackMenus.cpp

@@ -5,7 +5,7 @@
 #include "../Menus.h"
 #include "../Mix.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectAudioIO.h"
 #include "../ProjectHistory.h"

src/menus/TransportMenus.cpp

@@ -6,7 +6,7 @@
 #include "../DeviceManager.h"
 #include "../LabelTrack.h"
 #include "../Menus.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectAudioIO.h"
 #include "../ProjectAudioManager.h"

src/menus/ViewMenus.cpp

@@ -1,6 +1,6 @@
 #include "../CommonCommandFlags.h"
 #include "../Menus.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectHistory.h"
 #include "../ProjectSettings.h"

src/prefs/ApplicationPrefs.cpp

@@ -21,7 +21,7 @@
 #include <wx/defs.h>
 #include <wx/hyperlink.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 #include "ui/AccessibleLinksFormatter.h"

src/prefs/BatchPrefs.cpp

@@ -22,7 +22,7 @@ setting used in debugging batch (aka macros) processing.
 #include <wx/textdlg.h>
 
 #include "Languages.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 BEGIN_EVENT_TABLE(BatchPrefs, PrefsPanel)

src/prefs/DevicePrefs.cpp

@@ -37,7 +37,7 @@ other settings.
 
 #include "portaudio.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../DeviceManager.h"
 

src/prefs/DirectoriesPrefs.cpp

@@ -32,7 +32,7 @@
 #include <wx/filename.h>
 #include <wx/utils.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../TempDirectory.h"
 #include "../widgets/AudacityMessageBox.h"

src/prefs/EffectsPrefs.cpp

@@ -25,7 +25,7 @@
 
 #include "Languages.h"
 #include "../PluginManager.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 EffectsPrefs::EffectsPrefs(wxWindow * parent, wxWindowID winid)

src/prefs/ExtImportPrefs.cpp

@@ -21,7 +21,7 @@
 #include <wx/listctrl.h>
 #include <wx/dnd.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../import/Import.h"
 #include "../widgets/AudacityMessageBox.h"

src/prefs/GUIPrefs.cpp

@@ -26,7 +26,7 @@
 #include "../FileNames.h"
 #include "Languages.h"
 #include "../Theme.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 #include "GUISettings.h"

src/prefs/ImportExportPrefs.cpp

@@ -20,7 +20,7 @@
 
 #include <wx/defs.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 ImportExportPrefs::ImportExportPrefs(wxWindow * parent, wxWindowID winid)

src/prefs/KeyConfigPrefs.cpp

@@ -34,7 +34,7 @@ KeyConfigPrefs and MousePrefs use.
 #include <wx/statbox.h>
 #include <wx/textctrl.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../commands/CommandManager.h"
 #include "../xml/XMLFileReader.h"

src/prefs/MidiIOPrefs.cpp

@@ -36,7 +36,7 @@ other settings.
 
 #include "../../lib-src/portmidi/pm_common/portmidi.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../widgets/AudacityMessageBox.h"
 

src/prefs/ModulePrefs.cpp

@@ -25,7 +25,7 @@ with names like mod-script-pipe that add NEW features.
 
 #include "../ShuttleGui.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ModuleSettings.h"
 
 ////////////////////////////////////////////////////////////////////////////////

src/prefs/MousePrefs.cpp

@@ -39,7 +39,7 @@
 #include <wx/intl.h>
 #include <wx/listctrl.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 // The numbers of the columns of the mList.

src/prefs/PlaybackPrefs.cpp

@@ -25,7 +25,7 @@
 #include <wx/textctrl.h>
 
 #include "../ShuttleGui.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 
 PlaybackPrefs::PlaybackPrefs(wxWindow * parent, wxWindowID winid)
 :  PrefsPanel(parent, winid, XO("Playback"))

src/prefs/PrefsDialog.cpp

@@ -35,7 +35,7 @@
 #include <wx/treectrl.h>
 
 #include "../AudioIOBase.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../commands/CommandManager.h"
 

src/prefs/QualityPrefs.cpp

@@ -25,7 +25,7 @@
 
 #include "../AudioIOBase.h"
 #include "../Dither.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Resample.h"
 #include "../ShuttleGui.h"
 

src/prefs/RecordingPrefs.cpp

@@ -27,7 +27,7 @@
 #include <algorithm>
 
 #include "../prefs/GUISettings.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 using std::min;

src/prefs/SpectrogramSettings.cpp

@@ -22,7 +22,7 @@ Paul Licameli
 #include <algorithm>
 
 #include "../FFT.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 
 #include <cmath>
 

src/prefs/SpectrogramSettings.h

@@ -11,7 +11,7 @@ Paul Licameli
 #ifndef __AUDACITY_SPECTROGRAM_SETTINGS__
 #define __AUDACITY_SPECTROGRAM_SETTINGS__
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../SampleFormat.h"
 #include "../RealFFTf.h"
 

src/prefs/ThemePrefs.cpp

@@ -33,7 +33,7 @@ Provides:
 
 #include <wx/app.h>
 #include <wx/wxprec.h>
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Theme.h"
 #include "../ShuttleGui.h"
 #include "../AColor.h"

src/prefs/TracksBehaviorsPrefs.cpp

@@ -17,7 +17,7 @@
 
 #include "TracksBehaviorsPrefs.h"
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 TracksBehaviorsPrefs::TracksBehaviorsPrefs(wxWindow * parent, wxWindowID winid)

src/prefs/TracksPrefs.cpp

@@ -23,7 +23,7 @@
 //#include <algorithm>
 //#include <wx/defs.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 #include "../tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h"
 

src/prefs/WarningsPrefs.cpp

@@ -22,7 +22,7 @@
 
 #include <wx/defs.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../ShuttleGui.h"
 
 ////////////////////////////////////////////////////////////////////////////////

src/prefs/WaveformSettings.cpp

@@ -23,7 +23,7 @@ Paul Licameli
 #include <algorithm>
 #include <wx/intl.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 
 
 WaveformSettings::Globals::Globals()

src/prefs/WaveformSettings.h

@@ -11,7 +11,7 @@ Paul Licameli
 #ifndef __AUDACITY_WAVEFORM_SETTINGS__
 #define __AUDACITY_WAVEFORM_SETTINGS__
 
-#include "../Prefs.h"
+#include "Prefs.h"
 
 class EnumValueSymbols;
 

src/toolbars/ControlToolBar.cpp

@@ -58,7 +58,7 @@
 #include "../AllThemeResources.h"
 #include "../AudioIO.h"
 #include "../ImageManipulation.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectAudioIO.h"
 #include "../ProjectAudioManager.h"

src/toolbars/DeviceToolBar.cpp

@@ -42,7 +42,7 @@
 #include "../AudioIOBase.h"
 #include "../ImageManipulation.h"
 #include "../KeyboardCapture.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ShuttleGui.h"
 #include "../widgets/Grabber.h"

src/toolbars/EditToolBar.cpp

@@ -51,7 +51,7 @@
 #include "../BatchCommands.h"
 #include "../ImageManipulation.h"
 #include "../Menus.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../UndoManager.h"
 #include "../widgets/AButton.h"

src/toolbars/MixerToolBar.cpp

@@ -38,7 +38,7 @@
 #include "../AudioIO.h"
 #include "../ImageManipulation.h"
 #include "../KeyboardCapture.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../widgets/ASlider.h"
 #include "../widgets/Grabber.h"
 

src/toolbars/ScrubbingToolBar.cpp

@@ -33,7 +33,7 @@
 #include "../AdornedRulerPanel.h"
 #include "../AllThemeResources.h"
 #include "../ImageManipulation.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../UndoManager.h"
 #include "../widgets/AButton.h"
 #include "../tracks/ui/Scrubbing.h"

src/toolbars/SelectionBar.cpp

@@ -54,7 +54,7 @@ with changes in the SelectionBar.
 #include "../AudioIO.h"
 #include "../AColor.h"
 #include "../KeyboardCapture.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../ProjectAudioIO.h"
 #include "../ProjectSettings.h"

src/toolbars/SpectralSelectionBar.cpp

@@ -53,7 +53,7 @@ with changes in the SpectralSelectionBar.
 #endif
 #include <wx/statline.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../AllThemeResources.h"
 #include "../SelectedRegion.h"

src/toolbars/ToolBar.cpp

@@ -53,7 +53,7 @@ in which buttons can be placed.
 #include "../commands/CommandManager.h"
 #include "../widgets/AButton.h"
 #include "../widgets/Grabber.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 
 ////////////////////////////////////////////////////////////
 /// ToolBarResizer

src/toolbars/ToolBar.h

@@ -17,7 +17,7 @@
 #include <vector>
 #include <wx/defs.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Theme.h"
 #include "../widgets/wxPanelWrapper.h" // to inherit
 #include <wx/windowptr.h>

src/toolbars/ToolDock.cpp

@@ -45,7 +45,7 @@
 #include "../AColor.h"
 #include "../AllThemeResources.h"
 #include "../ImageManipulation.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../widgets/Grabber.h"
 
 const ToolBarConfiguration::Position

src/toolbars/ToolManager.cpp

@@ -55,7 +55,7 @@
 #include "../AColor.h"
 #include "../AllThemeResources.h"
 #include "../ImageManipulation.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../Project.h"
 #include "../widgets/AButton.h"
 #include "../widgets/ASlider.h"

src/toolbars/ToolsToolBar.cpp

@@ -47,7 +47,7 @@
 #endif
 #include <wx/tooltip.h>
 
-#include "../Prefs.h"
+#include "Prefs.h"
 #include "../AllThemeResources.h"
 #include "../ImageManipulation.h"
 #include "../Project.h"

src/toolbars/TranscriptionToolBar.cpp

@@ -44,7 +44,7 @@
 #include "../widgets/AButton.h"
 #include "../widgets/ASlider.h"
 #include "../tracks/ui/Scrubbing.h"
-#include "../Prefs.h"
+#include "Prefs.h"
 
 #ifdef EXPERIMENTAL_VOICE_DETECTION
 #include "../VoiceKey.h"