diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index b417ff612..e9479fb6c 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -173,7 +173,6 @@ audioplayer.receiving_list Liste wird empfangen, bitte warten... audioplayer.repeat_on Repeatmodus aktivieren audioplayer.rewind schneller Rückl. audioplayer.save_playlist Playlist speichern -audioplayer.screensaver_timeout Bildschirmschoner audioplayer.select_title_by_name Titelsuche nach Name (SMS) audioplayer.show_playlist Playlist anzeigen audioplayer.shuffle Zufällig @@ -908,7 +907,6 @@ menu.hint_audioplayer_order Ändern der Sortierreihenfolge der Wiedergabeliste menu.hint_audioplayer_playlist Aktiviert die Anzeige der Titel in der Wiedergabeliste menu.hint_audioplayer_repeat Aktiviert das Wiederholen der Wiedergabeliste, wenn das Ende erreicht ist menu.hint_audioplayer_sc_metadata Aktiviert das Anzeigen der Audio-Metadaten -menu.hint_audioplayer_screensaver Aktiviert den Bildschirmschoner nach dieser Zeit (Minuten) menu.hint_audioplayer_title Aktivieren Sie die Titelsuche (SMS-Stil) in der Playliste menu.hint_auto_lang Wählen Sie, ob automatisch ihre bevorzugte Tonspur ausgewählt wird, wenn sie vorhanden ist menu.hint_auto_subs Automatische Anzeige der Untertitel in Ihrer bevorzugten Sprache @@ -1286,6 +1284,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_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_screensaver_delay Legen sie die Zeit (in Minuten) fest, nach der der Bildschirmschoner starten soll menu.hint_screensaver_dir Wählen Sie das Verzeichnis, in dem die Bilder für Ihren Bildschirmschoner gespeichert sind menu.hint_screensaver_timeout Wählen Sie Die Wartezeit bis zum Bilderwechsel des Bildschirmschoners menu.hint_screensaver_setup Konfigurieren Sie die Optionen des Bildschirmschoners für den Audioplayer @@ -2054,9 +2053,10 @@ scants.startnow Kanalsuche starten scants.test Empfangstest scants.transponders Transponder: scrambled_channel Verschlüsselung aktiv +screensaver.delay Verzögerung screensaver.dir Verzeichnis +screensaver.menu Bildschirmschoner screensaver.timeout Bilderwechsel -screensaver.setup Bildschirmschoner screensetup.lowerright grün = Bildrand unten, rechts screensetup.upperleft rot = Bildrand oben, links screenshot.count Anzahl diff --git a/data/locale/english.locale b/data/locale/english.locale index a6e831ee8..133758382 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -173,7 +173,6 @@ audioplayer.receiving_list Receiving list, please wait audioplayer.repeat_on enable repeat mode audioplayer.rewind rewind audioplayer.save_playlist save play list -audioplayer.screensaver_timeout screensaver timeout audioplayer.select_title_by_name search title by name (SMS) audioplayer.show_playlist Show Playlist audioplayer.shuffle shuffle @@ -911,7 +910,6 @@ menu.hint_audioplayer_order Change playlist sort order menu.hint_audioplayer_playlist Show playlist items menu.hint_audioplayer_repeat Enable playlist repeat when end of list reached menu.hint_audioplayer_sc_metadata Enable streaming audio metadata parsing -menu.hint_audioplayer_screensaver Set screensaver timeout, in minutes menu.hint_audioplayer_title Enable SMS-style title search in playlist menu.hint_auto_lang Auto-switch audio to preferred language menu.hint_auto_subs Auto-start subtitles for preferred language @@ -1290,7 +1288,8 @@ 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_scrambled_message Show scrambled message, when channel cannot be decoded menu.hint_screen_setup Configure screen margins -menu.hint_screensaver_dir Select directory in which the screensaver has to start. +menu.hint_screensaver_delay Set the time (in minutes) after which the screensaver has to start +menu.hint_screensaver_dir Select directory in which the screensaver has to start menu.hint_screensaver_timeout Select the timeout to change pictures in screensavers menu.hint_screensaver_setup Configure screensaver options for audioplayer menu.hint_screenshot_count When no GUI on screen, you can save 1-5\nscreenshot serie @@ -2059,6 +2058,7 @@ scants.startnow start scan scants.test Test signal scants.transponders Transponders: scrambled_channel Scrambled channel +screensaver.delay Delay screensaver.dir Directory screensaver.menu Screensaver screensaver.timeout Change pictures diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 2339d49ff..71dbc4307 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -373,9 +373,9 @@ int CAudioPlayerGui::show() if ( msg == CRCInput::RC_timeout || msg == NeutrinoMessages::EVT_TIMER) { - int timeout = time(NULL) - m_idletime; - int screensaver_timeout = g_settings.audioplayer_screensaver; - if (screensaver_timeout != 0 && timeout > screensaver_timeout*60 && !m_screensaver) + int delay = time(NULL) - m_idletime; + int screensaver_delay = g_settings.screensaver_delay; + if (screensaver_delay != 0 && delay > screensaver_delay*60 && !m_screensaver) screensaver(true); } else diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp index b95433215..84fd29cf1 100644 --- a/src/gui/audioplayer_setup.cpp +++ b/src/gui/audioplayer_setup.cpp @@ -125,11 +125,6 @@ int CAudioPlayerSetup::showAudioPlayerSetup() mc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_PLAYLIST); audioplayerSetup->addItem(mc); - CMenuOptionNumberChooser *cc = new CMenuOptionNumberChooser(LOCALE_AUDIOPLAYER_SCREENSAVER_TIMEOUT, &g_settings.audioplayer_screensaver, true, 0, 999, NULL, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); - cc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE)); - cc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_SCREENSAVER); - audioplayerSetup->addItem(cc); - mc = new CMenuOptionChooser(LOCALE_AUDIOPLAYER_HIGHPRIO, &g_settings.audioplayer_highprio, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true ); mc->setHint("", LOCALE_MENU_HINT_AUDIOPLAYER_HIGHPRIO); audioplayerSetup->addItem(mc); diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 5520f6b9d..89e8a1590 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1271,8 +1271,14 @@ void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver) mf->setHint("", LOCALE_MENU_HINT_SCREENSAVER_DIR); menu_screensaver->addItem(mf); + // screensaver delay + CMenuOptionNumberChooser* nc = new CMenuOptionNumberChooser(LOCALE_SCREENSAVER_DELAY, &g_settings.screensaver_delay, true, 0, 999, NULL, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); + nc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE)); + nc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_DELAY); + menu_screensaver->addItem(nc); + // screensaver timeout - CMenuOptionNumberChooser* nc = new CMenuOptionNumberChooser(LOCALE_SCREENSAVER_TIMEOUT, &g_settings.screensaver_timeout, true, 10, 60); + nc = new CMenuOptionNumberChooser(LOCALE_SCREENSAVER_TIMEOUT, &g_settings.screensaver_timeout, true, 0, 60); nc->setNumberFormat(std::string("%d ") + g_Locale->getText(LOCALE_UNIT_SHORT_SECOND)); nc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT); menu_screensaver->addItem(nc); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c81abeb92..df40f4add 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -497,6 +497,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 0 ); //screen saver + g_settings.screensaver_delay = configfile.getInt32("screensaver_delay", 1); g_settings.screensaver_dir = configfile.getString("screensaver_dir", DATADIR "/neutrino/icons/"); g_settings.screensaver_timeout = configfile.getInt32("screensaver_timeout", 10); @@ -778,7 +779,6 @@ int CNeutrinoApp::loadSetup(const char * fname) //Audio-Player g_settings.audioplayer_display = configfile.getInt32("audioplayer_display",(int)CAudioPlayerGui::ARTIST_TITLE); g_settings.audioplayer_follow = configfile.getInt32("audioplayer_follow",0); - g_settings.audioplayer_screensaver = configfile.getInt32("audioplayer_screensaver", 1); g_settings.audioplayer_highprio = configfile.getInt32("audioplayer_highprio",0); g_settings.audioplayer_select_title_by_name = configfile.getInt32("audioplayer_select_title_by_name",0); g_settings.audioplayer_repeat_on = configfile.getInt32("audioplayer_repeat_on",0); @@ -1025,6 +1025,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setString("subs_charset", g_settings.subs_charset); //screen saver + configfile.setInt32("screensaver_delay", g_settings.screensaver_delay); configfile.setString("screensaver_dir", g_settings.screensaver_dir); configfile.setInt32("screensaver_timeout", g_settings.screensaver_timeout); @@ -1238,7 +1239,6 @@ void CNeutrinoApp::saveSetup(const char * fname) //Audio-Player configfile.setInt32( "audioplayer_display", g_settings.audioplayer_display ); configfile.setInt32( "audioplayer_follow", g_settings.audioplayer_follow ); - configfile.setInt32( "audioplayer_screensaver", g_settings.audioplayer_screensaver ); configfile.setInt32( "audioplayer_highprio", g_settings.audioplayer_highprio ); configfile.setInt32( "audioplayer_select_title_by_name", g_settings.audioplayer_select_title_by_name ); configfile.setInt32( "audioplayer_repeat_on", g_settings.audioplayer_repeat_on ); diff --git a/src/system/locals.h b/src/system/locals.h index d428502dc..6f59cf31e 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -200,7 +200,6 @@ typedef enum LOCALE_AUDIOPLAYER_REPEAT_ON, LOCALE_AUDIOPLAYER_REWIND, LOCALE_AUDIOPLAYER_SAVE_PLAYLIST, - LOCALE_AUDIOPLAYER_SCREENSAVER_TIMEOUT, LOCALE_AUDIOPLAYER_SELECT_TITLE_BY_NAME, LOCALE_AUDIOPLAYER_SHOW_PLAYLIST, LOCALE_AUDIOPLAYER_SHUFFLE, @@ -938,7 +937,6 @@ typedef enum LOCALE_MENU_HINT_AUDIOPLAYER_PLAYLIST, LOCALE_MENU_HINT_AUDIOPLAYER_REPEAT, LOCALE_MENU_HINT_AUDIOPLAYER_SC_METADATA, - LOCALE_MENU_HINT_AUDIOPLAYER_SCREENSAVER, LOCALE_MENU_HINT_AUDIOPLAYER_TITLE, LOCALE_MENU_HINT_AUTO_LANG, LOCALE_MENU_HINT_AUTO_SUBS, @@ -1317,6 +1315,7 @@ typedef enum LOCALE_MENU_HINT_SCAN_USEUSALS, LOCALE_MENU_HINT_SCRAMBLED_MESSAGE, LOCALE_MENU_HINT_SCREEN_SETUP, + LOCALE_MENU_HINT_SCREENSAVER_DELAY, LOCALE_MENU_HINT_SCREENSAVER_DIR, LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT, LOCALE_MENU_HINT_SCREENSAVER_SETUP, @@ -2086,6 +2085,7 @@ typedef enum LOCALE_SCANTS_TEST, LOCALE_SCANTS_TRANSPONDERS, LOCALE_SCRAMBLED_CHANNEL, + LOCALE_SCREENSAVER_DELAY, LOCALE_SCREENSAVER_DIR, LOCALE_SCREENSAVER_MENU, LOCALE_SCREENSAVER_TIMEOUT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d41f442f0..278b738d5 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -200,7 +200,6 @@ const char * locale_real_names[] = "audioplayer.repeat_on", "audioplayer.rewind", "audioplayer.save_playlist", - "audioplayer.screensaver_timeout", "audioplayer.select_title_by_name", "audioplayer.show_playlist", "audioplayer.shuffle", @@ -938,7 +937,6 @@ const char * locale_real_names[] = "menu.hint_audioplayer_playlist", "menu.hint_audioplayer_repeat", "menu.hint_audioplayer_sc_metadata", - "menu.hint_audioplayer_screensaver", "menu.hint_audioplayer_title", "menu.hint_auto_lang", "menu.hint_auto_subs", @@ -1317,6 +1315,7 @@ const char * locale_real_names[] = "menu.hint_scan_useusals", "menu.hint_scrambled_message", "menu.hint_screen_setup", + "menu.hint_screensaver_delay", "menu.hint_screensaver_dir", "menu.hint_screensaver_timeout", "menu.hint_screensaver_setup", @@ -2086,6 +2085,7 @@ const char * locale_real_names[] = "scants.test", "scants.transponders", "scrambled_channel", + "screensaver.delay", "screensaver.dir", "screensaver.menu", "screensaver.timeout", diff --git a/src/system/settings.h b/src/system/settings.h index 7a9a9c65c..a4ee7196c 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -207,6 +207,7 @@ struct SNeutrinoSettings int easymenu; //screen saver + int screensaver_delay; std::string screensaver_dir; int screensaver_timeout; @@ -656,7 +657,6 @@ struct SNeutrinoSettings //audioplayer int audioplayer_display; int audioplayer_follow; - int audioplayer_screensaver; int audioplayer_highprio; int audioplayer_select_title_by_name; int audioplayer_repeat_on;