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: visualize of 'ready'status and simplify paint of 'ok' button

Browse Source
This commit is contained in:
Thilo Graf
2014-10-04 23:40:04 +02:00
parent c8a4d7f6b9
commit 3f6eaa11a3
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
#include <poll.h> #include <poll.h>
#include <fcntl.h> #include <fcntl.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <gui/components/cc.h>
#include <errno.h> #include <errno.h>
CShellWindow::CShellWindow(const std::string &command, const int _mode, int *res) { CShellWindow::CShellWindow(const std::string &command, const int _mode, int *res) {
@@ -170,6 +171,9 @@ CShellWindow::CShellWindow(const std::string &command, const int _mode, int *res
} }
} while(ok); } while(ok);
txt += "\n...ready";
textBox->setText(&txt, textBox->getWindowsPos().iWidth, false);
fclose(f); fclose(f);
int s; int s;
errno = 0; errno = 0;
@@ -186,17 +190,14 @@ CShellWindow::CShellWindow(const std::string &command, const int _mode, int *res
CShellWindow::~CShellWindow() CShellWindow::~CShellWindow()
{ {
if (textBox && (mode & ACKNOWLEDGE)) { if (textBox && (mode & ACKNOWLEDGE)) {
int iw, ih; int b_width = 150;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_OKAY, &iw, &ih); int b_height = 35;
Font *font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL];
int b_width = font->getRenderWidth(g_Locale->getText(LOCALE_MESSAGEBOX_OK)) + 36 + ih + (RADIUS_LARGE / 2);
int fh = font->getHeight();
int b_height = std::max(fh, ih) + 8 + (RADIUS_LARGE / 2);
int xpos = frameBuffer->getScreenWidth() - b_width; int xpos = frameBuffer->getScreenWidth() - b_width;
int ypos = frameBuffer->getScreenHeight() - b_height; int ypos = frameBuffer->getScreenHeight() - b_height;
frameBuffer->paintBoxRel(xpos, ypos, b_width, b_height, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE);
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_OKAY, xpos + ((b_height - ih) / 2), ypos + ((b_height - ih) / 2), ih); CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_OK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true);
font->RenderString(xpos + iw + 17, ypos + fh + ((b_height - fh) / 2), b_width - (iw + 21), g_Locale->getText(LOCALE_MESSAGEBOX_OK), COL_MENUCONTENT_TEXT); btn.paint();
frameBuffer->blit(); frameBuffer->blit();
neutrino_msg_t msg; neutrino_msg_t msg;