From f1e4723964daa476a99024485c2725ac38b2341e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 27 Oct 2016 12:08:32 +0200 Subject: [PATCH] CMsgBox: add option for No Yes button arrangement Useful if order of red and green buttons must be changed. Return values are untouched. --- src/gui/widget/msgbox.cpp | 16 ++++++++++++++++ src/gui/widget/msgbox.h | 6 ++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp index 7ed4f207c..369be51bf 100644 --- a/src/gui/widget/msgbox.cpp +++ b/src/gui/widget/msgbox.cpp @@ -179,6 +179,22 @@ void CMsgBox::initButtons() btn.btn_alias = mbBack; v_buttons.push_back(btn); } + 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.text = BTN_TEXT(mbYes); + btn.directKey = CRCInput::RC_red; + btn.directKeyAlt = CRCInput::RC_ok; + btn.btn_result = mbrYes; + btn.btn_alias = mbYes; + v_buttons.push_back(btn); + } ccw_footer->setButtonLabels(v_buttons, 0, 125); ccw_footer->getButtonChainObject()->setColorBody(col_body); diff --git a/src/gui/widget/msgbox.h b/src/gui/widget/msgbox.h index 3c927f0fa..653aa1fed 100644 --- a/src/gui/widget/msgbox.h +++ b/src/gui/widget/msgbox.h @@ -74,7 +74,8 @@ class CMsgBox : public CHintBox mbOKCancel = 0x20, mbYesNoCancel = 0x40, mbYesNo = 0x80, - mbAll = 0x100, + mbNoYes = 0x100, + mbAll = 0x200, //unused allign stuff, only for compatibility mbBtnAlignCenter1 = 0x0400, /* centered, large distances */ mbBtnAlignCenter2 = 0x0800, /* centered, small distances */ @@ -267,7 +268,8 @@ class CMsgBox : public CHintBox * mbOKCancel = 0x20, * mbYesNoCancel = 0x40, * mbYesNo = 0x80, - * mbAll = 0x100, + * mbNoYes = 0x100, + * mbAll = 0x200, * NOTE: allign parameters are currently not supported, these values are existing for compatibility only! */ void setShowedButtons(const int& ShowButtons){mb_show_button = ShowButtons; initButtons();}