From 2f29b0ca415b26bc53d23649ce5850f1594950a3 Mon Sep 17 00:00:00 2001 From: satbaby Date: Thu, 29 Jul 2010 13:03:09 +0000 Subject: [PATCH] -add ca one icon git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@690 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/icons/Makefile.am | 2 +- data/icons/ca2.png | Bin 0 -> 145 bytes data/icons/ca2_gray.png | Bin 0 -> 145 bytes src/gui/infoviewer.cpp | 10 ++++------ src/gui/widget/icons.h | 2 ++ src/neutrino_menue.cpp | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 data/icons/ca2.png create mode 100644 data/icons/ca2_gray.png diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 30f9ac0f9..b24a2eaed 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -8,7 +8,7 @@ install_DATA = \ polski.png portugues.png romania.png russkij.png nederlands.png slovak.png suomi.png svenska.png \ blau.png gelb.png gruen.png rot.png \ bookmarkmanager.png border_lr.png border_ul.png \ - ca.png colors.png dbox.png dbox_small.png \ + ca.png ca2.png ca2_gray.png colors.png dbox.png dbox_small.png \ dd.png dd_avail.png dd_gray.png ddfill.png \ down.png up.png right.png left.png \ error.png features.png file.png folder.png games.png \ diff --git a/data/icons/ca2.png b/data/icons/ca2.png new file mode 100644 index 0000000000000000000000000000000000000000..d253c6e0de9563a401c00a6d86a7e6a82b2e920e GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^5FR)6*LT85B5J4$fEH9?5-yFQ=2QqgSKpPIw8A*>2~@Or9D~ pHXYubV5BF{s4e>IkKX(m^G>KsE0F*I literal 0 HcmV?d00001 diff --git a/data/icons/ca2_gray.png b/data/icons/ca2_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c1a5f8523b467022ad2e1dc0f78ab6269533c9 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^5paintProgressBar(BoxEndX - (2*icon_large_width + 2*icon_small_width + 4*2) - 102, + varscale->paintProgressBar(BoxEndX - ((g_settings.casystem_display ? 2:3)*icon_large_width + 2*icon_small_width + (g_settings.casystem_display ?4:5)*2) - 102, BBarY + InfoHeightY_Info / 2 - 2 - 6, 100, 6, per, 100); per = 0; //HD info @@ -1209,7 +1209,7 @@ void CInfoViewer::showSNR () } } - hddscale->paintProgressBar(BoxEndX - (2*icon_large_width + 2*icon_small_width + 4*2) - 102, + hddscale->paintProgressBar(BoxEndX - ((g_settings.casystem_display ? 2:3)*icon_large_width + 2*icon_small_width + (g_settings.casystem_display ?4:5)*2) - 102, BBarY + InfoHeightY_Info / 2 + 2, 100, 6, per, 100); } } @@ -1865,12 +1865,10 @@ 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 0 - frameBuffer->paintIcon(fta ? NEUTRINO_ICON_16_9_GREY : NEUTRINO_ICON_16_9,BoxEndX - (3*icon_large_width + 2*icon_small_width + 5*2), BBarY, + frameBuffer->paintIcon(fta ? NEUTRINO_ICON_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2, BoxEndX - (3*icon_large_width + 2*icon_small_width + 5*2), BBarY, InfoHeightY_Info); -#endif } void CInfoViewer::showIcon_CA_Status (int notfirst) diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 50f19620e..9bed3f520 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -109,6 +109,8 @@ #define NEUTRINO_ICON_AUTO_SHIFT "ats" #define NEUTRINO_ICON_NUMERIC_PAD "numericpad" #define NEUTRINO_ICON_SCRAMBLED "ca" +#define NEUTRINO_ICON_SCRAMBLED2 "ca2" +#define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray" #define NEUTRINO_ICON_BOOKMARK_MANAGER "bookmarkmanager" #define NEUTRINO_ICON_BORDER_UL "border_ul" #define NEUTRINO_ICON_BORDER_LR "border_lr" diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index c62f7c363..14d047cab 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2471,9 +2471,9 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo addMenueIntroItems(*miscSettingsInfobar); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - CMenuOptionChooser *ca_mode = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, &g_settings.casystem_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - CAModeNotifier* testNotifier = new CAModeNotifier( ca_mode ); - miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, testNotifier)); + CMenuOptionChooser *ca_mode = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, &g_settings.casystem_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.casystem_display); + CAModeNotifier* camodeNotifier = new CAModeNotifier( ca_mode ); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, camodeNotifier)); miscSettingsInfobar->addItem(ca_mode); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true));