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

Merge branch 'cst-next.pre' into cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-04-30 09:20:43 +02:00
parent 2af16e6a08 2d1fb7b8ef
commit 946c0e8bc4
81 changed files with 909 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/neutrino.cpp
View File

@@ -235,7 +235,8 @@ CNeutrinoApp::CNeutrinoApp()
favorites_changed = false;
bouquets_changed = false;
channels_init = false;
channellist_visible = false;
channelList_allowed = true;
channelList_painted = false;
}
/*-------------------------------------------------------------------------------------
@@ -544,7 +545,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
CThemes::getTheme(configfile);
g_settings.gradiant = (configfile.getBool( "gradiant", false ))? 1 : 0;
//personalize
g_settings.personalize_pincode = configfile.getString( "personalize_pincode", "0000" );
@@ -1069,7 +1070,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
CThemes::setTheme(configfile);
configfile.setBool( "gradiant", (g_settings.gradiant!=0)?true:false );
//personalize
configfile.setString("personalize_pincode", g_settings.personalize_pincode);
@@ -1951,9 +1952,7 @@ TIMER_START();
/* later on, we'll crash anyway, so tell about it. */
if (! zapit_init)
ShowMsg(LOCALE_MESSAGEBOX_INFO,
"Zapit initialization failed.\nThis is a fatal error, sorry.",
CMessageBox::mbrBack, CMessageBox::mbBack);
DisplayErrorMessage("Zapit initialization failed. This is a fatal error, sorry.");
InitZapitClient();
g_Zapit->setStandby(false);
@@ -2496,10 +2495,18 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
{
/* Exit here if paint of channlellist is not allowed, disallow could be possible, eg: if
* RC_ok or other stuff is shared with other window handlers and
* it's easy here to disable channellist paint if required!
*/
if (!channelList_allowed){
channelList_allowed = true;
return menu_return::RETURN_NONE;
}
channelList_painted = true;
neutrino_msg_t msg = _msg;
InfoClock->enableInfoClock(false);
channellist_visible = true;
StopSubtitles();
//_show:
@@ -2588,7 +2595,8 @@ _repeat:
SetChannelMode(LIST_MODE_FAV);
}
channellist_visible = false;
channelList_painted = false;
if (!from_menu)
InfoClock->enableInfoClock(true);
@@ -3875,6 +3883,9 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
return menu_return::RETURN_EXIT_ALL;
}
else if(actionKey=="restart") {
//usage of slots from any classes
OnBeforeRestart();
if (recordingstatus)
DisplayErrorMessage(g_Locale->getText(LOCALE_SERVICEMENU_RESTART_REFUSED_RECORDING));
else {