mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

CProgressWindow: add possibility to show progress via signal

Browse Source
This commit is contained in:
Thilo Graf
2017-02-10 10:04:40 +01:00
parent 547238bfdd
commit 842c8e79bb
2 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,14 +33,39 @@
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <driver/display.h> #include <driver/display.h>
CProgressWindow::CProgressWindow(CComponentsForm *parent, const int &dx, const int &dy) CProgressWindow::CProgressWindow(CComponentsForm *parent,
: CComponentsWindow(0, 0, dx, dy, string(), NEUTRINO_ICON_INFO, parent, CC_SHADOW_ON) const int &dx,
const int &dy,
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> *globalSignal)
: CComponentsWindow(0, 0, dx, dy, string(), NEUTRINO_ICON_INFO, parent, CC_SHADOW_ON)
{ {
Init(); Init(statusSignal, localSignal, globalSignal);
} }
void CProgressWindow::Init() CProgressWindow::CProgressWindow(const neutrino_locale_t title,
const int &dx,
const int &dy,
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> *globalSignal)
: CComponentsWindow(0, 0, dx, dy, g_Locale->getText(title), NEUTRINO_ICON_INFO, NULL, CC_SHADOW_ON)
{ {
Init(statusSignal, localSignal, globalSignal);
}
void CProgressWindow::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> *globalSignal)
{
if (statusSignal)
*statusSignal->connect(sigc::mem_fun(*this, &CProgressWindow::showStatus));
if (localSignal)
*localSignal->connect(sigc::mem_fun(*this, &CProgressWindow::showLocalStatus));
if (globalSignal)
*globalSignal->connect(sigc::mem_fun(*this, &CProgressWindow::showGlobalStatus));
global_progress = local_progress = 100; global_progress = local_progress = 100;
showFooter(false); showFooter(false);
@@ -60,6 +85,7 @@ void CProgressWindow::Init()
status_txt->setDimensionsAll(x_item, y_item, w_item, h_txt); status_txt->setDimensionsAll(x_item, y_item, w_item, h_txt);
status_txt->setColorBody(col_body); status_txt->setColorBody(col_body);
status_txt->doPaintTextBoxBg(true); status_txt->doPaintTextBoxBg(true);
status_txt->doPaintBg(false);
addWindowItem(status_txt); addWindowItem(status_txt);
y_item += h_txt + 10; y_item += h_txt + 10;
@@ -121,7 +147,7 @@ void CProgressWindow::fitItems()
} }
} }
void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max) void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max, const std::string &statusText)
{ {
if (global_progress == prog) if (global_progress == prog)
return; return;
@@ -132,10 +158,10 @@ void CProgressWindow::showStatus(const unsigned int prog, const unsigned int max
global_bar->setHeight(g_height + g_height/2); global_bar->setHeight(g_height + g_height/2);
} }
showGlobalStatus(prog, max); showGlobalStatus(prog, max, statusText);
} }
void CProgressWindow::showGlobalStatus(const unsigned int prog, const unsigned int max) void CProgressWindow::showGlobalStatus(const unsigned int prog, const unsigned int max, const std::string &statusText)
{ {
if (global_progress == prog) if (global_progress == prog)
return; return;
@@ -143,6 +169,8 @@ void CProgressWindow::showGlobalStatus(const unsigned int prog, const unsigned i
global_bar->allowPaint(true); global_bar->allowPaint(true);
global_progress = prog; global_progress = prog;
global_bar->setValues(prog, (int)max); global_bar->setValues(prog, (int)max);
if (!statusText.empty())
showStatusMessageUTF(statusText);
global_bar->paint(false); global_bar->paint(false);
#ifdef VFD_UPDATE #ifdef VFD_UPDATE
@@ -150,7 +178,7 @@ void CProgressWindow::showGlobalStatus(const unsigned int prog, const unsigned i
#endif // VFD_UPDATE #endif // VFD_UPDATE
} }
void CProgressWindow::showLocalStatus(const unsigned int prog, const unsigned int max) void CProgressWindow::showLocalStatus(const unsigned int prog, const unsigned int max, const std::string &statusText)
{ {
if (local_progress == prog) if (local_progress == prog)
return; return;
@@ -158,6 +186,8 @@ void CProgressWindow::showLocalStatus(const unsigned int prog, const unsigned in
local_bar->allowPaint(true); local_bar->allowPaint(true);
local_progress = prog; local_progress = prog;
local_bar->setValues(prog, (int)max); local_bar->setValues(prog, (int)max);
if (!statusText.empty())
showStatusMessageUTF(statusText);
local_bar->paint(false); local_bar->paint(false);
#ifdef VFD_UPDATE #ifdef VFD_UPDATE

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

@@ -38,21 +38,36 @@ class CProgressWindow : public CComponentsWindow, public CMenuTarget
unsigned int local_progress; unsigned int local_progress;
int w_bar_frame; int w_bar_frame;
int h_height; int h_height;
void Init(); 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> *globalSignal);
void fitItems(); void fitItems();
public: public:
CProgressWindow(CComponentsForm *parent = NULL, const int &dx = 700, const int &dy = 200); CProgressWindow(CComponentsForm *parent = NULL,
const int &dx = 700,
const int &dy = 200,
sigc::signal<void, size_t, size_t, std::string> *status_Signal = NULL,
sigc::signal<void,size_t, size_t, std::string> *localSignal = NULL,
sigc::signal<void, size_t, size_t, std::string> *globalSignal = NULL);
CProgressWindow(const neutrino_locale_t title,
const int &dx = 700,
const int &dy = 200,
sigc::signal<void, size_t, size_t, std::string> *status_Signal = NULL,
sigc::signal<void,size_t, size_t, std::string> *localSignal = NULL,
sigc::signal<void, size_t, size_t, std::string> *globalSignal = NULL);
void setTitle(const neutrino_locale_t title); void setTitle(const neutrino_locale_t title);
virtual void hide(); virtual void hide();
virtual int exec( CMenuTarget* parent, const std::string & actionKey ); virtual int exec( CMenuTarget* parent, const std::string & actionKey );
void showStatus(const unsigned int prog, const unsigned int max = 100); void showStatus(const unsigned int prog, const unsigned int max = 100, const std::string &statusText = std::string());
void showGlobalStatus(const unsigned int prog, const unsigned int max = 100); void showLocalStatus(const unsigned int prog, const unsigned int max = 100, const std::string &statusText = std::string());
void showGlobalStatus(const unsigned int prog, const unsigned int max = 100, const std::string &statusText = std::string());
unsigned int getGlobalStatus(void); unsigned int getGlobalStatus(void);
void showLocalStatus(const unsigned int prog, const unsigned int max = 100);
void showStatusMessageUTF(const std::string & text); // UTF-8 void showStatusMessageUTF(const std::string & text); // UTF-8
void paint(bool do_save_bg = true); void paint(bool do_save_bg = true);
void setTitle(const std::string & title); void setTitle(const std::string & title);