mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 19:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
This commit is contained in:
vanhofen
2016-11-21 12:46:49 +01:00
parent 61e7e48f05 940432f3aa
commit 65e0a39980
125 changed files with 3517 additions and 3169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/rc_lock.cpp
View File

@@ -32,7 +32,8 @@
#include <gui/rc_lock.h>
#include <driver/display.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/msgbox.h>
const std::string CRCLock::NO_USER_INPUT = "NO_USER_INPUT";
@@ -75,15 +76,15 @@ int CRCLock::exec(CMenuTarget* parent, const std::string &actionKey)
char lock_msg[1024];
snprintf(lock_msg, sizeof(lock_msg)-1, g_Locale->getText(LOCALE_RCLOCK_LOCKMSG), key_unlock.c_str());
if (ShowMsg(LOCALE_RCLOCK_TITLE, lock_msg, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel,
NEUTRINO_ICON_INFO, 450, no_input ? 5 : -1, no_input) == CMessageBox::mbrCancel)
if (ShowMsg(LOCALE_RCLOCK_TITLE, lock_msg, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel,
NEUTRINO_ICON_INFO, 450, no_input ? 5 : -1, no_input) == CMsgBox::mbrCancel)
return menu_return::RETURN_EXIT_ALL;
locked = true;
lockRC();
locked = false;
ShowMsg(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMessageBox::mbrBack, CMessageBox::mbBack,
ShowMsg(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMsgBox::mbrBack, CMsgBox::mbBack,
NEUTRINO_ICON_INFO, 450, no_input ? 5 : -1);
return menu_return::RETURN_EXIT_ALL;
}