From 5c32172076689226055d1e82d6ad6997d04aab73 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 2 Aug 2015 15:28:53 -0700 Subject: [PATCH] Qt: Make keymapper present more information, and space things out a bit more --- CHANGES | 1 + res/keymap.qpic | Bin 22895 -> 25382 bytes src/platform/qt/GBAKeyEditor.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index bb108edd9..10d60be18 100644 --- a/CHANGES +++ b/CHANGES @@ -110,6 +110,7 @@ Misc: - GBA Input: Allow axes and buttons to be mapped to the same key - GBA BIOS: Stub out SoundBias - Qt: Gamepads can now have both buttons and analog axes mapped to the same key + - Qt: Increase usability of key mapper 0.2.1: (2015-05-13) Bugfixes: diff --git a/res/keymap.qpic b/res/keymap.qpic index ffb7f8b7d34b14fd240edf7ce42fac58ce594c68..ccdc82a08c7aac6bc404d55805e8323a4947d24b 100644 GIT binary patch literal 25382 zcmd^I33OCN*6xJ?#sw8nQBgn^QDhMu7Z7p**%Ss4>~57M8wu$S5Ry(v3c@0yIIe&S zCt({d0!@oio$v@7-JLty}kg zRgL}o_3GL`KX7~?a7ML&_XKwZ0>Pd5HPI>==od)aD{q3qg9nX_!OZtVKM(gk9IA-l zgRPew7qC?wA`!&zA%kIylo~edn{NWPl?M;DY16c6ad993BSmi2rJWA`+@jM|^Bu+u zez=V^wH^9t^wVhUYMg?D6HLdyP9Ql`2aIb-U+D>XSozr}-OwU*3}Ru>f17uVX&na( zLMMEKkAsEaocCLwI(JoxgM~#3<(xV^%(jI_ksnhoe(^?CmpcZru=BSl5T@H=0Q?L( z{WNgMX@kMSrmar77PI9BJvrNEDkFGgSmf&Ry`k-aO;30hIsLR>7GI!_Hx^}v>(I}` zeSe588rvzq-4qyt^ZE}jtZ4WmSS$?nt z<{e|EExInmJlk>PLZ%H4hHFLIZ`#h~8O*jN=*d~zL0i~yY?)G zqW|-@IQY)k@tJ+zgu?cZ)I6`*r(nMKIQY(^i|0lT*Vbq#QawhWY%x?9B~B$NtflXc z4%t`35cxzX1pPmx7JTMlVSp`Ztv=C;MiWq)xoPU)Yq zys%eZ`X`fXkDPfcW2Rn8^tOxC`WGgXxypHCfNFx%1Vb}M0dj_H&SF{D(N-}Bbwi$<#lnz|Z^(~lHK8@w7XJ?Gbw0?!LU7GF7_F>Z z;b3973P?8qZh4ilpeJYh5rlr*yWPKj^<<~bp%hpc`kjF;q{k9)$Hido_!%s5BKs(8 z7V7Fc@{h7(S{bwLvvL+IIDO4+gPMPf<%PU{SS*a=B9>D?Q~Kj4T(9vP77M}9gEXzR zz+yP|Ja2D;TV7?%%;lRP?Q4Z~1U=iZSV&{jw4AmfZENnh7+bUBhecM|njT2W$)G`z zNO`$ktkj@Xk6BTv-VtWrAF|@S8EHwg^bZt7i+&d;_M0_O;9+67Ivro3MHkdDa%knN zHCFu_G=;PA3tET966=j+1)=}N6qT(7i{b8Ay;{8)$!8&O&1%0A-S%g}zfl`P!tvnw-x*49wH%2wR3 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 L`M>KBY7qDr+y&?8 literal 22895 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