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

*neutrino buttonbars: reworked painting of buttonbar in

Browse Source 
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-02-21 09:08:10 +00:00
parent dbc92abfb9
commit e1f887af72
20 changed files with 317 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/widget/stringinput.cpp
View File

@@ -142,15 +142,16 @@ void CStringInput::init()
}
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
iheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getHeight();
height = hheight+ mheight+ 50;
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8; //initial height value for buttonbar
height = hheight+ mheight + 50;
if (hint_1 != NONEXISTANT_LOCALE)
{
height += iheight;
if (hint_2 != NONEXISTANT_LOCALE)
height += iheight;
}
height += g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //buttonbar;
x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth() - width)>>1);
y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1);
selected = 0;
@@ -470,7 +471,7 @@ int CStringInput::handleOthers(const neutrino_msg_t /*msg*/, const neutrino_msg_
void CStringInput::hide()
{
frameBuffer->paintBackgroundBoxRel(x, y, width, height);
frameBuffer->paintBackgroundBoxRel(x, y, width, height + footerHeight);
}
const char * CStringInput::getHint1(void)
@@ -484,7 +485,7 @@ void CStringInput::paint()
int icol_w, icol_h;
frameBuffer->paintBoxRel(x, y, width, hheight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP); //round
frameBuffer->paintBoxRel(x, y + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);//round
frameBuffer->paintBoxRel(x, y + hheight, width, height - hheight, COL_MENUCONTENT_PLUS_0);
if (!(iconfile.empty()))
{
@@ -561,15 +562,15 @@ CStringInputSMS::CStringInputSMS(const neutrino_locale_t Name, char* Value, int
void CStringInputSMS::initSMS(const char * const Valid_Chars)
{
last_digit = -1; // no key pressed yet
const char CharList[10][11] = { "0 -_/()<>=", // 9 characters
const char CharList[10][11] = { "0 -_/()<>=", // 10 characters
"1+.,:!?\\",
"abc2<EFBFBD>",
"abc2ä",
"def3",
"ghi4",
"jkl5",
"mno6<EFBFBD>",
"pqrs7<EFBFBD>",
"tuv8<EFBFBD>",
"mno6ö",
"pqrs7ß",
"tuv8ü",
"wxyz9" };
for (int i = 0; i < 10; i++)
@@ -686,30 +687,17 @@ void CStringInputSMS::keyRightPressed()
const struct button_label CStringInputSMSButtons[2] =
{
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_STRINGINPUT_CAPS },
// { NEUTRINO_ICON_BUTTON_GREEN , LOCALE_XXX },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_STRINGINPUT_CLEAR }
// { NEUTRINO_ICON_BUTTON_BLUE , LOCALE_XXX }
};
void CStringInputSMS::paint()
{
int icol_w, icol_h;
int bh, bw, fh;
CStringInput::paint();
fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
bh = std::max(fh, icol_h+4);
bw = (width - 20) / 2;
frameBuffer->paintIcon(NEUTRINO_ICON_NUMERIC_PAD, x+20+140, y+ hheight+ mheight+ iheight* 3+ 30, 0, COL_MENUCONTENT);
frameBuffer->paintBoxRel(x, y+height-bh, width, bh, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
//frameBuffer->paintHLine(x, x+width, y+height-25, COL_INFOBAR_SHADOW_PLUS_0);
//::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 8, y+height-25+1, 230, 2, CStringInputSMSButtons);
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y+height-bh, bw, bh, 2, CStringInputSMSButtons);
//buttonbar
::paintButtons(x, y + height, width, 2, CStringInputSMSButtons);
}
void CPINInput::paintChar(int pos)