audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replacing "power on/off" with "enable/disable"

This commit is contained in:
lllucius 2014-12-19 06:57:22 +00:00
parent d978d99fde
commit adeb0997e1
3 changed files with 369 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

362
images/Effect.h
View File

@ -1,46 +1,164 @@
/* XPM */
static const char * effect_on_xpm[] = {
"16 16 2 1",
" c None",
". c #03AAE1",
" ",
" .. ",
" . .. . ",
" .. .. .. ",
" ... .. ... ",
" .... .. .... ",
" ... .. ... ",
" ... .. ... ",
" ... .. ... ",
" ... ... ",
" ... ... ",
" ... ... ",
" .... .... ",
" ............ ",
" .......... ",
" ........ "};
static const char * effect_enable_xpm[] = {
"16 16 71 1",
" c #FFFFFF",
". c #C8E5C9",
"+ c #8FCA92",
"@ c #61B565",
"# c #41A646",
"$ c #E6F3E6",
"% c #90CB93",
"& c #3FA443",
"* c #35A03A",
"= c #7EC281",
"- c #36A03B",
"; c #39A23E",
"> c #37A13C",
", c #61B564",
"' c #96CD99",
") c #6BBA6F",
"! c #3CA341",
"~ c #3AA23F",
"{ c #6EBB72",
"] c #D3EAD5",
"^ c #FAFCFA",
"/ c #C4E3C5",
"( c #4EAC52",
"_ c #38A13D",
": c #3DA442",
"< c #67B76A",
"[ c #D5EBD5",
"} c #FDFEFD",
"| c #FAFDFB",
"1 c #ADD8AE",
"2 c #42A647",
"3 c #3EA442",
"4 c #70BC74",
"5 c #A3D4A6",
"6 c #84C486",
"7 c #49A94D",
"8 c #53AE56",
"9 c #C1E2C2",
"0 c #FAFDFA",
"a c #FBFDFB",
"b c #CAE6CC",
"c c #5BB260",
"d c #4DAB51",
"e c #BCE0BE",
"f c #F9FCFA",
"g c #EFF7EF",
"h c #B1DAB2",
"i c #A9D7AB",
"j c #F5FAF6",
"k c #FCFEFC",
"l c #D5EBD6",
"m c #63B566",
"n c #85C688",
"o c #E9F5EA",
"p c #FEFEFE",
"q c #F8FCF8",
"r c #F4FAF4",
"s c #FEFFFE",
"t c #E9F4E9",
"u c #7DC280",
"v c #8CC98F",
"w c #E8F4E9",
"x c #F6FBF6",
"y c #A1D3A3",
"z c #81C384",
"A c #D6ECD7",
"B c #E2F2E3",
"C c #A4D4A6",
"D c #4AAA4F",
"E c #54AE58",
"F c #5EB463",
" .+@##@+. ",
" $%&******&%$ ",
" $=**********=$ ",
" %********-;-*% ",
".&*******>,')!&.",
"+*******~{]^/(*+",
"@**_:_*><[}|12*@",
"#*34567890abc-*#",
"#*defghijklm-**#",
"@*&nopqrstu_***@",
"+**2vwssxy:****+",
".&**3zABCD****&.",
" %***!EF2*****% ",
" $=****-*****=$ ",
" $%&******&%$ ",
" .+@##@+. "};
/* XPM */
static const char * effect_off_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
" ",
" .. ",
" . .. . ",
" .. .. .. ",
" ... .. ... ",
" .... .. .... ",
" ... .. ... ",
" ... .. ... ",
" ... .. ... ",
" ... ... ",
" ... ... ",
" ... ... ",
" .... .... ",
" ............ ",
" .......... ",
" ........ "};
static const char * effect_disable_xpm[] = {
"16 16 51 1",
" c #FFFFFF",
". c #F3D3D3",
"+ c #E19393",
"@ c #D25C5C",
"# c #C73636",
"$ c #E7A8A8",
"% c #CD4B4B",
"& c #C32727",
"* c #C63333",
"= c #CF5353",
"- c #F0CACA",
"; c #EFC6C6",
"> c #DA7A7A",
", c #C83939",
"' c #DB7E7E",
") c #F5DBDB",
"! c #F2CFCF",
"~ c #CF5454",
"{ c #C42B2B",
"] c #C42A2A",
"^ c #F9EBEB",
"/ c #D56767",
"( c #C83A3A",
"_ c #CB4343",
": c #FCF6F6",
"< c #DF8D8D",
"[ c #C52E2E",
"} c #C52F2F",
"| c #E08F8F",
"1 c #FEFBFB",
"2 c #E8AEAE",
"3 c #D76E6E",
"4 c #F9E9E9",
"5 c #F1CBCB",
"6 c #CB4545",
"7 c #C32828",
"8 c #CE5050",
"9 c #F3D5D5",
"0 c #E19292",
"a c #F0C9C9",
"b c #C32929",
"c c #C93D3D",
"d c #ECBCBC",
"e c #FEFCFC",
"f c #CC4646",
"g c #C63232",
"h c #E49E9E",
"i c #FEFAFA",
"j c #FBEFEF",
"k c #D36161",
"l c #EDBFBF",
" .+@####@+. ",
" $%&&&&&&&&%$ ",
" $*&&&&&&&&&&*$ ",
".%&&&=+-;>,&&&%.",
"+&&&') !~{]&&&+",
"@&&=) ^/]&(_&&@",
"#&&+ :<[&}|<&&#",
"#&&- 12#&]34-&&#",
"#&&- 567789 -&&#",
"#&&0a=b&cde +&&#",
"@&&f6b&ghi )=&&@",
"+&&&77*<j )'&&&+",
".%&&&[kl-+=&&&%.",
" $*&&&&&&&&&&*$ ",
" $%&&&&&&&&%$ ",
" .+@####@+. "};
/* XPM */
static const char * effect_menu_xpm[] = {
@ -406,26 +524,150 @@ static const char * effect_ffwd_xpm[] = {
" "};
/* XPM */
static const char * effect_off_disabled_xpm[] = {
"16 16 2 1",
" c None",
". c #7f7f7f",
" ",
" .. ",
" . .. . ",
" .. .. .. ",
" ... .. ... ",
" .... .. .... ",
" ... .. ... ",
" ... .. ... ",
" ... .. ... ",
" ... ... ",
" ... ... ",
" ... ... ",
" .... .... ",
" ............ ",
" .......... ",
" ........ "};
static const char * effect_enable_disabled_xpm[] = {
"16 16 60 1",
" c #FFFFFF",
". c #D6D6D6",
"+ c #ACACAC",
"@ c #8B8B8B",
"# c #737373",
"$ c #ECECEC",
"% c #ADADAD",
"& c #717171",
"* c #6A6A6A",
"= c #A0A0A0",
"- c #6B6B6B",
"; c #6D6D6D",
"> c #6C6C6C",
", c #B1B1B1",
"' c #929292",
") c #6F6F6F",
"! c #6E6E6E",
"~ c #949494",
"{ c #DEDEDE",
"] c #FBFBFB",
"^ c #D3D3D3",
"/ c #7D7D7D",
"( c #707070",
"_ c #8F8F8F",
": c #E0E0E0",
"< c #FDFDFD",
"[ c #C2C2C2",
"} c #747474",
"| c #969696",
"1 c #BBBBBB",
"2 c #A4A4A4",
"3 c #797979",
"4 c #808080",
"5 c #D1D1D1",
"6 c #FCFCFC",
"7 c #D8D8D8",
"8 c #868686",
"9 c #7C7C7C",
"0 c #CECECE",
"a c #FAFAFA",
"b c #F3F3F3",
"c c #C5C5C5",
"d c #C0C0C0",
"e c #F7F7F7",
"f c #8C8C8C",
"g c #A5A5A5",
"h c #EFEFEF",
"i c #FEFEFE",
"j c #EEEEEE",
"k c #9F9F9F",
"l c #AAAAAA",
"m c #F8F8F8",
"n c #BABABA",
"o c #A2A2A2",
"p c #E1E1E1",
"q c #EAEAEA",
"r c #BCBCBC",
"s c #7A7A7A",
"t c #818181",
"u c #898989",
" .+@##@+. ",
" $%&******&%$ ",
" $=**********=$ ",
" %********-;-*% ",
".&*******>@,')&.",
"+*******!~{]^/*+",
"@**>(>*>_:<][}*@",
"#*&|12345]678-*#",
"#*90abcde<:f-**#",
"@*&ghiaeijk>***@",
"+**}ljiimn(****+",
".&**&opqrs****&.",
" %***)tu}*****% ",
" $=****-*****=$ ",
" $%&******&%$ ",
" .+@##@+. "};
/* XPM */
static const char * effect_disable_disabled_xpm[] = {
"16 16 46 1",
" c #FFFFFF",
". c #E3E3E3",
"+ c #BABABA",
"@ c #979797",
"# c #7E7E7E",
"$ c #C7C7C7",
"% c #8C8C8C",
"& c #757575",
"* c #7C7C7C",
"= c #919191",
"- c #DDDDDD",
"; c #DADADA",
"> c #AAAAAA",
", c #808080",
"' c #ACACAC",
") c #E8E8E8",
"! c #E0E0E0",
"~ c #777777",
"{ c #F2F2F2",
"] c #9E9E9E",
"^ c #818181",
"/ c #878787",
"( c #F9F9F9",
"_ c #B6B6B6",
": c #797979",
"< c #7A7A7A",
"[ c #B7B7B7",
"} c #FCFCFC",
"| c #CBCBCB",
"1 c #A2A2A2",
"2 c #F1F1F1",
"3 c #DEDEDE",
"4 c #888888",
"5 c #8F8F8F",
"6 c #E4E4E4",
"7 c #B9B9B9",
"8 c #DCDCDC",
"9 c #767676",
"0 c #838383",
"a c #D4D4D4",
"b c #FDFDFD",
"c c #898989",
"d c #C1C1C1",
"e c #F5F5F5",
"f c #9A9A9A",
"g c #D6D6D6",
" .+@####@+. ",
" $%&&&&&&&&%$ ",
" $*&&&&&&&&&&*$ ",
".%&&&=+-;>,&&&%.",
"+&&&') !=~~&&&+",
"@&&=) {]~&^/&&@",
"#&&+ (_:&<[_&&#",
"#&&- }|#&~12-&&#",
"#&&- 34&&56 -&&#",
"#&&78=9&0ab +&&#",
"@&&c49&*d} )=&&@",
"+&&&&&*_e )'&&&+",
".%&&&:fg-+=&&&%.",
" $*&&&&&&&&&&*$ ",
" $%&&&&&&&&%$ ",
" .+@####@+. "};
/* XPM */
static const char * effect_play_disabled_xpm[] = {

95
src/effects/Effect.cpp
View File

@ -2063,7 +2063,7 @@ enum
kUserPresetsDummyID = 30006,
kDeletePresetDummyID = 30007,
kMenuID = 30100,
kPowerID = 30101,
kEnableID = 30101,
kPlayID = 30102,
kRewindID = 30103,
kFFwdID = 30104,
@ -2079,7 +2079,7 @@ BEGIN_EVENT_TABLE(EffectUIHost, wxDialog)
EVT_BUTTON(wxID_APPLY, EffectUIHost::OnApply)
EVT_BUTTON(wxID_CANCEL, EffectUIHost::OnCancel)
EVT_BUTTON(kMenuID, EffectUIHost::OnMenu)
EVT_BUTTON(kPowerID, EffectUIHost::OnPower)
EVT_BUTTON(kEnableID, EffectUIHost::OnEnable)
EVT_BUTTON(kPlayID, EffectUIHost::OnPlay)
EVT_BUTTON(kRewindID, EffectUIHost::OnRewind)
EVT_BUTTON(kFFwdID, EffectUIHost::OnFFwd)
@ -2108,7 +2108,7 @@ EffectUIHost::EffectUIHost(wxWindow *parent,
mInitialized = false;
mPowerOn = true;
mEnable = false;
mPlayPos = 0.0;
mClient->SetUIHost(this);
@ -2190,20 +2190,21 @@ bool EffectUIHost::Initialize()
if (!mIsGUI)
{
mPowerToggleBtn = new wxButton(bar, kPowerID, _("Turn Power &On"));
mPowerToggleBtn->SetToolTip(_("Power effect on or off (enable or disable"));
bs->Add(mPowerToggleBtn, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, margin);
mEnableToggleBtn = new wxButton(bar, kEnableID, _("Disable &Effect"));
mEnableToggleBtn->SetToolTip(_("Enable or disable effect"));
bs->Add(mEnableToggleBtn, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, margin);
}
else
{
mOnBM = CreateBitmap(effect_on_xpm, true, false);
mOffBM = CreateBitmap(effect_off_xpm, true, false);
mOffDisabledBM = CreateBitmap(effect_off_disabled_xpm, true, false);
bb = new wxBitmapButton(bar, kPowerID, mOnBM);
bb->SetBitmapDisabled(mOffDisabledBM);
mPowerBtn = bb;
mPowerBtn->SetToolTip(_("Power effect on or off (enable or disable"));
bs->Add(mPowerBtn);
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);
@ -2497,17 +2498,17 @@ void EffectUIHost::OnMenu(wxCommandEvent & WXUNUSED(evt))
delete menu;
}
void EffectUIHost::OnPower(wxCommandEvent & WXUNUSED(evt))
void EffectUIHost::OnEnable(wxCommandEvent & WXUNUSED(evt))
{
mPowerOn = !mPowerOn;
mEnable = !mEnable;
if (mPowerOn)
if (mEnable)
{
mEffect->RealtimeResume();
mEffect->RealtimeSuspend();
}
else
{
mEffect->RealtimeSuspend();
mEffect->RealtimeResume();
}
UpdateControls();
@ -2788,6 +2789,11 @@ void EffectUIHost::UpdateControls()
bb->SetBitmapLabel(mStopBM);
bb->SetBitmapDisabled(mStopDisabledBM);
mPlayBtn->Enable(!mCapturing);
#if defined(__WXMAC__)
mPlayBtn->SetName(_("Stop &Playback"));
#else
mPlayBtn->SetLabel(_("Stop &Playback"));
#endif
}
}
else
@ -2807,25 +2813,36 @@ void EffectUIHost::UpdateControls()
bb->SetBitmapLabel(mPlayBM);
bb->SetBitmapDisabled(mPlayDisabledBM);
mPlayBtn->Enable(!mCapturing);
#if defined(__WXMAC__)
mPlayBtn->SetName(_("Start &Playback"));
#else
mPlayBtn->SetLabel(_("Start &Playback"));
#endif
}
}
if (mPowerOn)
if (mEnable)
{
if (!mIsGUI)
{
/* i18n-hint: The access key "&O" should be the same in
"Turn Power &Off" and "Turn Power &On" */
mPowerToggleBtn->SetLabel(_("Turn Power &Off"));
//mPowerToggleBtn->SetValue(true);
mPowerToggleBtn->Enable(!mCapturing);
mPowerToggleBtn->Refresh();
"Enable &Effect" and "Disable &Effect" */
mEnableToggleBtn->SetLabel(_("Enable &Effect"));
//mEnableToggleBtn->SetValue(true);
mEnableToggleBtn->Enable(!mCapturing);
mEnableToggleBtn->Refresh();
}
else
{
bb = (wxBitmapButton *) mPowerBtn;
bb->SetBitmapLabel(mOnBM);
mPowerBtn->Enable(!mCapturing);
bb = (wxBitmapButton *) mEnableBtn;
bb->SetBitmapLabel(mEnableBM);
bb->SetBitmapDisabled(mEnableDisabledBM);
mEnableBtn->Enable(!mCapturing);
#if defined(__WXMAC__)
mEnableBtn->SetName(_("Enable &Effect"));
#else
mEnableBtn->SetLabel(_("Enable &Effect"));
#endif
}
}
else
@ -2833,17 +2850,23 @@ void EffectUIHost::UpdateControls()
if (!mIsGUI)
{
/* i18n-hint: The access key "&O" should be the same in
"Turn Power &Off" and "Turn Power &On" */
mPowerToggleBtn->SetLabel(_("Turn Power &On"));
//mPowerToggleBtn->SetValue(false);
mPowerToggleBtn->Enable(!mCapturing);
mPowerToggleBtn->Refresh();
"Enable &Effect" and "Disable &Effect" */
mEnableToggleBtn->SetLabel(_("Disable &Effect"));
//mEnableToggleBtn->SetValue(false);
mEnableToggleBtn->Enable(!mCapturing);
mEnableToggleBtn->Refresh();
}
else
{
bb = (wxBitmapButton *) mPowerBtn;
bb->SetBitmapLabel(mOffBM);
mPowerBtn->Enable(!mCapturing);
bb = (wxBitmapButton *) mEnableBtn;
bb->SetBitmapLabel(mDisableBM);
bb->SetBitmapDisabled(mDisableDisabledBM);
mEnableBtn->Enable(!mCapturing);
#if defined(__WXMAC__)
mEnableBtn->SetName(_("Disable &Effect"));
#else
mEnableBtn->SetLabel(_("Disable &Effect"));
#endif
}
}
}

