1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-25 15:34:10 +02:00

Use same format for choice in Selection Toolbar as in SpectralSelection Toolbar

I've deliberately not given the choice a title, and deliberately put the word 'selection' at the end, so as to be better/faster for Screen Reader users.
The look of Selection Toolbar and Spectral Selection Toolbar is now consistent.  In dark themes both could have better looking choice boxes.
This commit is contained in:
James Crook
2017-05-31 19:47:45 +01:00
parent 29df7e1ce3
commit 1c6c608c13
2 changed files with 66 additions and 4 deletions

View File

@@ -18,8 +18,27 @@
// PLAIN_TITLES give Start Length Center End above each field.
// RADIO_TITLES give ()SE (*)Start-Length ()LE ()LC style.
// BUTTON_TITLES give < Start - Length > style.
// CHOICE gives a choice control
//#define SEL_RADIO_TITLES
#define SEL_BUTTON_TITLES
//#define SEL_BUTTON_TITLES
#define SEL_CHOICE
// OPTIONS_BUTTON gives a button with three dots to select the option.
// Column for
// Project rate
// Snap To
// Option Button
// Vertical Line
// Selection fields
// Vertical Line
// Cursor position
#ifdef OPTIONS_BUTTON
#define SIZER_COLS 8
#else
#define SIZER_COLS 7
#endif
class wxBitmap;
class wxCheckBox;
@@ -86,6 +105,7 @@ class SelectionBar final : public ToolBar {
void OnRate(wxCommandEvent & event);
void OnSnapTo(wxCommandEvent & event);
void OnChoice(wxCommandEvent & event);
void OnFocus(wxFocusEvent &event);
void OnCaptureKey(wxCommandEvent &event);
void OnSize(wxSizeEvent &evt);
@@ -116,6 +136,10 @@ class SelectionBar final : public ToolBar {
NumericTextCtrl *mEndTime;
NumericTextCtrl *mAudioTime;
#ifdef SEL_CHOICE
wxChoice * mChoice;
#endif
#ifdef PLAIN_TITLES
wxStaticText * mStartTitle;
wxStaticText * mCenterTitle;