diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 7c20c2d22..b422397dc 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -360,7 +360,7 @@ colormenu.fade Ein-/Ausblenden colormenu.font Verwendete Schriftart colormenu.font_ttx Videotext Schriftart colormenu.menucolors Themes -colormenu.osd_preset Monitor Auswahl +colormenu.osd_preset Bildschirm Auswahl colormenu.osd_resolution OSD-Auflösung colormenu.progressbar_active Farbe des aktiven Teil colormenu.progressbar_passive Hintergrundfarbe @@ -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 Monitor 1 und 2 für unterschiedliche Bildbereiche +menu.hint_osd_preset Wählen Sie zwischen Bildschirm 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 @@ -2272,8 +2272,8 @@ 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 +osd.preset_screen_a Bildschirm 1 +osd.preset_screen_b Bildschirm 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/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 4a28c885b..d17cb5a5f 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_LCD, LOCALE_OSD_PRESET_SCREEN_A }, - { COsdSetup::PRESET_CRT, LOCALE_OSD_PRESET_SCREEN_B } + { COsdSetup::PRESET_LCD_A, LOCALE_OSD_PRESET_SCREEN_A }, + { COsdSetup::PRESET_LCD_B, 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 ddaba6110..4bcfcdf6d 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_LCD, - PRESET_CRT + PRESET_LCD_A, + PRESET_LCD_B }; COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp index eefcbc7ec..be593c285 100644 --- a/src/gui/screensetup.cpp +++ b/src/gui/screensetup.cpp @@ -119,18 +119,18 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) case 1: { switch (g_settings.screen_preset) { - case COsdSetup::PRESET_LCD: - default: - g_settings.screen_StartX_lcd_1 = g_settings.screen_StartX; - g_settings.screen_StartY_lcd_1 = g_settings.screen_StartY; - g_settings.screen_EndX_lcd_1 = g_settings.screen_EndX; - g_settings.screen_EndY_lcd_1 = g_settings.screen_EndY; + case COsdSetup::PRESET_LCD_B: + g_settings.screen_StartX_lcd_b_1 = g_settings.screen_StartX; + g_settings.screen_StartY_lcd_b_1 = g_settings.screen_StartY; + g_settings.screen_EndX_lcd_b_1 = g_settings.screen_EndX; + g_settings.screen_EndY_lcd_b_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; + case COsdSetup::PRESET_LCD_A: + default: + g_settings.screen_StartX_lcd_a_1 = g_settings.screen_StartX; + g_settings.screen_StartY_lcd_a_1 = g_settings.screen_StartY; + g_settings.screen_EndX_lcd_a_1 = g_settings.screen_EndX; + g_settings.screen_EndY_lcd_a_1 = g_settings.screen_EndY; break; } } @@ -140,18 +140,18 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) default: { switch (g_settings.screen_preset) { - case COsdSetup::PRESET_LCD: - default: - g_settings.screen_StartX_lcd_0 = g_settings.screen_StartX; - g_settings.screen_StartY_lcd_0 = g_settings.screen_StartY; - g_settings.screen_EndX_lcd_0 = g_settings.screen_EndX; - g_settings.screen_EndY_lcd_0 = g_settings.screen_EndY; + case COsdSetup::PRESET_LCD_B: + g_settings.screen_StartX_lcd_b_0 = g_settings.screen_StartX; + g_settings.screen_StartY_lcd_b_0 = g_settings.screen_StartY; + g_settings.screen_EndX_lcd_b_0 = g_settings.screen_EndX; + g_settings.screen_EndY_lcd_b_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; + case COsdSetup::PRESET_LCD_A: + default: + g_settings.screen_StartX_lcd_a_0 = g_settings.screen_StartX; + g_settings.screen_StartY_lcd_a_0 = g_settings.screen_StartY; + g_settings.screen_EndX_lcd_a_0 = g_settings.screen_EndX; + g_settings.screen_EndY_lcd_a_0 = g_settings.screen_EndY; break; } } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d30eaffca..55d1de7e3 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -935,23 +935,28 @@ int CNeutrinoApp::loadSetup(const char * fname) #endif g_settings.osd_resolution = (osd_resolution_tmp == -1) ? configfile.getInt32("osd_resolution", osd_res) : osd_resolution_tmp; COsdHelpers::getInstance()->g_settings_osd_resolution_save = g_settings.osd_resolution; - g_settings.screen_StartX_crt_0 = configfile.getInt32("screen_StartX_crt_0", 80); - g_settings.screen_StartY_crt_0 = configfile.getInt32("screen_StartY_crt_0", 45); - g_settings.screen_EndX_crt_0 = configfile.getInt32("screen_EndX_crt_0" , 1280 - g_settings.screen_StartX_crt_0 - 1); - g_settings.screen_EndY_crt_0 = configfile.getInt32("screen_EndY_crt_0" , 580 - g_settings.screen_StartY_crt_0 - 1); - g_settings.screen_StartX_lcd_0 = configfile.getInt32("screen_StartX_lcd_0", 40); - g_settings.screen_StartY_lcd_0 = configfile.getInt32("screen_StartY_lcd_0", 25); - g_settings.screen_EndX_lcd_0 = configfile.getInt32("screen_EndX_lcd_0" , 1280 - g_settings.screen_StartX_lcd_0 - 1); - g_settings.screen_EndY_lcd_0 = configfile.getInt32("screen_EndY_lcd_0" , 720 - g_settings.screen_StartY_lcd_0 - 1); - g_settings.screen_StartX_crt_1 = configfile.getInt32("screen_StartX_crt_1", 80); - g_settings.screen_StartY_crt_1 = configfile.getInt32("screen_StartY_crt_1", 45); - g_settings.screen_EndX_crt_1 = configfile.getInt32("screen_EndX_crt_1" , 1920 - g_settings.screen_StartX_crt_1 - 1); - g_settings.screen_EndY_crt_1 = configfile.getInt32("screen_EndY_crt_1" , 870 - g_settings.screen_StartY_crt_1 - 1); - g_settings.screen_StartX_lcd_1 = configfile.getInt32("screen_StartX_lcd_1", 40); - g_settings.screen_StartY_lcd_1 = configfile.getInt32("screen_StartY_lcd_1", 25); - g_settings.screen_EndX_lcd_1 = configfile.getInt32("screen_EndX_lcd_1" , 1920 - g_settings.screen_StartX_lcd_1 - 1); - g_settings.screen_EndY_lcd_1 = configfile.getInt32("screen_EndY_lcd_1" , 1080 - g_settings.screen_StartY_lcd_1 - 1); - g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD); + + // default for fullpixel + g_settings.screen_StartX_lcd_a_0 = configfile.getInt32("screen_StartX_lcd_a_0", 0); + g_settings.screen_StartY_lcd_a_0 = configfile.getInt32("screen_StartY_lcd_a_0", 0); + g_settings.screen_EndX_lcd_a_0 = configfile.getInt32("screen_EndX_lcd_a_0" , 1280 - g_settings.screen_StartX_lcd_a_0 - 1); + g_settings.screen_EndY_lcd_a_0 = configfile.getInt32("screen_EndY_lcd_a_0" , 720 - g_settings.screen_StartY_lcd_a_0 - 1); + g_settings.screen_StartX_lcd_a_1 = configfile.getInt32("screen_StartX_lcd_a_1", 0); + g_settings.screen_StartY_lcd_a_1 = configfile.getInt32("screen_StartY_lcd_a_1", 0); + g_settings.screen_EndX_lcd_a_1 = configfile.getInt32("screen_EndX_lcd_a_1" , 1920 - g_settings.screen_StartX_lcd_a_1 - 1); + g_settings.screen_EndY_lcd_a_1 = configfile.getInt32("screen_EndY_lcd_a_1" , 1080 - g_settings.screen_StartY_lcd_a_1 - 1); + + // default for non fullpixel + g_settings.screen_StartX_lcd_b_0 = configfile.getInt32("screen_StartX_lcd_b_0", 22); + g_settings.screen_StartY_lcd_b_0 = configfile.getInt32("screen_StartY_lcd_b_0", 12); + g_settings.screen_EndX_lcd_b_0 = configfile.getInt32("screen_EndX_lcd_b_0" , 1259 - g_settings.screen_StartX_lcd_b_0 - 1); + g_settings.screen_EndY_lcd_b_0 = configfile.getInt32("screen_EndY_lcd_b_0" , 708 - g_settings.screen_StartY_lcd_b_0 - 1); + g_settings.screen_StartX_lcd_b_1 = configfile.getInt32("screen_StartX_lcd_b_1", 33); + g_settings.screen_StartY_lcd_b_1 = configfile.getInt32("screen_StartY_lcd_b_1", 18); + g_settings.screen_EndX_lcd_b_1 = configfile.getInt32("screen_EndX_lcd_b_1" , 1888 - g_settings.screen_StartX_lcd_b_1 - 1); + g_settings.screen_EndY_lcd_b_1 = configfile.getInt32("screen_EndY_lcd_b_1" , 1062 - g_settings.screen_StartY_lcd_b_1 - 1); + + g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD_A); setScreenSettings(); // avoid configuration mismatch @@ -1235,18 +1240,18 @@ void CNeutrinoApp::setScreenSettings() case 1: { switch (g_settings.screen_preset) { - case COsdSetup::PRESET_CRT: - g_settings.screen_StartX = g_settings.screen_StartX_crt_1; - g_settings.screen_StartY = g_settings.screen_StartY_crt_1; - g_settings.screen_EndX = g_settings.screen_EndX_crt_1; - g_settings.screen_EndY = g_settings.screen_EndY_crt_1; + case COsdSetup::PRESET_LCD_B: + g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_1; + g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_1; + g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_1; + g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_1; break; - case COsdSetup::PRESET_LCD: + case COsdSetup::PRESET_LCD_A: default: - g_settings.screen_StartX = g_settings.screen_StartX_lcd_1; - g_settings.screen_StartY = g_settings.screen_StartY_lcd_1; - g_settings.screen_EndX = g_settings.screen_EndX_lcd_1; - g_settings.screen_EndY = g_settings.screen_EndY_lcd_1; + g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_1; + g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_1; + g_settings.screen_EndX = g_settings.screen_EndX_lcd_a_1; + g_settings.screen_EndY = g_settings.screen_EndY_lcd_a_1; break; } } @@ -1256,18 +1261,18 @@ void CNeutrinoApp::setScreenSettings() default: { switch (g_settings.screen_preset) { - case COsdSetup::PRESET_CRT: - g_settings.screen_StartX = g_settings.screen_StartX_crt_0; - g_settings.screen_StartY = g_settings.screen_StartY_crt_0; - g_settings.screen_EndX = g_settings.screen_EndX_crt_0; - g_settings.screen_EndY = g_settings.screen_EndY_crt_0; + case COsdSetup::PRESET_LCD_B: + g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_0; + g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_0; + g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_0; + g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_0; break; - case COsdSetup::PRESET_LCD: + case COsdSetup::PRESET_LCD_A: default: - g_settings.screen_StartX = g_settings.screen_StartX_lcd_0; - g_settings.screen_StartY = g_settings.screen_StartY_lcd_0; - g_settings.screen_EndX = g_settings.screen_EndX_lcd_0; - g_settings.screen_EndY = g_settings.screen_EndY_lcd_0; + g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_0; + g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_0; + g_settings.screen_EndX = g_settings.screen_EndX_lcd_a_0; + g_settings.screen_EndY = g_settings.screen_EndY_lcd_a_0; break; } } @@ -1820,22 +1825,22 @@ void CNeutrinoApp::saveSetup(const char * fname) //screen configuration configfile.setInt32("osd_resolution" , COsdHelpers::getInstance()->g_settings_osd_resolution_save); - configfile.setInt32("screen_StartX_lcd_0", g_settings.screen_StartX_lcd_0); - configfile.setInt32("screen_StartY_lcd_0", g_settings.screen_StartY_lcd_0); - configfile.setInt32("screen_EndX_lcd_0" , g_settings.screen_EndX_lcd_0); - configfile.setInt32("screen_EndY_lcd_0" , g_settings.screen_EndY_lcd_0); - configfile.setInt32("screen_StartX_crt_0", g_settings.screen_StartX_crt_0); - configfile.setInt32("screen_StartY_crt_0", g_settings.screen_StartY_crt_0); - configfile.setInt32("screen_EndX_crt_0" , g_settings.screen_EndX_crt_0); - configfile.setInt32("screen_EndY_crt_0" , g_settings.screen_EndY_crt_0); - configfile.setInt32("screen_StartX_lcd_1", g_settings.screen_StartX_lcd_1); - configfile.setInt32("screen_StartY_lcd_1", g_settings.screen_StartY_lcd_1); - configfile.setInt32("screen_EndX_lcd_1" , g_settings.screen_EndX_lcd_1); - configfile.setInt32("screen_EndY_lcd_1" , g_settings.screen_EndY_lcd_1); - configfile.setInt32("screen_StartX_crt_1", g_settings.screen_StartX_crt_1); - configfile.setInt32("screen_StartY_crt_1", g_settings.screen_StartY_crt_1); - configfile.setInt32("screen_EndX_crt_1" , g_settings.screen_EndX_crt_1); - configfile.setInt32("screen_EndY_crt_1" , g_settings.screen_EndY_crt_1); + configfile.setInt32("screen_StartX_lcd_a_0", g_settings.screen_StartX_lcd_a_0); + configfile.setInt32("screen_StartY_lcd_a_0", g_settings.screen_StartY_lcd_a_0); + configfile.setInt32("screen_EndX_lcd_a_0" , g_settings.screen_EndX_lcd_a_0); + configfile.setInt32("screen_EndY_lcd_a_0" , g_settings.screen_EndY_lcd_a_0); + configfile.setInt32("screen_StartX_lcd_a_1", g_settings.screen_StartX_lcd_a_1); + configfile.setInt32("screen_StartY_lcd_a_1", g_settings.screen_StartY_lcd_a_1); + configfile.setInt32("screen_EndX_lcd_a_1" , g_settings.screen_EndX_lcd_a_1); + configfile.setInt32("screen_EndY_lcd_a_1" , g_settings.screen_EndY_lcd_a_1); + configfile.setInt32("screen_StartX_lcd_b_0", g_settings.screen_StartX_lcd_b_0); + configfile.setInt32("screen_StartY_lcd_b_0", g_settings.screen_StartY_lcd_b_0); + configfile.setInt32("screen_EndX_lcd_b_0" , g_settings.screen_EndX_lcd_b_0); + configfile.setInt32("screen_EndY_lcd_b_0" , g_settings.screen_EndY_lcd_b_0); + configfile.setInt32("screen_StartX_lcd_b_1", g_settings.screen_StartX_lcd_b_1); + configfile.setInt32("screen_StartY_lcd_b_1", g_settings.screen_StartY_lcd_b_1); + configfile.setInt32("screen_EndX_lcd_b_1" , g_settings.screen_EndX_lcd_b_1); + configfile.setInt32("screen_EndY_lcd_b_1" , g_settings.screen_EndY_lcd_b_1); configfile.setInt32("screen_preset" , g_settings.screen_preset); //Software-update @@ -5895,14 +5900,14 @@ static struct __key_rename key_rename[] = { { "casystem_display", "infobar_casystem_display" }, { "casystem_dotmatrix", "infobar_casystem_dotmatrix"}, { "casystem_frame", "infobar_casystem_frame" }, - { "screen_StartX_crt", "screen_StartX_crt_0" }, - { "screen_StartY_crt", "screen_StartY_crt_0" }, - { "screen_EndX_crt", "screen_EndX_crt_0" }, - { "screen_EndY_crt", "screen_EndY_crt_0" }, - { "screen_StartX_lcd", "screen_StartX_lcd_0" }, - { "screen_StartY_lcd", "screen_StartY_lcd_0" }, - { "screen_EndX_lcd", "screen_EndX_lcd_0" }, - { "screen_EndY_lcd", "screen_EndY_lcd_0" }, + { "screen_StartX_lcd", "screen_StartX_lcd_a_0" }, + { "screen_StartY_lcd", "screen_StartY_lcd_a_0" }, + { "screen_EndX_lcd", "screen_EndX_lcd_a_0" }, + { "screen_EndY_lcd", "screen_EndY_lcd_a_0" }, + { "screen_StartX_crt", "screen_StartX_lcd_b_0" }, + { "screen_StartY_crt", "screen_StartY_lcd_b_0" }, + { "screen_EndX_crt", "screen_EndX_lcd_b_0" }, + { "screen_EndY_crt", "screen_EndY_lcd_b_0" }, { "timing.infobar_movieplayer", "timing.infobar_media_video" }, { "ci_clock", "ci_clock_0" }, { "ci_save_pincode", "ci_save_pincode_0" }, diff --git a/src/system/settings.h b/src/system/settings.h index 7cd50685e..dbc2b90c0 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -801,22 +801,22 @@ struct SNeutrinoSettings int screen_StartY; int screen_EndX; int screen_EndY; - int screen_StartX_crt_0; - int screen_StartY_crt_0; - int screen_EndX_crt_0; - int screen_EndY_crt_0; - int screen_StartX_lcd_0; - int screen_StartY_lcd_0; - int screen_EndX_lcd_0; - int screen_EndY_lcd_0; - int screen_StartX_crt_1; - int screen_StartY_crt_1; - int screen_EndX_crt_1; - int screen_EndY_crt_1; - int screen_StartX_lcd_1; - int screen_StartY_lcd_1; - int screen_EndX_lcd_1; - int screen_EndY_lcd_1; + int screen_StartX_lcd_a_0; + int screen_StartY_lcd_a_0; + int screen_EndX_lcd_a_0; + int screen_EndY_lcd_a_0; + int screen_StartX_lcd_a_1; + int screen_StartY_lcd_a_1; + int screen_EndX_lcd_a_1; + int screen_EndY_lcd_a_1; + int screen_StartX_lcd_b_0; + int screen_StartY_lcd_b_0; + int screen_EndX_lcd_b_0; + int screen_EndY_lcd_b_0; + int screen_StartX_lcd_b_1; + int screen_StartY_lcd_b_1; + int screen_EndX_lcd_b_1; + int screen_EndY_lcd_b_1; int osd_resolution; int screen_preset; int screen_width;