diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index be731e628..84b2d26e4 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -524,6 +524,7 @@ extra.key_pip_setup PiP Konfiguration extra.key_pip_swap Umschalten PiP/live extra.key_record Aufnahme extra.key_screenshot Screenshot +extra.key_sleep Sleeptimer extra.key_switchformat Nächste Auflösung extra.key_timeshift Timeshift extra.key_unlock Entsperren @@ -1436,6 +1437,7 @@ menu.hint_key_repeatblockgeneric Die Verzögerung zwischen den Tastewiederholung menu.hint_key_right Wählen Sie die Funktion für die Tasten 'links' und 'rechts' im TV/Radio- und Movieplayer-Modus menu.hint_key_save Speichern Sie Ihre Tastenbelegungen in einer Datei namens keys.conf ab menu.hint_key_screenshot Weisen Sie eine Taste zu, um Menü- und/oder TV-Screenshots zu speichern +menu.hint_key_sleep Weisen Sie eine Taste zu, um einen Sleeptimer zu setzen 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 diff --git a/data/locale/english.locale b/data/locale/english.locale index 711548f99..208983ec1 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -524,6 +524,7 @@ extra.key_pip_setup Configure PiP extra.key_pip_swap Swap PiP/live extra.key_record Record extra.key_screenshot Screenshot +extra.key_sleep Sleeptimer extra.key_switchformat Next resolution extra.key_timeshift Timeshift extra.key_unlock Unlock @@ -1436,6 +1437,7 @@ menu.hint_key_repeatblockgeneric Delay between key repeats\nwhile button pressed menu.hint_key_right Select function for 'left' and 'right' keys in live TV/Radio mode and movieplayer mode 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_sleep Assign button to set a sleeptimer 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_standbyoff_add Assign additional button to leave standby mode diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index b8964e71d..80d8629a2 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -221,6 +221,7 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_EXTRA_KEY_NEXT43MODE, &g_settings.key_next43mode, NONEXISTANT_LOCALE }, {LOCALE_EXTRA_KEY_SWITCHFORMAT, &g_settings.key_switchformat, NONEXISTANT_LOCALE }, {LOCALE_EXTRA_KEY_SCREENSHOT, &g_settings.key_screenshot, LOCALE_MENU_HINT_KEY_SCREENSHOT }, + {LOCALE_EXTRA_KEY_SLEEP, &g_settings.key_sleep, LOCALE_MENU_HINT_KEY_SLEEP }, #if ENABLE_PIP {LOCALE_EXTRA_KEY_PIP_CLOSE, &g_settings.key_pip_close, LOCALE_MENU_HINT_KEY_PIP_CLOSE }, {LOCALE_EXTRA_KEY_PIP_CLOSE_AVINPUT, &g_settings.key_pip_close_avinput, NONEXISTANT_LOCALE /*LOCALE_MENU_HINT_KEY_PIP_CLOSE_AVINPUT*/ }, @@ -458,6 +459,10 @@ void CKeybindSetup::showKeyBindSetup(CMenuWidget *bindSettings) mf->setHint("", key_settings[NKEY_SCREENSHOT].hint); bindSettings->addItem(mf); #endif + // sleeptimer + mf = new CMenuForwarder(key_settings[NKEY_SLEEP].keydescription, true, keychooser[NKEY_SLEEP]->getKeyName(), keychooser[NKEY_SLEEP]); + mf->setHint("", key_settings[NKEY_SLEEP].hint); + bindSettings->addItem(mf); #if ENABLE_PIP // pip mf = new CMenuForwarder(key_settings[NKEY_PIP_CLOSE].keydescription, true, keychooser[NKEY_PIP_CLOSE]->getKeyName(), keychooser[NKEY_PIP_CLOSE]); diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index 2b792519d..0126b3281 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -85,6 +85,7 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver NKEY_NEXT43MODE, NKEY_SWITCHFORMAT, NKEY_SCREENSHOT, + NKEY_SLEEP, #if ENABLE_PIP NKEY_PIP_CLOSE, NKEY_PIP_CLOSE_AVINPUT, diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 400e0f942..7dad9661a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4185,7 +4185,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) g_videoSettings->SwitchFormat(); return messages_return::handled; } - else if( msg == CRCInput::RC_sleep ) { + else if( msg == (neutrino_msg_t) g_settings.key_sleep ) { CSleepTimerWidget *sleepTimer = new CSleepTimerWidget; sleepTimer->exec(NULL, ""); delete sleepTimer; @@ -5747,6 +5747,7 @@ void CNeutrinoApp::loadKeys(const char *fname) g_settings.key_quickzap_up = tconfig->getInt32("key_quickzap_up", CRCInput::RC_up); g_settings.key_record = tconfig->getInt32("key_record", CRCInput::RC_record); g_settings.key_screenshot = tconfig->getInt32("key_screenshot", (unsigned int)CRCInput::RC_games); + g_settings.key_sleep = tconfig->getInt32("key_sleep", CRCInput::RC_sleep); g_settings.key_standby_off_add = tconfig->getInt32("key_standby_off_add", CRCInput::RC_ok); g_settings.key_subchannel_down = tconfig->getInt32("key_subchannel_down", CRCInput::RC_left); g_settings.key_subchannel_up = tconfig->getInt32("key_subchannel_up", CRCInput::RC_right); @@ -5855,6 +5856,7 @@ void CNeutrinoApp::saveKeys(const char *fname) tconfig->setInt32("key_quickzap_up", g_settings.key_quickzap_up); tconfig->setInt32("key_record", g_settings.key_record); tconfig->setInt32("key_screenshot", g_settings.key_screenshot); + tconfig->setInt32("key_sleep", g_settings.key_sleep); tconfig->setInt32("key_standby_off_add", g_settings.key_standby_off_add); tconfig->setInt32("key_subchannel_down", g_settings.key_subchannel_down); tconfig->setInt32("key_subchannel_up", g_settings.key_subchannel_up); diff --git a/src/system/locals.h b/src/system/locals.h index bfb7d0358..7167e6fb4 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -551,6 +551,7 @@ typedef enum LOCALE_EXTRA_KEY_PIP_SWAP, LOCALE_EXTRA_KEY_RECORD, LOCALE_EXTRA_KEY_SCREENSHOT, + LOCALE_EXTRA_KEY_SLEEP, LOCALE_EXTRA_KEY_SWITCHFORMAT, LOCALE_EXTRA_KEY_TIMESHIFT, LOCALE_EXTRA_KEY_UNLOCK, @@ -1463,6 +1464,7 @@ typedef enum LOCALE_MENU_HINT_KEY_RIGHT, LOCALE_MENU_HINT_KEY_SAVE, LOCALE_MENU_HINT_KEY_SCREENSHOT, + LOCALE_MENU_HINT_KEY_SLEEP, LOCALE_MENU_HINT_KEY_SORT, LOCALE_MENU_HINT_KEY_SPECIAL_ACTIVE, LOCALE_MENU_HINT_KEY_STANDBYOFF_ADD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 7605895a7..636a0ffd3 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -551,6 +551,7 @@ const char * locale_real_names[] = "extra.key_pip_swap", "extra.key_record", "extra.key_screenshot", + "extra.key_sleep", "extra.key_switchformat", "extra.key_timeshift", "extra.key_unlock", @@ -1463,6 +1464,7 @@ const char * locale_real_names[] = "menu.hint_key_right", "menu.hint_key_save", "menu.hint_key_screenshot", + "menu.hint_key_sleep", "menu.hint_key_sort", "menu.hint_key_special_active", "menu.hint_key_standbyoff_add", diff --git a/src/system/settings.h b/src/system/settings.h index db921144a..ebd7bb59f 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -1239,6 +1239,7 @@ struct SNeutrinoSettings int key_quickzap_up; int key_record; int key_screenshot; + int key_sleep; int key_standby_off_add; int key_subchannel_down; int key_subchannel_up;