Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-21 14:50:06 +02:00
Code Issues Releases Wiki Activity

Bug 1864 - Spectrogram settings dialog hides the checkbox for "Enable Spectral Selection"

Browse Source 
Fixed by a more compact layout.
Also we now size the dialogs for unique pages to fit their contents.
This commit is contained in:
James Crook 2018-04-10 22:56:09 +01:00
parent 26860d9ef0
commit d1c2ff82f0
2 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/prefs/PrefsDialog.cpp
View File

@ -352,6 +352,7 @@ PrefsDialog::PrefsDialog
sz.DecTo(screenRect.GetSize()); sz.DecTo(screenRect.GetSize());
if( !mUniquePage ){
int prefWidth, prefHeight; int prefWidth, prefHeight;
gPrefs->Read(wxT("/Prefs/Width"), &prefWidth, sz.x); gPrefs->Read(wxT("/Prefs/Width"), &prefWidth, sz.x);
gPrefs->Read(wxT("/Prefs/Height"), &prefHeight, sz.y); gPrefs->Read(wxT("/Prefs/Height"), &prefHeight, sz.y);
@ -359,6 +360,7 @@ PrefsDialog::PrefsDialog
wxSize prefSize = wxSize(prefWidth, prefHeight); wxSize prefSize = wxSize(prefWidth, prefHeight);
prefSize.DecTo(screenRect.GetSize()); prefSize.DecTo(screenRect.GetSize());
SetSize(prefSize); SetSize(prefSize);
}
SetMinSize(sz); SetMinSize(sz);
// Center after all that resizing, but make sure it doesn't end up // Center after all that resizing, but make sure it doesn't end up
@ -500,9 +502,11 @@ void PrefsDialog::OnOK(wxCommandEvent & WXUNUSED(event))
mUniquePage->Commit(); mUniquePage->Commit();
} }
if( !mUniquePage ){
wxSize sz = GetSize(); wxSize sz = GetSize();
gPrefs->Write(wxT("/Prefs/Width"), sz.x); gPrefs->Write(wxT("/Prefs/Width"), sz.x);
gPrefs->Write(wxT("/Prefs/Height"), sz.y); gPrefs->Write(wxT("/Prefs/Height"), sz.y);
}
gPrefs->Flush(); gPrefs->Flush();
// Reads preference /GUI/Theme // Reads preference /GUI/Theme

34
src/prefs/SpectrumPrefs.cpp
View File

@ -171,54 +171,60 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(_("&Use Preferences"), mDefaulted); mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(_("&Use Preferences"), mDefaulted);
} }
S.StartStatic(_("Scale")); S.StartMultiColumn(2,wxEXPAND);
{ {
S.StartTwoColumn(); S.SetStretchyCol( 0 );
S.SetStretchyCol( 1 );
S.StartStatic(_("Scale"),1);
{ {
S.StartMultiColumn(2,wxEXPAND);
{
S.SetStretchyCol( 0 );
S.SetStretchyCol( 1 );
S.Id(ID_SCALE).TieChoice(_("S&cale") + wxString(wxT(":")), S.Id(ID_SCALE).TieChoice(_("S&cale") + wxString(wxT(":")),
mTempSettings.scaleType, mTempSettings.scaleType,
&mScaleChoices); &mScaleChoices);
mMinFreq = mMinFreq =
S.Id(ID_MINIMUM).TieNumericTextBox(_("Mi&nimum Frequency (Hz):"), S.Id(ID_MINIMUM).TieNumericTextBox(_("Mi&n Frequency (Hz):"),
mTempSettings.minFreq, mTempSettings.minFreq,
12); 12);
mMaxFreq = mMaxFreq =
S.Id(ID_MAXIMUM).TieNumericTextBox(_("Ma&ximum Frequency (Hz):"), S.Id(ID_MAXIMUM).TieNumericTextBox(_("Ma&x Frequency (Hz):"),
mTempSettings.maxFreq, mTempSettings.maxFreq,
12); 12);
} }
S.EndTwoColumn(); S.EndMultiColumn();
} }
S.EndStatic(); S.EndStatic();
S.StartStatic(_("Colors")); S.StartStatic(_("Colors"),1);
{ {
S.StartTwoColumn(); S.StartMultiColumn(2,wxEXPAND);
{ {
S.SetStretchyCol( 0 );
S.SetStretchyCol( 1 );
mGain = mGain =
S.Id(ID_GAIN).TieNumericTextBox(_("&Gain (dB):"), S.Id(ID_GAIN).TieNumericTextBox(_("&Gain (dB):"),
mTempSettings.gain, mTempSettings.gain,
8); 8);
mRange = mRange =
S.Id(ID_RANGE).TieNumericTextBox(_("&Range (dB):"), S.Id(ID_RANGE).TieNumericTextBox(_("&Range (dB):"),
mTempSettings.range, mTempSettings.range,
8); 8);
mFrequencyGain = mFrequencyGain =
S.Id(ID_FREQUENCY_GAIN).TieNumericTextBox(_("Frequency g&ain (dB/dec):"), S.Id(ID_FREQUENCY_GAIN).TieNumericTextBox(_("High &boost (dB/dec):"),
mTempSettings.frequencyGain, mTempSettings.frequencyGain,
4); 8);
} }
S.EndMultiColumn();
S.Id(ID_GRAYSCALE).TieCheckBox(_("Gra&yscale"), S.Id(ID_GRAYSCALE).TieCheckBox(_("Gra&yscale"),
mTempSettings.isGrayscale); mTempSettings.isGrayscale);
S.EndTwoColumn();
} }
S.EndStatic(); S.EndStatic();
}
S.EndMultiColumn();
S.StartStatic(_("Algorithm")); S.StartStatic(_("Algorithm"));
{ {