From dba04b4c68552cfee0bf14d54c0465e0455a47e0 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Thu, 29 Apr 2021 20:17:13 +0200 Subject: [PATCH] keybind_setup: remove unused - define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 3 - { 0, LOCALE_KEYBINDINGMENU_BOUQUETCHANNELS_ON_OK }, - { 1, LOCALE_KEYBINDINGMENU_BOUQUETLIST_ON_OK }, - { 2, LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK } Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4ad1733227f3bacb01692dcbadf9384520ecb5d9 Author: Frankenstone Date: 2021-04-29 (Thu, 29 Apr 2021) Origin message was: ------------------ keybind_setup: remove unused - define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 3 - { 0, LOCALE_KEYBINDINGMENU_BOUQUETCHANNELS_ON_OK }, - { 1, LOCALE_KEYBINDINGMENU_BOUQUETLIST_ON_OK }, - { 2, LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK } ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 3 --- data/locale/english.locale | 3 --- src/gui/keybind_setup.cpp | 10 +--------- src/system/locals.h | 3 --- src/system/locals_intern.h | 3 --- 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index febf18b2a..4f0638aab 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1124,11 +1124,8 @@ ipsetup.hint_1 Benutzen Sie 0..9 oder hoch/runter ipsetup.hint_2 OK speichert, EXIT bricht ab keybindingmenu.addrecord Aufnahme-Timer hinzufügen keybindingmenu.addremind Umschalt-Timer hinzufügen -keybindingmenu.allchannels_on_ok Kanalliste -keybindingmenu.bouquetchannels_on_ok Bouquet-Kanäle keybindingmenu.bouquetdown Bouquet zurück keybindingmenu.bouquethandling OK-Taste für -keybindingmenu.bouquetlist_on_ok Bouquetliste 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 7b1b1cc22..41df91276 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1124,11 +1124,8 @@ ipsetup.hint_1 Use 0..9, or use Up/Down, ipsetup.hint_2 OK saves, Exit aborts keybindingmenu.addrecord add record timer keybindingmenu.addremind add zapto timer -keybindingmenu.allchannels_on_ok all-services -keybindingmenu.bouquetchannels_on_ok current bouquet keybindingmenu.bouquetdown bouquet back keybindingmenu.bouquethandling Bouquet-control -keybindingmenu.bouquetlist_on_ok bouquet-list 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 3bf8dc315..66c053142 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -159,15 +159,7 @@ const CMenuOptionChooser::keyval KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_OPTIONS[K { SNeutrinoSettings::VOLUME, LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VOLUME }, { SNeutrinoSettings::INFOBAR, LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_INFOBAR } }; -#if 0 //not used -#define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 3 -const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS[KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT] = -{ - { 0, LOCALE_KEYBINDINGMENU_BOUQUETCHANNELS_ON_OK }, - { 1, LOCALE_KEYBINDINGMENU_BOUQUETLIST_ON_OK }, - { 2, LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK } -}; -#endif + typedef struct key_settings_t { const neutrino_locale_t keydescription; diff --git a/src/system/locals.h b/src/system/locals.h index f3a4cb295..372e958f7 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1151,11 +1151,8 @@ typedef enum LOCALE_IPSETUP_HINT_2, LOCALE_KEYBINDINGMENU_ADDRECORD, LOCALE_KEYBINDINGMENU_ADDREMIND, - LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK, - LOCALE_KEYBINDINGMENU_BOUQUETCHANNELS_ON_OK, LOCALE_KEYBINDINGMENU_BOUQUETDOWN, LOCALE_KEYBINDINGMENU_BOUQUETHANDLING, - LOCALE_KEYBINDINGMENU_BOUQUETLIST_ON_OK, LOCALE_KEYBINDINGMENU_BOUQUETUP, LOCALE_KEYBINDINGMENU_CANCEL, LOCALE_KEYBINDINGMENU_CHANNELDOWN, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index c5e5d7212..362a35706 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1151,11 +1151,8 @@ const char * locale_real_names[] = "ipsetup.hint_2", "keybindingmenu.addrecord", "keybindingmenu.addremind", - "keybindingmenu.allchannels_on_ok", - "keybindingmenu.bouquetchannels_on_ok", "keybindingmenu.bouquetdown", "keybindingmenu.bouquethandling", - "keybindingmenu.bouquetlist_on_ok", "keybindingmenu.bouquetup", "keybindingmenu.cancel", "keybindingmenu.channeldown",