1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-07 23:32:53 +02:00

All preferences in scrollers

We now do not need to worry about the preference dialogs getting too big for small screens.
This commit is contained in:
James Crook 2018-01-17 20:41:40 +00:00
parent 81b22a2b2b
commit a019addafb
20 changed files with 51 additions and 11 deletions

View File

@ -53,8 +53,10 @@ void BatchPrefs::Populate( )
/// Defines the dialog and does data exchange with it. /// Defines the dialog and does data exchange with it.
void BatchPrefs::PopulateOrExchange( ShuttleGui & S ) void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
{ {
S.StartHorizontalLay( wxEXPAND, 0 );
S.SetBorder( 2 ); S.SetBorder( 2 );
S.StartScroller();
S.StartHorizontalLay( wxEXPAND, 0 );
S.StartStatic( _("Behaviors"),1 ); S.StartStatic( _("Behaviors"),1 );
{ {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@ -64,7 +66,7 @@ void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
} }
S.EndStatic(); S.EndStatic();
S.EndHorizontalLay(); S.EndHorizontalLay();
S.EndScroller();
return; return;
} }

View File

@ -111,6 +111,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
wxArrayString empty; wxArrayString empty;
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Interface")); S.StartStatic(_("Interface"));
{ {
@ -189,6 +190,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
S.EndThreeColumn(); S.EndThreeColumn();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }

View File

@ -79,6 +79,7 @@ void DirectoriesPrefs::Populate()
void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S) void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Temporary files directory")); S.StartStatic(_("Temporary files directory"));
{ {
@ -122,6 +123,8 @@ void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
} }
S.EndStatic(); S.EndStatic();
#endif // DEPRECATED_AUDIO_CACHE #endif // DEPRECATED_AUDIO_CACHE
S.EndScroller();
} }
void DirectoriesPrefs::OnChooseTempDir(wxCommandEvent & e) void DirectoriesPrefs::OnChooseTempDir(wxCommandEvent & e)

View File

@ -56,8 +56,8 @@ void EffectsPrefs::Populate()
void EffectsPrefs::PopulateOrExchange(ShuttleGui & S) void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller(); S.StartScroller();
S.StartStatic(_("Enable Effects")); S.StartStatic(_("Enable Effects"));
{ {
@ -159,8 +159,8 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
true); true);
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
#endif #endif
S.EndScroller();
} }
bool EffectsPrefs::Commit() bool EffectsPrefs::Commit()

View File

@ -85,6 +85,7 @@ void ExtImportPrefs::Populate()
void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S) void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.TieCheckBox(_("A&ttempt to use filter in OpenFile dialog first"), S.TieCheckBox(_("A&ttempt to use filter in OpenFile dialog first"),
wxT("/ExtendedImport/OverrideExtendedImportByOpenFileDialogChoice"), wxT("/ExtendedImport/OverrideExtendedImportByOpenFileDialogChoice"),
@ -182,6 +183,8 @@ void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
S.EndHorizontalLay(); S.EndHorizontalLay();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
Layout(); Layout();
Fit(); Fit();
SetMinSize(GetSize()); SetMinSize(GetSize());

View File

@ -123,8 +123,8 @@ void GUIPrefs::Populate()
void GUIPrefs::PopulateOrExchange(ShuttleGui & S) void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller(); S.StartScroller();
S.StartStatic(_("Display")); S.StartStatic(_("Display"));
{ {
S.StartMultiColumn(2); S.StartMultiColumn(2);

View File

@ -50,6 +50,7 @@ void ImportExportPrefs::Populate()
void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S) void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("When importing audio files")); S.StartStatic(_("When importing audio files"));
{ {
@ -101,6 +102,7 @@ void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S)
} }
S.EndStatic(); S.EndStatic();
#endif #endif
S.EndScroller();
} }
bool ImportExportPrefs::Commit() bool ImportExportPrefs::Commit()

View File

@ -81,6 +81,8 @@ void LibraryPrefs::Populate()
void LibraryPrefs::PopulateOrExchange(ShuttleGui & S) void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("MP3 Export Library")); S.StartStatic(_("MP3 Export Library"));
{ {
S.StartTwoColumn(); S.StartTwoColumn();
@ -161,6 +163,8 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
#endif #endif
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
/// Sets the a text area on the dialog to have the name /// Sets the a text area on the dialog to have the name

View File

@ -115,6 +115,7 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) {
wxArrayString empty; wxArrayString empty;
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Interface")); S.StartStatic(_("Interface"));
{ {
@ -173,6 +174,8 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) {
} }
S.EndStatic(); S.EndStatic();
#endif #endif
S.EndScroller();
} }
void MidiIOPrefs::OnHost(wxCommandEvent & WXUNUSED(e)) void MidiIOPrefs::OnHost(wxCommandEvent & WXUNUSED(e))

View File