15
src/effects/Effect.h
View File

@ -503,7 +503,7 @@ private:
void OnApply(wxCommandEvent & evt);
void OnCancel(wxCommandEvent & evt);
void OnMenu(wxCommandEvent & evt);
void OnPower(wxCommandEvent & evt);
void OnEnable(wxCommandEvent & evt);
void OnPlay(wxCommandEvent & evt);
void OnRewind(wxCommandEvent & evt);
void OnFFwd(wxCommandEvent & evt);
@ -535,12 +535,12 @@ private:
wxButton *mApplyBtn;
wxButton *mCloseBtn;
wxButton *mMenuBtn;
wxButton *mPowerBtn;
wxButton *mEnableBtn;
wxButton *mPlayBtn;
wxButton *mRewindBtn;
wxButton *mFFwdBtn;
wxButton *mPowerToggleBtn;
wxButton *mEnableToggleBtn;
wxButton *mPlayToggleBtn;
wxBitmap mPlayBM;
@ -548,10 +548,11 @@ private:
wxBitmap mStopBM;
wxBitmap mStopDisabledBM;
bool mPowerOn;
wxBitmap mOnBM;
wxBitmap mOffBM;
wxBitmap mOffDisabledBM;
bool mEnable;
wxBitmap mEnableBM;
wxBitmap mEnableDisabledBM;
wxBitmap mDisableBM;
wxBitmap mDisableDisabledBM;
bool mPlaying;
bool mCapturing;