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

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ff64d2dc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-21 14:00:15 +01:00
parent b5076f082d 5b871d8901
commit 4bd35f43be
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ void CProgressWindow::Init( signal<void, size_t, size_t, string> *statusSignal,
if (globalSignal) if (globalSignal)
*globalSignal->connect(mem_fun(*this, &CProgressWindow::showGlobalStatus)); *globalSignal->connect(mem_fun(*this, &CProgressWindow::showGlobalStatus));
global_progress = local_progress = 0; global_progress = local_progress = percent_progress = 0;
showFooter(false); showFooter(false);
@@ -91,6 +91,8 @@ void CProgressWindow::Init( signal<void, size_t, size_t, string> *statusSignal,
status_txt->doPaintBg(false); status_txt->doPaintBg(false);
addWindowItem(status_txt); addWindowItem(status_txt);
cur_statusText = string();
//create local_bar object //create local_bar object
local_bar = getProgressItem(); local_bar = getProgressItem();
@@ -128,10 +130,16 @@ CProgressBar* CProgressWindow::getProgressItem()
void CProgressWindow::initStatus(const unsigned int prog, const unsigned int max, const string &statusText, CProgressBar *pBar) void CProgressWindow::initStatus(const unsigned int prog, const unsigned int max, const string &statusText, CProgressBar *pBar)
{ {
pBar->allowPaint(true); pBar->allowPaint(true);
pBar->setValues(prog, (int)max); unsigned int cur_perc = prog*100/(max+1);
if (!statusText.empty()) if (percent_progress != cur_perc || prog == 0){
showStatusMessageUTF(statusText); pBar->setValues(prog, (int)max);
pBar->paint(false); if (!statusText.empty() && (cur_statusText != statusText)){
showStatusMessageUTF(statusText);
cur_statusText = statusText;
}
pBar->paint(false);
percent_progress = cur_perc;
}
} }
void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max, const string &statusText) void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max, const string &statusText)

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

@@ -39,6 +39,8 @@ class CProgressWindow : public CComponentsWindow, public CMenuTarget
unsigned int global_progress; unsigned int global_progress;
unsigned int local_progress; unsigned int local_progress;
unsigned int percent_progress;
std::string cur_statusText;
int h_height; int h_height;
void Init( sigc::signal<void, size_t, size_t, std::string> *statusSignal, void Init( sigc::signal<void, size_t, size_t, std::string> *statusSignal,
sigc::signal<void,size_t, size_t, std::string> *localSignal, sigc::signal<void,size_t, size_t, std::string> *localSignal,