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

- move new colored events menu point from general osd settings to infobar settings as this is a more appropriate place

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1663 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
striper
2011-09-04 15:57:48 +00:00
parent d93630be48
commit 4bcf630afd
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/locale/deutsch.locale
View File

@@ -336,10 +336,6 @@ extra.cache_txt Teletext zwischenspeichern
extra.chadded Der aktuelle Kanal wird dem selektierten Bouquet hinzugefügt...\n extra.chadded Der aktuelle Kanal wird dem selektierten Bouquet hinzugefügt...\n
extra.chalreadyinbq Der aktuelle Kanal ist bereits im selektierten Bouquet...\n extra.chalreadyinbq Der aktuelle Kanal ist bereits im selektierten Bouquet...\n
extra.clear_log Logdatei löschen extra.clear_log Logdatei löschen
extra.colored_events Sendung farbig
extra.colored_events_0 keine
extra.colored_events_1 aktuelle
extra.colored_events_2 nächste
extra.dboxinfo Box-Info extra.dboxinfo Box-Info
extra.east Osten extra.east Osten
extra.fec_1_2 1/2 S1_QPSK extra.fec_1_2 1/2 S1_QPSK
@@ -755,6 +751,10 @@ miscsettings.infobar Infobar
miscsettings.infobar_casystem_display CA-System Anzeige miscsettings.infobar_casystem_display CA-System Anzeige
miscsettings.infobar_casystem_mini Mini miscsettings.infobar_casystem_mini Mini
miscsettings.infobar_casystem_mode Diskret miscsettings.infobar_casystem_mode Diskret
miscsettings.infobar_colored_events Sendung farbig
miscsettings.infobar_colored_events_0 keine
miscsettings.infobar_colored_events_1 aktuelle
miscsettings.infobar_colored_events_2 nächste
miscsettings.infobar_disp_0 Kein Logo miscsettings.infobar_disp_0 Kein Logo
miscsettings.infobar_disp_1 Logo in der Nummernbox miscsettings.infobar_disp_1 Logo in der Nummernbox
miscsettings.infobar_disp_2 Logo/Kanalnummer miscsettings.infobar_disp_2 Logo/Kanalnummer

8
data/locale/english.locale
View File

@@ -336,10 +336,6 @@ extra.cache_txt Cache teletext
extra.chadded The current channel has been added to selected bouquet....\n extra.chadded The current channel has been added to selected bouquet....\n
extra.chalreadyinbq The current channel is already in selected bouquet....\n extra.chalreadyinbq The current channel is already in selected bouquet....\n
extra.clear_log Clear Log extra.clear_log Clear Log
extra.colored_events Program colored
extra.colored_events_0 none
extra.colored_events_1 current
extra.colored_events_2 next
extra.dboxinfo Box Info extra.dboxinfo Box Info
extra.east East extra.east East
extra.fec_1_2 1/2 extra.fec_1_2 1/2
@@ -755,6 +751,10 @@ miscsettings.infobar Infobar
miscsettings.infobar_casystem_display CA-System Display miscsettings.infobar_casystem_display CA-System Display
miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mini mini
miscsettings.infobar_casystem_mode discreet miscsettings.infobar_casystem_mode discreet
miscsettings.infobar_colored_events Program colored
miscsettings.infobar_colored_events_0 none
miscsettings.infobar_colored_events_1 current
miscsettings.infobar_colored_events_2 next
miscsettings.infobar_disp_0 without Logo miscsettings.infobar_disp_0 without Logo
miscsettings.infobar_disp_1 Logo 1 miscsettings.infobar_disp_1 Logo 1
miscsettings.infobar_disp_2 Logo 2 miscsettings.infobar_disp_2 Logo 2

10
src/gui/osd_setup.cpp
View File

