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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
This commit is contained in:
Stefan Seyfried
2014-01-23 14:08:37 +01:00
parent d1f005b956 072ac5a089
commit a112e8fb49
92 changed files with 2474 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/rc_lock.cpp
View File

@@ -54,7 +54,7 @@ int CRCLock::exec(CMenuTarget* parent, const std::string &actionKey)
parent->hide();
bool no_input = (actionKey == NO_USER_INPUT);
if (ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_LOCKMSG,
if (ShowMsg(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_LOCKMSG,
CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel,
NEUTRINO_ICON_INFO,450,no_input ? 5 : -1,no_input) == CMessageBox::mbrCancel)
return menu_return::RETURN_EXIT_ALL;
@@ -64,7 +64,7 @@ int CRCLock::exec(CMenuTarget* parent, const std::string &actionKey)
lockBox();
locked = false;
ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO,450, no_input ? 5 : -1);
ShowMsg(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO,450, no_input ? 5 : -1);
return menu_return::RETURN_EXIT_ALL;
}