diff --git a/data/key-mapper.glade b/data/key-mapper.glade index 3158499c..66aad6dc 100644 --- a/data/key-mapper.glade +++ b/data/key-mapper.glade @@ -274,7 +274,6 @@ 700 False Key Mapper - 400 mouse @@ -562,47 +561,127 @@ 3 + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + False + 15 + vertical + 10 - + True False - vertical 10 - + True False - 10 - - - True - False - Left joystick - 0 - - - True - True - 0 - - - - - 100 - True - False - - Mouse - Wheel - - - - - False - True - 1 - - + Left joystick + 0 + + + True + True + 0 + + + + + 100 + True + False + + Mouse + Wheel + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + 10 + + + True + False + Right joystick + 0 + + + True + True + 0 + + + + + 100 + True + False + + Mouse + Wheel + + + + + False + True + 1 + + + + + False + True + 1 + + + + + True + False + 10 + + + True + False + Mouse speed + 13 + 0 False @@ -611,99 +690,31 @@ - + + 0 True - False - 10 - - - True - False - Right joystick - 0 - - - True - True - 0 - - - - - 100 - True - False - - Mouse - Wheel - - - - - False - True - 1 - - + True + mouse_speed_adjustment + 1 + False + - False + True True 1 - - - True - False - 10 - - - True - False - Mouse speed - 13 - 0 - - - False - True - 0 - - - - - 0 - True - True - mouse_speed_adjustment - 1 - False - - - - True - True - 1 - - - - - False - True - 2 - - False True - 6 + 2 - True + False True 2 diff --git a/keymapper/gtk/window.py b/keymapper/gtk/window.py index 3144fbec..64de59dc 100755 --- a/keymapper/gtk/window.py +++ b/keymapper/gtk/window.py @@ -158,8 +158,10 @@ class Window: """Set slider and dropdown values when a gamepad is selected.""" devices = get_devices() if devices[self.selected_device]['gamepad']: + self.get('gamepad_separator').show() self.get('gamepad_config').show() else: + self.get('gamepad_separator').hide() self.get('gamepad_config').hide() return diff --git a/readme/screenshot_2.png b/readme/screenshot_2.png index 7f517fd6..cf64b64b 100644 Binary files a/readme/screenshot_2.png and b/readme/screenshot_2.png differ