mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMsgBox: apply order of color buttons like on remote control

Browse Source 
Ensures unified conventions over gui.
This commit is contained in:
Thilo Graf
2016-10-27 12:15:23 +02:00
parent f1e4723964
commit f2b781dd6d
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/widget/msgbox.cpp
View File

@@ -143,15 +143,6 @@ void CMsgBox::initButtons()
btn.btn_alias = mbOk; btn.btn_alias = mbOk;
v_buttons.push_back(btn); v_buttons.push_back(btn);
} }
if (mb_show_button & mbYes){
btn.button = NEUTRINO_ICON_BUTTON_GREEN;
btn.text = BTN_TEXT(mbYes);
btn.directKey = CRCInput::RC_green;
btn.directKeyAlt = CRCInput::RC_ok;
btn.btn_result = mbrYes;
btn.btn_alias = mbYes;
v_buttons.push_back(btn);
}
if (mb_show_button & mbNo){ if (mb_show_button & mbNo){
btn.button = NEUTRINO_ICON_BUTTON_RED; btn.button = NEUTRINO_ICON_BUTTON_RED;
btn.text = BTN_TEXT(mbNo); btn.text = BTN_TEXT(mbNo);
@@ -161,6 +152,15 @@ void CMsgBox::initButtons()
btn.btn_alias = mbNo; btn.btn_alias = mbNo;
v_buttons.push_back(btn); v_buttons.push_back(btn);
} }
if (mb_show_button & mbYes){
btn.button = NEUTRINO_ICON_BUTTON_GREEN;
btn.text = BTN_TEXT(mbYes);
btn.directKey = CRCInput::RC_green;
btn.directKeyAlt = CRCInput::RC_ok;
btn.btn_result = mbrYes;
btn.btn_alias = mbYes;
v_buttons.push_back(btn);
}
if (mb_show_button & mbCancel){ if (mb_show_button & mbCancel){
btn.button = NEUTRINO_ICON_BUTTON_HOME; btn.button = NEUTRINO_ICON_BUTTON_HOME;
btn.text = BTN_TEXT(mbCancel); btn.text = BTN_TEXT(mbCancel);
@@ -180,13 +180,6 @@ void CMsgBox::initButtons()
v_buttons.push_back(btn); v_buttons.push_back(btn);
} }
if (mb_show_button & mbNoYes){ if (mb_show_button & mbNoYes){
btn.button = NEUTRINO_ICON_BUTTON_GREEN;
btn.text = BTN_TEXT(mbNo);
btn.directKey = CRCInput::RC_green;
btn.directKeyAlt = CRCInput::RC_home;
btn.btn_result = mbrNo;
btn.btn_alias = mbNo;
v_buttons.push_back(btn);
btn.button = NEUTRINO_ICON_BUTTON_RED; btn.button = NEUTRINO_ICON_BUTTON_RED;
btn.text = BTN_TEXT(mbYes); btn.text = BTN_TEXT(mbYes);
btn.directKey = CRCInput::RC_red; btn.directKey = CRCInput::RC_red;
@@ -194,6 +187,13 @@ void CMsgBox::initButtons()
btn.btn_result = mbrYes; btn.btn_result = mbrYes;
btn.btn_alias = mbYes; btn.btn_alias = mbYes;
v_buttons.push_back(btn); v_buttons.push_back(btn);
btn.button = NEUTRINO_ICON_BUTTON_GREEN;
btn.text = BTN_TEXT(mbNo);
btn.directKey = CRCInput::RC_green;
btn.directKeyAlt = CRCInput::RC_home;
btn.btn_result = mbrNo;
btn.btn_alias = mbNo;
v_buttons.push_back(btn);
} }
ccw_footer->setButtonLabels(v_buttons, 0, 125); ccw_footer->setButtonLabels(v_buttons, 0, 125);