diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 30792e3b6..a12e105f2 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1051,7 +1051,7 @@ ipsetup.hint_2 OK speichert, EXIT bricht ab
keybindingmenu.addrecord Aufnahme-Timer hinzufügen
keybindingmenu.addremind Umschalt-Timer hinzufügen
keybindingmenu.bouquetdown Bouquet zurück
-keybindingmenu.bouquethandling OK-Taste für
+keybindingmenu.bouquetlist_mode OK-Taste für
keybindingmenu.bouquetup Bouquet weiter
keybindingmenu.cancel Kanalliste schließen
keybindingmenu.channeldown Kanal runter
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 8212bc3ed..4ef133fab 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1051,7 +1051,7 @@ ipsetup.hint_2 OK saves, Exit aborts
keybindingmenu.addrecord add record timer
keybindingmenu.addremind add zapto timer
keybindingmenu.bouquetdown bouquet back
-keybindingmenu.bouquethandling Bouquet-control
+keybindingmenu.bouquetlist_mode Bouquetlist mode
keybindingmenu.bouquetup next bouquet
keybindingmenu.cancel close channellist
keybindingmenu.channeldown channel down
diff --git a/data/y-web/Y_Settings_buttons.yhtm b/data/y-web/Y_Settings_buttons.yhtm
index a9e0f8962..bb3b7fb43 100644
--- a/data/y-web/Y_Settings_buttons.yhtm
+++ b/data/y-web/Y_Settings_buttons.yhtm
@@ -232,9 +232,8 @@ function do_submit()
| OK-Taste für |
|
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index f5e0e4705..b8964e71d 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -146,6 +146,13 @@ int CKeybindSetup::exec(CMenuTarget *parent, const std::string &actionKey)
return res;
}
+#define KEYBINDINGMENU_BOUQUETLIST_MODE_OPTION_COUNT 2
+const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETLIST_MODE_OPTIONS[KEYBINDINGMENU_BOUQUETLIST_MODE_OPTION_COUNT] =
+{
+ { SNeutrinoSettings::CHANNELLIST, LOCALE_KEYBINDINGMENU_CHANNELLIST },
+ { SNeutrinoSettings::FAVORITES, LOCALE_KEYBINDINGMENU_FAVORITES }
+};
+
#define KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT 3
const CMenuOptionChooser::keyval KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTIONS[KEYBINDINGMENU_REMOTECONTROL_HARDWARE_OPTION_COUNT] =
{
@@ -500,10 +507,10 @@ void CKeybindSetup::showKeyBindModeSetup(CMenuWidget *bindSettings_modes)
void CKeybindSetup::showKeyBindChannellistSetup(CMenuWidget *bindSettings_chlist)
{
bindSettings_chlist->addIntroItems(LOCALE_KEYBINDINGMENU_CHANNELLIST);
-#if 0
- CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_BOUQUETHANDLING, &g_settings.bouquetlist_mode, KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS, KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT, true);
+
+ CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_BOUQUETLIST_MODE, &g_settings.bouquetlist_mode, KEYBINDINGMENU_BOUQUETLIST_MODE_OPTIONS, KEYBINDINGMENU_BOUQUETLIST_MODE_OPTION_COUNT, true);
bindSettings_chlist->addItem(oj);
-#endif
+
for (int i = NKEY_LIST_START; i <= NKEY_CURRENT_TRANSPONDER; i++)
{
CMenuForwarder *mf = new CMenuForwarder(key_settings[i].keydescription, true, keychooser[i]->getKeyName(), keychooser[i]);
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 9559590ff..4d7c52d6c 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1569,6 +1569,18 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
{
configfile.deleteKey("infobar_cn");
}
+// if (g_settings.version_pseudo < "20210801210000")
+// {
+// if (g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items == "7,35")
+// {
+// g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items = "7,35,freeze";
+// configfile.setString("usermenu_tv_yellow", g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->items);
+// }
+// }
+ if (g_settings.version_pseudo < "20211209230000")
+ {
+ g_settings.bouquetlist_mode = SNeutrinoSettings::CHANNELLIST;
+ }
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
@@ -3795,10 +3807,26 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
if(msg == CRCInput::RC_ok)
{
- if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0)
- nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP!
- else
- nNewChannel = bouquetList->exec(true);
+ switch (g_settings.bouquetlist_mode)
+ {
+ case SNeutrinoSettings::FAVORITES:
+ {
+ SetChannelMode(LIST_MODE_FAV);
+ if (bouquetList->Bouquets.empty())
+ SetChannelMode(LIST_MODE_PROV);
+ nNewChannel = bouquetList->exec(true);
+ break;
+ }
+ case SNeutrinoSettings::CHANNELLIST:
+ default:
+ {
+ if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0)
+ nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP!
+ else
+ nNewChannel = bouquetList->exec(true);
+ break;
+ }
+ }
} else if(msg == CRCInput::RC_sat) {
SetChannelMode(LIST_MODE_SAT);
nNewChannel = bouquetList->exec(true);
@@ -5829,7 +5857,7 @@ void CNeutrinoApp::loadKeys(const char *fname)
g_settings.mpkey_time = tconfig->getInt32("mpkey.time", CRCInput::RC_timeshift);
// key options
- g_settings.bouquetlist_mode = tconfig->getInt32("bouquetlist_mode", 1);
+ g_settings.bouquetlist_mode = tconfig->getInt32("bouquetlist_mode", SNeutrinoSettings::CHANNELLIST);
g_settings.menu_left_exit = tconfig->getInt32("menu_left_exit", 0);
g_settings.repeat_blocker = tconfig->getInt32("repeat_blocker", 450);
g_settings.repeat_genericblocker = tconfig->getInt32("repeat_genericblocker", 100);
diff --git a/src/system/locals.h b/src/system/locals.h
index 1ae0781c9..5427ea134 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1078,7 +1078,7 @@ typedef enum
LOCALE_KEYBINDINGMENU_ADDRECORD,
LOCALE_KEYBINDINGMENU_ADDREMIND,
LOCALE_KEYBINDINGMENU_BOUQUETDOWN,
- LOCALE_KEYBINDINGMENU_BOUQUETHANDLING,
+ LOCALE_KEYBINDINGMENU_BOUQUETLIST_MODE,
LOCALE_KEYBINDINGMENU_BOUQUETUP,
LOCALE_KEYBINDINGMENU_CANCEL,
LOCALE_KEYBINDINGMENU_CHANNELDOWN,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index a99679984..fb291c19b 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1078,7 +1078,7 @@ const char * locale_real_names[] =
"keybindingmenu.addrecord",
"keybindingmenu.addremind",
"keybindingmenu.bouquetdown",
- "keybindingmenu.bouquethandling",
+ "keybindingmenu.bouquetlist_mode",
"keybindingmenu.bouquetup",
"keybindingmenu.cancel",
"keybindingmenu.channeldown",
diff --git a/src/system/settings.h b/src/system/settings.h
index ddc574d7f..7e124cd56 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -1263,6 +1263,12 @@ struct SNeutrinoSettings
INFOBAR = 3
};
+ enum BOUQUETLIST_MODES
+ {
+ CHANNELLIST = 0,
+ FAVORITES = 1
+ };
+
int mode_left_right_key_tv;
};
diff --git a/version_pseudo.h b/version_pseudo.h
index d7f722e34..b92c2cb27 100644
--- a/version_pseudo.h
+++ b/version_pseudo.h
@@ -1 +1 @@
-#define NEUTRINO_VERSION_PSEUDO "20210702230000"
+#define NEUTRINO_VERSION_PSEUDO "20211209230000"