Skip to content

Commit e3c4f77

Browse files
stenzekstenzek
committed
Qt: Fix tab order in settings pages
1 parent 1a4ca3b commit e3c4f77

9 files changed

+325
-325
lines changed

‎src/duckstation-qt/achievementsettingswidget.ui‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,17 @@
2929
<string>Settings</string>
3030
</property>
3131
<layout class="QGridLayout" name="settingsLayout">
32-
<item row="1" column="1">
33-
<widget class="QCheckBox" name="spectatorMode">
34-
<property name="text">
35-
<string>Enable Spectator Mode</string>
36-
</property>
37-
</widget>
38-
</item>
3932
<item row="0" column="0">
4033
<widget class="QCheckBox" name="enable">
4134
<property name="text">
4235
<string>Enable Achievements</string>
4336
</property>
4437
</widget>
4538
</item>
46-
<item row="2" column="0">
47-
<widget class="QCheckBox" name="unofficialAchievements">
39+
<item row="0" column="1">
40+
<widget class="QCheckBox" name="hardcoreMode">
4841
<property name="text">
49-
<string>Test Unofficial Achievements</string>
42+
<string>Enable Hardcore Mode</string>
5043
</property>
5144
</widget>
5245
</item>
@@ -57,10 +50,17 @@
5750
</property>
5851
</widget>
5952
</item>
60-
<item row="0" column="1">
61-
<widget class="QCheckBox" name="hardcoreMode">
53+
<item row="1" column="1">
54+
<widget class="QCheckBox" name="spectatorMode">
6255
<property name="text">
63-
<string>Enable Hardcore Mode</string>
56+
<string>Enable Spectator Mode</string>
57+
</property>
58+
</widget>
59+
</item>
60+
<item row="2" column="0">
61+
<widget class="QCheckBox" name="unofficialAchievements">
62+
<property name="text">
63+
<string>Test Unofficial Achievements</string>
6464
</property>
6565
</widget>
6666
</item>
@@ -80,10 +80,10 @@
8080
<string>Notifications</string>
8181
</property>
8282
<layout class="QGridLayout" name="gridLayout_2" columnstretch="1,1">
83-
<item row="1" column="0">
84-
<widget class="QCheckBox" name="leaderboardNotifications">
83+
<item row="0" column="0">
84+
<widget class="QCheckBox" name="achievementNotifications">
8585
<property name="text">
86-
<string>Show Leaderboard Notifications</string>
86+
<string>Show Achievement Notifications</string>
8787
</property>
8888
</widget>
8989
</item>
@@ -126,10 +126,10 @@
126126
</item>
127127
</layout>
128128
</item>
129-
<item row="0" column="0">
130-
<widget class="QCheckBox" name="achievementNotifications">
129+
<item row="1" column="0">
130+
<widget class="QCheckBox" name="leaderboardNotifications">
131131
<property name="text">
132-
<string>Show Achievement Notifications</string>
132+
<string>Show Leaderboard Notifications</string>
133133
</property>
134134
</widget>
135135
</item>
@@ -172,17 +172,17 @@
172172
</item>
173173
</layout>
174174
</item>
175-
<item row="2" column="1">
176-
<widget class="QCheckBox" name="soundEffects">
175+
<item row="2" column="0">
176+
<widget class="QCheckBox" name="leaderboardTrackers">
177177
<property name="text">
178-
<string>Enable Sound Effects</string>
178+
<string>Show Leaderboard Trackers</string>
179179
</property>
180180
</widget>
181181
</item>
182-
<item row="2" column="0">
183-
<widget class="QCheckBox" name="leaderboardTrackers">
182+
<item row="2" column="1">
183+
<widget class="QCheckBox" name="soundEffects">
184184
<property name="text">
185-
<string>Show Leaderboard Trackers</string>
185+
<string>Enable Sound Effects</string>
186186
</property>
187187
</widget>
188188
</item>
@@ -202,16 +202,16 @@
202202
</property>
203203
</widget>
204204
</item>
205+
<item row="0" column="1">
206+
<widget class="QComboBox" name="challengeIndicatorMode"/>
207+
</item>
205208
<item row="1" column="0">
206209
<widget class="QCheckBox" name="progressIndicators">
207210
<property name="text">
208211
<string>Show Progress Indicators</string>
209212
</property>
210213
</widget>
211214
</item>
212-
<item row="0" column="1">
213-
<widget class="QComboBox" name="challengeIndicatorMode"/>
214-
</item>
215215
</layout>
216216
</widget>
217217
</item>

