Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-03-04 19:32:30 +01:00
46 changed files with 335 additions and 233 deletions

View File

@@ -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);