diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 9503650e2..168f5f88b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -939,6 +939,7 @@ keybindingmenu.channeldown Kanal runter keybindingmenu.channellist Kanalliste keybindingmenu.channelup Kanal hoch keybindingmenu.edit Tastenbelegungen bearbeiten +keybindingmenu.favorites Favoriten keybindingmenu.head Tastenbelegungen keybindingmenu.lastchannel Letzter Kanal keybindingmenu.longkeypress_duration Langer Tastendruck @@ -1257,6 +1258,7 @@ menu.hint_key_cancel Weisen Sie eine Taste für das Schließen der Menüs zu menu.hint_key_channeldown Weisen Sie eine Taste für das Herunterschalten in der Kanalliste zu menu.hint_key_channellist Konfigurieren Sie die Tastenbelegung für die Kanalliste menu.hint_key_channelup Weisen Sie eine Taste für das Hochschalten in der Kanalliste zu +menu.hint_key_favorites Weisen Sie eine Taste für das Anzeigen der Favoriten zu menu.hint_key_format_mode_active Die Taste für das Videoformat deaktivieren/aktivieren menu.hint_key_hardware Definieren Sie, welche Fernbedienung Sie verwenden möchten. Die Bestätigung erfolgt mit der Ausgewählten menu.hint_key_history Definieren Sie eine Taste für das Anzeigen der letzten Programme, die Sie schauten diff --git a/data/locale/english.locale b/data/locale/english.locale index 435be6d3b..e927bd02b 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -939,6 +939,7 @@ keybindingmenu.channeldown channel down keybindingmenu.channellist Channellist keybindingmenu.channelup channel up keybindingmenu.edit Edit keybindings +keybindingmenu.favorites Favorites keybindingmenu.head Keybindings keybindingmenu.lastchannel Quick zap keybindingmenu.longkeypress_duration Long key-press @@ -1257,6 +1258,7 @@ menu.hint_key_cancel Assign button to close GUI window menu.hint_key_channeldown Assign button for fast switch to previous\nchannel in channel list menu.hint_key_channellist Configure keybingdings for channel list menu.hint_key_channelup Assign button for fast switch to next\nchannel in channel list +menu.hint_key_favorites Assign button to show favorites menu.hint_key_format_mode_active Disable/enable key for the video format conversion menu.hint_key_hardware Change remote control type menu.hint_key_history Assign button to show channel\nchannel switch history diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 1de9db27e..bd76f5000 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -454,8 +454,8 @@ int CAudioPlayerGui::show() if (m_state != CAudioPlayerGui::STOP) stop(); } - //add RC_favorites for internetradio - else if ((msg == CRCInput::RC_favorites) && (m_inetmode)) + //add key_favorites for internetradio + else if ((msg == (neutrino_msg_t) g_settings.key_favorites) && (m_inetmode)) { if (m_key_level == 0) { diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 1782d40e5..f252002c8 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -472,8 +472,8 @@ int CBouquetList::show(bool bShowChannelList) loop = false; } else if ((msg == CRCInput::RC_timeout ) || - (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || - ((msg == CRCInput::RC_favorites) && (CNeutrinoApp::getInstance()->GetChannelMode() == LIST_MODE_FAV))) + (msg == (neutrino_msg_t) g_settings.key_channelList_cancel) || + ((msg == (neutrino_msg_t) g_settings.key_favorites) && (CNeutrinoApp::getInstance()->GetChannelMode() == LIST_MODE_FAV))) { selected = oldselected; if(fader.StartFadeOut()) { @@ -482,7 +482,7 @@ int CBouquetList::show(bool bShowChannelList) } else loop=false; } - else if(msg == CRCInput::RC_red || msg == CRCInput::RC_favorites) { + else if(msg == CRCInput::RC_red || msg == (neutrino_msg_t) g_settings.key_favorites) { if (!favonly && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_FAV) { CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_FAV); hide(); diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 057bfd8fc..6cb547706 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -165,6 +165,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_FAVORITES, &g_settings.key_favorites, LOCALE_MENU_HINT_KEY_FAVORITES }, {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 }, @@ -428,6 +429,10 @@ void CKeybindSetup::showKeyBindSetup(CMenuWidget *bindSettings) bindSettings->addItem(new CMenuSeparator()); + // favorites + mf = new CMenuForwarder(key_settings[NKEY_FAVORITES].keydescription, true, keychooser[NKEY_FAVORITES]->getKeyName(), keychooser[NKEY_FAVORITES]); + mf->setHint("", key_settings[NKEY_FAVORITES].hint); + bindSettings->addItem(mf); // timeshift mf = new CMenuForwarder(key_settings[NKEY_TIMESHIFT].keydescription, true, keychooser[NKEY_TIMESHIFT]->getKeyName(), keychooser[NKEY_TIMESHIFT]); mf->setHint("", key_settings[NKEY_TIMESHIFT].hint); @@ -436,8 +441,8 @@ void CKeybindSetup::showKeyBindSetup(CMenuWidget *bindSettings) mf = new CMenuForwarder(key_settings[NKEY_UNLOCK].keydescription, true, keychooser[NKEY_UNLOCK]->getKeyName(), keychooser[NKEY_UNLOCK]); mf->setHint("", key_settings[NKEY_UNLOCK].hint); bindSettings->addItem(mf); - // screenshot #ifdef SCREENSHOT + // screenshot mf = new CMenuForwarder(key_settings[NKEY_SCREENSHOT].keydescription, true, keychooser[NKEY_SCREENSHOT]->getKeyName(), keychooser[NKEY_SCREENSHOT]); mf->setHint("", key_settings[NKEY_SCREENSHOT].hint); bindSettings->addItem(mf); diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index 5d4385729..3c6e9bce4 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -47,6 +47,7 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver NKEY_TV_RADIO_MODE, NKEY_POWER_OFF, NKEY_STANDBY_OFF_ADD, + NKEY_FAVORITES, NKEY_PAGE_UP, NKEY_PAGE_DOWN, NKEY_VOLUME_UP, diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 59628acb6..c37651468 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3051,6 +3051,10 @@ void CNeutrinoApp::RealRun() showMainMenu(); } } + else if (msg == (neutrino_msg_t) g_settings.key_favorites) + { + showChannelList(msg); + } else if( ( msg == (neutrino_msg_t) g_settings.key_quickzap_up ) || ( msg == (neutrino_msg_t) g_settings.key_quickzap_down ) ) { quickZap(msg); @@ -3329,13 +3333,13 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu) } else if(msg == CRCInput::RC_sat) { SetChannelMode(LIST_MODE_SAT); nNewChannel = bouquetList->exec(true); - } else if(msg == CRCInput::RC_favorites) { - SetChannelMode(LIST_MODE_FAV); + } else if(msg == CRCInput::RC_www) { + SetChannelMode(LIST_MODE_WEB); if (bouquetList->Bouquets.empty()) SetChannelMode(LIST_MODE_PROV); nNewChannel = bouquetList->exec(true); - } else if(msg == CRCInput::RC_www) { - SetChannelMode(LIST_MODE_WEB); + } else if(msg == (neutrino_msg_t) g_settings.key_favorites) { + SetChannelMode(LIST_MODE_FAV); if (bouquetList->Bouquets.empty()) SetChannelMode(LIST_MODE_PROV); nNewChannel = bouquetList->exec(true); @@ -3472,10 +3476,13 @@ bool CNeutrinoApp::listModeKey(const neutrino_msg_t msg) { if ( msg == CRCInput::RC_sat - || msg == CRCInput::RC_favorites || msg == CRCInput::RC_www + || msg == (neutrino_msg_t) g_settings.key_favorites ) + { + printf("CNeutrinoApp::listModeKey: true\n"); return true; + } return false; } @@ -5118,6 +5125,7 @@ void CNeutrinoApp::loadKeys(const char * fname) 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_favorites = tconfig->getInt32( "key_favorites", CRCInput::RC_favorites ); 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 ); g_settings.key_channelList_cancel = tconfig->getInt32( "key_channelList_cancel", CRCInput::RC_home ); @@ -5231,6 +5239,7 @@ void CNeutrinoApp::saveKeys(const char * fname) tconfig->setInt32( "key_channelList_addrecord", g_settings.key_channelList_addrecord ); tconfig->setInt32( "key_channelList_addremind", g_settings.key_channelList_addremind ); + tconfig->setInt32( "key_favorites", g_settings.key_favorites ); tconfig->setInt32( "key_list_start", g_settings.key_list_start ); tconfig->setInt32( "key_list_end", g_settings.key_list_end ); tconfig->setInt32( "key_timeshift", g_settings.key_timeshift ); diff --git a/src/system/locals.h b/src/system/locals.h index 3adfe5d2f..9e8cb046a 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -966,6 +966,7 @@ typedef enum LOCALE_KEYBINDINGMENU_CHANNELLIST, LOCALE_KEYBINDINGMENU_CHANNELUP, LOCALE_KEYBINDINGMENU_EDIT, + LOCALE_KEYBINDINGMENU_FAVORITES, LOCALE_KEYBINDINGMENU_HEAD, LOCALE_KEYBINDINGMENU_LASTCHANNEL, LOCALE_KEYBINDINGMENU_LONGKEYPRESS_DURATION, @@ -1284,6 +1285,7 @@ typedef enum LOCALE_MENU_HINT_KEY_CHANNELDOWN, LOCALE_MENU_HINT_KEY_CHANNELLIST, LOCALE_MENU_HINT_KEY_CHANNELUP, + LOCALE_MENU_HINT_KEY_FAVORITES, LOCALE_MENU_HINT_KEY_FORMAT_MODE_ACTIVE, LOCALE_MENU_HINT_KEY_HARDWARE, LOCALE_MENU_HINT_KEY_HISTORY, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index f4b0247e3..94fc29372 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -966,6 +966,7 @@ const char * locale_real_names[] = "keybindingmenu.channellist", "keybindingmenu.channelup", "keybindingmenu.edit", + "keybindingmenu.favorites", "keybindingmenu.head", "keybindingmenu.lastchannel", "keybindingmenu.longkeypress_duration", @@ -1284,6 +1285,7 @@ const char * locale_real_names[] = "menu.hint_key_channeldown", "menu.hint_key_channellist", "menu.hint_key_channelup", + "menu.hint_key_favorites", "menu.hint_key_format_mode_active", "menu.hint_key_hardware", "menu.hint_key_history", diff --git a/src/system/settings.h b/src/system/settings.h index 071e995ef..d13436100 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -557,6 +557,7 @@ struct SNeutrinoSettings int key_channelList_addrecord; int key_channelList_addremind; + int key_favorites; int key_quickzap_up; int key_quickzap_down; int key_bouquet_up;