diff options
author | Adityarup Laha <30696515+adityaruplaha@users.noreply.github.com> | 2019-02-16 16:19:29 +0100 |
---|---|---|
committer | fearlessTobi <thm.frey@gmail.com> | 2019-03-16 03:55:57 +0100 |
commit | 57a4a2ae0fc35906723ffc9f788f3cf7dd9c4ba5 (patch) | |
tree | 3ad8f3c6e2b2c26d10055e14be3197a932a48862 /src/yuzu/configuration/configure.ui | |
parent | 06ac6460d31036dddf7e4ae12355391035cc30ca (diff) |
yuzu: Make hotkeys configurable via the GUI
* Adds a new Hotkeys tab in the Controls group.
* Double-click a Hotkey to rebind it.
Diffstat (limited to 'src/yuzu/configuration/configure.ui')
-rw-r--r-- | src/yuzu/configuration/configure.ui | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure.ui b/src/yuzu/configuration/configure.ui index 3f03f0b77f..267717bc97 100644 --- a/src/yuzu/configuration/configure.ui +++ b/src/yuzu/configuration/configure.ui @@ -7,9 +7,15 @@ <x>0</x> <y>0</y> <width>382</width> - <height>241</height> + <height>650</height> </rect> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>650</height> + </size> + </property> <property name="windowTitle"> <string>yuzu Configuration</string> </property> @@ -62,6 +68,11 @@ <string>Input</string> </attribute> </widget> + <widget class="ConfigureHotkeys" name="hotkeysTab"> + <attribute name="title"> + <string>Hotkeys</string> + </attribute> + </widget> <widget class="ConfigureGraphics" name="graphicsTab"> <attribute name="title"> <string>Graphics</string> @@ -150,6 +161,12 @@ <header>configuration/configure_input_simple.h</header> <container>1</container> </customwidget> + <customwidget> + <class>ConfigureHotkeys</class> + <extends>QWidget</extends> + <header>configuration/configure_hotkeys.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources/> <connections> |