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

fix shutdown for neo

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c973dfdd5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-08-13 (Fri, 13 Aug 2010)

Origin message was:
------------------
-fix shutdown for neo

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


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-08-13 10:07:38 +00:00
parent 79bc5c17b3
commit d30e06ce00
6 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/epgplus.cpp
View File

@@ -125,6 +125,10 @@ void EpgPlus::Header::paint(const char * Name)
this->font->RenderString (this->x + 10, this->y + this->font->getHeight(),
this->width - 20, head, COL_MENUHEAD, 0, true);
//this->width - 20, g_Locale->getText (LOCALE_EPGPLUS_HEAD) , COL_MENUHEAD, 0, true);
int icol_w, icol_h;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h);
this->frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_HELP, this->x + this->width - icol_w - RADIUS_LARGE - 10, this->y, icol_h);
}
int EpgPlus::Header::getUsedHeight()
@@ -501,7 +505,7 @@ struct button_label buttonLabels[] = {
void EpgPlus::Footer::paintButtons (button_label * pbuttonLabels, int numberOfButtons)
{
int buttonWidth = (this->width - 20) / 4;
int buttonWidth = (this->width - RADIUS_LARGE) / 4;
int yPos = this->y + this->getUsedHeight();
this->frameBuffer->paintBoxRel (this->x, yPos, this->width, buttonHeight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
@@ -509,9 +513,6 @@ void EpgPlus::Footer::paintButtons (button_label * pbuttonLabels, int numberOfBu
::paintButtons (this->frameBuffer, this->fontButtons, g_Locale, this->x + 10,
yPos, buttonWidth, buttonHeight, numberOfButtons, pbuttonLabels);
int icol_w, icol_h;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h);
this->frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_HELP, this->x + this->width - icol_w - 10, yPos, buttonHeight);
}
EpgPlus::EpgPlus()
@@ -652,8 +653,8 @@ void EpgPlus::init()
currentViewMode = ViewMode_Scroll;
currentSwapMode = SwapMode_ByPage;
#endif
usableScreenWidth = w_max (g_settings.screen_EndX, 4);
usableScreenHeight = h_max (g_settings.screen_EndY, 4);
usableScreenWidth = w_max (g_settings.screen_EndX, 0);
usableScreenHeight = h_max (g_settings.screen_EndY, 0);
std::string FileName = std::string (g_settings.font_file);
for (size_t i = 0; i < NumberOfFontSettings; ++i) {
int size = fontSettingTable[i].size;

5
src/gui/widget/progresswindow.cpp
View File

@@ -43,7 +43,8 @@ CProgressWindow::CProgressWindow()
frameBuffer = CFrameBuffer::getInstance();
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
width = w_max (420, 0);
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getWidth();
width = w_max (32*fw, 0);
height = h_max(hheight+5*mheight, 20);
global_progress = local_progress = 101;
@@ -145,7 +146,7 @@ void CProgressWindow::paint()
int ypos=y;
frameBuffer->paintBoxRel(x, ypos, width, hheight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);
if (caption != NONEXISTANT_LOCALE)
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10, ypos+ hheight, width- 10, g_Locale->getText(caption), COL_MENUHEAD, 0, true); // UTF-8
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10, ypos+ hheight, width - 10, g_Locale->getText(caption), COL_MENUHEAD, 0, true); // UTF-8
frameBuffer->paintBoxRel(x, ypos+ hheight, width, height- hheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
ypos+= hheight + (mheight >>1);