From 87ae0b0f582c4c24b355456ecc3cd82ebb2007ff Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 18 Jun 2021 23:08:11 +0200 Subject: [PATCH] - osd-setup: move screen stuff into own submenu Signed-off-by: Thilo Graf --- data/locale/deutsch.locale | 6 ++++-- data/locale/english.locale | 6 ++++-- src/gui/osd_setup.cpp | 34 ++++++++++++++++++++++++---------- src/gui/osd_setup.h | 1 + src/neutrino_menue.h | 1 + src/system/locals.h | 4 +++- src/system/locals_intern.h | 4 +++- 7 files changed, 40 insertions(+), 16 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 90d6fd29b..17a6fe78e 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -366,7 +366,7 @@ colormenu.fade Ein-/Ausblenden colormenu.font Verwendete Schriftart colormenu.font_ttx Videotext Schriftart colormenu.menucolors Themes -colormenu.osd_preset Bildschirm Auswahl +colormenu.osd_preset Bildschirmauswahl colormenu.osd_resolution OSD-Auflösung colormenu.progressbar_active Farbe des aktiven Teil colormenu.progressbar_passive Hintergrundfarbe @@ -1681,7 +1681,7 @@ menu.hint_scan_usalsall Verwenden Sie USALS für alle Satelliten an diesem Tuner menu.hint_scan_useusals Verwenden Sie USALS für diesen Satelliten,\nwenn aktiv, wird Rotorposition ignoriert menu.hint_scart_osd_fix Anzeigefix für ältere Monitore\nPAL bzw. PAL-Breitbild Auflösung menu.hint_scrambled_message Bei aktivierter Option erscheint eine Meldung, wenn ein verschlüsselter Sender nicht entschlüsselt werden kann -menu.hint_screen_setup Konfigurieren Sie den Bildschirmbereich für die Menüanzeige +menu.hint_screen Konfigurieren Sie Bildschirme und Bildschirmbereiche menu.hint_screensaver_delay Legen sie die Zeit (in Minuten) fest, nach der der Bildschirmschoner starten soll oder schaltet ihn aus menu.hint_screensaver_dir Wählen Sie das Verzeichnis, in dem die Bilder für Ihren Bildschirmschoner gespeichert sind menu.hint_screensaver_enable_text_info Zeige zusätzliche Textinformationen an falls verfügbar. @@ -1689,6 +1689,7 @@ menu.hint_screensaver_mode Modus des Bilschirmschoners wählen. menu.hint_screensaver_random Aktviere/deaktiviere zufällige Bilderauswahl. menu.hint_screensaver_setup Konfigurieren Sie die Optionen des Bildschirmschoners für den Audioplayer und den Radio-Modus menu.hint_screensaver_timeout Wechselintervall des Bildschirmschoners +menu.hint_screensetup Konfigurieren Sie den Bildschirmbereich für die Menüanzeige menu.hint_screenshot_count Wählen Sie, wie viele Screenshots erstellt werden sollen menu.hint_screenshot_cover Während der Wiedergabe von Aufnahmen kann ein Screenshot für die Vorschau im Moviebrowser erstellt werden menu.hint_screenshot_dir Wählen Sie das Verzeichnis zum Speichern der Screenshots @@ -2566,6 +2567,7 @@ scants.test Empfangstest scants.transponders Transponder: scart_osd_fix CRT SCART OSD-Fix scrambled_channel Verschlüsselung aktiv +screen.menu Bildschirm screensaver.delay Verzögerung screensaver.dir Verzeichnis screensaver.enable_text_info Textinformationen diff --git a/data/locale/english.locale b/data/locale/english.locale index 551daec17..4ac8091bd 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -366,7 +366,7 @@ colormenu.fade Fade GUI colormenu.font Select GUI font colormenu.font_ttx Select Teletext font colormenu.menucolors Themes -colormenu.osd_preset Screen preset +colormenu.osd_preset Screen selection colormenu.osd_resolution OSD resolution colormenu.progressbar_active Active part color colormenu.progressbar_passive Background @@ -1681,7 +1681,7 @@ menu.hint_scan_usalsall Use USALS for all satellites on this frontend menu.hint_scan_useusals Use USALS for this satellite,\nif ON, rotor position ignored menu.hint_scart_osd_fix Screen-fix for some older TVs\nPAL/PAL widescreen resolution menu.hint_scrambled_message Show scrambled message, when channel cannot be decoded -menu.hint_screen_setup Configure screen margins +menu.hint_screen Configure screens and screen margins menu.hint_screensaver_delay Set the time (in minutes) after which the screensaver has to start or turn it off menu.hint_screensaver_dir Select directory in which the screensaver has to start menu.hint_screensaver_enable_text_info Show additional text informations if available. @@ -1689,6 +1689,7 @@ menu.hint_screensaver_mode Select screensaver mode. menu.hint_screensaver_random Enable/disable random image selection. menu.hint_screensaver_setup Configure screensaver options for audioplayer and radio mode menu.hint_screensaver_timeout Select the timeout to changes in screensavers +menu.hint_screensetup Configure screen margins menu.hint_screenshot_count When no GUI on screen, you can save 1-5\nscreenshot serie menu.hint_screenshot_cover ON: When playing record, overwrite single\nscreenshot to show inside MovieBrowser menu.hint_screenshot_dir Select directory to save screenshots @@ -2566,6 +2567,7 @@ scants.test Test signal scants.transponders Transponders: scart_osd_fix CRT SCART OSD-Fix scrambled_channel Scrambled channel +screen.menu Screen screensaver.delay Delay screensaver.dir Directory screensaver.enable_text_info Text information diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 6577eac6a..064760f82 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -577,7 +577,7 @@ int COsdSetup::showOsdSetup() CMenuOptionChooser * mc = NULL; // osd main menu - osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP); + osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP); osd_menu->setWizardMode(is_wizard); // intro with subhead and back button @@ -594,7 +594,7 @@ int COsdSetup::showOsdSetup() osd_menu->addItem(mf); // fonts - CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_FONT); + CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_FONT); showOsdFontSizeSetup(&osd_menu_fonts); mf = new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &osd_menu_fonts, NULL, CRCInput::RC_green); mf->setHint("", LOCALE_MENU_HINT_FONTS); @@ -608,9 +608,10 @@ int COsdSetup::showOsdSetup() osd_menu->addItem(mf); // screen - CScreenSetup screensetup; - mf = new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, &screensetup, NULL, CRCInput::RC_blue); - mf->setHint("", LOCALE_MENU_HINT_SCREEN_SETUP); + CMenuWidget osd_menu_screen(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREEN); + showOsdScreenSetup(&osd_menu_screen); + mf = new CMenuForwarder(LOCALE_SCREEN_MENU, true, NULL, &osd_menu_screen, NULL, CRCInput::RC_blue); + mf->setHint("", LOCALE_MENU_HINT_SCREEN); osd_menu->addItem(mf); // menus @@ -725,11 +726,6 @@ int COsdSetup::showOsdSetup() osd_menu->addItem(osd_res); #endif - // monitor - mc = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this); - mc->setHint("", LOCALE_MENU_HINT_OSD_PRESET); - osd_menu->addItem(mc); - #if defined BOXMODEL_CST_HD1 int scart_osd_fix_exist = 0; if (file_exists("/var/etc/.scart_osd_fix")) @@ -1706,6 +1702,24 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist) return res; } +void COsdSetup::showOsdScreenSetup(CMenuWidget *menu_screen) +{ + CMenuForwarder *mf = NULL; + CMenuOptionChooser *mc = NULL; + + menu_screen->addIntroItems(LOCALE_SCREEN_MENU); + + // screen + mf = new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, new CScreenSetup, NULL, CRCInput::RC_red); + mf->setHint("", LOCALE_MENU_HINT_SCREENSETUP); + menu_screen->addItem(mf); + + // monitor + mc = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this, CRCInput::RC_green); + mc->setHint("", LOCALE_MENU_HINT_OSD_PRESET); + menu_screen->addItem(mc); +} + #ifdef SCREENSHOT //screenshot #define SCREENSHOT_FMT_OPTION_COUNT 3 diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 0a50e58e8..130a12b46 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -78,6 +78,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver void showOsdEventlistSetup(CMenuWidget *menu_eventlist); void showOsdVolumeSetup(CMenuWidget *menu_volume); void showOsdInfoclockSetup(CMenuWidget *menu_infoclock); + void showOsdScreenSetup(CMenuWidget *menu_screen); void showOsdScreenShotSetup(CMenuWidget *menu_screenshot); void showOsdScreensaverSetup(CMenuWidget *menu_screensaver); void paintWindowSize(int w, int h); diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index 114abf5ca..9c6b342d0 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -62,6 +62,7 @@ enum MN_WIDGET_ID MN_WIDGET_ID_OSDSETUP_INFOBAR, MN_WIDGET_ID_OSDSETUP_MENUCOLORS, MN_WIDGET_ID_OSDSETUP_TIMEOUT, + MN_WIDGET_ID_OSDSETUP_SCREEN, MN_WIDGET_ID_OSDSETUP_SCREENSHOT, MN_WIDGET_ID_OSDSETUP_SCREENSAVER, MN_WIDGET_ID_OSDSETUP_VOLUME, diff --git a/src/system/locals.h b/src/system/locals.h index 34412f3de..1b9dacd12 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1708,7 +1708,7 @@ typedef enum LOCALE_MENU_HINT_SCAN_USEUSALS, LOCALE_MENU_HINT_SCART_OSD_FIX, LOCALE_MENU_HINT_SCRAMBLED_MESSAGE, - LOCALE_MENU_HINT_SCREEN_SETUP, + LOCALE_MENU_HINT_SCREEN, LOCALE_MENU_HINT_SCREENSAVER_DELAY, LOCALE_MENU_HINT_SCREENSAVER_DIR, LOCALE_MENU_HINT_SCREENSAVER_ENABLE_TEXT_INFO, @@ -1716,6 +1716,7 @@ typedef enum LOCALE_MENU_HINT_SCREENSAVER_RANDOM, LOCALE_MENU_HINT_SCREENSAVER_SETUP, LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT, + LOCALE_MENU_HINT_SCREENSETUP, LOCALE_MENU_HINT_SCREENSHOT_COUNT, LOCALE_MENU_HINT_SCREENSHOT_COVER, LOCALE_MENU_HINT_SCREENSHOT_DIR, @@ -2593,6 +2594,7 @@ typedef enum LOCALE_SCANTS_TRANSPONDERS, LOCALE_SCART_OSD_FIX, LOCALE_SCRAMBLED_CHANNEL, + LOCALE_SCREEN_MENU, LOCALE_SCREENSAVER_DELAY, LOCALE_SCREENSAVER_DIR, LOCALE_SCREENSAVER_ENABLE_TEXT_INFO, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index eb6fafb59..e6367708d 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1708,7 +1708,7 @@ const char * locale_real_names[] = "menu.hint_scan_useusals", "menu.hint_scart_osd_fix", "menu.hint_scrambled_message", - "menu.hint_screen_setup", + "menu.hint_screen", "menu.hint_screensaver_delay", "menu.hint_screensaver_dir", "menu.hint_screensaver_enable_text_info", @@ -1716,6 +1716,7 @@ const char * locale_real_names[] = "menu.hint_screensaver_random", "menu.hint_screensaver_setup", "menu.hint_screensaver_timeout", + "menu.hint_screensetup", "menu.hint_screenshot_count", "menu.hint_screenshot_cover", "menu.hint_screenshot_dir", @@ -2593,6 +2594,7 @@ const char * locale_real_names[] = "scants.transponders", "scart_osd_fix", "scrambled_channel", + "screen.menu", "screensaver.delay", "screensaver.dir", "screensaver.enable_text_info",