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: set some alternate keys to default key values

Browse Source
This commit is contained in:
Thilo Graf
2016-10-05 15:17:25 +02:00
parent b272c407d7
commit 3e01cbe1ac
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,6 +135,7 @@ void CMsgBox::initButtons()
btn.button = NEUTRINO_ICON_BUTTON_OKAY; btn.button = NEUTRINO_ICON_BUTTON_OKAY;
btn.text = BTN_TEXT(mbOk); btn.text = BTN_TEXT(mbOk);
btn.directKey = CRCInput::RC_ok; btn.directKey = CRCInput::RC_ok;
btn.directKeyAlt = btn.directKey;
btn.btn_result = mbrOk; btn.btn_result = mbrOk;
btn.btn_alias = mbOk; btn.btn_alias = mbOk;
v_buttons.push_back(btn); v_buttons.push_back(btn);
@@ -170,6 +171,7 @@ void CMsgBox::initButtons()
btn.button = NEUTRINO_ICON_BUTTON_HOME; btn.button = NEUTRINO_ICON_BUTTON_HOME;
btn.text = BTN_TEXT(mbBack); btn.text = BTN_TEXT(mbBack);
btn.directKey = CRCInput::RC_home; btn.directKey = CRCInput::RC_home;
btn.directKeyAlt = btn.directKey;
btn.btn_result = mbrBack; btn.btn_result = mbrBack;
btn.btn_alias = mbBack; btn.btn_alias = mbBack;
v_buttons.push_back(btn); v_buttons.push_back(btn);
@@ -216,7 +218,7 @@ int CMsgBox::exec()
int selected = ccw_footer->getSelectedButton(); int selected = ccw_footer->getSelectedButton();
dprintf(DEBUG_NORMAL, "[CMsgBox] [%s - %d] getSelectedButton()= %d\n", __func__, __LINE__,ccw_footer->getSelectedButton()); dprintf(DEBUG_NORMAL, "\033[32m[CMsgBox] [%s - %d] getSelectedButton()= %d\033[0m\n", __func__, __LINE__,ccw_footer->getSelectedButton());
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
@@ -262,13 +264,13 @@ int CMsgBox::exec()
ccw_footer->setSelectedButton(selected-1); ccw_footer->setSelectedButton(selected-1);
mb_show_button = ccw_footer->getSelectedButtonObject()->getButtonAlias(); mb_show_button = ccw_footer->getSelectedButtonObject()->getButtonAlias();
} }
dprintf(DEBUG_INFO, "\033[32m[CMsgBox] [%s - %d] result = %d, mb_show_button = %d\033[0m\n", __func__, __LINE__, result, mb_show_button);
selected = ccw_footer->getSelectedButton(); selected = ccw_footer->getSelectedButton();
refreshFoot(); refreshFoot();
//refresh timeout on any pressed navi key! This resets current timeout end to the initial value //refresh timeout on any pressed navi key! This resets current timeout end to the initial value
if (timeout > 0) if (timeout > 0)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
dprintf(DEBUG_INFO, "\033[32m[CMsgBox] [%s - %d] result = %d, mb_show_button = %d\033[0m\n", __func__, __LINE__, result, mb_show_button);
} }
//***action buttons without preselection*** //***action buttons without preselection***
for (size_t i = 0; i< ccw_footer->getButtonChainObject()->size(); i++){ for (size_t i = 0; i< ccw_footer->getButtonChainObject()->size(); i++){