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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-26 22:51:58 +02:00
parent 1f5b252c74 144725ebcd
commit 72745a089b
31 changed files with 187 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/scan.cpp
View File

@@ -357,7 +357,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
perror(NEUTRINO_SCAN_STOP_SCRIPT " failed");
}
if(!test) {
CComponentsHeaderLocalized header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED);
CComponentsHeader header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : LOCALE_SCANTS_FAILED);
header.paint(CC_SAVE_SCREEN_NO);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(0xFFFF);
do {
@@ -521,7 +521,7 @@ void CScanTs::paintLine(int px, int py, int w, const char * const txt)
void CScanTs::paint(bool fortest)
{
CComponentsHeaderLocalized header(x, y, width, hheight, fortest ? LOCALE_SCANTS_TEST : LOCALE_SCANTS_HEAD);
CComponentsHeader header(x, y, width, hheight, fortest ? LOCALE_SCANTS_TEST : LOCALE_SCANTS_HEAD);
header.setCaptionAlignment(CCHeaderTypes::CC_TITLE_CENTER);
header.paint(CC_SAVE_SCREEN_NO);