diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c2c8b4abe..d1b1193eb 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1591,7 +1591,8 @@ menu.hint_streaminfo Aktuelle Sender-Informationen über PIDs, SNR-Verhältnis, menu.hint_subchannel_pos Wählen Sie die Anzeigeposition der Unterkanäle aus menu.hint_sw_update System aktualisieren, Image sichern und wiederherstellen menu.hint_theme Wählen Sie ein vordefiniertes Farbschema, speichern oder laden Sie ihre eigenen Farbschemata -menu.hint_timeouts Gibt an, nach welcher Zeit in Sekunden die Menüs oder Infofenster sich automatisch schließen (0 deaktiviert) +menu.hint_timeouts Anzeigedauer für Menüs oder Infofenster, die sich automatisch schließen (0 deaktiviert) +menu.hint_timeouts_static_messages Anzeigedauer für bestimmte Meldungen mit Benutzerinteraktion menu.hint_timer_followscreenings Zeige Terminauswahl mit Folge-Events zur Timerprogrammierung. "Immer" zeigt die Auswahl auch dann, wenn nur ein Event gefunden wurde. menu.hint_timers Hinzufügen, entfernen und bearbeiten geplanter Aufnahmen oder anderer Timer menu.hint_timezone Wählen Sie ihre Zeitzone aus @@ -2641,6 +2642,7 @@ timing.infobar_radio Infobar (Radiobetrieb) timing.menu Menü timing.numericzap Umschalten mit Zifferntasten timing.popup_messages Popup Meldungen +timing.static_messages Interaktive Meldungen timing.volumebar Lautstärkeanzeige tmdb.api_key TMDb API Schlüssel tmdb.enabled TMDb-Unterstützung diff --git a/data/locale/english.locale b/data/locale/english.locale index 737f93aa7..a60518467 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1592,6 +1592,7 @@ menu.hint_subchannel_pos Select subchannels menu position menu.hint_sw_update Update software menu.hint_theme Select pre-defined color theme\nSave or load theme from files menu.hint_timeouts Configure time to hide GUI windows\nin seconds +menu.hint_timeouts_static_messages Timeout for specific messages with user interaction menu.hint_timer_followscreenings Show selection with followscreenings for timer programming. "Always" shows selection even if just one event is found. menu.hint_timers Add/Remove/Edit scheduled\nrecording, reminders etc. menu.hint_timezone Select your timezone @@ -2641,6 +2642,7 @@ timing.infobar_radio Infobar (radio mode) timing.menu Menu timing.numericzap Numeric Zap timing.popup_messages Popup messages +timing.static_messages Interactive messages timing.volumebar Volume bar tmdb.api_key TMDb API key tmdb.enabled TMDb support diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 092ca0fb3..6450a1866 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -1326,6 +1326,7 @@ menu.hint_subchannel_pos Selecteer menu positie van subkanalen menu.hint_sw_update Update software menu.hint_theme Select voorgedefinieerde thema\n Opslaan of laad thema van bestand menu.hint_timeouts Verberg gebruikers interface na bepaald aantal seconden. +menu.hint_timeouts_static_messages Timeout for specific messages with user interaction menu.hint_timers Toevoegen/Verplaats/Bewerk \ngeplande opnames of timers etc. menu.hint_timezone Selecteer uw tijdzone menu.hint_tools Start tools @@ -2201,6 +2202,8 @@ timing.infobar_radio Infobalk (radio modus) timing.menu Menu timing.numericzap Numeriek Zap timing.volumebar Volume balk +timing.popup_messages Popup messages +timing.static_messages Interactive messages tmdb.read_data Zoeken TMDB data... unicable.lnb Invoer Unicable unicable.qrg Unicable Frequentie diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index c3f774481..194fb3a84 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -1433,6 +1433,7 @@ menu.hint_subchannel_pos Pozícia menu výberu sub-kanálov menu.hint_sw_update Aktualizácia software menu.hint_theme Výber prednastavených farebných vzhľadov\nUloženie alebo nahranie vzhľadu zo súborov menu.hint_timeouts Konfigurácia času zmiznutia GUI okien\nv sekundách +menu.hint_timeouts_static_messages Timeout for specific messages with user interaction menu.hint_timers Pridanie/Odstránenie/Upravenie plánovaného\nnahrávania, pripomienky atď. menu.hint_timezone Výber časového pásma menu.hint_tmdb_api_key Vložte váš TMDb API kľúč. Neuvedením údajov sa vypne podpora TMDb @@ -2402,6 +2403,8 @@ timing.infobar_radio Stavový riadok (rádio mód) timing.menu Ponuka timing.numericzap Prepínanie číslami timing.volumebar Ukazateľ hlasitosti +timing.popup_messages Popup messages +timing.static_messages Interactive messages tmdb.api_key TMDb API kľúč tmdb.enabled TMDb podpora tmdb.read_data Vyhľadávanie údajov TMDB... diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e92a9ab10..c3e9d459f 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1070,7 +1070,7 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout) { CMenuOptionNumberChooser *ch = new CMenuOptionNumberChooser(timing_setting[i].name, &g_settings.timing[i], true, 0, 180); ch->setNumberFormat(nf); - ch->setHint("", LOCALE_MENU_HINT_OSD_TIMING); + ch->setHint("", timing_setting[i].hint); menu_timeout->addItem(ch); } diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp index 51480afa1..151a0cc73 100644 --- a/src/gui/widget/msgbox.cpp +++ b/src/gui/widget/msgbox.cpp @@ -238,7 +238,7 @@ int CMsgBox::exec() ccw_footer->getSelectedButtonObject()->setButtonAlias(mb_show_button); int selected = ccw_footer->getSelectedButton(); if (timeout == NO_TIMEOUT) - timeout = 0; + timeout = MSGBOX_DEFAULT_TIMEOUT; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); diff --git a/src/gui/widget/msgbox.h b/src/gui/widget/msgbox.h index 47abd9a54..5c81dfb33 100644 --- a/src/gui/widget/msgbox.h +++ b/src/gui/widget/msgbox.h @@ -38,6 +38,7 @@ #define MSGBOX_MIN_WIDTH HINTBOX_MIN_WIDTH #define MSGBOX_MIN_HEIGHT HINTBOX_MIN_HEIGHT + 75 +#define MSGBOX_DEFAULT_TIMEOUT g_settings.timing[SNeutrinoSettings::TIMING_STATIC_MESSAGES] #define DEFAULT_MSGBOX_TEXT_MODE (CMsgBox::CENTER | CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH) //! Sub class of CHintBox. Shows a window as a messagebox diff --git a/src/system/locals.h b/src/system/locals.h index f4be7f24c..1398e685a 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1619,6 +1619,7 @@ typedef enum LOCALE_MENU_HINT_SW_UPDATE, LOCALE_MENU_HINT_THEME, LOCALE_MENU_HINT_TIMEOUTS, + LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES, LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS, LOCALE_MENU_HINT_TIMERS, LOCALE_MENU_HINT_TIMEZONE, @@ -2668,6 +2669,7 @@ typedef enum LOCALE_TIMING_MENU, LOCALE_TIMING_NUMERICZAP, LOCALE_TIMING_POPUP_MESSAGES, + LOCALE_TIMING_STATIC_MESSAGES, LOCALE_TIMING_VOLUMEBAR, LOCALE_TMDB_API_KEY, LOCALE_TMDB_ENABLED, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 405928695..5684b10fa 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1619,6 +1619,7 @@ const char * locale_real_names[] = "menu.hint_sw_update", "menu.hint_theme", "menu.hint_timeouts", + "menu.hint_timeouts_static_messages", "menu.hint_timer_followscreenings", "menu.hint_timers", "menu.hint_timezone", @@ -2668,6 +2669,7 @@ const char * locale_real_names[] = "timing.menu", "timing.numericzap", "timing.popup_messages", + "timing.static_messages", "timing.volumebar", "tmdb.api_key", "tmdb.enabled", diff --git a/src/system/settings.h b/src/system/settings.h index e3430adc0..7d5377840 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -414,6 +414,7 @@ struct SNeutrinoSettings TIMING_FILEBROWSER = 7, TIMING_NUMERICZAP = 8, TIMING_POPUP_MESSAGES = 9, + TIMING_STATIC_MESSAGES = 10, TIMING_SETTING_COUNT }; @@ -918,20 +919,22 @@ typedef struct time_settings_t { const int default_timing; const neutrino_locale_t name; + const neutrino_locale_t hint; } time_settings_struct_t; const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_COUNT] = { - { 180, LOCALE_TIMING_MENU }, //NI - { 180, LOCALE_TIMING_CHANLIST }, //NI - { 180, LOCALE_TIMING_EPG }, //NI - { 6, LOCALE_TIMING_INFOBAR }, - { 0, LOCALE_TIMING_INFOBAR_RADIO }, - { 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER}, - { 3, LOCALE_TIMING_VOLUMEBAR }, - { 180, LOCALE_TIMING_FILEBROWSER }, //NI - { 3, LOCALE_TIMING_NUMERICZAP }, - { 6, LOCALE_TIMING_POPUP_MESSAGES} + { 180, LOCALE_TIMING_MENU, LOCALE_MENU_HINT_OSD_TIMING}, //NI //TODO: add hint locales + { 180, LOCALE_TIMING_CHANLIST, LOCALE_MENU_HINT_OSD_TIMING}, //NI + { 180, LOCALE_TIMING_EPG, LOCALE_MENU_HINT_OSD_TIMING}, //NI + { 6, LOCALE_TIMING_INFOBAR, LOCALE_MENU_HINT_OSD_TIMING}, + { 0, LOCALE_TIMING_INFOBAR_RADIO, LOCALE_MENU_HINT_OSD_TIMING}, + { 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER, LOCALE_MENU_HINT_OSD_TIMING}, + { 3, LOCALE_TIMING_VOLUMEBAR, LOCALE_MENU_HINT_OSD_TIMING}, + { 180, LOCALE_TIMING_FILEBROWSER, LOCALE_MENU_HINT_OSD_TIMING}, //NI + { 3, LOCALE_TIMING_NUMERICZAP, LOCALE_MENU_HINT_OSD_TIMING}, + { 6, LOCALE_TIMING_POPUP_MESSAGES, LOCALE_MENU_HINT_OSD_TIMING}, + { 180, LOCALE_TIMING_STATIC_MESSAGES, LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES} //NI }; // lcdd