diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c9ad10531..89511af7e 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1188,6 +1188,7 @@ lcd4l_convert Konvertiere Umlaute lcd4l_display_type Display-Typ lcd4l_display_type_setup Display-Typ einstellen lcd4l_logodir Senderlogo-Verzeichnis +lcd4l_screenshots Screenshots erstellen lcd4l_skin Display-Style lcd4l_skin_0 Standard lcd4l_skin_1 Groß @@ -1554,6 +1555,7 @@ menu.hint_lcd4l_convert Konvertiert Umlaute für die eingebaute LCD4Linux-Schrif menu.hint_lcd4l_display_type Wählen Sie den Typ des externen Displays menu.hint_lcd4l_display_type_setup Einstellungen für den Typ des externen Displays menu.hint_lcd4l_logodir Verzeichnis für eigene Senderlogos. Bei ungültigem Eintrag werden die Standard-Logos benutzt. +menu.hint_lcd4l_screenshots Erzeugt Screenshots des externen Displays in /tmp/lcd4linux.png menu.hint_lcd4l_skin Auswahl der verfügbaren Darstellungsarten\nStandard, Benutzerdefiniert, etc. menu.hint_lcd4l_skin_radio Wechselt die Darstellungsart, wenn der Radio-Modus aktiviert wird menu.hint_lcd4l_support LCD4Linux aktivieren/deaktivieren\nUnterstützte Displays: Pearl DPF, Samsung SPF diff --git a/data/locale/english.locale b/data/locale/english.locale index 7e4c7fae6..4e75d72ce 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1188,6 +1188,7 @@ lcd4l_convert Convert umlauts lcd4l_display_type Display type lcd4l_display_type_setup Display type setup lcd4l_logodir Channel logo directory +lcd4l_screenshots Create screenshots lcd4l_skin Display style lcd4l_skin_0 Standard lcd4l_skin_1 Large @@ -1554,6 +1555,7 @@ menu.hint_lcd4l_convert Convert umlauts for the built-in LCD4Linux font menu.hint_lcd4l_display_type Choose type of external display menu.hint_lcd4l_display_type_setup Settings for the type of external display menu.hint_lcd4l_logodir Directory for own channel logos. Fallback to default logos when entry is invalid. +menu.hint_lcd4l_screenshots Create screenshots from external display in /tmp/lcd4linux.png menu.hint_lcd4l_skin Switch between styles\nDefault, User defined, etc. menu.hint_lcd4l_skin_radio Switch style when Radio-Mode is activated menu.hint_lcd4l_support Activate/deactivate LCD4Linux\nSupported displays: Pearl DPF, Samsung SPF diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index b66efba0f..56df8da63 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -173,6 +173,7 @@ int CLCD4lSetup::show() temp_lcd4l_display_type = g_settings.lcd4l_display_type; temp_lcd4l_skin = g_settings.lcd4l_skin; temp_lcd4l_brightness = g_settings.lcd4l_brightness; + temp_lcd4l_screenshots = g_settings.lcd4l_screenshots; CMenuOptionChooser *mc; CMenuForwarder *mf; @@ -223,6 +224,10 @@ int CLCD4lSetup::show() mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_CONVERT); lcd4lSetup->addItem(mc); + mc = new CMenuOptionChooser(LOCALE_LCD4L_SCREENSHOTS, &temp_lcd4l_screenshots, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SCREENSHOTS); + lcd4lSetup->addItem(mc); + int res = lcd4lSetup->exec(NULL, ""); lcd4lSetup->hide(); @@ -257,6 +262,14 @@ int CLCD4lSetup::show() initlcd4l = true; } + if (g_settings.lcd4l_screenshots != temp_lcd4l_screenshots) + { + g_settings.lcd4l_screenshots = temp_lcd4l_screenshots; + initlcd4l = true; + + CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE); + } + if (initlcd4l) CLCD4l::getInstance()->InitLCD4l(); diff --git a/src/gui/lcd4l_setup.h b/src/gui/lcd4l_setup.h index 4dddc677f..593e47041 100644 --- a/src/gui/lcd4l_setup.h +++ b/src/gui/lcd4l_setup.h @@ -41,6 +41,7 @@ class CLCD4lSetup : public CMenuTarget, CChangeObserver int temp_lcd4l_display_type; int temp_lcd4l_skin; int temp_lcd4l_brightness; + int temp_lcd4l_screenshots; int width; int show(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 22679d1ca..d7bee2f0a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -418,6 +418,7 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.lcd4l_brightness = configfile.getInt32("lcd4l_brightness", 7); g_settings.lcd4l_brightness_standby = configfile.getInt32("lcd4l_brightness_standby", 3); g_settings.lcd4l_convert = configfile.getInt32("lcd4l_convert", 1); + g_settings.lcd4l_screenshots = configfile.getInt32("lcd4l_screenshots", 0); #endif g_settings.mode_icons = configfile.getInt32("mode_icons", 0); @@ -1678,6 +1679,7 @@ void CNeutrinoApp::saveSetup(const char *fname) configfile.setInt32("lcd4l_brightness", g_settings.lcd4l_brightness); configfile.setInt32("lcd4l_brightness_standby", g_settings.lcd4l_brightness_standby); configfile.setInt32("lcd4l_convert", g_settings.lcd4l_convert); + configfile.setInt32("lcd4l_screenshots", g_settings.lcd4l_screenshots); #endif configfile.setInt32("mode_icons", g_settings.mode_icons); diff --git a/src/system/locals.h b/src/system/locals.h index e1147de90..a537415b4 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1215,6 +1215,7 @@ typedef enum LOCALE_LCD4L_DISPLAY_TYPE, LOCALE_LCD4L_DISPLAY_TYPE_SETUP, LOCALE_LCD4L_LOGODIR, + LOCALE_LCD4L_SCREENSHOTS, LOCALE_LCD4L_SKIN, LOCALE_LCD4L_SKIN_0, LOCALE_LCD4L_SKIN_1, @@ -1581,6 +1582,7 @@ typedef enum LOCALE_MENU_HINT_LCD4L_DISPLAY_TYPE, LOCALE_MENU_HINT_LCD4L_DISPLAY_TYPE_SETUP, LOCALE_MENU_HINT_LCD4L_LOGODIR, + LOCALE_MENU_HINT_LCD4L_SCREENSHOTS, LOCALE_MENU_HINT_LCD4L_SKIN, LOCALE_MENU_HINT_LCD4L_SKIN_RADIO, LOCALE_MENU_HINT_LCD4L_SUPPORT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d9598795d..e98181c0e 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1215,6 +1215,7 @@ const char * locale_real_names[] = "lcd4l_display_type", "lcd4l_display_type_setup", "lcd4l_logodir", + "lcd4l_screenshots", "lcd4l_skin", "lcd4l_skin_0", "lcd4l_skin_1", @@ -1581,6 +1582,7 @@ const char * locale_real_names[] = "menu.hint_lcd4l_display_type", "menu.hint_lcd4l_display_type_setup", "menu.hint_lcd4l_logodir", + "menu.hint_lcd4l_screenshots", "menu.hint_lcd4l_skin", "menu.hint_lcd4l_skin_radio", "menu.hint_lcd4l_support", diff --git a/src/system/settings.h b/src/system/settings.h index bea942ad1..ea681a256 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -319,6 +319,7 @@ struct SNeutrinoSettings int lcd4l_brightness; int lcd4l_brightness_standby; int lcd4l_convert; + int lcd4l_screenshots; #endif #define MODE_ICONS_NR_OF_ENTRIES 8