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

neutrino: fix up simple resolution setup

Browse Source 
'off' does not work as expected (e.g. var/hdd bars are not shifted
accordingly), so disable this for now.
Original patch is by bazi98 btw ;)

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9099d973d6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-12-26 (Sun, 26 Dec 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-12-26 18:52:07 +00:00
parent f72e48eb9c
commit 58eb1b8dc4
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer.cpp
View File

@@ -2009,14 +2009,8 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon, int &icon_space_offset)
void CInfoViewer::showOne_CAIcon(bool fta) void CInfoViewer::showOne_CAIcon(bool fta)
{ {
if (g_settings.infobar_show_res < 2){
frameBuffer->paintIcon(fta ? NEUTRINO_ICON_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2, BoxEndX - (icon_xres_width + icon_crypt_width + 2*icon_large_width + 2*icon_small_width + 6*2), BBarY, frameBuffer->paintIcon(fta ? NEUTRINO_ICON_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2, BoxEndX - (icon_xres_width + icon_crypt_width + 2*icon_large_width + 2*icon_small_width + 6*2), BBarY,
InfoHeightY_Info); InfoHeightY_Info);
}
else if (g_settings.infobar_show_res == 2){
frameBuffer->paintIcon(fta ? NEUTRINO_ICON_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2, BoxEndX - (icon_crypt_width + 2*icon_large_width + 2*icon_small_width + 5*2), BBarY,
InfoHeightY_Info);
}
} }
void CInfoViewer::showIcon_CA_Status (int notfirst) void CInfoViewer::showIcon_CA_Status (int notfirst)

6
src/gui/osd_setup.cpp
View File

@@ -220,12 +220,12 @@ const CMenuOptionChooser::keyval MENU_DISP_POS_OPTIONS[MENU_DISP_POS_OPTIONS_CO
{ 4 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT } { 4 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT }
}; };
#define INFOBAR_SHOW_RES_MODE_OPTION_COUNT 3 #define INFOBAR_SHOW_RES_MODE_OPTION_COUNT 2
const CMenuOptionChooser::keyval INFOBAR_SHOW_RES_MODE_OPTIONS[INFOBAR_SHOW_RES_MODE_OPTION_COUNT] = const CMenuOptionChooser::keyval INFOBAR_SHOW_RES_MODE_OPTIONS[INFOBAR_SHOW_RES_MODE_OPTION_COUNT] =
{ {
{ 0, LOCALE_OPTIONS_ON }, { 0, LOCALE_OPTIONS_ON },
{ 1, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE }, { 1, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE }
{ 2, LOCALE_OPTIONS_OFF } // { 2, LOCALE_OPTIONS_OFF } // OFF does not really work correctly yet (var/hdd bars not shifted etc)
}; };