mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

keybind-setup: addition to 8de975e92d

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 844d0f72e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-10 (Fri, 10 Dec 2021)

Origin message was:
------------------
- keybind-setup: addition to 8de975e92d

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-12-10 19:56:53 +01:00
parent 0078138934
commit 7d18b3df74
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -1130,7 +1130,7 @@ ipsetup.hint_2 OK speichert, EXIT bricht ab
keybindingmenu.addrecord Aufnahme-Timer hinzufügen keybindingmenu.addrecord Aufnahme-Timer hinzufügen
keybindingmenu.addremind Umschalt-Timer hinzufügen keybindingmenu.addremind Umschalt-Timer hinzufügen
keybindingmenu.bouquetdown Bouquet zurück keybindingmenu.bouquetdown Bouquet zurück
keybindingmenu.bouquethandling OK-Taste für keybindingmenu.bouquetlist_mode OK-Taste für
keybindingmenu.bouquetup Bouquet weiter keybindingmenu.bouquetup Bouquet weiter
keybindingmenu.cancel Kanalliste schließen keybindingmenu.cancel Kanalliste schließen
keybindingmenu.channeldown Kanal runter keybindingmenu.channeldown Kanal runter

2
data/locale/english.locale
View File

@@ -1130,7 +1130,7 @@ ipsetup.hint_2 OK saves, Exit aborts
keybindingmenu.addrecord add record timer keybindingmenu.addrecord add record timer
keybindingmenu.addremind add zapto timer keybindingmenu.addremind add zapto timer
keybindingmenu.bouquetdown bouquet back keybindingmenu.bouquetdown bouquet back
keybindingmenu.bouquethandling Bouquet-control keybindingmenu.bouquetlist_mode Bouquetlist mode
keybindingmenu.bouquetup next bouquet keybindingmenu.bouquetup next bouquet
keybindingmenu.cancel close channellist keybindingmenu.cancel close channellist
keybindingmenu.channeldown channel down keybindingmenu.channeldown channel down

6
src/gui/keybind_setup.cpp
View File

@@ -146,8 +146,8 @@ int CKeybindSetup::exec(CMenuTarget *parent, const std::string &actionKey)
return res; return res;
} }
#define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 2 #define KEYBINDINGMENU_BOUQUETLIST_MODE_OPTION_COUNT 2
const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS[KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT] = const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETLIST_MODE_OPTIONS[KEYBINDINGMENU_BOUQUETLIST_MODE_OPTION_COUNT] =
{ {
{ SNeutrinoSettings::CHANNELLIST, LOCALE_KEYBINDINGMENU_CHANNELLIST }, { SNeutrinoSettings::CHANNELLIST, LOCALE_KEYBINDINGMENU_CHANNELLIST },
{ SNeutrinoSettings::FAVORITES, LOCALE_KEYBINDINGMENU_FAVORITES } { SNeutrinoSettings::FAVORITES, LOCALE_KEYBINDINGMENU_FAVORITES }
@@ -508,7 +508,7 @@ void CKeybindSetup::showKeyBindChannellistSetup(CMenuWidget *bindSettings_chlist
{ {
bindSettings_chlist->addIntroItems(LOCALE_KEYBINDINGMENU_CHANNELLIST); 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); bindSettings_chlist->addItem(oj);
for (int i = NKEY_LIST_START; i <= NKEY_CURRENT_TRANSPONDER; i++) for (int i = NKEY_LIST_START; i <= NKEY_CURRENT_TRANSPONDER; i++)

2
src/system/locals.h
View File

@@ -1157,7 +1157,7 @@ typedef enum
LOCALE_KEYBINDINGMENU_ADDRECORD, LOCALE_KEYBINDINGMENU_ADDRECORD,
LOCALE_KEYBINDINGMENU_ADDREMIND, LOCALE_KEYBINDINGMENU_ADDREMIND,
LOCALE_KEYBINDINGMENU_BOUQUETDOWN, LOCALE_KEYBINDINGMENU_BOUQUETDOWN,
LOCALE_KEYBINDINGMENU_BOUQUETHANDLING, LOCALE_KEYBINDINGMENU_BOUQUETLIST_MODE,
LOCALE_KEYBINDINGMENU_BOUQUETUP, LOCALE_KEYBINDINGMENU_BOUQUETUP,
LOCALE_KEYBINDINGMENU_CANCEL, LOCALE_KEYBINDINGMENU_CANCEL,
LOCALE_KEYBINDINGMENU_CHANNELDOWN, LOCALE_KEYBINDINGMENU_CHANNELDOWN,

2
src/system/locals_intern.h
View File

@@ -1157,7 +1157,7 @@ const char * locale_real_names[] =
"keybindingmenu.addrecord", "keybindingmenu.addrecord",
"keybindingmenu.addremind", "keybindingmenu.addremind",
"keybindingmenu.bouquetdown", "keybindingmenu.bouquetdown",
"keybindingmenu.bouquethandling", "keybindingmenu.bouquetlist_mode",
"keybindingmenu.bouquetup", "keybindingmenu.bouquetup",
"keybindingmenu.cancel", "keybindingmenu.cancel",
"keybindingmenu.channeldown", "keybindingmenu.channeldown",

4
src/system/settings.h
View File

@@ -1267,10 +1267,10 @@ struct SNeutrinoSettings
INFOBAR = 3 INFOBAR = 3
}; };
enum BOUQUETHANDLING_SETTINGS enum BOUQUETLIST_MODES
{ {
CHANNELLIST = 0, CHANNELLIST = 0,
FAVORITES = 2 FAVORITES = 1
}; };
int mode_left_right_key_tv; int mode_left_right_key_tv;