diff --git a/www/index.html b/www/index.html index 643a312..015c449 100644 --- a/www/index.html +++ b/www/index.html @@ -49,8 +49,6 @@

Filtering


Miscellaneous
- Keyboard -

Color options

You can use colours to highlight modifier buttons or control types: diff --git a/www/scripts/bindings.py b/www/scripts/bindings.py index 037536d..92e8878 100755 --- a/www/scripts/bindings.py +++ b/www/scripts/bindings.py @@ -968,10 +968,6 @@ def parseForm(form): displayGroups.append('Holo-Me') if form.getvalue('showmisc'): displayGroups.append('Misc') - if form.getvalue('keyboard'): - showKeyboard = True - else: - showKeyboard = False styling = 'None' # Yes we do mean a string 'None' if form.getvalue('styling') == 'group': @@ -983,7 +979,7 @@ def parseForm(form): description = form.getvalue('description') if description is None: description = '' - return (displayGroups, showKeyboard, styling, description) + return (displayGroups, styling, description) def determineMode(form): deviceForBlockImage = form.getvalue('blocks') @@ -1005,10 +1001,9 @@ def determineMode(form): mode = Mode.generate return mode -def saveReplayInfo(config, description, styling, displayGroups, devices, showKeyboard, errors): +def saveReplayInfo(config, description, styling, displayGroups, devices, errors): replayInfo = {} replayInfo['displayGroups'] = displayGroups - replayInfo['showKeyboard'] = showKeyboard replayInfo['misconfigurationWarnings'] = errors.misconfigurationWarnings replayInfo['unhandledDevicesWarnings'] = errors.unhandledDevicesWarnings replayInfo['deviceWarnings'] = errors.deviceWarnings @@ -1074,7 +1069,6 @@ def main(): with replayPath.open("rb") as pickleFile: replayInfo = pickle.load(pickleFile) displayGroups = replayInfo.get('displayGroups', ['Galaxy map', 'General', 'Head look', 'SRV', 'Ship', 'UI']) - showKeyboard = replayInfo.get('showKeyboard', True) errors.misconfigurationWarnings = replayInfo.get('misconfigurationWarnings', replayInfo.get('warnings', '')) errors.deviceWarnings = replayInfo.get('deviceWarnings', '') errors.unhandledDevicesWarnings = '' @@ -1084,7 +1078,6 @@ def main(): # devices = replayInfo['devices'] except FileNotFoundError: displayGroups = ['Galaxy map', 'General', 'Head look', 'SRV', 'Ship', 'UI'] - showKeyboard = True except (ValueError, FileNotFoundError): errors.errors = '

Configuration "%s" not found

' % runId displayGroups = ['Galaxy map', 'General', 'Head look', 'SRV', 'Ship', 'UI'] @@ -1094,7 +1087,7 @@ def main(): config.makeDir() runId = config.name displayGroups = [] - (displayGroups, showKeyboard, styling, description) = parseForm(form) + (displayGroups, styling, description) = parseForm(form) xml = form.getvalue('bindings') if xml is None or xml is b'': errors.errors = '

No bindings file supplied; please go back and select your binds file as per the instructions.

' @@ -1156,7 +1149,7 @@ def main(): # Save variables for later replays if (mode is Mode.generate and public): - saveReplayInfo(config, description, styling, displayGroups, devices, showKeyboard, errors) + saveReplayInfo(config, description, styling, displayGroups, devices, errors) printHTML(mode, config, public, createdImages, deviceForBlockImage, errors)