@ -101,7 +101,9 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
StatusChoices.Add( _("Ask" ) ); StatusChoices.Add( _("Ask" ) );
StatusChoices.Add( _("Failed" ) ); StatusChoices.Add( _("Failed" ) );
StatusChoices.Add( _("New" ) ); StatusChoices.Add( _("New" ) );
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic( {} ); S.StartStatic( {} );
{ {
@ -110,7 +112,6 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
S.AddFixedText(wxString(wxT(" ")) + _("'Failed' means Audacity thinks the module is broken and won't run it.") ); S.AddFixedText(wxString(wxT(" ")) + _("'Failed' means Audacity thinks the module is broken and won't run it.") );
S.AddFixedText(wxString(wxT(" ")) + _("'New' means no choice has been made yet.") ); S.AddFixedText(wxString(wxT(" ")) + _("'New' means no choice has been made yet.") );
S.AddFixedText(_("Changes to these settings only take effect when Audacity starts up.")); S.AddFixedText(_("Changes to these settings only take effect when Audacity starts up."));
S.StartScroller();
{ {
S.StartMultiColumn( 2 ); S.StartMultiColumn( 2 );
int i; int i;
@ -122,9 +123,9 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.AddFixedText( _("No modules were found") ); S.AddFixedText( _("No modules were found") );
} }
S.EndScroller();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
bool ModulePrefs::Commit() bool ModulePrefs::Commit()

View File

@ -53,6 +53,7 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
wxTextCtrl *w; wxTextCtrl *w;
S.StartScroller();
S.SetBorder(2); S.SetBorder(2);
S.StartStatic(_("Effects Preview")); S.StartStatic(_("Effects Preview"));
@ -114,6 +115,8 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
S.EndThreeColumn(); S.EndThreeColumn();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
bool PlaybackPrefs::Commit() bool PlaybackPrefs::Commit()

View File

@ -56,6 +56,7 @@ void ProjectsPrefs::Populate()
void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S) void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("When saving a project that depends on other audio files")); S.StartStatic(_("When saving a project that depends on other audio files"));
{ {
@ -71,6 +72,8 @@ void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S)
S.EndRadioButtonGroup(); S.EndRadioButtonGroup();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
bool ProjectsPrefs::Commit() bool ProjectsPrefs::Commit()

View File

@ -118,6 +118,7 @@ void QualityPrefs::GetNamesAndLabels()
void QualityPrefs::PopulateOrExchange(ShuttleGui & S) void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Sampling")); S.StartStatic(_("Sampling"));
{ {
@ -204,6 +205,8 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
S.EndMultiColumn(); S.EndMultiColumn();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
/// Enables or disables the Edit box depending on /// Enables or disables the Edit box depending on

View File

@ -71,6 +71,7 @@ void RecordingPrefs::Populate()
void RecordingPrefs::PopulateOrExchange(ShuttleGui & S) void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Playthrough")); S.StartStatic(_("Playthrough"));
{ {
@ -220,6 +221,8 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
} }
S.EndStatic(); S.EndStatic();
#endif #endif
S.EndScroller();
} }
bool RecordingPrefs::Commit() bool RecordingPrefs::Commit()

View File

@ -158,13 +158,12 @@ void SpectrumPrefs::PopulatePaddingChoices(size_t windowSize)
void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S) void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
mPopulating = true; mPopulating = true;
S.SetBorder(2); S.SetBorder(2);
S.StartScroller(); {
// S.StartStatic(_("Track Settings")); // S.StartStatic(_("Track Settings"));
// { // {
S.StartScroller(); {
mDefaultsCheckbox = 0; mDefaultsCheckbox = 0;
if (mWt) { if (mWt) {

View File

@ -88,6 +88,7 @@ void ThemePrefs::Populate()
void ThemePrefs::PopulateOrExchange(ShuttleGui & S) void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Info")); S.StartStatic(_("Info"));
{ {
@ -146,6 +147,8 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
S.EndHorizontalLay(); S.EndHorizontalLay();
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
/// Load Theme from multiple png files. /// Load Theme from multiple png files.

View File

@ -59,8 +59,8 @@ void TracksBehaviorsPrefs::Populate()
void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S) void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller(); S.StartScroller();
S.StartStatic(_("Behaviors")); S.StartStatic(_("Behaviors"));
{ {
S.TieCheckBox(_("A&uto-select, if selection required"), S.TieCheckBox(_("A&uto-select, if selection required"),

View File

@ -119,8 +119,8 @@ void TracksPrefs::Populate()
void TracksPrefs::PopulateOrExchange(ShuttleGui & S) void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller(); S.StartScroller();
S.StartStatic(_("Display")); S.StartStatic(_("Display"));
{ {
S.TieCheckBox(_("&Pinned Recording/Playback head"), S.TieCheckBox(_("&Pinned Recording/Playback head"),

View File

@ -52,6 +52,7 @@ void WarningsPrefs::Populate()
void WarningsPrefs::PopulateOrExchange(ShuttleGui & S) void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
{ {
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
S.StartStatic(_("Show Warnings/Prompts for")); S.StartStatic(_("Show Warnings/Prompts for"));
{ {
@ -78,6 +79,8 @@ void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
true); true);
} }
S.EndStatic(); S.EndStatic();
S.EndScroller();
} }
bool WarningsPrefs::Commit() bool WarningsPrefs::Commit()

View File

@ -76,6 +76,7 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
mPopulating = true; mPopulating = true;
S.SetBorder(2); S.SetBorder(2);
S.StartScroller();
// S.StartStatic(_("Track Settings")); // S.StartStatic(_("Track Settings"));
{ {
@ -113,6 +114,8 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
S.EndStatic(); S.EndStatic();
*/ */
S.EndScroller();
EnableDisableRange(); EnableDisableRange();
mPopulating = false; mPopulating = false;