mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-04 20:28:29 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ad27fb3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -305,7 +305,7 @@ int CKeybindSetup::showKeySetup()
|
||||
#endif
|
||||
|
||||
cc = new CMenuOptionNumberChooser(LOCALE_KEYBINDINGMENU_REPEATBLOCK,
|
||||
&g_settings.repeat_blocker, true, 0, 999, NULL,
|
||||
&g_settings.repeat_blocker, true, 0, 999, this,
|
||||
CRCInput::convertDigitToKey(shortcut++), NULL, 0, 0, LOCALE_OPTIONS_OFF);
|
||||
cc->setNumberFormat(ms_number_format);
|
||||
cc->setNumericInput(true);
|
||||
@@ -313,7 +313,7 @@ int CKeybindSetup::showKeySetup()
|
||||
keySettings->addItem(cc);
|
||||
|
||||
cc = new CMenuOptionNumberChooser(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC,
|
||||
&g_settings.repeat_genericblocker, true, 0, 999, NULL,
|
||||
&g_settings.repeat_genericblocker, true, 0, 999, this,
|
||||
CRCInput::convertDigitToKey(shortcut++), NULL, 0, 0, LOCALE_OPTIONS_OFF);
|
||||
cc->setNumberFormat(ms_number_format);
|
||||
cc->setNumericInput(true);
|
||||
|
Reference in New Issue
Block a user