diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 657a0c8b0..8cae50f89 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -854,24 +854,22 @@ fsk.to_12 bis 12 fsk.to_16 bis 16 fsk.to_7 bis 7 glcd.align_center zentriert -glcd.align_channel Sendername ausrichten -glcd.align_duration Sendungsdauer ausrichten -glcd.align_end Sendungsende ausrichten -glcd.align_epg EPG ausrichten glcd.align_left links glcd.align_none keine glcd.align_right rechts -glcd.align_start Sendungsstart ausrichten -glcd.align_time Uhrzeit ausrichten glcd.background Hintergrundbild -glcd.bar_width Fortschrittsbalken Weite -glcd.bar_x_position Fortschrittsbalken x-Position -glcd.bar_y_position Fortschrittsbalken y-Position glcd.brightness Helligkeit -glcd.brightness_standby Helligkeit im Standby-Modus glcd.brightness_dim Dimmen glcd.brightness_dim_time Dimmen nach glcd.brightness_settings Helligkeit +glcd.brightness_standby Helligkeit im Standby-Modus +glcd.channel_align Sendername ausrichten +glcd.channel_size Sendername Höhe +glcd.channel_x_position Sendername x-Position +glcd.channel_y_position Sendername y-Position +glcd.clock_digital_y_position Digitaluhr y-Position +glcd.clock_simple_size Einfache Uhr Höhe +glcd.clock_simple_y_position Einfache Uhr y-Position glcd.color.amber Amber glcd.color.black Schwarz glcd.color.blue Blau @@ -893,15 +891,22 @@ glcd.color.red Rot glcd.color.teal Teal glcd.color.white Weiß glcd.color.yellow Gelb -glcd.channel_x_position Sendername x-Position -glcd.channel_y_position Sendername y-Position -glcd.digital_clock_y_position Digitaluhr y-Position +glcd.color_bg Hintergrundfarbe +glcd.color_fg Textfarbe glcd.display Display-Typ +glcd.duration_align Sendungsdauer ausrichten +glcd.duration_show Sendungsdauer anzeigen +glcd.duration_size Sendungsdauer Höhe glcd.duration_x_position Sendungsdauer x-Position glcd.duration_y_position Sendungsdauer y-Position glcd.enable GraphLCD aktiv +glcd.end_align Sendungsende ausrichten +glcd.end_show Sendungsende anzeigen +glcd.end_size Sendungsende Höhe glcd.end_x_position Sendungsende x-Position glcd.end_y_position Sendungsende y-Position +glcd.epg_align EPG ausrichten +glcd.epg_size EPG Höhe glcd.epg_x_position EPG x-Position glcd.epg_y_position EPG y-Position glcd.font Schrift @@ -917,59 +922,54 @@ glcd.icon_ts_x_position Icon Timeshift x-Position glcd.icon_txt_x_position Icon Radiotext x-Position glcd.icon_y_percent Icons Höhe glcd.icon_y_position Icons y-Position -glcd.logodir Senderlogo-Verzeichnis +glcd.logo_show Senderlogo anzeigen +glcd.logo_size Senderlogo max. Höhe % +glcd.logo_width Senderlogo max. Breite % glcd.logo_x_position Senderlogo x-Position glcd.logo_y_position Senderlogo y-Position +glcd.logodir Senderlogo-Verzeichnis glcd.mirror_osd OSD-Menü auf GraphLCD anzeigen glcd.mirror_video Videobild auf GraphLCD anzeigen glcd.position_settings Positionen und Größen +glcd.progressbar_color Fortschrittsbalken Farbe +glcd.progressbar_show Fortschrittsbalken anzeigen +glcd.progressbar_size Fortschrittsbalken Höhe +glcd.progressbar_width Fortschrittsbalken Weite +glcd.progressbar_x_position Fortschrittsbalken x-Position +glcd.progressbar_y_position Fortschrittsbalken y-Position glcd.restart Neu erkennen glcd.scroll_speed Scroll-Geschwindigkeit -glcd.select.bar Fortschrittsbalkenfarbe -glcd.select.bg Hintergrundfarbe -glcd.select.fg Textfarbe -glcd.show_duration Sendungsdauer anzeigen -glcd.show_end Sendungsende anzeigen -glcd.show_logo Senderlogo anzeigen -glcd.show_progressbar Fortschrittsbalken anzeigen -glcd.show_start Sendungsstart anzeigen -glcd.show_time Uhrzeit anzeigen -glcd.show_weather Wetter anzeigen -glcd.simple_clock_y_position Einfache Uhr y-Position -glcd.size_bar Fortschrittsbalken Höhe -glcd.size_channel Sendername Höhe -glcd.size_duration Sendungsdauer Höhe -glcd.size_end Sendungsende Höhe -glcd.size_epg EPG Höhe -glcd.size_logo Senderlogo max. Höhe % -glcd.size_simple_clock Einfache Uhr Höhe -glcd.size_start Sendungsstart Höhe -glcd.size_time Uhrzeit Höhe -glcd.size_time_standby Uhrzeit Höhe im Standby -glcd.theme Theme auswählen -glcd.theme_settings Themes -glcd.standby_analog_clock Analoge Uhr -glcd.standby_digital_clock Digitale Uhr -glcd.standby_lcd_clock LCD-Uhr -glcd.standby_led_clock LED-Uhr +glcd.standby_clock Zeitanzeige im Standby +glcd.standby_clock_analog Analoge Uhr +glcd.standby_clock_digital Digitale Uhr +glcd.standby_clock_lcd LCD-Uhr +glcd.standby_clock_led LED-Uhr +glcd.standby_clock_simple Einfache Uhr glcd.standby_settings Standby-Einstellungen -glcd.standby_simple_clock Einfache Uhr glcd.standby_weather Wetter im Standby -glcd.standby_weather_percent Wetter Höhe glcd.standby_weather_curr_x_position Wetter im Standby heute x-Position glcd.standby_weather_next_x_position Wetter im Standby morgen x-Position +glcd.standby_weather_percent Wetter Höhe glcd.standby_weather_y_position Wetter im Standby y-Position +glcd.start_align Sendungsstart ausrichten +glcd.start_show Sendungsstart anzeigen +glcd.start_size Sendungsstart Höhe glcd.start_x_position Sendungsstart x-Position glcd.start_y_position Sendungsstart y-Position -glcd.time_in_standby Zeitanzeige im Standby +glcd.theme Theme auswählen +glcd.theme_settings Themes +glcd.time_align Uhrzeit ausrichten +glcd.time_show Uhrzeit anzeigen +glcd.time_size Uhrzeit Höhe +glcd.time_size_standby Uhrzeit Höhe im Standby glcd.time_x_position Uhrzeit x-Position glcd.time_y_position Uhrzeit y-Position glcd.volume Lautstärke -glcd.weather_percent Wetter Höhe glcd.weather_curr_x_position Wetter heute x-Position glcd.weather_next_x_position Wetter morgen x-Position +glcd.weather_percent Wetter Höhe +glcd.weather_show Wetter anzeigen glcd.weather_y_position Wetter y-Position -glcd.width_logo Senderlogo max. Breite % hdd_10min 10 min. hdd_1min 1 min. hdd_20min 20 min. diff --git a/data/locale/english.locale b/data/locale/english.locale index e55beb0e9..4257da2d8 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -854,24 +854,22 @@ fsk.to_12 to 12 fsk.to_16 to 16 fsk.to_7 to 7 glcd.align_center centered -glcd.align_channel Channel arrangement -glcd.align_duration Event duration arrangement -glcd.align_end Event end arrangement -glcd.align_epg EPG arrangement glcd.align_left left glcd.align_none none glcd.align_right right -glcd.align_start Event start arrangement -glcd.align_time Time arrangement glcd.background BG Picture -glcd.bar_width Progress bar width -glcd.bar_x_position Progress bar x-position -glcd.bar_y_position Progress bar y-position glcd.brightness Brightness -glcd.brightness_standby Brightness standby glcd.brightness_dim Dim glcd.brightness_dim_time Dim timeout glcd.brightness_settings Brightness +glcd.brightness_standby Brightness standby +glcd.channel_align Channel arrangement +glcd.channel_size Channel height +glcd.channel_x_position Channel x-position +glcd.channel_y_position Channel y-position +glcd.clock_digital_y_position Digital clock y-position +glcd.clock_simple_size Simple clock height +glcd.clock_simple_y_position Simple clock y-position glcd.color.amber Amber glcd.color.black Black glcd.color.blue Blue @@ -893,15 +891,22 @@ glcd.color.red Red glcd.color.teal Teal glcd.color.white White glcd.color.yellow Yellow -glcd.channel_x_position Channel x-position -glcd.channel_y_position Channel y-position -glcd.digital_clock_y_position Digital clock y-position +glcd.color_bg Background color +glcd.color_fg Text color glcd.display Display-type +glcd.duration_align Event duration arrangement +glcd.duration_show Event duration display +glcd.duration_size Event duration height glcd.duration_x_position Event duration x-position glcd.duration_y_position Event duration y-position glcd.enable GraphLCD active +glcd.end_align Event end arrangement +glcd.end_show Event end display +glcd.end_size Event end height glcd.end_x_position Event end x-position glcd.end_y_position Event end y-position +glcd.epg_align EPG arrangement +glcd.epg_size EPG height glcd.epg_x_position EPG x-position glcd.epg_y_position EPG y-position glcd.font Font @@ -917,59 +922,54 @@ glcd.icon_ts_x_position Icon Timeshift x-position glcd.icon_txt_x_position Icon Radiotext x-position glcd.icon_y_percent Icons height glcd.icon_y_position Icons y-position -glcd.logodir Channel logo directory +glcd.logo_show Channel logo display +glcd.logo_size Channel logo max. height % +glcd.logo_width Channel logo max. width % glcd.logo_x_position Channel logo x-position glcd.logo_y_position Channel logo y-position +glcd.logodir Channel logo directory glcd.mirror_osd Show OSD-menu on GraphLCD glcd.mirror_video Show video on GraphLCD glcd.position_settings Positions and dimensions +glcd.progressbar_color Progress bar color +glcd.progressbar_show Progress bar display +glcd.progressbar_size Progress bar height +glcd.progressbar_width Progress bar width +glcd.progressbar_x_position Progress bar x-position +glcd.progressbar_y_position Progress bar y-position glcd.restart Restart glcd.scroll_speed Scroll speed -glcd.select.bar Progress bar color -glcd.select.bg Background color -glcd.select.fg Text color -glcd.show_duration Event duration display -glcd.show_end Event end display -glcd.show_logo Channel logo display -glcd.show_progressbar Progress bar display -glcd.show_start Event start display -glcd.show_time Time display -glcd.show_weather Weather display -glcd.simple_clock_y_position Simple clock y-position -glcd.size_bar Progress bar height -glcd.size_channel Channel height -glcd.size_duration Event duration height -glcd.size_end Event end height -glcd.size_epg EPG height -glcd.size_logo Channel logo max. height % -glcd.size_simple_clock Simple clock height -glcd.size_start Event start height -glcd.size_time Time height -glcd.size_time_standby Standby time height -glcd.theme Select theme -glcd.theme_settings Themes -glcd.standby_analog_clock Analog clock -glcd.standby_digital_clock Digital clock -glcd.standby_lcd_clock LCD-clock -glcd.standby_led_clock LED-clock +glcd.standby_clock Time display in standby mode +glcd.standby_clock_analog Analog clock +glcd.standby_clock_digital Digital clock +glcd.standby_clock_lcd LCD-clock +glcd.standby_clock_led LED-clock +glcd.standby_clock_simple Simple clock glcd.standby_settings Standby-settings -glcd.standby_simple_clock Simple clock glcd.standby_weather Weather in standby mode -glcd.standby_weather_percent Weather height glcd.standby_weather_curr_x_position Weather in standby mode current x-position glcd.standby_weather_next_x_position Weather in standby mode next x-position +glcd.standby_weather_percent Weather height glcd.standby_weather_y_position Weather in standby mode y-position +glcd.start_align Event start arrangement +glcd.start_show Event start display +glcd.start_size Event start height glcd.start_x_position Event start x-position glcd.start_y_position Event start y-position -glcd.time_in_standby Time display in standby mode +glcd.theme Select theme +glcd.theme_settings Themes +glcd.time_align Time arrangement +glcd.time_show Time display +glcd.time_size Time height +glcd.time_size_standby Standby time height glcd.time_x_position Time x-position glcd.time_y_position Time y-position glcd.volume Volume -glcd.weather_percent Weather height glcd.weather_curr_x_position Weather current x-position glcd.weather_next_x_position Weather next x-position +glcd.weather_percent Weather height +glcd.weather_show Weather display glcd.weather_y_position Weather y-position -glcd.width_logo Channel logo max. width % hdd_10min 10 min. hdd_1min 1 min. hdd_20min 20 min. diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 65a1b36ef..5e4177f5f 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -846,6 +846,102 @@ fsk.from_7 od 7 fsk.to_12 do 12 fsk.to_16 do 16 fsk.to_7 do 7 +glcd.align_center zarovnaný +glcd.align_left vľavo +glcd.align_none žiadne +glcd.align_right vpravo +glcd.brightness Jas +glcd.brightness_dim Stmaviť +glcd.brightness_dim_time Stmievanie +glcd.brightness_settings Nastavenia jasu +glcd.brightness_standby Jas v pohotovostnom režime +glcd.channel_align Zarovnať kanál +glcd.channel_size Výška kanála +glcd.channel_x_position Kanál x-pozícia +glcd.channel_y_position Kanál y-pozícia +glcd.clock_digital_y_position Digitálne hodiny y-pozícia +glcd.clock_simple_size Výška jednoduchých hodín +glcd.clock_simple_y_position Jednoduché hodiny y-pozícia +glcd.color.amber Jantárová +glcd.color.black Čierna +glcd.color.blue Modrá +glcd.color.bluegray Modrošedá +glcd.color.brown Hnedá +glcd.color.cyan Tyrkisová +glcd.color.deeporange Tmavo oranžová +glcd.color.deeppurple Tmavo fialová +glcd.color.gray Šedá +glcd.color.green Zelená +glcd.color.indigo Tmavo modrá +glcd.color.lightblue Svetlo modrá +glcd.color.lightgreen Svetlo zelená +glcd.color.lime Limetová +glcd.color.orange Oranžová +glcd.color.pink Ružová +glcd.color.purple Fialová +glcd.color.red Červená +glcd.color.teal Modrozelená +glcd.color.white Biela +glcd.color.yellow Žltá +glcd.color_bg Farba pozadia +glcd.color_fg Farba textu +glcd.display Typ displeja +glcd.duration_align Zarovnať dĺžku programu +glcd.duration_show Zobraziť trvanie programu +glcd.duration_size Výška trvania programu +glcd.duration_x_position Trvanie programu x-pozícia +glcd.duration_y_position Trvanie programu y-pozícia +glcd.enable Použiť grafický LCD +glcd.end_align Zarovnať koniec programu +glcd.end_show Zobraziť koniec programu +glcd.end_size Výška konca programu +glcd.end_x_position Koniec programu x-pozícia +glcd.end_y_position Koniec programu y-pozícia +glcd.epg_align Zarovnať EPG +glcd.epg_size Výška EPG +glcd.epg_x_position EPG x-pozícia +glcd.epg_y_position EPG y-pozícia +glcd.font Písmo +glcd.font_autoresize Automatická veľkosť písma +glcd.head Nastavenie grafického LCD +glcd.logo_show Zobraziť logo stanice +glcd.logo_size Výška loga +glcd.logo_x_position Logo x-pozícia +glcd.logo_y_position Logo y-pozícia +glcd.mirror_osd Zobraziť ponuku OSD na grafickom LCD +glcd.mirror_video Zobraziť obraz videa na grafickom LCD +glcd.position_settings Pozície a veľkosti +glcd.progressbar_color Farba pruhu posuvu +glcd.progressbar_show Zobraziť indikátor priebehu +glcd.progressbar_size Výška lišty priebehu +glcd.progressbar_width Šírka pruhu posuvu +glcd.progressbar_x_position Ukazovateľ priebehu x-pozícia +glcd.progressbar_y_position Ukazovateľ priebehu y-pozícia +glcd.restart Znova spustiť +glcd.scroll_speed Rýchlosť rolovania +glcd.standby_clock Zobrazenie času v pohotovostnom režime +glcd.standby_clock_analog Analógové hodiny +glcd.standby_clock_digital Digitálne hodiny +glcd.standby_clock_lcd LCD hodiny +glcd.standby_clock_led LED hodiny +glcd.standby_clock_simple Jednoduché hodiny +glcd.standby_settings Nastavenia pohotovostného režimu +glcd.standby_weather Počasie v pohotovostnom stave +glcd.start_align Zarovnať začiatik programu +glcd.start_show Zobraziť začiatok programu +glcd.start_size Výška začiatku programu +glcd.start_x_position Začiatok programu x-pozícia +glcd.start_y_position Začiatok programu y-pozícia +glcd.theme Vyberte vzhľad +glcd.theme_settings Nastavenia vzhľadu +glcd.time_align Zarovnať čas +glcd.time_show Zobraziť čas +glcd.time_size Výška času +glcd.time_size_standby Výška času v pohotovostnom režime +glcd.time_x_position Čas x-pozícia +glcd.time_y_position Čas y-pozícia +glcd.volume Hlasitosť +glcd.weather_show Zobraziť počasie hdd_10min 10 minút hdd_1min 1 minúta hdd_20min 20 minút diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 46f9523a1..fe3abb317 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -229,19 +229,19 @@ void cGLCD::Exec() if (doStandbyTime || doStandbyWeather) { - if (t.glcd_time_in_standby == CLOCK_ANALOG) + if (t.glcd_standby_clock == CLOCK_ANALOG) { ShowAnalogClock(tm->tm_hour, tm->tm_min, tm->tm_sec, bitmap->Width()/2, bitmap->Height()/2); } - else if (t.glcd_time_in_standby == CLOCK_DIGITAL) + else if (t.glcd_standby_clock == CLOCK_DIGITAL) { ShowDigitalClock(tm->tm_hour, tm->tm_min); } - else if (t.glcd_time_in_standby > CLOCK_OFF) + else if (t.glcd_standby_clock > CLOCK_OFF) { - ShowSimpleClock(strftime("%H:%M", tm), t.glcd_time_in_standby); + ShowSimpleClock(strftime("%H:%M", tm), t.glcd_standby_clock); } - if (t.glcd_standby_weather == 1 && t.glcd_time_in_standby != CLOCK_ANALOG) + if (t.glcd_standby_weather == 1 && t.glcd_standby_clock != CLOCK_ANALOG) { ShowWeather(true); } @@ -1198,9 +1198,9 @@ void cGLCD::StandbyMode(bool b) SNeutrinoGlcdTheme &t = g_settings.glcd_theme; if (cglcd) { - if (t.glcd_time_in_standby || t.glcd_standby_weather) + if (t.glcd_standby_clock || t.glcd_standby_weather) { - if (t.glcd_time_in_standby) + if (t.glcd_standby_clock) cglcd->doStandbyTime = b; else cglcd->doStandbyTime = false; diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp index 6eb68e475..cf13ef3d7 100644 --- a/src/gui/glcdsetup.cpp +++ b/src/gui/glcdsetup.cpp @@ -39,16 +39,16 @@ #include #include "glcdthemes.h" -static const CMenuOptionChooser::keyval TIME_IN_STANDBY_OPTIONS[] = +static const CMenuOptionChooser::keyval STANDBY_CLOCK_OPTIONS[] = { { cGLCD::CLOCK_OFF, LOCALE_OPTIONS_OFF }, - { cGLCD::CLOCK_SIMPLE, LOCALE_GLCD_STANDBY_SIMPLE_CLOCK }, - { cGLCD::CLOCK_LED, LOCALE_GLCD_STANDBY_LED_CLOCK }, - { cGLCD::CLOCK_LCD, LOCALE_GLCD_STANDBY_LCD_CLOCK }, - { cGLCD::CLOCK_DIGITAL, LOCALE_GLCD_STANDBY_DIGITAL_CLOCK }, - { cGLCD::CLOCK_ANALOG, LOCALE_GLCD_STANDBY_ANALOG_CLOCK } + { cGLCD::CLOCK_SIMPLE, LOCALE_GLCD_STANDBY_CLOCK_SIMPLE }, + { cGLCD::CLOCK_LED, LOCALE_GLCD_STANDBY_CLOCK_LED }, + { cGLCD::CLOCK_LCD, LOCALE_GLCD_STANDBY_CLOCK_LCD }, + { cGLCD::CLOCK_DIGITAL, LOCALE_GLCD_STANDBY_CLOCK_DIGITAL }, + { cGLCD::CLOCK_ANALOG, LOCALE_GLCD_STANDBY_CLOCK_ANALOG } }; -#define TIME_IN_STANDBY_OPTION_COUNT (sizeof(TIME_IN_STANDBY_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) +#define STANDBY_CLOCK_OPTION_COUNT (sizeof(STANDBY_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) static const CMenuOptionChooser::keyval ALIGNMENT_OPTIONS[] = { @@ -264,14 +264,14 @@ bool GLCD_Menu::changeNotify(const neutrino_locale_t OptionName, void *Data) { case LOCALE_GLCD_CHANNEL_X_POSITION: case LOCALE_GLCD_CHANNEL_Y_POSITION: - case LOCALE_GLCD_SIZE_CHANNEL: - case LOCALE_GLCD_ALIGN_CHANNEL: + case LOCALE_GLCD_CHANNEL_SIZE: + case LOCALE_GLCD_CHANNEL_ALIGN: cglcd->lockChannel(CNeutrinoApp::getInstance()->channelList->getActiveChannelName()); break; - case LOCALE_GLCD_TIME_IN_STANDBY: - cdy->setActive(t.glcd_time_in_standby == cGLCD::CLOCK_DIGITAL); - csh->setActive(t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE); - csy->setActive(t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE); + case LOCALE_GLCD_STANDBY_CLOCK: + cdy->setActive(t.glcd_standby_clock == cGLCD::CLOCK_DIGITAL); + csh->setActive(t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE); + csy->setActive(t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE); break; case LOCALE_GLCD_ENABLE: if (g_settings.glcd_enable) @@ -345,19 +345,19 @@ int GLCD_Menu::GLCD_Standby_Settings() SNeutrinoGlcdTheme &t = g_settings.glcd_theme; CMenuOptionChooser *mc; - mc = new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &t.glcd_time_in_standby, TIME_IN_STANDBY_OPTIONS, TIME_IN_STANDBY_OPTION_COUNT, true, this); + mc = new CMenuOptionChooser(LOCALE_GLCD_STANDBY_CLOCK, &t.glcd_standby_clock, STANDBY_CLOCK_OPTIONS, STANDBY_CLOCK_OPTION_COUNT, true, this); //mc->setHint("", LOCALE_TODO); gss->addItem(mc); - cdy = new CMenuOptionNumberChooser(LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION, &t.glcd_standby_clock_digital_y_position, (t.glcd_position_settings && t.glcd_time_in_standby == cGLCD::CLOCK_DIGITAL), 0, 500, this); + cdy = new CMenuOptionNumberChooser(LOCALE_GLCD_CLOCK_DIGITAL_Y_POSITION, &t.glcd_standby_clock_digital_y_position, (t.glcd_position_settings && t.glcd_standby_clock == cGLCD::CLOCK_DIGITAL), 0, 500, this); //cdy->setHint("", LOCALE_TODO); gss->addItem(cdy); - csh = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_SIMPLE_CLOCK, &t.glcd_standby_clock_simple_size, (t.glcd_position_settings && t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 100, this); + csh = new CMenuOptionNumberChooser(LOCALE_GLCD_CLOCK_SIMPLE_SIZE, &t.glcd_standby_clock_simple_size, (t.glcd_position_settings && t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE), 0, 100, this); //csh->setHint("", LOCALE_TODO); gss->addItem(csh); - csy = new CMenuOptionNumberChooser(LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION, &t.glcd_standby_clock_simple_y_position, (t.glcd_position_settings && t.glcd_time_in_standby == cGLCD::CLOCK_SIMPLE), 0, 500, this); + csy = new CMenuOptionNumberChooser(LOCALE_GLCD_CLOCK_SIMPLE_Y_POSITION, &t.glcd_standby_clock_simple_y_position, (t.glcd_position_settings && t.glcd_standby_clock == cGLCD::CLOCK_SIMPLE), 0, 500, this); //csy->setHint("", LOCALE_TODO); gss->addItem(csy); @@ -475,19 +475,19 @@ int GLCD_Menu::GLCD_Theme_Settings() // colors - CColorChooser *fg = new CColorChooser(LOCALE_GLCD_SELECT_FG, &t.glcd_foreground_color_red, &t.glcd_foreground_color_green, &t.glcd_foreground_color_blue, NULL, colorSetupNotifier); - gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_FG, true, NULL, fg)); + CColorChooser *fg = new CColorChooser(LOCALE_GLCD_COLOR_FG, &t.glcd_foreground_color_red, &t.glcd_foreground_color_green, &t.glcd_foreground_color_blue, NULL, colorSetupNotifier); + gts->addItem(new CMenuDForwarder(LOCALE_GLCD_COLOR_FG, true, NULL, fg)); - CColorChooser *bg = new CColorChooser(LOCALE_GLCD_SELECT_BG, &t.glcd_background_color_red, &t.glcd_background_color_green, &t.glcd_background_color_blue, NULL, colorSetupNotifier); - gts->addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BG, true, NULL, bg)); + CColorChooser *bg = new CColorChooser(LOCALE_GLCD_COLOR_BG, &t.glcd_background_color_red, &t.glcd_background_color_green, &t.glcd_background_color_blue, NULL, colorSetupNotifier); + gts->addItem(new CMenuDForwarder(LOCALE_GLCD_COLOR_BG, true, NULL, bg)); gts->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_GLCD_POSITION_SETTINGS)); // channel name - gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_CHANNEL, &t.glcd_channel_percent, true, 0, 100, this)); + gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_SIZE, &t.glcd_channel_percent, true, 0, 100, this)); - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_CHANNEL, &t.glcd_channel_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_CHANNEL_ALIGN, &t.glcd_channel_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL)); gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_X_POSITION, &t.glcd_channel_x_position, true, 0, oled_width, this)); @@ -497,13 +497,13 @@ int GLCD_Menu::GLCD_Theme_Settings() // channel logo - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_LOGO, &t.glcd_logo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_LOGO_SHOW, &t.glcd_logo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_LOGO, &t.glcd_logo_percent, t.glcd_logo, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_SIZE, &t.glcd_logo_percent, t.glcd_logo, 0, 100, this); gts->addItem(nc); ChannelLogoActivate.Add(nc); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_WIDTH_LOGO, &t.glcd_logo_width_percent, t.glcd_logo, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_WIDTH, &t.glcd_logo_width_percent, t.glcd_logo, 0, 100, this); gts->addItem(nc); ChannelLogoActivate.Add(nc); @@ -519,9 +519,9 @@ int GLCD_Menu::GLCD_Theme_Settings() // event - gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_EPG, &t.glcd_epg_percent, true, 0, 100, this)); + gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_EPG_SIZE, &t.glcd_epg_percent, true, 0, 100, this)); - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_EPG, &t.glcd_epg_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_EPG_ALIGN, &t.glcd_epg_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL)); gts->addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_EPG_X_POSITION, &t.glcd_epg_x_position, true, 0, oled_width, this)); @@ -531,13 +531,13 @@ int GLCD_Menu::GLCD_Theme_Settings() // event duration - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_DURATION, &t.glcd_duration, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_DURATION_SHOW, &t.glcd_duration, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_DURATION, &t.glcd_duration_percent, t.glcd_duration, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_DURATION_SIZE, &t.glcd_duration_percent, t.glcd_duration, 0, 100, this); gts->addItem(nc); DurationActivate.Add(nc); - oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_DURATION, &t.glcd_duration_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_duration, NULL); + oc = new CMenuOptionChooser(LOCALE_GLCD_DURATION_ALIGN, &t.glcd_duration_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_duration, NULL); gts->addItem(oc); DurationActivate.Add(oc); @@ -553,13 +553,13 @@ int GLCD_Menu::GLCD_Theme_Settings() // event start - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_START, &t.glcd_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_START_SHOW, &t.glcd_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_START, &t.glcd_start_percent, t.glcd_start, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_START_SIZE, &t.glcd_start_percent, t.glcd_start, 0, 100, this); gts->addItem(nc); StartActivate.Add(nc); - oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_START, &t.glcd_start_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL); + oc = new CMenuOptionChooser(LOCALE_GLCD_START_ALIGN, &t.glcd_start_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_start, NULL); gts->addItem(oc); StartActivate.Add(oc); @@ -575,13 +575,13 @@ int GLCD_Menu::GLCD_Theme_Settings() // event end - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_END, &t.glcd_end, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_END_SHOW, &t.glcd_end, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_END, &t.glcd_end_percent, t.glcd_end, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_END_SIZE, &t.glcd_end_percent, t.glcd_end, 0, 100, this); gts->addItem(nc); EndActivate.Add(nc); - oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_END, &t.glcd_end_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, true, NULL); + oc = new CMenuOptionChooser(LOCALE_GLCD_END_ALIGN, &t.glcd_end_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_end, NULL); gts->addItem(oc); EndActivate.Add(oc); @@ -597,26 +597,26 @@ int GLCD_Menu::GLCD_Theme_Settings() // progress bar - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_PROGRESSBAR, &t.glcd_progressbar, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_PROGRESSBAR_SHOW, &t.glcd_progressbar, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_BAR, &t.glcd_progressbar_percent, t.glcd_progressbar, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_SIZE, &t.glcd_progressbar_percent, t.glcd_progressbar, 0, 100, this); gts->addItem(nc); ProgressActivate.Add(nc); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_WIDTH, &t.glcd_progressbar_width, t.glcd_progressbar, 0, oled_width, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_WIDTH, &t.glcd_progressbar_width, t.glcd_progressbar, 0, oled_width, this); gts->addItem(nc); ProgressActivate.Add(nc); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_X_POSITION, &t.glcd_progressbar_x_position, t.glcd_progressbar, 0, oled_width, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_X_POSITION, &t.glcd_progressbar_x_position, t.glcd_progressbar, 0, oled_width, this); gts->addItem(nc); ProgressActivate.Add(nc); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_BAR_Y_POSITION, &t.glcd_progressbar_y_position, t.glcd_progressbar, 0, oled_height, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_PROGRESSBAR_Y_POSITION, &t.glcd_progressbar_y_position, t.glcd_progressbar, 0, oled_height, this); gts->addItem(nc); ProgressActivate.Add(nc); - CColorChooser *bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_progressbar_color_red, &t.glcd_progressbar_color_green, &t.glcd_progressbar_color_blue, NULL, colorSetupNotifier); - mf = new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, t.glcd_progressbar, NULL, bar); + CColorChooser *bar = new CColorChooser(LOCALE_GLCD_PROGRESSBAR_COLOR, &t.glcd_progressbar_color_red, &t.glcd_progressbar_color_green, &t.glcd_progressbar_color_blue, NULL, colorSetupNotifier); + mf = new CMenuDForwarder(LOCALE_GLCD_PROGRESSBAR_COLOR, t.glcd_progressbar, NULL, bar); gts->addItem(mf); ProgressActivate.Add(mf); @@ -624,13 +624,13 @@ int GLCD_Menu::GLCD_Theme_Settings() // time - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_TIME, &t.glcd_time, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_SHOW, &t.glcd_time, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); - nc = new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_TIME, &t.glcd_time_percent, t.glcd_time, 0, 100, this); + nc = new CMenuOptionNumberChooser(LOCALE_GLCD_TIME_SIZE, &t.glcd_time_percent, t.glcd_time, 0, 100, this); gts->addItem(nc); TimeActivate.Add(nc); - oc = new CMenuOptionChooser(LOCALE_GLCD_ALIGN_TIME, &t.glcd_time_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_time, NULL); + oc = new CMenuOptionChooser(LOCALE_GLCD_TIME_ALIGN, &t.glcd_time_align, ALIGNMENT_OPTIONS, ALIGNMENT_OPTION_COUNT, t.glcd_time, NULL); gts->addItem(oc); TimeActivate.Add(oc); @@ -646,7 +646,7 @@ int GLCD_Menu::GLCD_Theme_Settings() // weather - gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_SHOW_WEATHER, &t.glcd_weather, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); + gts->addItem(new CMenuOptionChooser(LOCALE_GLCD_WEATHER_SHOW, &t.glcd_weather, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); nc = new CMenuOptionNumberChooser(LOCALE_GLCD_WEATHER_PERCENT, &t.glcd_weather_percent, t.glcd_weather, 0, 100, this); gts->addItem(nc); diff --git a/src/gui/glcdthemes.cpp b/src/gui/glcdthemes.cpp index ea55df07e..4c1a09f3c 100644 --- a/src/gui/glcdthemes.cpp +++ b/src/gui/glcdthemes.cpp @@ -343,16 +343,16 @@ void CGLCDThemes::setTheme(CConfigFile &configfile) configfile.setInt32("glcd_icon_timer_x_position", t.glcd_icon_timer_x_position); configfile.setInt32("glcd_icon_rec_x_position", t.glcd_icon_rec_x_position); configfile.setInt32("glcd_icon_ts_x_position", t.glcd_icon_ts_x_position); + configfile.setInt32("glcd_standby_clock", t.glcd_standby_clock); + configfile.setInt32("glcd_standby_clock_digital_y_position", t.glcd_standby_clock_digital_y_position); + configfile.setInt32("glcd_standby_clock_simple_size", t.glcd_standby_clock_simple_size); + configfile.setInt32("glcd_standby_clock_simple_y_position", t.glcd_standby_clock_simple_y_position); configfile.setBool("glcd_weather", t.glcd_weather); configfile.setInt32("glcd_weather_percent", t.glcd_weather_percent); configfile.setInt32("glcd_weather_curr_x_position", t.glcd_weather_curr_x_position); configfile.setInt32("glcd_weather_next_x_position", t.glcd_weather_next_x_position); configfile.setInt32("glcd_weather_y_position", t.glcd_weather_y_position); - configfile.setInt32("glcd_time_in_standby", t.glcd_time_in_standby); configfile.setInt32("glcd_standby_weather", t.glcd_standby_weather); - configfile.setInt32("glcd_standby_clock_digital_y_position", t.glcd_standby_clock_digital_y_position); - configfile.setInt32("glcd_standby_clock_simple_size", t.glcd_standby_clock_simple_size); - configfile.setInt32("glcd_standby_clock_simple_y_position", t.glcd_standby_clock_simple_y_position); configfile.setInt32("glcd_standby_weather_percent", t.glcd_standby_weather_percent); configfile.setInt32("glcd_standby_weather_curr_x_position", t.glcd_standby_weather_curr_x_position); configfile.setInt32("glcd_standby_weather_next_x_position", t.glcd_standby_weather_next_x_position); @@ -421,16 +421,16 @@ void CGLCDThemes::getTheme(CConfigFile &configfile) t.glcd_icon_timer_x_position = configfile.getInt32("glcd_icon_timer_x_position", 0); t.glcd_icon_rec_x_position = configfile.getInt32("glcd_icon_rec_x_position", 0); t.glcd_icon_ts_x_position = configfile.getInt32("glcd_icon_ts_x_position", 0); + t.glcd_standby_clock = configfile.getInt32("glcd_standby_clock", 1); + t.glcd_standby_clock_digital_y_position = configfile.getInt32("glcd_standby_clock_digital_y_position", 0); + t.glcd_standby_clock_simple_size = configfile.getInt32("glcd_standby_clock_simple_size", 0); + t.glcd_standby_clock_simple_y_position = configfile.getInt32("glcd_standby_clock_simple_y_position", 0); t.glcd_weather = configfile.getBool("glcd_weather", false); t.glcd_weather_percent = configfile.getInt32("glcd_weather_percent", 15); t.glcd_weather_curr_x_position = configfile.getInt32("glcd_weather_curr_x_position", 0); t.glcd_weather_next_x_position = configfile.getInt32("glcd_weather_next_x_position", 0); t.glcd_weather_y_position = configfile.getInt32("glcd_weather_y_position", 0); - t.glcd_time_in_standby = configfile.getInt32("glcd_time_in_standby", 1); t.glcd_standby_weather = configfile.getInt32("glcd_standby_weather", 1); - t.glcd_standby_clock_digital_y_position = configfile.getInt32("glcd_standby_clock_digital_y_position", 0); - t.glcd_standby_clock_simple_size = configfile.getInt32("glcd_standby_clock_simple_size", 0); - t.glcd_standby_clock_simple_y_position = configfile.getInt32("glcd_standby_clock_simple_y_position", 0); t.glcd_standby_weather_percent = configfile.getInt32("glcd_standby_weather_percent", 40); t.glcd_standby_weather_curr_x_position = configfile.getInt32("glcd_standby_weather_curr_x_position", 0); t.glcd_standby_weather_next_x_position = configfile.getInt32("glcd_standby_weather_next_x_position", 0); diff --git a/src/system/locals.h b/src/system/locals.h index 3c08c4f65..a7dfae410 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -881,24 +881,22 @@ typedef enum LOCALE_FSK_TO_16, LOCALE_FSK_TO_7, LOCALE_GLCD_ALIGN_CENTER, - LOCALE_GLCD_ALIGN_CHANNEL, - LOCALE_GLCD_ALIGN_DURATION, - LOCALE_GLCD_ALIGN_END, - LOCALE_GLCD_ALIGN_EPG, LOCALE_GLCD_ALIGN_LEFT, LOCALE_GLCD_ALIGN_NONE, LOCALE_GLCD_ALIGN_RIGHT, - LOCALE_GLCD_ALIGN_START, - LOCALE_GLCD_ALIGN_TIME, LOCALE_GLCD_BACKGROUND, - LOCALE_GLCD_BAR_WIDTH, - LOCALE_GLCD_BAR_X_POSITION, - LOCALE_GLCD_BAR_Y_POSITION, LOCALE_GLCD_BRIGHTNESS, LOCALE_GLCD_BRIGHTNESS_DIM, LOCALE_GLCD_BRIGHTNESS_DIM_TIME, LOCALE_GLCD_BRIGHTNESS_SETTINGS, LOCALE_GLCD_BRIGHTNESS_STANDBY, + LOCALE_GLCD_CHANNEL_ALIGN, + LOCALE_GLCD_CHANNEL_SIZE, + LOCALE_GLCD_CHANNEL_X_POSITION, + LOCALE_GLCD_CHANNEL_Y_POSITION, + LOCALE_GLCD_CLOCK_DIGITAL_Y_POSITION, + LOCALE_GLCD_CLOCK_SIMPLE_SIZE, + LOCALE_GLCD_CLOCK_SIMPLE_Y_POSITION, LOCALE_GLCD_COLOR_AMBER, LOCALE_GLCD_COLOR_BLACK, LOCALE_GLCD_COLOR_BLUE, @@ -920,15 +918,22 @@ typedef enum LOCALE_GLCD_COLOR_TEAL, LOCALE_GLCD_COLOR_WHITE, LOCALE_GLCD_COLOR_YELLOW, - LOCALE_GLCD_CHANNEL_X_POSITION, - LOCALE_GLCD_CHANNEL_Y_POSITION, - LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION, + LOCALE_GLCD_COLOR_BG, + LOCALE_GLCD_COLOR_FG, LOCALE_GLCD_DISPLAY, + LOCALE_GLCD_DURATION_ALIGN, + LOCALE_GLCD_DURATION_SHOW, + LOCALE_GLCD_DURATION_SIZE, LOCALE_GLCD_DURATION_X_POSITION, LOCALE_GLCD_DURATION_Y_POSITION, LOCALE_GLCD_ENABLE, + LOCALE_GLCD_END_ALIGN, + LOCALE_GLCD_END_SHOW, + LOCALE_GLCD_END_SIZE, LOCALE_GLCD_END_X_POSITION, LOCALE_GLCD_END_Y_POSITION, + LOCALE_GLCD_EPG_ALIGN, + LOCALE_GLCD_EPG_SIZE, LOCALE_GLCD_EPG_X_POSITION, LOCALE_GLCD_EPG_Y_POSITION, LOCALE_GLCD_FONT, @@ -944,59 +949,54 @@ typedef enum LOCALE_GLCD_ICON_TXT_X_POSITION, LOCALE_GLCD_ICON_Y_PERCENT, LOCALE_GLCD_ICON_Y_POSITION, - LOCALE_GLCD_LOGODIR, + LOCALE_GLCD_LOGO_SHOW, + LOCALE_GLCD_LOGO_SIZE, + LOCALE_GLCD_LOGO_WIDTH, LOCALE_GLCD_LOGO_X_POSITION, LOCALE_GLCD_LOGO_Y_POSITION, + LOCALE_GLCD_LOGODIR, LOCALE_GLCD_MIRROR_OSD, LOCALE_GLCD_MIRROR_VIDEO, LOCALE_GLCD_POSITION_SETTINGS, + LOCALE_GLCD_PROGRESSBAR_COLOR, + LOCALE_GLCD_PROGRESSBAR_SHOW, + LOCALE_GLCD_PROGRESSBAR_SIZE, + LOCALE_GLCD_PROGRESSBAR_WIDTH, + LOCALE_GLCD_PROGRESSBAR_X_POSITION, + LOCALE_GLCD_PROGRESSBAR_Y_POSITION, LOCALE_GLCD_RESTART, LOCALE_GLCD_SCROLL_SPEED, - LOCALE_GLCD_SELECT_BAR, - LOCALE_GLCD_SELECT_BG, - LOCALE_GLCD_SELECT_FG, - LOCALE_GLCD_SHOW_DURATION, - LOCALE_GLCD_SHOW_END, - LOCALE_GLCD_SHOW_LOGO, - LOCALE_GLCD_SHOW_PROGRESSBAR, - LOCALE_GLCD_SHOW_START, - LOCALE_GLCD_SHOW_TIME, - LOCALE_GLCD_SHOW_WEATHER, - LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION, - LOCALE_GLCD_SIZE_BAR, - LOCALE_GLCD_SIZE_CHANNEL, - LOCALE_GLCD_SIZE_DURATION, - LOCALE_GLCD_SIZE_END, - LOCALE_GLCD_SIZE_EPG, - LOCALE_GLCD_SIZE_LOGO, - LOCALE_GLCD_SIZE_SIMPLE_CLOCK, - LOCALE_GLCD_SIZE_START, - LOCALE_GLCD_SIZE_TIME, - LOCALE_GLCD_SIZE_TIME_STANDBY, - LOCALE_GLCD_THEME, - LOCALE_GLCD_THEME_SETTINGS, - LOCALE_GLCD_STANDBY_ANALOG_CLOCK, - LOCALE_GLCD_STANDBY_DIGITAL_CLOCK, - LOCALE_GLCD_STANDBY_LCD_CLOCK, - LOCALE_GLCD_STANDBY_LED_CLOCK, + LOCALE_GLCD_STANDBY_CLOCK, + LOCALE_GLCD_STANDBY_CLOCK_ANALOG, + LOCALE_GLCD_STANDBY_CLOCK_DIGITAL, + LOCALE_GLCD_STANDBY_CLOCK_LCD, + LOCALE_GLCD_STANDBY_CLOCK_LED, + LOCALE_GLCD_STANDBY_CLOCK_SIMPLE, LOCALE_GLCD_STANDBY_SETTINGS, - LOCALE_GLCD_STANDBY_SIMPLE_CLOCK, LOCALE_GLCD_STANDBY_WEATHER, - LOCALE_GLCD_STANDBY_WEATHER_PERCENT, LOCALE_GLCD_STANDBY_WEATHER_CURR_X_POSITION, LOCALE_GLCD_STANDBY_WEATHER_NEXT_X_POSITION, + LOCALE_GLCD_STANDBY_WEATHER_PERCENT, LOCALE_GLCD_STANDBY_WEATHER_Y_POSITION, + LOCALE_GLCD_START_ALIGN, + LOCALE_GLCD_START_SHOW, + LOCALE_GLCD_START_SIZE, LOCALE_GLCD_START_X_POSITION, LOCALE_GLCD_START_Y_POSITION, - LOCALE_GLCD_TIME_IN_STANDBY, + LOCALE_GLCD_THEME, + LOCALE_GLCD_THEME_SETTINGS, + LOCALE_GLCD_TIME_ALIGN, + LOCALE_GLCD_TIME_SHOW, + LOCALE_GLCD_TIME_SIZE, + LOCALE_GLCD_TIME_SIZE_STANDBY, LOCALE_GLCD_TIME_X_POSITION, LOCALE_GLCD_TIME_Y_POSITION, LOCALE_GLCD_VOLUME, - LOCALE_GLCD_WEATHER_PERCENT, LOCALE_GLCD_WEATHER_CURR_X_POSITION, LOCALE_GLCD_WEATHER_NEXT_X_POSITION, + LOCALE_GLCD_WEATHER_PERCENT, + LOCALE_GLCD_WEATHER_SHOW, LOCALE_GLCD_WEATHER_Y_POSITION, - LOCALE_GLCD_WIDTH_LOGO, LOCALE_HDD_10MIN, LOCALE_HDD_1MIN, LOCALE_HDD_20MIN, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 7fd637212..7ca238997 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -881,24 +881,22 @@ const char * locale_real_names[] = "fsk.to_16", "fsk.to_7", "glcd.align_center", - "glcd.align_channel", - "glcd.align_duration", - "glcd.align_end", - "glcd.align_epg", "glcd.align_left", "glcd.align_none", "glcd.align_right", - "glcd.align_start", - "glcd.align_time", "glcd.background", - "glcd.bar_width", - "glcd.bar_x_position", - "glcd.bar_y_position", "glcd.brightness", "glcd.brightness_dim", "glcd.brightness_dim_time", "glcd.brightness_settings", "glcd.brightness_standby", + "glcd.channel_align", + "glcd.channel_size", + "glcd.channel_x_position", + "glcd.channel_y_position", + "glcd.clock_digital_y_position", + "glcd.clock_simple_size", + "glcd.clock_simple_y_position", "glcd.color.amber", "glcd.color.black", "glcd.color.blue", @@ -920,15 +918,22 @@ const char * locale_real_names[] = "glcd.color.teal", "glcd.color.white", "glcd.color.yellow", - "glcd.channel_x_position", - "glcd.channel_y_position", - "glcd.digital_clock_y_position", + "glcd.color_bg", + "glcd.color_fg", "glcd.display", + "glcd.duration_align", + "glcd.duration_show", + "glcd.duration_size", "glcd.duration_x_position", "glcd.duration_y_position", "glcd.enable", + "glcd.end_align", + "glcd.end_show", + "glcd.end_size", "glcd.end_x_position", "glcd.end_y_position", + "glcd.epg_align", + "glcd.epg_size", "glcd.epg_x_position", "glcd.epg_y_position", "glcd.font", @@ -944,59 +949,54 @@ const char * locale_real_names[] = "glcd.icon_txt_x_position", "glcd.icon_y_percent", "glcd.icon_y_position", - "glcd.logodir", + "glcd.logo_show", + "glcd.logo_size", + "glcd.logo_width", "glcd.logo_x_position", "glcd.logo_y_position", + "glcd.logodir", "glcd.mirror_osd", "glcd.mirror_video", "glcd.position_settings", + "glcd.progressbar_color", + "glcd.progressbar_show", + "glcd.progressbar_size", + "glcd.progressbar_width", + "glcd.progressbar_x_position", + "glcd.progressbar_y_position", "glcd.restart", "glcd.scroll_speed", - "glcd.select.bar", - "glcd.select.bg", - "glcd.select.fg", - "glcd.show_duration", - "glcd.show_end", - "glcd.show_logo", - "glcd.show_progressbar", - "glcd.show_start", - "glcd.show_time", - "glcd.show_weather", - "glcd.simple_clock_y_position", - "glcd.size_bar", - "glcd.size_channel", - "glcd.size_duration", - "glcd.size_end", - "glcd.size_epg", - "glcd.size_logo", - "glcd.size_simple_clock", - "glcd.size_start", - "glcd.size_time", - "glcd.size_time_standby", - "glcd.theme", - "glcd.theme_settings", - "glcd.standby_analog_clock", - "glcd.standby_digital_clock", - "glcd.standby_lcd_clock", - "glcd.standby_led_clock", + "glcd.standby_clock", + "glcd.standby_clock_analog", + "glcd.standby_clock_digital", + "glcd.standby_clock_lcd", + "glcd.standby_clock_led", + "glcd.standby_clock_simple", "glcd.standby_settings", - "glcd.standby_simple_clock", "glcd.standby_weather", - "glcd.standby_weather_percent", "glcd.standby_weather_curr_x_position", "glcd.standby_weather_next_x_position", + "glcd.standby_weather_percent", "glcd.standby_weather_y_position", + "glcd.start_align", + "glcd.start_show", + "glcd.start_size", "glcd.start_x_position", "glcd.start_y_position", - "glcd.time_in_standby", + "glcd.theme", + "glcd.theme_settings", + "glcd.time_align", + "glcd.time_show", + "glcd.time_size", + "glcd.time_size_standby", "glcd.time_x_position", "glcd.time_y_position", "glcd.volume", - "glcd.weather_percent", "glcd.weather_curr_x_position", "glcd.weather_next_x_position", + "glcd.weather_percent", + "glcd.weather_show", "glcd.weather_y_position", - "glcd.width_logo", "hdd_10min", "hdd_1min", "hdd_20min", diff --git a/src/system/settings.h b/src/system/settings.h index 603bb38ce..09ea165c6 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -286,19 +286,18 @@ struct SNeutrinoGlcdTheme int glcd_icon_rec_x_position; int glcd_icon_ts_x_position; + int glcd_standby_clock; + int glcd_standby_clock_digital_y_position; + int glcd_standby_clock_simple_size; + int glcd_standby_clock_simple_y_position; + int glcd_weather; int glcd_weather_percent; int glcd_weather_curr_x_position; int glcd_weather_next_x_position; int glcd_weather_y_position; - int glcd_time_in_standby; int glcd_standby_weather; - - int glcd_standby_clock_digital_y_position; - int glcd_standby_clock_simple_size; - int glcd_standby_clock_simple_y_position; - int glcd_standby_weather_percent; int glcd_standby_weather_curr_x_position; int glcd_standby_weather_next_x_position;