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

CShellWindow: optimize error review after error message

Browse Source 
Show close button in window, give user possibility to read error listing
before close the window!
This commit is contained in:
Thilo Graf
2014-11-24 11:17:28 +01:00
parent 14779cce55
commit 04ad939ea7
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,25 +201,31 @@ void CShellWindow::exec()
void CShellWindow::showResult() void CShellWindow::showResult()
{ {
if (textBox){ if (textBox){
bool show_button = false;
bool exit = false; bool exit = false;
if (mode & ACKNOWLEDGE){
int b_width = 150;
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); if (mode & ACKNOWLEDGE){
btn.paint(); show_button = true;
} }
else if (mode & ACKNOWLEDGE_MSG){ else if (mode & ACKNOWLEDGE_MSG){
if (*res != 0){ if (*res != 0){
DisplayErrorMessage("Please press button"); DisplayErrorMessage("Please press button");
show_button = true;
}else{ }else{
DisplayInfoMessage("...ready. Please press OK"); DisplayInfoMessage("...ready. Please press OK");
exit = true; exit = true;
} }
} }
if (show_button){
int b_width = 150;
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);
btn.paint();
}
neutrino_msg_t msg; neutrino_msg_t msg;
neutrino_msg_data_t data; neutrino_msg_data_t data;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);