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

Update menu changes; setup wizard banner

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@634 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: c3897d3231
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-06-19 (Sat, 19 Jun 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-06-19 09:55:21 +00:00
parent de9ecda242
commit d317be113f
14 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/widget/messagebox.cpp
View File

@@ -57,7 +57,7 @@ CMessageBox::CMessageBox(const neutrino_locale_t Caption, const char * const Tex
num++;
if (showbuttons & mbNo)
num++;
if (showbuttons & (mbCancel | mbBack))
if (showbuttons & (mbCancel | mbBack | mbOk))
num++;
int new_width = 15 + num*ButtonWidth;
if(new_width > m_width)
@@ -80,7 +80,7 @@ CMessageBox::CMessageBox(const neutrino_locale_t Caption, ContentLines& Lines, c
num++;
if (showbuttons & mbNo)
num++;
if (showbuttons & (mbCancel | mbBack))
if (showbuttons & (mbCancel | mbBack | mbOk))
num++;
int new_width = 15 + num*ButtonWidth;
if(new_width > m_width)
@@ -152,7 +152,7 @@ void CMessageBox::paintButtons()
}
if (showbuttons & (mbCancel | mbBack))
if (showbuttons & (mbCancel | mbBack | mbOk))
{
if (result >= mbrCancel)
{
@@ -168,7 +168,9 @@ void CMessageBox::paintButtons()
m_window->paintBoxRel(xpos, m_height-m_fheight-20, ButtonWidth, m_fheight, (CFBWindow::color_t)bgcolor, RADIUS_LARGE);//round
//m_window->paintIcon(NEUTRINO_ICON_BUTTON_HOME, xpos+10, m_height-m_fheight-19);
m_window->paintIcon(NEUTRINO_ICON_BUTTON_HOME, xpos+14, m_height-m_fheight - 20, m_fheight);
m_window->RenderString(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], xpos + 43, m_height-m_fheight+4, ButtonWidth- 53, g_Locale->getText((showbuttons & mbCancel) ? LOCALE_MESSAGEBOX_CANCEL : LOCALE_MESSAGEBOX_BACK), (CFBWindow::color_t)color, 0, true); // UTF-8
m_window->RenderString(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], xpos + 43, m_height-m_fheight+4, ButtonWidth- 53,
g_Locale->getText((showbuttons & mbCancel) ? LOCALE_MESSAGEBOX_CANCEL : (showbuttons & mbOk) ? LOCALE_MESSAGEBOX_OK : LOCALE_MESSAGEBOX_BACK),
(CFBWindow::color_t)color, 0, true); // UTF-8
}
}
@@ -205,9 +207,9 @@ int CMessageBox::exec(int timeout)
}
else if (((msg == CRCInput::RC_timeout) ||
(msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) &&
(showbuttons & (mbCancel | mbBack)))
(showbuttons & (mbCancel | mbBack | mbOk)))
{
result = (showbuttons & mbCancel) ? mbrCancel : mbrBack;
result = (showbuttons & mbCancel) ? mbrCancel : (showbuttons & mbOk) ? mbrOk: mbrBack;
loop = false;
}
else if ((msg == CRCInput::RC_green) && (showbuttons & mbNo))