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

-add ca one icon

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@690 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-07-29 13:03:09 +00:00
parent adde01fe2e
commit 2f29b0ca41
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/icons/Makefile.am
View File

@@ -8,7 +8,7 @@ install_DATA = \
polski.png portugues.png romania.png russkij.png nederlands.png slovak.png suomi.png svenska.png \ polski.png portugues.png romania.png russkij.png nederlands.png slovak.png suomi.png svenska.png \
blau.png gelb.png gruen.png rot.png \ blau.png gelb.png gruen.png rot.png \
bookmarkmanager.png border_lr.png border_ul.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 \ dd.png dd_avail.png dd_gray.png ddfill.png \
down.png up.png right.png left.png \ down.png up.png right.png left.png \
error.png features.png file.png folder.png games.png \ error.png features.png file.png folder.png games.png \

BIN
data/icons/ca2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 B

BIN
data/icons/ca2_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 B

10
src/gui/infoviewer.cpp
View File

@@ -1186,7 +1186,7 @@ void CInfoViewer::showSNR ()
/* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle, /* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle,
scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between
the scales */ the scales */
varscale->paintProgressBar(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); BBarY + InfoHeightY_Info / 2 - 2 - 6, 100, 6, per, 100);
per = 0; per = 0;
//HD info //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); 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_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2, BoxEndX - (3*icon_large_width + 2*icon_small_width + 5*2), BBarY,
frameBuffer->paintIcon(fta ? NEUTRINO_ICON_16_9_GREY : NEUTRINO_ICON_16_9,BoxEndX - (3*icon_large_width + 2*icon_small_width + 5*2), BBarY,
InfoHeightY_Info); InfoHeightY_Info);
#endif
} }
void CInfoViewer::showIcon_CA_Status (int notfirst) void CInfoViewer::showIcon_CA_Status (int notfirst)

2
src/gui/widget/icons.h
View File

@@ -109,6 +109,8 @@
#define NEUTRINO_ICON_AUTO_SHIFT "ats" #define NEUTRINO_ICON_AUTO_SHIFT "ats"
#define NEUTRINO_ICON_NUMERIC_PAD "numericpad" #define NEUTRINO_ICON_NUMERIC_PAD "numericpad"
#define NEUTRINO_ICON_SCRAMBLED "ca" #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_BOOKMARK_MANAGER "bookmarkmanager"
#define NEUTRINO_ICON_BORDER_UL "border_ul" #define NEUTRINO_ICON_BORDER_UL "border_ul"
#define NEUTRINO_ICON_BORDER_LR "border_lr" #define NEUTRINO_ICON_BORDER_LR "border_lr"

6
src/neutrino_menue.cpp
View File

@@ -2471,9 +2471,9 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo
addMenueIntroItems(*miscSettingsInfobar); addMenueIntroItems(*miscSettingsInfobar);
miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); 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); 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* testNotifier = new CAModeNotifier( ca_mode ); 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, testNotifier)); 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(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)); 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));