From f2b781dd6dda84d64624f981fa56f92ef37438aa Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Thu, 27 Oct 2016 12:15:23 +0200
Subject: [PATCH] CMsgBox: apply order of color buttons like on remote control

Ensures unified conventions over gui.
---
 src/gui/widget/msgbox.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp
index 369be51bf..b9fc55d94 100644
--- a/src/gui/widget/msgbox.cpp
+++ b/src/gui/widget/msgbox.cpp
@@ -143,15 +143,6 @@ void CMsgBox::initButtons()
 		btn.btn_alias = mbOk;
 		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){
 		btn.button = NEUTRINO_ICON_BUTTON_RED;
 		btn.text = BTN_TEXT(mbNo);
@@ -161,6 +152,15 @@ void CMsgBox::initButtons()
 		btn.btn_alias = mbNo;
 		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){
 		btn.button = NEUTRINO_ICON_BUTTON_HOME;
 		btn.text = BTN_TEXT(mbCancel);
@@ -180,13 +180,6 @@ void CMsgBox::initButtons()
 		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;
@@ -194,6 +187,13 @@ void CMsgBox::initButtons()
 		btn.btn_result = mbrYes;
 		btn.btn_alias = mbYes;
 		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);