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

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

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-15 11:49:05 +01:00
parent 2dae9f273a 39c2751a05
commit 36741264b0
265 changed files with 381 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -570,7 +570,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.infobar_progressbar = configfile.getInt32("infobar_progressbar" , 2 ); //NI
g_settings.infobar_casystem_display = configfile.getInt32("infobar_casystem_display", 0 ); //NI
g_settings.infobar_casystem_dotmatrix = configfile.getInt32("infobar_casystem_dotmatrix", 0 );
g_settings.infobar_casystem_frame = configfile.getInt32("infobar_casystem_frame", 1 );
g_settings.infobar_casystem_frame = configfile.getInt32("infobar_casystem_frame", 0 ); //NI
g_settings.scrambled_message = configfile.getBool("scrambled_message", false ); //NI
g_settings.volume_pos = configfile.getInt32("volume_pos", CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER ); //NI
g_settings.volume_digits = configfile.getBool("volume_digits", true);
@@ -3552,9 +3552,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
else if( msg == NeutrinoMessages::SLEEPTIMER) {
if(data) {//INACTIVITY SLEEPTIMER
skipShutdownTimer =
(ShowMsg(LOCALE_MESSAGEBOX_INFO, g_settings.shutdown_real ? LOCALE_SHUTDOWNTIMER_ANNOUNCE:LOCALE_SLEEPTIMERBOX_ANNOUNCE,
CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes);//FIXME
int msgbox = ShowMsg(LOCALE_MESSAGEBOX_INFO, g_settings.shutdown_real ? LOCALE_SHUTDOWNTIMER_ANNOUNCE:LOCALE_SLEEPTIMERBOX_ANNOUNCE,
CMsgBox::mbrCancel, CMsgBox::mbCancel, NULL, 450, 60);
skipShutdownTimer = !(msgbox & CMsgBox::mbrTimeout);
if(skipShutdownTimer) {
printf("NeutrinoMessages::INACTIVITY SLEEPTIMER: skiping\n");
skipShutdownTimer = false;
@@ -3794,7 +3794,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
if(CRecordManager::getInstance()->RecordingStatus() || cYTCache::getInstance()->isActive()) {
do_shutdown =
(ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWN_RECORDING_QUERY, CMsgBox::mbrNo,
CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes);
CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT, true) == CMsgBox::mbrYes);
}
if(do_shutdown) {