From 9099d973d6587fb7adc249c7da2fb0e8e80c8d58 Mon Sep 17 00:00:00 2001 From: seife Date: Sun, 26 Dec 2010 18:52:07 +0000 Subject: [PATCH] neutrino: fix up simple resolution setup '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 --- src/gui/infoviewer.cpp | 6 ------ src/gui/osd_setup.cpp | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 147839ef2..f4a8661ab 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -2009,14 +2009,8 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon, int &icon_space_offset) 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, 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) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index fa7f7238d..0ffd81d7d 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -220,12 +220,12 @@ const CMenuOptionChooser::keyval MENU_DISP_POS_OPTIONS[MENU_DISP_POS_OPTIONS_CO { 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] = { { 0, LOCALE_OPTIONS_ON }, - { 1, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE }, - { 2, LOCALE_OPTIONS_OFF } + { 1, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE } +// { 2, LOCALE_OPTIONS_OFF } // OFF does not really work correctly yet (var/hdd bars not shifted etc) };