diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 24eeb6ed4..cf5702490 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1138,11 +1138,6 @@ miscsettings.infobar_disp_5 Logo/Signalbalken miscsettings.infobar_disp_6 Logo+Kanalnummer/Signalbalken miscsettings.infobar_disp_log Logo miscsettings.infobar_logo_hdd_dir Logo-Verz. -miscsettings.infobar_progressbar Fortschrittsbalken Opt. -miscsettings.infobar_progressbar_0 Standard -miscsettings.infobar_progressbar_1 unterhalb Kanalname -miscsettings.infobar_progressbar_2 unterhalb Kanalname (schmal) -miscsettings.infobar_progressbar_3 zwischen EPG-Events (schmal) miscsettings.infobar_sat_display Kabel-/Satellitenanbieter miscsettings.infobar_show Info bei EPG Änderungen miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen @@ -1150,6 +1145,20 @@ miscsettings.infobar_show_res Auflösung anzeigen miscsettings.infobar_show_res_simple einfach miscsettings.infobar_show_sysfs_hdd Füllstandanzeige (sysFS & hdd) miscsettings.infobar_show_tuner Aktiven Tuner anzeigen +miscsettings.progressbar Fortschrittsbalken +miscsettings.progressbar_color Farbe +miscsettings.progressbar_design Design +miscsettings.progressbar_design_0 farbige Punkte +miscsettings.progressbar_design_1 farbige vertikale Linien +miscsettings.progressbar_design_2 farbige horizontale Linien +miscsettings.progressbar_design_3 Farbverlauf +miscsettings.progressbar_design_4 monochrom +miscsettings.progressbar_design_long Progressbardesign +miscsettings.progressbar_infobar_position Position +miscsettings.progressbar_infobar_position_0 Standard +miscsettings.progressbar_infobar_position_1 unterhalb Kanalname +miscsettings.progressbar_infobar_position_2 unterhalb Kanalname (schmal) +miscsettings.progressbar_infobar_position_3 zwischen EPG-Events (schmal) miscsettings.radiotext Radiotext miscsettings.shutdown_count Komplett ausschalten nach miscsettings.shutdown_count_hint1 Zeit (in Minuten), nach der vom Standby in @@ -1503,12 +1512,6 @@ pinprotection.head PIN-Abfrage pinprotection.wrongcode Geben Sie den Code nocheinmal ein! plugins.hdd_dir Externes Plugin-Verz. plugins.result Pluginausgabe -progressbar.color Fortschrittsbalkendesign -progressbar.color.full farbig -progressbar.color.horizontal farbige horizontale Linien -progressbar.color.matrix farbige Punkte -progressbar.color.mono monochrom -progressbar.color.vertical farbige vertikale Linien rclock.lockmsg Die Fernbedienung wird gesperrt.\n Um die Sperre aufzuheben, bitte\n und auf der Fernbedienung\n drücken. rclock.menueadd FB sperren rclock.title Fernbedienung sperren diff --git a/data/locale/english.locale b/data/locale/english.locale index 8c6b900c6..96a2fe23b 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1138,11 +1138,6 @@ miscsettings.infobar_disp_5 Logo+signal miscsettings.infobar_disp_6 Logo+channel number+signal miscsettings.infobar_disp_log Logo miscsettings.infobar_logo_hdd_dir Logo dir -miscsettings.infobar_progressbar progressbar options -miscsettings.infobar_progressbar_0 standard -miscsettings.infobar_progressbar_1 below channel name -miscsettings.infobar_progressbar_2 small below channel name -miscsettings.infobar_progressbar_3 narrow between EPG-Events miscsettings.infobar_sat_display Satellite display on infobar miscsettings.infobar_show show Info on EPG change miscsettings.infobar_show_dd_available show DD availability @@ -1150,6 +1145,20 @@ miscsettings.infobar_show_res show resolution on infobar miscsettings.infobar_show_res_simple simple miscsettings.infobar_show_sysfs_hdd Fill level (sysFS & hdd) miscsettings.infobar_show_tuner Display active tuner +miscsettings.progressbar Progressbar +miscsettings.progressbar_color Color +miscsettings.progressbar_design Design +miscsettings.progressbar_design_0 colored points +miscsettings.progressbar_design_1 colored vertical lines +miscsettings.progressbar_design_2 colored horizontal lines +miscsettings.progressbar_design_3 colored bar +miscsettings.progressbar_design_4 monochrome +miscsettings.progressbar_design_long Progressbardesign +miscsettings.progressbar_infobar_position Position +miscsettings.progressbar_infobar_position_0 standard +miscsettings.progressbar_infobar_position_1 below channel name +miscsettings.progressbar_infobar_position_2 small below channel name +miscsettings.progressbar_infobar_position_3 narrow between EPG-Events miscsettings.radiotext Radiotext miscsettings.shutdown_count In standby, switch off after miscsettings.shutdown_count_hint1 time (in minutes) to switch from standby @@ -1503,12 +1512,6 @@ pinprotection.head Enter PIN code pinprotection.wrongcode PIN-Code was wrong! Try again. plugins.hdd_dir Plugin HDD dir. plugins.result plugin output -progressbar.color Progressbardesign -progressbar.color.full colored -progressbar.color.horizontal colored horizontal lines -progressbar.color.matrix colored dots -progressbar.color.mono monochrome -progressbar.color.vertical colored vertical lines rclock.lockmsg Your box remote control will be locked.\n To unlock it, press \n and on your remote control. rclock.menueadd Lock RC rclock.title Lock Remote Control diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 333549647..b971f5aeb 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -389,6 +389,13 @@ const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_ { 2, LOCALE_MISCSETTINGS_COLORED_EVENTS_2 }, //next }; +/* these are more descriptive... */ +#define LOCALE_PROGRESSBAR_COLOR_MATRIX LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0 +#define LOCALE_PROGRESSBAR_COLOR_VERTICAL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1 +#define LOCALE_PROGRESSBAR_COLOR_HORIZONTAL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2 +#define LOCALE_PROGRESSBAR_COLOR_FULL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3 +#define LOCALE_PROGRESSBAR_COLOR_MONO LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4 + #define PROGRESSBAR_COLOR_OPTION_COUNT 5 const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPTION_COUNT] = { @@ -523,7 +530,7 @@ int COsdSetup::showOsdSetup() // color progress bar int pb_color = g_settings.progressbar_color ? g_settings.progressbar_design : -1; - mc = new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &pb_color, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true); + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, &pb_color, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR); osd_menu->addItem(mc); @@ -752,10 +759,10 @@ const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS[LOCAL #define LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT 4 const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT]= { - { 0 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_0 }, - { 1 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_1 }, - { 2 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_2 }, - { 3 , LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_3 } + { 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 }, + { 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 }, + { 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 }, + { 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 } }; //infobar @@ -786,7 +793,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) menu_infobar->addItem(mc); // infobar progress - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR, &g_settings.infobar_progressbar, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT, true); + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR, &g_settings.infobar_progressbar, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR); menu_infobar->addItem(mc); diff --git a/src/system/locals.h b/src/system/locals.h index 31f595c54..503258966 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1165,11 +1165,6 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_DISP_6, LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, - LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR, - LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_0, - LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_1, - LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_2, - LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_3, LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_SHOW, LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, @@ -1177,6 +1172,20 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE, LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, + LOCALE_MISCSETTINGS_PROGRESSBAR, + LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4, + LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, + LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, + LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0, + LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1, + LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2, + LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3, LOCALE_MISCSETTINGS_RADIOTEXT, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1, @@ -1530,12 +1539,6 @@ typedef enum LOCALE_PINPROTECTION_WRONGCODE, LOCALE_PLUGINS_HDD_DIR, LOCALE_PLUGINS_RESULT, - LOCALE_PROGRESSBAR_COLOR, - LOCALE_PROGRESSBAR_COLOR_FULL, - LOCALE_PROGRESSBAR_COLOR_HORIZONTAL, - LOCALE_PROGRESSBAR_COLOR_MATRIX, - LOCALE_PROGRESSBAR_COLOR_MONO, - LOCALE_PROGRESSBAR_COLOR_VERTICAL, LOCALE_RCLOCK_LOCKMSG, LOCALE_RCLOCK_MENUEADD, LOCALE_RCLOCK_TITLE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 7785bb060..375a3f834 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1165,11 +1165,6 @@ const char * locale_real_names[] = "miscsettings.infobar_disp_6", "miscsettings.infobar_disp_log", "miscsettings.infobar_logo_hdd_dir", - "miscsettings.infobar_progressbar", - "miscsettings.infobar_progressbar_0", - "miscsettings.infobar_progressbar_1", - "miscsettings.infobar_progressbar_2", - "miscsettings.infobar_progressbar_3", "miscsettings.infobar_sat_display", "miscsettings.infobar_show", "miscsettings.infobar_show_dd_available", @@ -1177,6 +1172,20 @@ const char * locale_real_names[] = "miscsettings.infobar_show_res_simple", "miscsettings.infobar_show_sysfs_hdd", "miscsettings.infobar_show_tuner", + "miscsettings.progressbar", + "miscsettings.progressbar_color", + "miscsettings.progressbar_design", + "miscsettings.progressbar_design_0", + "miscsettings.progressbar_design_1", + "miscsettings.progressbar_design_2", + "miscsettings.progressbar_design_3", + "miscsettings.progressbar_design_4", + "miscsettings.progressbar_design_long", + "miscsettings.progressbar_infobar_position", + "miscsettings.progressbar_infobar_position_0", + "miscsettings.progressbar_infobar_position_1", + "miscsettings.progressbar_infobar_position_2", + "miscsettings.progressbar_infobar_position_3", "miscsettings.radiotext", "miscsettings.shutdown_count", "miscsettings.shutdown_count_hint1", @@ -1530,12 +1539,6 @@ const char * locale_real_names[] = "pinprotection.wrongcode", "plugins.hdd_dir", "plugins.result", - "progressbar.color", - "progressbar.color.full", - "progressbar.color.horizontal", - "progressbar.color.matrix", - "progressbar.color.mono", - "progressbar.color.vertical", "rclock.lockmsg", "rclock.menueadd", "rclock.title",