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

CShellWindow/COPKGManager: handle some error from shell output

Browse Source 
TODO: add missing handlers


Origin commit data
------------------
Commit: ed5bbdc540
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-05-23 (Sat, 23 May 2015)
This commit is contained in:
Thilo Graf
2015-05-23 22:52:57 +02:00
parent 5b8ffae117
commit fac2770a84
4 changed files with 133 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/widget/shellwindow.cpp
View File

@@ -156,8 +156,9 @@ void CShellWindow::exec()
//callback for line handler
std::string s_output = std::string((output));
OnShellOutputLoop(s_output, res, &ok);
OnShellOutputLoop(&s_output, res, &ok);
dprintf(DEBUG_NORMAL, "[CShellWindow] [%s - %d] res=%d ok=%d\n", __func__, __LINE__, *res, ok);
if (lines.size() > lines_max)
lines.pop_front();
txt = "";

16
src/gui/widget/shellwindow.h
View File

@@ -64,22 +64,22 @@ class CShellWindow : public sigc::trackable
//Tis function should handle the shell output!
//declare a slot with return value as 'void' and parameter as 'string', here by rev!
sigc::slot1<void, string&> sl;
sigc::slot1<void, string&> sl_shell_output;
//fill the slot with your member function in your class that do evaluate the output lines
sl = sigc::mem_fun(*this, &CYourClass::YourMemberFunction);
sl_shell_output = sigc::mem_fun(*this, &CYourClass::YourMemberFunction);
//create the CShellWindow object in verbose mode, important: parameter 'auto_exec' must be set to 'false', so it is possible to connect the slot before engages the exec() methode
CShellWindow shell(cmd, (verbose ? CShellWindow::VERBOSE : 0) | (acknowledge ? CShellWindow::ACKNOWLEDGE_MSG : 0), &res, false);
//connect slot
shell.OnShellOutputLoop.connect(sl);
shell.OnShellOutputLoop.connect(sl_shell_output);
//now exec...
shell.exec();
...other code...
*/
sigc::signal<void, std::string&, int*, bool*> OnShellOutputLoop;
sigc::signal<void, std::string*, int*, bool*> OnShellOutputLoop;
/*!
signal/event handler runs after task is finished.
@@ -92,20 +92,22 @@ class CShellWindow : public sigc::trackable
instead the default message.
//declare a slot with return value as 'void' and wihout any parameter
sigc::slot<void, int*> sl;
sigc::slot<void, int*> sl_result_err;
//fill the slot with your member function in your class with your action
sl = sigc::mem_fun(*this, &CYourClass::YourMemberFunction);
sl_result_err = sigc::mem_fun(*this, &CYourClass::YourMemberFunction);
//create the CShellWindow object in verbose mode, important: parameter 'auto_exec' must be set to 'false', so it is possible to connect the slot before engages the exec() methode
CShellWindow shell(cmd, (verbose ? CShellWindow::VERBOSE : 0) | (acknowledge ? CShellWindow::ACKNOWLEDGE_MSG : 0), &res, false);
//connect slot
shell1.OnResultError.connect(sl);
shell1.OnResultError.connect(sl_result_err);
//now exec...
shell.exec();
...other code...
Use of OnResultOk is similar with OnResultError.
*/
sigc::signal<void, int*> OnResultError;
sigc::signal<void, int*> OnResultOk;