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

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

Browse Source
This commit is contained in:
satbaby
2010-01-20 13:18:58 +00:00
parent a4abeb3679
commit 9a54710d40
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/infoviewer.cpp
View File

@@ -167,6 +167,8 @@ void CInfoViewer::Init()
changePB(); changePB();
pbBlinkChange = g_settings.progressbar_color; pbBlinkChange = g_settings.progressbar_color;
casysChange = g_settings.casystem_display;
channellogoChange = g_settings.infobar_show_channellogo;
/* we need to calculate this only once */ /* we need to calculate this only once */
info_time_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth("22:22") + 10; info_time_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth("22:22") + 10;
@@ -372,37 +374,18 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
pbBlinkChange = g_settings.progressbar_color; pbBlinkChange = g_settings.progressbar_color;
changePB(); changePB();
} }
//#################################################################
if (g_settings.casystem_display)
bottom_bar_offset = 22;
else
bottom_bar_offset = 0;
BoxStartX = g_settings.screen_StartX + 10; if (casysChange != g_settings.casystem_display || channellogoChange != g_settings.infobar_show_channellogo){
BoxEndX = g_settings.screen_EndX - 10; casysChange = g_settings.casystem_display;
BoxEndY = g_settings.screen_EndY - 10 - InfoHeightY_Info - bottom_bar_offset; channellogoChange = g_settings.infobar_show_channellogo;
BoxStartY = BoxEndY - InfoHeightY - ChanHeight / 2;
BBarY = BoxEndY + bottom_bar_offset; if (g_settings.casystem_display)
BBarFontY = BBarY + InfoHeightY_Info - (InfoHeightY_Info - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()) / 2; /* center in buttonbar */ bottom_bar_offset = 22;
else
/* ChanNameX gets modified in showChannelLogo(), so we initialize it in showTitle() bottom_bar_offset = 0;
ChanNameX = BoxStartX + ChanWidth + SHADOW_OFFSET; start();
*/
ChanNameY = BoxStartY + (ChanHeight / 2) + SHADOW_OFFSET; //oberkante schatten?
ChanInfoX = BoxStartX + (ChanWidth / 3);
//#################################################################
if ( g_settings.infobar_show_channellogo != 3) /* 3 is "old default" with sigscales etc. */
{
ChanWidth = 4 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getRenderWidth(widest_number) + 10;
ChanHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getHeight() * 9 / 8;
}
else
{ /* default mode, with signal bars etc. */
ChanWidth = 122;
ChanHeight = 74;
} }
ChanNameY = BoxStartY + (ChanHeight / 2) + SHADOW_OFFSET; //oberkante schatten? ChanNameY = BoxStartY + (ChanHeight / 2) + SHADOW_OFFSET; //oberkante schatten?
ChanInfoX = BoxStartX + (ChanWidth / 3); ChanInfoX = BoxStartX + (ChanWidth / 3);

3
src/gui/infoviewer.h
View File

@@ -96,7 +96,8 @@ class CInfoViewer
CProgressBar *snrscale, *sigscale, *hddscale, *varscale, *timescale; CProgressBar *snrscale, *sigscale, *hddscale, *varscale, *timescale;
bool pbBlinkChange; bool pbBlinkChange;
void changePB(); void changePB();
bool casysChange;
bool channellogoChange;
void paintBackground(int col_Numbox); void paintBackground(int col_Numbox);
void show_Data( bool calledFromEvent = false ); void show_Data( bool calledFromEvent = false );
void display_Info(const char *current, const char *next, bool UTF8 = true, void display_Info(const char *current, const char *next, bool UTF8 = true,