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

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

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/infoviewer.cpp
View File

@@ -220,11 +220,11 @@ void CInfoViewer::start ()
2 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getHeight() + 25;
infoViewerBB->Init();
ChanWidth = max(125, 4 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getMaxDigitWidth() + 10);
ChanWidth = std::max(125, 4 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getMaxDigitWidth() + 10);
ChanHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getHeight()/* * 9/8*/;
ChanHeight += g_SignalFont->getHeight()/2;
ChanHeight = max(75, ChanHeight);
ChanHeight = std::max(75, ChanHeight);
numbox_offset = 3;
BoxStartX = g_settings.screen_StartX + 10;
@@ -236,7 +236,7 @@ void CInfoViewer::start ()
ChanInfoX = BoxStartX + (ChanWidth / 3);
initClock();
time_height = max(ChanHeight / 2, clock->getHeight());
time_height = std::max(ChanHeight / 2, clock->getHeight());
time_width = clock->getWidth();
//NI
@@ -2200,8 +2200,8 @@ void CInfoViewer::showInfoFile()
}
//get text from file and set it to info object, exit and delete object if failed
string old_txt = infobar_txt->getText();
string new_txt = infobar_txt->getTextFromFile(infobar_file);
std::string old_txt = infobar_txt->getText();
std::string new_txt = infobar_txt->getTextFromFile(infobar_file);
bool has_text = infobar_txt->setText(new_txt, CTextBox::CENTER, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]);
if (new_txt.empty()){
killInfobarText();