‎src/duckstation-qt/biossettingswidget.ui‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,23 @@
2929
<string>BIOS Selection</string>
3030
</property>
3131
<layout class="QGridLayout" name="gridLayout">
32+
<item row="0" column="0">
33+
<widget class="QLabel" name="label">
34+
<property name="text">
35+
<string>NTSC-J (Japan):</string>
36+
</property>
37+
</widget>
38+
</item>
39+
<item row="0" column="1">
40+
<widget class="QComboBox" name="imageNTSCJ">
41+
<property name="sizePolicy">
42+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
43+
<horstretch>0</horstretch>
44+
<verstretch>0</verstretch>
45+
</sizepolicy>
46+
</property>
47+
</widget>
48+
</item>
3249
<item row="1" column="1">
3350
<widget class="QComboBox" name="imageNTSCU">
3451
<property name="sizePolicy">
@@ -53,23 +70,6 @@
5370
</property>
5471
</widget>
5572
</item>
56-
<item row="0" column="1">
57-
<widget class="QComboBox" name="imageNTSCJ">
58-
<property name="sizePolicy">
59-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
60-
<horstretch>0</horstretch>
61-
<verstretch>0</verstretch>
62-
</sizepolicy>
63-
</property>
64-
</widget>
65-
</item>
66-
<item row="0" column="0">
67-
<widget class="QLabel" name="label">
68-
<property name="text">
69-
<string>NTSC-J (Japan):</string>
70-
</property>
71-
</widget>
72-
</item>
7373
<item row="2" column="1">
7474
<widget class="QComboBox" name="imagePAL">
7575
<property name="sizePolicy">

‎src/duckstation-qt/consolesettingswidget.ui‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@
5858
</property>
5959
</widget>
6060
</item>
61-
<item row="1" column="0">
62-
<widget class="QCheckBox" name="fastForwardBoot">
61+
<item row="0" column="1">
62+
<widget class="QCheckBox" name="fastForwardMemoryCardAccess">
6363
<property name="text">
64-
<string>Fast Forward Boot</string>
64+
<string>Fast Forward Memory Card Access</string>
6565
</property>
6666
</widget>
6767
</item>
68-
<item row="0" column="1">
69-
<widget class="QCheckBox" name="fastForwardMemoryCardAccess">
68+
<item row="1" column="0">
69+
<widget class="QCheckBox" name="fastForwardBoot">
7070
<property name="text">
71-
<string>Fast Forward Memory Card Access</string>
71+
<string>Fast Forward Boot</string>
7272
</property>
7373
</widget>
7474
</item>
@@ -90,16 +90,16 @@
9090
<string>CPU Emulation</string>
9191
</property>
9292
<layout class="QGridLayout" name="gridLayout_4" columnstretch="0,1">
93-
<item row="0" column="1">
94-
<widget class="QComboBox" name="cpuExecutionMode"/>
95-
</item>
96-
<item row="3" column="0" colspan="2">
97-
<widget class="QCheckBox" name="recompilerICache">
93+
<item row="0" column="0">
94+
<widget class="QLabel" name="cpuExecutionModeLabel">
9895
<property name="text">
99-
<string>Enable Recompiler ICache</string>
96+
<string>Execution Mode:</string>
10097
</property>
10198
</widget>
10299
</item>
100+
<item row="0" column="1">
101+
<widget class="QComboBox" name="cpuExecutionMode"/>
102+
</item>
103103
<item row="1" column="0" colspan="2">
104104
<layout class="QHBoxLayout" name="horizontalLayout">
105105
<item>
@@ -134,13 +134,6 @@
134134
</item>
135135
</layout>
136136
</item>
137-
<item row="0" column="0">
138-
<widget class="QLabel" name="cpuExecutionModeLabel">
139-
<property name="text">
140-
<string>Execution Mode:</string>
141-
</property>
142-
</widget>
143-
</item>
144137
<item row="2" column="0" colspan="2">
145138
<widget class="QSlider" name="cpuClockSpeed">
146139
<property name="minimum">
@@ -163,6 +156,13 @@
163156
</property>
164157
</widget>
165158
</item>
159+
<item row="3" column="0" colspan="2">
160+
<widget class="QCheckBox" name="recompilerICache">
161+
<property name="text">
162+
<string>Enable Recompiler ICache</string>
163+
</property>
164+
</widget>
165+
</item>
166166
</layout>
167167
</widget>
168168
</item>

0 commit comments

Comments
 (0)