@@ -264,9 +264,9 @@ const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS[CHANNE
#define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3 #define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3
const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] = const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] =
{ {
{ 0, LOCALE_EXTRA_COLORED_EVENTS_0 }, //none { 0, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_0 }, //none
{ 1, LOCALE_EXTRA_COLORED_EVENTS_1 }, //current { 1, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_1 }, //current
{ 2, LOCALE_EXTRA_COLORED_EVENTS_2 }, //next { 2, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_2 }, //next
}; };
@@ -326,7 +326,6 @@ void COsdSetup::showOsdSetup()
osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_FADE, &g_settings.widget_fade, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true )); osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_FADE, &g_settings.widget_fade, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ));
osd_menu->addItem(new CMenuOptionChooser(LOCALE_EXTRA_BIGWINDOWS, &g_settings.big_windows, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); osd_menu->addItem(new CMenuOptionChooser(LOCALE_EXTRA_BIGWINDOWS, &g_settings.big_windows, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
osd_menu->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); osd_menu->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
osd_menu->addItem(new CMenuOptionChooser(LOCALE_EXTRA_COLORED_EVENTS, &g_settings.colored_events, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true));
osd_menu->exec(NULL, ""); osd_menu->exec(NULL, "");
osd_menu->hide(); osd_menu->hide();
@@ -383,7 +382,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.colored_events_red, CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.colored_events_red,
&g_settings.colored_events_green, &g_settings.colored_events_blue, NULL, colorSetupNotifier); &g_settings.colored_events_green, &g_settings.colored_events_blue, NULL, colorSetupNotifier);
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_EXTRA_COLORED_EVENTS)); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS));
menu_colors->addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events )); menu_colors->addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events ));
} }
@@ -592,6 +591,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD, &g_settings.infobar_show_var_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_VAR_HDD, &g_settings.infobar_show_var_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true));
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true));
// radiotextNotifier = new CRadiotextNotifier(); // radiotextNotifier = new CRadiotextNotifier();
// menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, radiotextNotifier)); // menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, radiotextNotifier));
} }

8
src/system/locals.h
View File

@@ -363,10 +363,6 @@ typedef enum
LOCALE_EXTRA_CHADDED, LOCALE_EXTRA_CHADDED,
LOCALE_EXTRA_CHALREADYINBQ, LOCALE_EXTRA_CHALREADYINBQ,
LOCALE_EXTRA_CLEAR_LOG, LOCALE_EXTRA_CLEAR_LOG,
LOCALE_EXTRA_COLORED_EVENTS,
LOCALE_EXTRA_COLORED_EVENTS_0,
LOCALE_EXTRA_COLORED_EVENTS_1,
LOCALE_EXTRA_COLORED_EVENTS_2,
LOCALE_EXTRA_DBOXINFO, LOCALE_EXTRA_DBOXINFO,
LOCALE_EXTRA_EAST, LOCALE_EXTRA_EAST,
LOCALE_EXTRA_FEC_1_2, LOCALE_EXTRA_FEC_1_2,
@@ -782,6 +778,10 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY,
LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI,
LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_0,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_1,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_2,
LOCALE_MISCSETTINGS_INFOBAR_DISP_0, LOCALE_MISCSETTINGS_INFOBAR_DISP_0,
LOCALE_MISCSETTINGS_INFOBAR_DISP_1, LOCALE_MISCSETTINGS_INFOBAR_DISP_1,
LOCALE_MISCSETTINGS_INFOBAR_DISP_2, LOCALE_MISCSETTINGS_INFOBAR_DISP_2,

8
src/system/locals_intern.h
View File

@@ -363,10 +363,6 @@ const char * locale_real_names[] =
"extra.chadded", "extra.chadded",
"extra.chalreadyinbq", "extra.chalreadyinbq",
"extra.clear_log", "extra.clear_log",
"extra.colored_events",
"extra.colored_events_0",
"extra.colored_events_1",
"extra.colored_events_2",
"extra.dboxinfo", "extra.dboxinfo",
"extra.east", "extra.east",
"extra.fec_1_2", "extra.fec_1_2",
@@ -782,6 +778,10 @@ const char * locale_real_names[] =
"miscsettings.infobar_casystem_display", "miscsettings.infobar_casystem_display",
"miscsettings.infobar_casystem_mini", "miscsettings.infobar_casystem_mini",
"miscsettings.infobar_casystem_mode", "miscsettings.infobar_casystem_mode",
"miscsettings.infobar_colored_events",
"miscsettings.infobar_colored_events_0",
"miscsettings.infobar_colored_events_1",
"miscsettings.infobar_colored_events_2",
"miscsettings.infobar_disp_0", "miscsettings.infobar_disp_0",
"miscsettings.infobar_disp_1", "miscsettings.infobar_disp_1",
"miscsettings.infobar_disp_2", "miscsettings.infobar_disp_2",