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: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
This commit is contained in:
vanhofen
2017-06-26 22:51:58 +02:00
parent 99130d47ab d4545b0abd
commit c8cba2e151
31 changed files with 187 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,6 +124,7 @@ CProgressBar* CProgressWindow::getProgressItem()
pBar->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
pBar->setFrameThickness(1);
pBar->setColorFrame(COL_PROGRESSBAR_ACTIVE_PLUS_0);
pBar->setType(CProgressBar::PB_TIMESCALE);
addWindowItem(pBar);
return pBar;
@@ -132,7 +133,6 @@ 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);
pBar->setValues(prog, (int)max);
if (!statusText.empty() && (cur_statusText != statusText)){
showStatusMessageUTF(statusText);