Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

Change label/tooltip for power button to indicate action

Browse Source 
(Holler if it should indicate state instead and if the
play/stop button should do the same)
This commit is contained in:
lllucius 2014-12-14 16:28:19 +00:00
parent 07b5a68274
commit 7fd0f4e8bc
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/effects/Effect.cpp
View File

@ -2149,7 +2149,7 @@ bool EffectUIHost::Initialize()
mOffDisabledBM = CreateBitmap(effect_off_disabled_xpm, true, false);
mPowerBtn = new wxBitmapButton(bar, kPowerID, mOnBM);
mPowerBtn->SetBitmapDisabled(mOffDisabledBM);
SetLabelAndTip(mPowerBtn, _("P&ower On/Off"));
SetLabelAndTip(mPowerBtn, _("P&ower On"));
bs->Add(mPowerBtn);
bs->Add(5, 5);
@ -2691,7 +2691,7 @@ wxBitmap EffectUIHost::CreateBitmap(const char *xpm[], bool up, bool pusher)
// of wxBitmapButton and how it is currently implemented in wx2.8.12.
//
// I'm hoping that when we transition to wx3 all of this can go away.
void EffectUIHost::SetLabelAndTip(wxBitmapButton *btn, const wxString & label)
void EffectUIHost::SetLabelAndTip(wxBitmapButton *btn, const wxString & label, bool setAccel)
{
if (btn != NULL)
{
@ -2699,7 +2699,10 @@ void EffectUIHost::SetLabelAndTip(wxBitmapButton *btn, const wxString & label)
if (pos != wxNOT_FOUND && pos < label.Length() - 1)
{
wxChar c = wxToupper(label[pos + 1]);
mAccels.Add(wxAcceleratorEntry(wxACCEL_ALT, c, btn->GetId()));
if (setAccel)
{
mAccels.Add(wxAcceleratorEntry(wxACCEL_ALT, c, btn->GetId()));
}
#if defined(__WXMAC__)
btn->SetName(label);
#else
@ -2730,8 +2733,19 @@ void EffectUIHost::UpdateControls()
mFFwdBtn->Enable(!mCapturing);
mPlayBtn->SetBitmapLabel(mPlaying ? mStopBM : mPlayBM);
mPlayBtn->SetBitmapDisabled(mPlaying ? mStopDisabledBM: mPlayDisabledBM);
mPowerBtn->SetBitmapLabel(mPowerOn ? mOnBM : mOffBM);
mPlayBtn->SetBitmapDisabled(mPlaying ? mStopDisabledBM : mPlayDisabledBM);
if (mPowerOn)
{
mPowerBtn->SetBitmapLabel(mOnBM);
SetLabelAndTip(mPowerBtn, _("P&ower Off"), false);
}
else
{
mPowerBtn->SetBitmapLabel(mOffBM);
SetLabelAndTip(mPowerBtn, _("P&ower On"), false);
}
}
void EffectUIHost::LoadUserPresets()

2
src/effects/Effect.h
View File

@ -518,7 +518,7 @@ private:
void UpdateControls();
wxBitmap CreateBitmap(const char *xpm[], bool up, bool pusher);
void SetLabelAndTip(wxBitmapButton *btn, const wxString & label = wxEmptyString);
void SetLabelAndTip(wxBitmapButton *btn, const wxString & label = wxEmptyString, bool setAccel = true);
void LoadUserPresets();
private: