summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Kewlan2020-03-29 14:37:23 +0200
committerGravatar Kewlan2020-03-29 14:37:23 +0200
commita8f3a13a1f8c7ffbef0c3b8376bb5ba99e69f4cc (patch)
tree5ea7fc29f01b891ffc40a1519824b94c7be26acc
parentMerge pull request #3568 from bunnei/time-calcspan (diff)
downloadyuzu-a8f3a13a1f8c7ffbef0c3b8376bb5ba99e69f4cc.tar.gz
yuzu-a8f3a13a1f8c7ffbef0c3b8376bb5ba99e69f4cc.tar.xz
yuzu-a8f3a13a1f8c7ffbef0c3b8376bb5ba99e69f4cc.zip
Re-order the shoulder buttons both in the configuration menu, and in the code.
Diffstat
-rw-r--r--src/yuzu/configuration/configure_input_player.ui72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index 1556481d0..c3a1b68f0 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -839,21 +839,21 @@
839 <bool>false</bool> 839 <bool>false</bool>
840 </property> 840 </property>
841 <layout class="QGridLayout" name="gridLayout_3"> 841 <layout class="QGridLayout" name="gridLayout_3">
842 <item row="3" column="0"> 842 <item row="0" column="0">
843 <layout class="QVBoxLayout" name="buttonShoulderButtonsSLVerticalLayout"> 843 <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout">
844 <item> 844 <item>
845 <layout class="QHBoxLayout" name="buttonShoulderButtonsSLHorizontalLayout"> 845 <layout class="QHBoxLayout" name="buttonShoulderButtonsLHorizontalLayout">
846 <item> 846 <item>
847 <widget class="QLabel" name="labelSL"> 847 <widget class="QLabel" name="labelL">
848 <property name="text"> 848 <property name="text">
849 <string>SL:</string> 849 <string>L:</string>
850 </property> 850 </property>
851 </widget> 851 </widget>
852 </item> 852 </item>
853 </layout> 853 </layout>
854 </item> 854 </item>
855 <item> 855 <item>
856 <widget class="QPushButton" name="buttonSL"> 856 <widget class="QPushButton" name="buttonL">
857 <property name="text"> 857 <property name="text">
858 <string/> 858 <string/>
859 </property> 859 </property>
@@ -861,21 +861,21 @@
861 </item> 861 </item>
862 </layout> 862 </layout>
863 </item> 863 </item>
864 <item row="2" column="1"> 864 <item row="0" column="1">
865 <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout"> 865 <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout">
866 <item> 866 <item>
867 <layout class="QHBoxLayout" name="buttonShoulderButtonsZRHorizontalLayout"> 867 <layout class="QHBoxLayout" name="buttonShoulderButtonsRHorizontalLayout">
868 <item> 868 <item>
869 <widget class="QLabel" name="labelZR"> 869 <widget class="QLabel" name="labelR">
870 <property name="text"> 870 <property name="text">
871 <string>ZR:</string> 871 <string>R:</string>
872 </property> 872 </property>
873 </widget> 873 </widget>
874 </item> 874 </item>
875 </layout> 875 </layout>
876 </item> 876 </item>
877 <item> 877 <item>
878 <widget class="QPushButton" name="buttonZR"> 878 <widget class="QPushButton" name="buttonR">
879 <property name="text"> 879 <property name="text">
880 <string/> 880 <string/>
881 </property> 881 </property>
@@ -883,21 +883,21 @@
883 </item> 883 </item>
884 </layout> 884 </layout>
885 </item> 885 </item>
886 <item row="3" column="1"> 886 <item row="1" column="0">
887 <layout class="QVBoxLayout" name="buttonShoulderButtonsSRVerticalLayout"> 887 <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout">
888 <item> 888 <item>
889 <layout class="QHBoxLayout" name="buttonShoulderButtonsSRHorizontalLayout"> 889 <layout class="QHBoxLayout" name="buttonShoulderButtonsZLHorizontalLayout">
890 <item> 890 <item>
891 <widget class="QLabel" name="labelSR"> 891 <widget class="QLabel" name="labelZL">
892 <property name="text"> 892 <property name="text">
893 <string>SR:</string> 893 <string>ZL:</string>
894 </property> 894 </property>
895 </widget> 895 </widget>
896 </item> 896 </item>
897 </layout> 897 </layout>
898 </item> 898 </item>
899 <item> 899 <item>
900 <widget class="QPushButton" name="buttonSR"> 900 <widget class="QPushButton" name="buttonZL">
901 <property name="text"> 901 <property name="text">
902 <string/> 902 <string/>
903 </property> 903 </property>
@@ -905,21 +905,21 @@
905 </item> 905 </item>
906 </layout> 906 </layout>
907 </item> 907 </item>
908 <item row="0" column="1"> 908 <item row="1" column="1">
909 <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout"> 909 <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout">
910 <item> 910 <item>
911 <layout class="QHBoxLayout" name="buttonShoulderButtonsZLHorizontalLayout"> 911 <layout class="QHBoxLayout" name="buttonShoulderButtonsZRHorizontalLayout">
912 <item> 912 <item>
913 <widget class="QLabel" name="labelZL"> 913 <widget class="QLabel" name="labelZR">
914 <property name="text"> 914 <property name="text">
915 <string>ZL:</string> 915 <string>ZR:</string>
916 </property> 916 </property>
917 </widget> 917 </widget>
918 </item> 918 </item>
919 </layout> 919 </layout>
920 </item> 920 </item>
921 <item> 921 <item>
922 <widget class="QPushButton" name="buttonZL"> 922 <widget class="QPushButton" name="buttonZR">
923 <property name="text"> 923 <property name="text">
924 <string/> 924 <string/>
925 </property> 925 </property>
@@ -927,21 +927,21 @@
927 </item> 927 </item>
928 </layout> 928 </layout>
929 </item> 929 </item>
930 <item row="0" column="0"> 930 <item row="2" column="0">
931 <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout"> 931 <layout class="QVBoxLayout" name="buttonShoulderButtonsSLVerticalLayout">
932 <item> 932 <item>
933 <layout class="QHBoxLayout" name="buttonShoulderButtonsLHorizontalLayout"> 933 <layout class="QHBoxLayout" name="buttonShoulderButtonsSLHorizontalLayout">
934 <item> 934 <item>
935 <widget class="QLabel" name="labelL"> 935 <widget class="QLabel" name="labelSL">
936 <property name="text"> 936 <property name="text">
937 <string>L:</string> 937 <string>SL:</string>
938 </property> 938 </property>
939 </widget> 939 </widget>
940 </item> 940 </item>
941 </layout> 941 </layout>
942 </item> 942 </item>
943 <item> 943 <item>
944 <widget class="QPushButton" name="buttonL"> 944 <widget class="QPushButton" name="buttonSL">
945 <property name="text"> 945 <property name="text">
946 <string/> 946 <string/>
947 </property> 947 </property>
@@ -949,21 +949,21 @@
949 </item> 949 </item>
950 </layout> 950 </layout>
951 </item> 951 </item>
952 <item row="2" column="0"> 952 <item row="2" column="1">
953 <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout"> 953 <layout class="QVBoxLayout" name="buttonShoulderButtonsSRVerticalLayout">
954 <item> 954 <item>
955 <layout class="QHBoxLayout" name="buttonShoulderButtonsRHorizontalLayout"> 955 <layout class="QHBoxLayout" name="buttonShoulderButtonsSRHorizontalLayout">
956 <item> 956 <item>
957 <widget class="QLabel" name="labelR"> 957 <widget class="QLabel" name="labelSR">
958 <property name="text"> 958 <property name="text">
959 <string>R:</string> 959 <string>SR:</string>
960 </property> 960 </property>
961 </widget> 961 </widget>
962 </item> 962 </item>
963 </layout> 963 </layout>
964 </item> 964 </item>
965 <item> 965 <item>
966 <widget class="QPushButton" name="buttonR"> 966 <widget class="QPushButton" name="buttonSR">
967 <property name="text"> 967 <property name="text">
968 <string/> 968 <string/>
969 </property> 969 </property>
HIC SVNT DRACONES