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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
This commit is contained in:
vanhofen
2016-10-10 17:27:55 +02:00
parent 8f5588a9d1 dc1c46750d
commit 7220c6b265
169 changed files with 1683 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/imageinfo_ni.cpp
View File

@@ -47,7 +47,7 @@
#include <fstream>
#include <sstream>
#include <gui/customcolor.h>
#include <gui/color_custom.h>
#include <gui/components/cc.h>
#include <system/debug.h>
#include <cs_api.h>
@@ -176,8 +176,22 @@ int CImageInfoNI::exec(CMenuTarget* parent, const std::string &)
{
break;
}
continue;
}
else if (msg == CRCInput::RC_setup)
if (fadeout && msg == CRCInput::RC_timeout)
{
if (fader.StartFadeOut())
{
msg = 0;
continue;
}
else
{
break;
}
}
if (msg == CRCInput::RC_setup)
{
res = menu_return::RETURN_EXIT_ALL;
fadeout = true;
@@ -203,18 +217,6 @@ int CImageInfoNI::exec(CMenuTarget* parent, const std::string &)
CNeutrinoApp::getInstance()->handleMsg(msg, data);
}
if (fadeout && msg == CRCInput::RC_timeout)
{
if (fader.StartFadeOut())
{
msg = 0;
}
else
{
break;
}
}
Stat_Info(&cpu);
paint_CPU_Percent(CPU_Percent(&cpu));
}
@@ -274,7 +276,7 @@ void CImageInfoNI::paint()
ypos += iheight/2;
CConfigFile config('\t');
config.loadConfig("/.version");
config.loadConfig(TARGET_PREFIX "/.version");
std::string imagename = config.getString("imagename", "NI-Neutrino-HD");
std::string homepage = config.getString("homepage", "www.neutrino-images.de");