From fe71518e5043f4d323a90ade1a209b5e8fadf35f Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Wed, 31 Mar 2021 22:15:28 +0200 Subject: [PATCH] osd_setup: osd preset crt/lcd add locals use now for different Screen Setup when using different monitors Conflicts: data/locale/deutsch.locale data/locale/english.locale src/system/locals.h src/system/locals_intern.h --- data/locale/deutsch.locale | 6 +++++- data/locale/english.locale | 8 ++++++-- src/gui/osd_setup.cpp | 4 ++-- src/gui/osd_setup.h | 4 ++-- src/gui/screensetup.cpp | 24 ++++++++++++------------ src/system/locals.h | 4 ++++ src/system/locals_intern.h | 4 ++++ 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 76b1f22a5..7c20c2d22 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1520,7 +1520,7 @@ menu.hint_opkg_upgrade Aktualisiert alle installierten Pakete auf die neueste ve menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs usw. menu.hint_osd_behavior_infobar Infobar nach Zeitvorgabe oder manuell ein- oder ausblenden. menu.hint_osd_language Wählen Sie ihre Menü-Sprache -menu.hint_osd_preset Wählen Sie zwischen Röhren-TV (CRT) oder Flachbildschirm (LCD) +menu.hint_osd_preset Wählen Sie zwischen Monitor 1 und 2 für unterschiedliche Bildbereiche menu.hint_osd_resolution Wählen Sie eine OSD-Auflösung menu.hint_osd_timing OSD-Element nach Zeitvorgabe oder manuell ein- oder ausblenden. menu.hint_other_fonts Ändern Sie andere Schriftgrößen @@ -2270,6 +2270,10 @@ options.off aus options.on ein options.on.without_messages ohne Msg options.serial seriell +options.start starten +options.stop stoppen +osd.preset_screen_a Monitor 1 +osd.preset_screen_b Monitor 2 parentallock.bouquetmode Bouquets sind standardmässig parentallock.changepin PIN-Code festlegen parentallock.changepin_hint1 Geben Sie hier Ihren neuen PIN-Code ein! diff --git a/data/locale/english.locale b/data/locale/english.locale index 72927e663..acc1d9952 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -360,7 +360,7 @@ colormenu.fade Fade GUI colormenu.font Select GUI font colormenu.font_ttx Select Teletext font colormenu.menucolors Themes -colormenu.osd_preset TV preset +colormenu.osd_preset Screen preset colormenu.osd_resolution OSD resolution colormenu.progressbar_active Active part color colormenu.progressbar_passive Background @@ -1520,7 +1520,7 @@ menu.hint_opkg_upgrade Updates all installed packages to the most recent version menu.hint_osd Colors, fonts, screen size\nGUI look and feel options menu.hint_osd_behavior_infobar Show infobar depending on time set or manually on or off. menu.hint_osd_language Select OSD language -menu.hint_osd_preset Pre-configured screen margins for CRT and LCD TV +menu.hint_osd_preset Choose between Screen A and B for different Screen Setup menu.hint_osd_resolution Change OSD resolution menu.hint_osd_timing Show OSD element depending on time set or manually on or off. menu.hint_other_fonts Change other font sizes @@ -2270,6 +2270,10 @@ options.off off options.on on options.on.without_messages Without msg options.serial serial +options.start start +options.stop stop +osd.preset_screen_a Screen 1 +osd.preset_screen_a Screen 2 parentallock.bouquetmode Bouquets are default parentallock.changepin change PIN code parentallock.changepin_hint1 Enter your new parental lock pin code here! diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index a544f318d..4a28c885b 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -421,8 +421,8 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) #define OSD_PRESET_OPTIONS_COUNT 2 const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] = { - { COsdSetup::PRESET_CRT, NONEXISTANT_LOCALE, "CRT" }, - { COsdSetup::PRESET_LCD, NONEXISTANT_LOCALE, "LCD" } + { COsdSetup::PRESET_LCD, LOCALE_OSD_PRESET_SCREEN_A }, + { COsdSetup::PRESET_CRT, LOCALE_OSD_PRESET_SCREEN_B } }; #define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4 diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 8627a7023..ddaba6110 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -101,8 +101,8 @@ class COsdSetup : public CMenuTarget, public CChangeObserver enum { - PRESET_CRT, - PRESET_LCD + PRESET_LCD, + PRESET_CRT }; COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp index 9b1066211..eefcbc7ec 100644 --- a/src/gui/screensetup.cpp +++ b/src/gui/screensetup.cpp @@ -119,12 +119,6 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) case 1: { switch (g_settings.screen_preset) { - case COsdSetup::PRESET_CRT: - g_settings.screen_StartX_crt_1 = g_settings.screen_StartX; - g_settings.screen_StartY_crt_1 = g_settings.screen_StartY; - g_settings.screen_EndX_crt_1 = g_settings.screen_EndX; - g_settings.screen_EndY_crt_1 = g_settings.screen_EndY; - break; case COsdSetup::PRESET_LCD: default: g_settings.screen_StartX_lcd_1 = g_settings.screen_StartX; @@ -132,6 +126,12 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) g_settings.screen_EndX_lcd_1 = g_settings.screen_EndX; g_settings.screen_EndY_lcd_1 = g_settings.screen_EndY; break; + case COsdSetup::PRESET_CRT: + g_settings.screen_StartX_crt_1 = g_settings.screen_StartX; + g_settings.screen_StartY_crt_1 = g_settings.screen_StartY; + g_settings.screen_EndX_crt_1 = g_settings.screen_EndX; + g_settings.screen_EndY_crt_1 = g_settings.screen_EndY; + break; } } break; @@ -140,12 +140,6 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) default: { switch (g_settings.screen_preset) { - case COsdSetup::PRESET_CRT: - g_settings.screen_StartX_crt_0 = g_settings.screen_StartX; - g_settings.screen_StartY_crt_0 = g_settings.screen_StartY; - g_settings.screen_EndX_crt_0 = g_settings.screen_EndX; - g_settings.screen_EndY_crt_0 = g_settings.screen_EndY; - break; case COsdSetup::PRESET_LCD: default: g_settings.screen_StartX_lcd_0 = g_settings.screen_StartX; @@ -153,6 +147,12 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) g_settings.screen_EndX_lcd_0 = g_settings.screen_EndX; g_settings.screen_EndY_lcd_0 = g_settings.screen_EndY; break; + case COsdSetup::PRESET_CRT: + g_settings.screen_StartX_crt_0 = g_settings.screen_StartX; + g_settings.screen_StartY_crt_0 = g_settings.screen_StartY; + g_settings.screen_EndX_crt_0 = g_settings.screen_EndX; + g_settings.screen_EndY_crt_0 = g_settings.screen_EndY; + break; } } break; diff --git a/src/system/locals.h b/src/system/locals.h index be20fe2c5..57e9d7640 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2297,6 +2297,10 @@ typedef enum LOCALE_OPTIONS_ON, LOCALE_OPTIONS_ON_WITHOUT_MESSAGES, LOCALE_OPTIONS_SERIAL, + LOCALE_OPTIONS_START, + LOCALE_OPTIONS_STOP, + LOCALE_OSD_PRESET_SCREEN_A, + LOCALE_OSD_PRESET_SCREEN_B, LOCALE_PARENTALLOCK_BOUQUETMODE, LOCALE_PARENTALLOCK_CHANGEPIN, LOCALE_PARENTALLOCK_CHANGEPIN_HINT1, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 627858cc6..f5c6317eb 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2297,6 +2297,10 @@ const char * locale_real_names[] = "options.on", "options.on.without_messages", "options.serial", + "options.start", + "options.stop", + "osd.preset_screen_a", + "osd.preset_screen_b", "parentallock.bouquetmode", "parentallock.changepin", "parentallock.changepin_hint1",