mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-06-20 14:26:38 +02:00
parent d612fbc05f cdf0123bea
commit cf951434d5
14 changed files with 270 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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);
@@ -132,16 +132,13 @@ CProgressBar* CProgressWindow::getProgressItem()
void CProgressWindow::initStatus(const unsigned int prog, const unsigned int max, const string &statusText, CProgressBar *pBar)
{
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)