Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Spectral SelectionBar tweaks from Paul Limaceli.

Browse Source 
- Center and Width now the default
- Above choice persists.
- Accessibility changes (focus was lost on changing choice)
This commit is contained in:
james.k.crook@gmail.com 2014-11-10 21:09:28 +00:00
parent a68093ae60
commit c900da7a56
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/toolbars/SpectralSelectionBar.cpp
View File

@ -51,6 +51,7 @@ with changes in the SpectralSelectionBar.
#include "SpectralSelectionBar.h"
#include "../AudacityApp.h"
#include "../Prefs.h"
#include "../SelectedRegion.h"
#include "../widgets/NumericTextCtrl.h"
@ -78,9 +79,12 @@ BEGIN_EVENT_TABLE(SpectralSelectionBar, ToolBar)
EVT_COMMAND(wxID_ANY, EVT_LOGFREQUENCYTEXTCTRL_UPDATED, SpectralSelectionBar::OnUpdate)
END_EVENT_TABLE()
static const wxString preferencePath
(wxT("/GUI/Toolbars/SpectralSelection/CenterAndWidthChoice"));
SpectralSelectionBar::SpectralSelectionBar()
: ToolBar(SpectralSelectionBarID, _("SpectralSelection"), wxT("SpectralSelection"))
, mListener(NULL), mbCenterAndWidth(false)
, mListener(NULL), mbCenterAndWidth(true)
, mCenter(0.0), mWidth(0.0), mLow(0.0), mHigh(0.0)
, mCenterCtrl(NULL), mWidthCtrl(NULL), mLowCtrl(NULL), mHighCtrl(NULL)
, mChoice(NULL)
@ -99,6 +103,8 @@ void SpectralSelectionBar::Create(wxWindow * parent)
void SpectralSelectionBar::Populate()
{
gPrefs->Read(preferencePath, &mbCenterAndWidth, true);
// This will be inherited by all children:
SetFont(wxFont(9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
@ -127,7 +133,7 @@ void SpectralSelectionBar::Populate()
};
mChoice = new wxChoice
(this, OnChoiceID, wxDefaultPosition, wxDefaultSize, 2, choices,
0, wxDefaultValidator, _("Spectral Selection Specifications"));
0, wxDefaultValidator, _("Spectral Selection"));
mChoice->SetSelection(mbCenterAndWidth ? 0 : 1);
mainSizer->Add(mChoice, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND, 5);
@ -267,7 +273,10 @@ void SpectralSelectionBar::OnCtrl(wxCommandEvent & event)
void SpectralSelectionBar::OnChoice(wxCommandEvent &)
{
mbCenterAndWidth = (0 == mChoice->GetSelection());
gPrefs->Write(preferencePath, mbCenterAndWidth);
gPrefs->Flush();
ToolBar::ReCreateButtons();
mChoice->SetFocus();
ValuesToControls();
Updated();
}