diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index e0282fee5..d26f3e576 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -995,7 +995,7 @@ keybindingmenu.modechange Moduswechsel keybindingmenu.navigation Navigation keybindingmenu.pagedown Seite weiter keybindingmenu.pageup Seite zurück -keybindingmenu.poweroff Standby EIN/AUS +keybindingmenu.poweroff Standby ein/aus keybindingmenu.quickzap Schnellumschaltung keybindingmenu.remotecontrol_hardware Hardware keybindingmenu.remotecontrol_hardware_coolstream CST @@ -1009,6 +1009,7 @@ keybindingmenu.repeatblock Anfangsverzögerung keybindingmenu.repeatblockgeneric Wiederholungsverzögerung keybindingmenu.sort Sortierreihenfolge ändern keybindingmenu.special_active Sondertasten +keybindingmenu.standbyoff_add Standby aus (zusätzlich) keybindingmenu.subchanneldown Unterkanal zurück keybindingmenu.subchannelup Unterkanal weiter keybindingmenu.tvradiomode Fernseh-/Radio-Modus @@ -1353,6 +1354,7 @@ menu.hint_key_save Speichern Sie Ihre Tastenbelegungen in einer Datei namens key menu.hint_key_screenshot Weisen Sie eine Taste zu, um Menü- und/oder TV-Screenshots zu speichern menu.hint_key_sort Weisen Sie eine Taste für das Sortieren in der Kanalliste zu menu.hint_key_special_active Deaktivieren oder aktivieren einiger Sondertasten +menu.hint_key_standbyoff_add Weisen Sie eine zusätzliche Taste zum Beenden des Standby-Modus zu menu.hint_key_subchanneldown Weisen Sie eine Taste für das Zurückschalten in den Unterkanälen zu menu.hint_key_subchannelup Weisen Sie eine Taste für das Weiterschalten in den Unterkanälen zu menu.hint_key_timeshift Weisen Sie eine Taste für das Starten von Timeshift zu @@ -1655,7 +1657,7 @@ menu.hint_softupdate_expert Einzelne Partitionen aus dem Flash lesen bzw. in den menu.hint_softupdate_expert_read Einzelne Partitionen (U-Boot, Splash, Kernel, SystemFS) aus dem Flash lesen menu.hint_softupdate_expert_write Einzelne Partitionen (Splash, Kernel, SystemFS) in den Flash schreiben menu.hint_softupdate_settings Das lokale Update-Verzeichnis und die Konfigurationsdatei festlegen -menu.hint_standby Receiver in den Standby Modus versetzen +menu.hint_standby Receiver in den Standby-Modus versetzen menu.hint_start_tostandby Aktiviert den Standby-Modus direkt nach dem Starten der Box menu.hint_streaminfo Aktuelle Sender-Informationen über PIDs, SNR-Verhältnis, Bitrate usw. menu.hint_subchannel_pos Wählen Sie die Anzeigeposition der Unterkanäle aus @@ -1761,7 +1763,7 @@ miscsettings.epg_scan_bq Aktuelles Bouquet miscsettings.epg_scan_fav Alle Favoriten miscsettings.epg_scan_live Bei eingeschalteter Box miscsettings.epg_scan_sel Markierte Bouquets -miscsettings.epg_scan_standby Im Standby Modus +miscsettings.epg_scan_standby Im Standby-Modus miscsettings.general Allgemein miscsettings.head Erweitert miscsettings.infobar Infobar @@ -1820,7 +1822,7 @@ miscsettings.radiotext Radiotext miscsettings.shutdown_count Komplett ausschalten nach miscsettings.shutdown_count_hint1 Zeit (in Minuten), nach der vom Standby in miscsettings.shutdown_count_hint2 den Deep-Standby geschalten wird (0 = aus) -miscsettings.shutdown_real Standbymodus +miscsettings.shutdown_real Standby-Modus miscsettings.shutdown_real_rcdelay Verzögertes Ausschalten miscsettings.sleeptimer Ausschalten nach Inaktivität miscsettings.sleeptimer_min Sleeptimer Vorgabe diff --git a/data/locale/english.locale b/data/locale/english.locale index c7116eeb3..f044912d3 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1008,7 +1008,8 @@ keybindingmenu.remotecontrol_hardware_tripledragon Triple Dragon keybindingmenu.repeatblock Generic delay keybindingmenu.repeatblockgeneric Repeat delay keybindingmenu.sort Change sort order -keybindingmenu.special_active Special Keys +keybindingmenu.special_active Special keys +keybindingmenu.standbyoff_add Standby off (additional) keybindingmenu.subchanneldown Subchannel down keybindingmenu.subchannelup Subchannel up keybindingmenu.tvradiomode TV/Radio mode @@ -1044,7 +1045,7 @@ lcd_info_line Show in infoline lcd_info_line_channel Channelname lcd_info_line_clock Clock lcdcontroler.brightness Normal mode -lcdcontroler.brightnessdeepstandby Deep standby +lcdcontroler.brightnessdeepstandby Deep-standby lcdcontroler.brightnessstandby Standby lcdmenu.dim_brightness Brightness after dimm timeout lcdmenu.dim_time Dimm timeout @@ -1059,9 +1060,9 @@ lcdmenu.statusline.playtime Playtime lcdmenu.statusline.volume Volume ledcontroler.backlight Buttons backlight ledcontroler.backlight.tv TV mode -ledcontroler.blink Blink in deep standby, if timer set +ledcontroler.blink Blink in deep-standby, if timer set ledcontroler.menu Power Button LEDs -ledcontroler.mode.deepstandby Deep standby +ledcontroler.mode.deepstandby Deep-standby ledcontroler.mode.record Blinking while record ledcontroler.mode.standby Standby ledcontroler.mode.tv TV mode @@ -1101,7 +1102,7 @@ mainmenu.recording_stop Stop mainmenu.scripts Scripts mainmenu.service Installation (service) mainmenu.settings System settings -mainmenu.shutdown Shutdown (deep standby) +mainmenu.shutdown Shutdown (Deep-standby) mainmenu.sleeptimer SleepTimer mainmenu.standby Standby mainmenu.tools Tools @@ -1223,7 +1224,7 @@ menu.hint_epg_read_now Read saved EPG data from an external device menu.hint_epg_save Save cached EPG data to an external device menu.hint_epg_save_frequently Save cached EPG data in frequently intervals to an external device menu.hint_epg_save_mode Cache EPG only for channels present in favorite bouquets -menu.hint_epg_save_standby Save EPG on soft standby mode +menu.hint_epg_save_standby Save EPG on soft-standby mode menu.hint_epg_scan Select bouquets to scan epg, current on zap,\nall or selected favorites menu.hint_epg_scan_mode Enable background epg scan using free tuner menu.hint_eventlist_additional Show additional informations\nin main box @@ -1343,7 +1344,7 @@ menu.hint_key_pic_mode_active Disable/enable key for the screen format menu.hint_key_pic_size_active Disable/enable key for the 4:3 display behavior menu.hint_key_pip_close Assign button to stop PiP\nor start it for current channel menu.hint_key_pip_setup Assign button to configure PiP -menu.hint_key_poweroff Assign button to switch power state\n (standby/deepstandby <-> running) +menu.hint_key_poweroff Assign button to switch power state\n (standby/deep-standby <-> running) menu.hint_key_quickzap Configure keybingdings for quick\nchannel switch menu.hint_key_record Assign button to start a recording menu.hint_key_repeatblock Delay after button press and before\nfirst key repeat @@ -1353,6 +1354,7 @@ menu.hint_key_save Save keybindings to a file named keys.conf menu.hint_key_screenshot Assign button to save GUI and/or TV screenshot menu.hint_key_sort Assign button to change channel list sort order menu.hint_key_special_active Disable or enable some special keys +menu.hint_key_standby_add Assign additional button to leave standby mode menu.hint_key_subchanneldown Assign button for fast switch\n to previous subchannel menu.hint_key_subchannelup Assign button for fast switch\n to next subchannel menu.hint_key_timeshift Assign button to start timeshift @@ -1375,7 +1377,7 @@ menu.hint_lcd4l_skin_radio Switch the mode, when Radio-Mode is activated menu.hint_lcd4l_support Activate/deactivate LCD4Linux\nsupported display: Pearl DPF menu.hint_lcd4l_weather Shows first tuxwetter favorite on display at standby menu.hint_leds_blink Blinking LEDs in deep-standby -menu.hint_leds_deepstandby LEDs state in deeps-standby mode +menu.hint_leds_deepstandby LEDs state in deep-standby mode menu.hint_leds_record LEDs state when box recording menu.hint_leds_standby LEDs state in soft-standby mode menu.hint_leds_tv Working LEDs state @@ -1639,7 +1641,7 @@ menu.hint_settings Configure System\nNetwork, audio, video, OSD etc. menu.hint_shoutcast_dev_id Type your SHOUTcast Dev ID. An empty input disables SHOUTcast support menu.hint_shoutcast_enabled Enable or disable SHOUTcast support menu.hint_show_mute_icon Show mute icon, when volume set to 0 -menu.hint_shutdown Put your box in deep standby mode\nNo confirmation +menu.hint_shutdown Put your box in deep-standby mode\nNo confirmation menu.hint_shutdown_count Time to put box in deep-standby\nfrom soft-standby mode menu.hint_shutdown_rcdelay Enable deep-standby, if power button\npressed more than 1 second menu.hint_shutdown_real Enable soft-standby mode\nIf disabled, power button put box to deep-standby @@ -1753,7 +1755,7 @@ miscsettings.epg_read_now Restore EPG now miscsettings.epg_save Save EPG on shutdown miscsettings.epg_save_frequently Save EPG frequently miscsettings.epg_save_mode Favorites only -miscsettings.epg_save_standby Save EPG on soft standby +miscsettings.epg_save_standby Save EPG on soft-standby miscsettings.epg_scan EPG scan mode miscsettings.epg_scan_always Always miscsettings.epg_scan_bouquets EPG scan bouquets @@ -1819,7 +1821,7 @@ miscsettings.progressbar_timescale_yellow yellow miscsettings.radiotext Radiotext miscsettings.shutdown_count In standby, switch off after miscsettings.shutdown_count_hint1 time (in minutes) to switch from standby -miscsettings.shutdown_count_hint2 to deep standby (0 = off). +miscsettings.shutdown_count_hint2 to deep-standby (0 = off). miscsettings.shutdown_real Enable standby miscsettings.shutdown_real_rcdelay Delayed shutdown miscsettings.sleeptimer Inactivity shutdown timer diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index bb936b7d9..da47f46d8 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -161,6 +161,7 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = { {LOCALE_KEYBINDINGMENU_TVRADIOMODE, &g_settings.key_tvradio_mode, LOCALE_MENU_HINT_KEY_TVRADIOMODE }, {LOCALE_KEYBINDINGMENU_POWEROFF, &g_settings.key_power_off, LOCALE_MENU_HINT_KEY_POWEROFF }, + {LOCALE_KEYBINDINGMENU_STANDBYOFF_ADD, &g_settings.key_standby_off_add, LOCALE_MENU_HINT_KEY_STANDBYOFF_ADD }, {LOCALE_KEYBINDINGMENU_PAGEUP, &g_settings.key_pageup, LOCALE_MENU_HINT_KEY_PAGEUP }, {LOCALE_KEYBINDINGMENU_PAGEDOWN, &g_settings.key_pagedown, LOCALE_MENU_HINT_KEY_PAGEDOWN }, {LOCALE_KEYBINDINGMENU_VOLUMEUP, &g_settings.key_volumeup, LOCALE_MENU_HINT_KEY_VOLUMEUP }, @@ -474,6 +475,10 @@ void CKeybindSetup::showKeyBindModeSetup(CMenuWidget *bindSettings_modes) mf = new CMenuForwarder(key_settings[NKEY_POWER_OFF].keydescription, true, keychooser[NKEY_POWER_OFF]->getKeyName(), keychooser[NKEY_POWER_OFF], NULL, CRCInput::RC_green); mf->setHint("", key_settings[NKEY_POWER_OFF].hint); bindSettings_modes->addItem(mf); + + mf = new CMenuForwarder(key_settings[NKEY_STANDBY_OFF_ADD].keydescription, true, keychooser[NKEY_STANDBY_OFF_ADD]->getKeyName(), keychooser[NKEY_STANDBY_OFF_ADD], NULL, CRCInput::RC_yellow); + mf->setHint("", key_settings[NKEY_STANDBY_OFF_ADD].hint); + bindSettings_modes->addItem(mf); } void CKeybindSetup::showKeyBindChannellistSetup(CMenuWidget *bindSettings_chlist) diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index ae0f87f6e..5d4385729 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -46,6 +46,7 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver { NKEY_TV_RADIO_MODE, NKEY_POWER_OFF, + NKEY_STANDBY_OFF_ADD, NKEY_PAGE_UP, NKEY_PAGE_DOWN, NKEY_VOLUME_UP, diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 0a2d44539..691bc10c5 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3477,6 +3477,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } /* ================================== KEYS ================================================ */ + if (msg == (neutrino_msg_t) g_settings.key_standby_off_add && mode == NeutrinoModes::mode_standby) + msg = CRCInput::RC_standby_off; + if( msg == CRCInput::RC_ok || msg == (neutrino_msg_t) g_settings.key_zaphistory || msg == (neutrino_msg_t) g_settings.key_current_transponder || (!g_InfoViewer->getSwitchMode() && CNeutrinoApp::getInstance()->listModeKey(msg))) { if( (mode == NeutrinoModes::mode_tv) || (mode == NeutrinoModes::mode_radio) || (mode == NeutrinoModes::mode_ts) || (mode == NeutrinoModes::mode_webtv) || (mode == NeutrinoModes::mode_webradio)) { @@ -5054,6 +5057,7 @@ void CNeutrinoApp::loadKeys(const char * fname) //rc-key configuration g_settings.key_tvradio_mode = tconfig.getInt32( "key_tvradio_mode", (unsigned int)CRCInput::RC_nokey ); g_settings.key_power_off = tconfig.getInt32( "key_power_off", CRCInput::RC_standby ); + g_settings.key_standby_off_add = tconfig.getInt32( "key_standby_off_add", CRCInput::RC_ok ); g_settings.key_pageup = tconfig.getInt32( "key_channelList_pageup", CRCInput::RC_page_up ); g_settings.key_pagedown = tconfig.getInt32( "key_channelList_pagedown", CRCInput::RC_page_down ); @@ -5146,6 +5150,7 @@ void CNeutrinoApp::saveKeys(const char * fname) //rc-key configuration tconfig.setInt32( "key_tvradio_mode", g_settings.key_tvradio_mode ); tconfig.setInt32( "key_power_off", g_settings.key_power_off ); + tconfig.setInt32( "key_standby_off_add", g_settings.key_standby_off_add ); tconfig.setInt32( "key_channelList_pageup", g_settings.key_pageup ); tconfig.setInt32( "key_channelList_pagedown", g_settings.key_pagedown ); diff --git a/src/system/locals.h b/src/system/locals.h index 93a63e07c..cbb055d95 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1036,6 +1036,7 @@ typedef enum LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, LOCALE_KEYBINDINGMENU_SORT, LOCALE_KEYBINDINGMENU_SPECIAL_ACTIVE, + LOCALE_KEYBINDINGMENU_STANDBYOFF_ADD, LOCALE_KEYBINDINGMENU_SUBCHANNELDOWN, LOCALE_KEYBINDINGMENU_SUBCHANNELUP, LOCALE_KEYBINDINGMENU_TVRADIOMODE, @@ -1380,6 +1381,7 @@ typedef enum LOCALE_MENU_HINT_KEY_SCREENSHOT, LOCALE_MENU_HINT_KEY_SORT, LOCALE_MENU_HINT_KEY_SPECIAL_ACTIVE, + LOCALE_MENU_HINT_KEY_STANDBYOFF_ADD, LOCALE_MENU_HINT_KEY_SUBCHANNELDOWN, LOCALE_MENU_HINT_KEY_SUBCHANNELUP, LOCALE_MENU_HINT_KEY_TIMESHIFT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index a764cbd04..6be29a5d9 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1036,6 +1036,7 @@ const char * locale_real_names[] = "keybindingmenu.repeatblockgeneric", "keybindingmenu.sort", "keybindingmenu.special_active", + "keybindingmenu.standbyoff_add", "keybindingmenu.subchanneldown", "keybindingmenu.subchannelup", "keybindingmenu.tvradiomode", @@ -1380,6 +1381,7 @@ const char * locale_real_names[] = "menu.hint_key_screenshot", "menu.hint_key_sort", "menu.hint_key_special_active", + "menu.hint_key_standbyoff_add", "menu.hint_key_subchanneldown", "menu.hint_key_subchannelup", "menu.hint_key_timeshift", diff --git a/src/system/settings.h b/src/system/settings.h index 01f2e9cfd..45c8950bc 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -546,6 +546,7 @@ struct SNeutrinoSettings int key_list_start; int key_list_end; int key_power_off; + int key_standby_off_add; int menu_left_exit; int timeshift_pause; int auto_timeshift;