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/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)
This commit is contained in:
vanhofen
2017-06-19 23:08:41 +02:00
parent a720d9a416 37cbe5ff7a
commit 99130d47ab
17 changed files with 301 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/widget/progresswindow.cpp
View File

@@ -81,7 +81,7 @@ void CProgressWindow::Init( signal<void, size_t, size_t, string> *statusSignal,
if (globalSignal)
*globalSignal->connect(mem_fun(*this, &CProgressWindow::showGlobalStatus));
global_progress = local_progress = percent_progress = 0;
global_progress = local_progress = 0;
showFooter(false);
@@ -133,15 +133,13 @@ void CProgressWindow::initStatus(const unsigned int prog, const unsigned int max
{
pBar->allowPaint(true);
unsigned int cur_perc = prog*100/(max+1);
if (percent_progress != cur_perc || prog == 0){
pBar->setValues(prog, (int)max);
if (!statusText.empty() && (cur_statusText != statusText)){
showStatusMessageUTF(statusText);
cur_statusText = statusText;
}
pBar->paint(false);
percent_progress = cur_perc;
pBar->setValues(prog, (int)max);
if (!statusText.empty() && (cur_statusText != statusText)){
showStatusMessageUTF(statusText);
cur_statusText = statusText;
}
pBar->paint(false);
frameBuffer->blit();
}
void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max, const string &statusText)