From 0d2e3060b5e31ce86b01de49474f66178826875e 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 } --- 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 eeb0bc913..65f4ab121 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1044,11 +1044,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 0c188410c..9b24e0a3a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1044,11 +1044,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 35251e224..545523b36 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 011a69829..e1e37714b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1071,11 +1071,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 c7e53c94e..1e903cdba 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1071,11 +1071,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",