mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CShellWindow: use slots for ACKNOWLEDGE_EVENT mode results

Browse Source
This commit is contained in:
Thilo Graf
2015-03-24 14:46:18 +01:00
parent ae66014102
commit 982fbb962e
2 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,8 @@ void CShellWindow::exec()
//callback for line handler
std::string s_output = std::string((output));
OnShellOutputLoop(s_output);
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 = "";
@@ -200,12 +201,14 @@ void CShellWindow::exec()
errno = 0;
int r = waitpid(pid, &s, 0);
if (res) {
dprintf(DEBUG_NORMAL, "[CShellWindow] [%s - %d] res=%d, error[%d]: %s\n", __func__, __LINE__, *res, errno, strerror(errno));
if (r == -1)
*res = errno;
else
*res = WEXITSTATUS(s);
if (res){
//if res value was generated inside signal, then use foreign res from signal instead own res value
if (OnShellOutputLoop.empty()){
if (r == -1)
*res = errno;
else
*res = WEXITSTATUS(s);
}
}
showResult();
@@ -220,12 +223,14 @@ void CShellWindow::showResult()
if (mode & ACKNOWLEDGE){
show_button = true;
}
else if (mode & ACKNOWLEDGE_MSG){
else if (mode & ACKNOWLEDGE_EVENT){
if (*res != 0){
DisplayErrorMessage("Please press button");
OnResultError(res);
if (OnResultError.empty())
DisplayErrorMessage("Error while execution of task. Please see window for details!");
show_button = true;
}else{
DisplayInfoMessage("...ready. Please press OK");
OnResultOk(res);
exit = true;
}
}
@@ -235,7 +240,7 @@ void CShellWindow::showResult()
int b_height = 35;
int xpos = frameBuffer->getScreenWidth() - b_width;
int ypos = frameBuffer->getScreenHeight() - b_height;
CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_OK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true);
CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_BACK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true);
btn.paint();
}