From f0c076d48da8dc0210ed85a26bb63aafbb555f25 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 10 Dec 2021 19:56:53 +0100 Subject: [PATCH] keybind-setup: addition to 0e869b8a96c324627e86468b8445457462c3687b Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/844d0f72e79d03ddceb787644eb44dc06412a73c Author: vanhofen Date: 2021-12-10 (Fri, 10 Dec 2021) Origin message was: ------------------ - keybind-setup: addition to 0e869b8a96c324627e86468b8445457462c3687b --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/keybind_setup.cpp | 6 +++--- src/system/locals.h | 2 +- src/system/locals_intern.h | 2 +- src/system/settings.h | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1d8d59d5c..ff2e4b45d 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1130,7 +1130,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 584e54755..e11ae92b0 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1130,7 +1130,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/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index f6014c800..81163c81c 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -146,8 +146,8 @@ int CKeybindSetup::exec(CMenuTarget *parent, const std::string &actionKey) return res; } -#define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 2 -const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS[KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT] = +#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 } @@ -508,7 +508,7 @@ void CKeybindSetup::showKeyBindChannellistSetup(CMenuWidget *bindSettings_chlist { bindSettings_chlist->addIntroItems(LOCALE_KEYBINDINGMENU_CHANNELLIST); - 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); for (int i = NKEY_LIST_START; i <= NKEY_CURRENT_TRANSPONDER; i++) diff --git a/src/system/locals.h b/src/system/locals.h index b5dd2d9f1..911bef4cf 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1157,7 +1157,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 94111704e..721d8195b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1157,7 +1157,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 afaaaa3f2..2fb238bb4 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -1267,10 +1267,10 @@ struct SNeutrinoSettings INFOBAR = 3 }; - enum BOUQUETHANDLING_SETTINGS + enum BOUQUETLIST_MODES { CHANNELLIST = 0, - FAVORITES = 2 + FAVORITES = 1 }; int mode_left_right_key_tv;