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

Trying a checkbox to control enabled state

Browse Source
This commit is contained in:
lllucius 2014-12-20 18:22:44 +00:00
parent 9a0d4b2364
commit e64019dcf6
2 changed files with 18 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/effects/Effect.cpp
View File

@ -2079,7 +2079,7 @@ BEGIN_EVENT_TABLE(EffectUIHost, wxDialog)
EVT_BUTTON(wxID_APPLY, EffectUIHost::OnApply) EVT_BUTTON(wxID_APPLY, EffectUIHost::OnApply)
EVT_BUTTON(wxID_CANCEL, EffectUIHost::OnCancel) EVT_BUTTON(wxID_CANCEL, EffectUIHost::OnCancel)
EVT_BUTTON(kMenuID, EffectUIHost::OnMenu) EVT_BUTTON(kMenuID, EffectUIHost::OnMenu)
EVT_BUTTON(kEnableID, EffectUIHost::OnEnable) EVT_CHECKBOX(kEnableID, EffectUIHost::OnEnable)
EVT_BUTTON(kPlayID, EffectUIHost::OnPlay) EVT_BUTTON(kPlayID, EffectUIHost::OnPlay)
EVT_BUTTON(kRewindID, EffectUIHost::OnRewind) EVT_BUTTON(kRewindID, EffectUIHost::OnRewind)
EVT_BUTTON(kFFwdID, EffectUIHost::OnFFwd) EVT_BUTTON(kFFwdID, EffectUIHost::OnFFwd)
@ -2112,7 +2112,7 @@ EffectUIHost::EffectUIHost(wxWindow *parent,
mDisableTransport = false; mDisableTransport = false;
mEnable = false; mEnabled = true;
mPlayPos = 0.0; mPlayPos = 0.0;
@ -2199,25 +2199,6 @@ bool EffectUIHost::Initialize()
} }
mMenuBtn->SetToolTip(_("Manage presets and options")); mMenuBtn->SetToolTip(_("Manage presets and options"));
if (!mIsGUI)
{
mEnableToggleBtn = new wxButton(bar, kEnableID, _("Disable &Effect"));
mEnableToggleBtn->SetToolTip(_("Enable or disable effect"));
bs->Add(mEnableToggleBtn, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, margin);
}
else
{
mEnableBM = CreateBitmap(effect_enable_xpm, true, false);
mDisableBM = CreateBitmap(effect_disable_xpm, true, false);
mEnableDisabledBM = CreateBitmap(effect_enable_disabled_xpm, true, false);
mDisableDisabledBM = CreateBitmap(effect_disable_disabled_xpm, true, false);
bb = new wxBitmapButton(bar, kEnableID, mDisableBM);
bb->SetBitmapDisabled(mDisableDisabledBM);
mEnableBtn = bb;
mEnableBtn->SetToolTip(_("Enable or disable effect"));
bs->Add(mEnableBtn);
}
bs->Add(5, 5); bs->Add(5, 5);
if (!mIsGUI) if (!mIsGUI)
@ -2276,6 +2257,13 @@ bool EffectUIHost::Initialize()
} }
mFFwdBtn->SetToolTip(_("Skip forward")); mFFwdBtn->SetToolTip(_("Skip forward"));
bs->Add(5, 5);
mEnableCb = new wxCheckBox(bar, kEnableID, _("&Enable"));
mEnableCb->SetValue(mEnabled);
mEnableCb->SetName(_("Enable"));
bs->Add(mEnableCb, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, margin);
UpdateControls(); UpdateControls();
bar->SetSizerAndFit(bs); bar->SetSizerAndFit(bs);
@ -2523,15 +2511,15 @@ void EffectUIHost::OnMenu(wxCommandEvent & WXUNUSED(evt))
void EffectUIHost::OnEnable(wxCommandEvent & WXUNUSED(evt)) void EffectUIHost::OnEnable(wxCommandEvent & WXUNUSED(evt))
{ {
mEnable = !mEnable; mEnabled = mEnableCb->GetValue();
if (mEnable) if (mEnabled)
{ {
mEffect->RealtimeSuspend(); mEffect->RealtimeResume();
} }
else else
{ {
mEffect->RealtimeResume(); mEffect->RealtimeSuspend();
} }
UpdateControls(); UpdateControls();
@ -2821,17 +2809,17 @@ void EffectUIHost::UpdateControls()
{ {
// Don't allow focus to get trapped // Don't allow focus to get trapped
wxWindow *focus = FindFocus(); wxWindow *focus = FindFocus();
if (focus == mRewindBtn || focus == mFFwdBtn || focus == mPlayBtn || focus == mEnableBtn) if (focus == mRewindBtn || focus == mFFwdBtn || focus == mPlayBtn || focus == mEnableCb)
{ {
mCloseBtn->SetFocus(); mCloseBtn->SetFocus();
} }
} }
mApplyBtn->Enable(!mCapturing); mApplyBtn->Enable(!mCapturing);
(!mIsGUI ? mPlayToggleBtn : mPlayBtn)->Enable(!(mCapturing || mDisableTransport));
mRewindBtn->Enable(!(mCapturing || mDisableTransport)); mRewindBtn->Enable(!(mCapturing || mDisableTransport));
mFFwdBtn->Enable(!(mCapturing || mDisableTransport)); mFFwdBtn->Enable(!(mCapturing || mDisableTransport));
(!mIsGUI ? mPlayToggleBtn : mPlayBtn)->Enable(!(mCapturing || mDisableTransport)); mEnableCb->Enable(!(mCapturing || mDisableTransport));
(!mIsGUI ? mEnableToggleBtn : mEnableBtn)->Enable(!(mCapturing || mDisableTransport));
wxBitmapButton *bb; wxBitmapButton *bb;
@ -2876,51 +2864,6 @@ void EffectUIHost::UpdateControls()
bb->SetName(_("Start &Playback")); bb->SetName(_("Start &Playback"));
#else #else
bb->SetLabel(_("Start &Playback")); bb->SetLabel(_("Start &Playback"));
#endif
}
}
if (mEnable)
{
if (!mIsGUI)
{
/* i18n-hint: The access key "&O" should be the same in
"Enable &Effect" and "Disable &Effect" */
mEnableToggleBtn->SetLabel(_("Enable &Effect"));
mEnableToggleBtn->Refresh();
}
else
{
bb = (wxBitmapButton *) mEnableBtn;
bb->SetBitmapLabel(mEnableBM);
bb->SetBitmapDisabled(mEnableDisabledBM);
bb->SetToolTip(_("Enable"));
#if defined(__WXMAC__)
bb->SetName(_("Enable &Effect"));
#else
bb->SetLabel(_("Enable &Effect"));
#endif
}
}
else
{
if (!mIsGUI)
{
/* i18n-hint: The access key "&O" should be the same in
"Enable &Effect" and "Disable &Effect" */
mEnableToggleBtn->SetLabel(_("Disable &Effect"));
mEnableToggleBtn->Refresh();
}
else
{
bb = (wxBitmapButton *) mEnableBtn;
bb->SetBitmapLabel(mDisableBM);
bb->SetBitmapDisabled(mDisableDisabledBM);
bb->SetToolTip(_("Disable"));
#if defined(__WXMAC__)
bb->SetName(_("Disable &Effect"));
#else
bb->SetLabel(_("Disable &Effect"));
#endif #endif
} }
} }

8
src/effects/Effect.h
View File

@ -536,10 +536,10 @@ private:
wxButton *mApplyBtn; wxButton *mApplyBtn;
wxButton *mCloseBtn; wxButton *mCloseBtn;
wxButton *mMenuBtn; wxButton *mMenuBtn;
wxButton *mEnableBtn;
wxButton *mPlayBtn; wxButton *mPlayBtn;
wxButton *mRewindBtn; wxButton *mRewindBtn;
wxButton *mFFwdBtn; wxButton *mFFwdBtn;
wxCheckBox *mEnableCb;
wxButton *mEnableToggleBtn; wxButton *mEnableToggleBtn;
wxButton *mPlayToggleBtn; wxButton *mPlayToggleBtn;
@ -549,11 +549,7 @@ private:
wxBitmap mStopBM; wxBitmap mStopBM;
wxBitmap mStopDisabledBM; wxBitmap mStopDisabledBM;
bool mEnable; bool mEnabled;
wxBitmap mEnableBM;
wxBitmap mEnableDisabledBM;
wxBitmap mDisableBM;
wxBitmap mDisableDisabledBM;
bool mDisableTransport; bool mDisableTransport;
bool mPlaying; bool mPlaying;