summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/yuzu/configuration/configure_debug.ui181
-rw-r--r--src/yuzu/configuration/configure_tas.ui62
3 files changed, 77 insertions, 168 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df2ff3fa..870d0ebdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,7 @@ endif()
135# boost asio's concept usage doesn't play nicely with some compilers yet. 135# boost asio's concept usage doesn't play nicely with some compilers yet.
136add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) 136add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
137if (MSVC) 137if (MSVC)
138 add_compile_options(/std:c++latest) 138 add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>)
139 139
140 # cubeb and boost still make use of deprecated result_of. 140 # cubeb and boost still make use of deprecated result_of.
141 add_definitions(-D_HAS_DEPRECATED_RESULT_OF) 141 add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui
index 3fe9ff7de..b884a56b0 100644
--- a/src/yuzu/configuration/configure_debug.ui
+++ b/src/yuzu/configuration/configure_debug.ui
@@ -2,85 +2,55 @@
2<ui version="4.0"> 2<ui version="4.0">
3 <class>ConfigureDebug</class> 3 <class>ConfigureDebug</class>
4 <widget class="QWidget" name="ConfigureDebug"> 4 <widget class="QWidget" name="ConfigureDebug">
5 <property name="geometry">
6 <rect>
7 <x>0</x>
8 <y>0</y>
9 <width>400</width>
10 <height>777</height>
11 </rect>
12 </property>
13 <property name="windowTitle">
14 <string>Form</string>
15 </property>
16 <layout class="QVBoxLayout" name="verticalLayout_1"> 5 <layout class="QVBoxLayout" name="verticalLayout_1">
17 <item> 6 <item>
18 <widget class="QGroupBox" name="groupBox_2"> 7 <widget class="QGroupBox" name="groupBox_2">
19 <property name="title"> 8 <property name="title">
20 <string>Logging</string> 9 <string>Logging</string>
21 </property> 10 </property>
22 <layout class="QVBoxLayout" name="verticalLayout_4"> 11 <layout class="QGridLayout" name="gridLayout_1">
23 <item> 12 <item row="0" column="0" colspan="2">
24 <layout class="QHBoxLayout" name="horizontalLayout_2"> 13 <layout class="QHBoxLayout" name="horizontalLayout_1">
25 <item> 14 <item>
26 <widget class="QLabel" name="label_1"> 15 <widget class="QLabel" name="label_1">
27 <property name="text"> 16 <property name="text">
28 <string>Global Log Filter</string> 17 <string>Global Log Filter</string>
18 </property>
19 </widget>
20 </item>
21 <item>
22 <widget class="QLineEdit" name="log_filter_edit"/>
23 </item>
24 </layout>
25 </item>
26 <item row="1" column="0">
27 <widget class="QCheckBox" name="toggle_console">
28 <property name="text">
29 <string>Show Log in Console</string>
30 </property>
31 </widget>
32 </item>
33 <item row="1" column="1">
34 <widget class="QPushButton" name="open_log_button">
35 <property name="text">
36 <string>Open Log Location</string>
37 </property>
38 </widget>
39 </item>
40 <item row="2" column="0">
41 <widget class="QCheckBox" name="extended_logging">
42 <property name="enabled">
43 <bool>true</bool>
29 </property> 44 </property>
30 </widget> 45 <property name="toolTip">
31 </item> 46 <string>When checked, the max size of the log increases from 100 MB to 1 GB</string>
32 <item>
33 <widget class="QLineEdit" name="log_filter_edit"/>
34 </item>
35 </layout>
36 </item>
37 <item>
38 <layout class="QHBoxLayout" name="horizontalLayout_3">
39 <item>
40 <widget class="QCheckBox" name="toggle_console">
41 <property name="text">
42 <string>Show Log in Console</string>
43 </property> 47 </property>
44 </widget>
45 </item>
46 <item>
47 <widget class="QPushButton" name="open_log_button">
48 <property name="text"> 48 <property name="text">
49 <string>Open Log Location</string> 49 <string>Enable Extended Logging**</string>
50 </property> 50 </property>
51 </widget> 51 </widget>
52 </item> 52 </item>
53 </layout> 53 </layout>
54 </item>
55 <item>
56 <widget class="QCheckBox" name="extended_logging">
57 <property name="enabled">
58 <bool>true</bool>
59 </property>
60 <property name="toolTip">
61 <string>When checked, the max size of the log increases from 100 MB to 1 GB</string>
62 </property>
63 <property name="text">
64 <string>Enable Extended Logging</string>
65 </property>
66 </widget>
67 </item>
68 <item>
69 <widget class="QLabel" name="label_2">
70 <property name="font">
71 <font>
72 <italic>true</italic>
73 </font>
74 </property>
75 <property name="text">
76 <string>This will be reset automatically when yuzu closes.</string>
77 </property>
78 <property name="indent">
79 <number>20</number>
80 </property>
81 </widget>
82 </item>
83 </layout>
84 </widget> 54 </widget>
85 </item> 55 </item>
86 <item> 56 <item>
@@ -111,7 +81,7 @@
111 <property name="title"> 81 <property name="title">
112 <string>Graphics</string> 82 <string>Graphics</string>
113 </property> 83 </property>
114 <layout class="QGridLayout" name="gridLayout_3"> 84 <layout class="QGridLayout" name="gridLayout_2">
115 <item row="0" column="0"> 85 <item row="0" column="0">
116 <widget class="QCheckBox" name="enable_graphics_debugging"> 86 <widget class="QCheckBox" name="enable_graphics_debugging">
117 <property name="enabled"> 87 <property name="enabled">
@@ -176,33 +146,18 @@
176 <property name="title"> 146 <property name="title">
177 <string>Debugging</string> 147 <string>Debugging</string>
178 </property> 148 </property>
179 <layout class="QVBoxLayout" name="verticalLayout_7"> 149 <layout class="QGridLayout" name="gridLayout_3">
180 <item> 150 <item row="0" column="0">
181 <widget class="QCheckBox" name="fs_access_log"> 151 <widget class="QCheckBox" name="fs_access_log">
182 <property name="text"> 152 <property name="text">
183 <string>Enable FS Access Log</string> 153 <string>Enable FS Access Log</string>
184 </property> 154 </property>
185 </widget> 155 </widget>
186 </item> 156 </item>
187 <item> 157 <item row="1" column="0">
188 <widget class="QCheckBox" name="reporting_services"> 158 <widget class="QCheckBox" name="reporting_services">
189 <property name="text"> 159 <property name="text">
190 <string>Enable Verbose Reporting Services</string> 160 <string>Enable Verbose Reporting Services**</string>
191 </property>
192 </widget>
193 </item>
194 <item>
195 <widget class="QLabel" name="label_4">
196 <property name="font">
197 <font>
198 <italic>true</italic>
199 </font>
200 </property>
201 <property name="text">
202 <string>This will be reset automatically when yuzu closes.</string>
203 </property>
204 <property name="indent">
205 <number>20</number>
206 </property> 161 </property>
207 </widget> 162 </widget>
208 </item> 163 </item>
@@ -214,47 +169,32 @@
214 <property name="title"> 169 <property name="title">
215 <string>Advanced</string> 170 <string>Advanced</string>
216 </property> 171 </property>
217 <layout class="QVBoxLayout" name="verticalLayout_8"> 172 <layout class="QGridLayout" name="gridLayout_4">
218 <item> 173 <item> row="0" column="0">
219 <widget class="QCheckBox" name="quest_flag"> 174 <widget class="QCheckBox" name="quest_flag">
220 <property name="text"> 175 <property name="text">
221 <string>Kiosk (Quest) Mode</string> 176 <string>Kiosk (Quest) Mode</string>
222 </property> 177 </property>
223 </widget> 178 </widget>
224 </item> 179 </item>
225 <item> 180 <item row="1" column="0">
226 <widget class="QCheckBox" name="enable_cpu_debugging"> 181 <widget class="QCheckBox" name="enable_cpu_debugging">
227 <property name="text"> 182 <property name="text">
228 <string>Enable CPU Debugging</string> 183 <string>Enable CPU Debugging</string>
229 </property> 184 </property>
230 </widget> 185 </widget>
231 </item> 186 </item>
232 <item> 187 <item row="2" column="0">
233 <widget class="QCheckBox" name="use_debug_asserts"> 188 <widget class="QCheckBox" name="use_debug_asserts">
234 <property name="text"> 189 <property name="text">
235 <string>Enable Debug Asserts</string> 190 <string>Enable Debug Asserts</string>
236 </property> 191 </property>
237 </widget> 192 </widget>
238 </item> 193 </item>
239 <item> 194 <item row="0" column="1">
240 <widget class="QCheckBox" name="use_auto_stub"> 195 <widget class="QCheckBox" name="use_auto_stub">
241 <property name="text"> 196 <property name="text">
242 <string>Enable Auto-Stub</string> 197 <string>Enable Auto-Stub**</string>
243 </property>
244 </widget>
245 </item>
246 <item>
247 <widget class="QLabel" name="label_5">
248 <property name="font">
249 <font>
250 <italic>true</italic>
251 </font>
252 </property>
253 <property name="text">
254 <string>This will be reset automatically when yuzu closes.</string>
255 </property>
256 <property name="indent">
257 <number>20</number>
258 </property> 198 </property>
259 </widget> 199 </widget>
260 </item> 200 </item>
@@ -262,20 +202,19 @@
262 </widget> 202 </widget>
263 </item> 203 </item>
264 <item> 204 <item>
265 <spacer name="verticalSpacer"> 205 <widget class="QLabel" name="label_5">
266 <property name="orientation"> 206 <property name="font">
267 <enum>Qt::Vertical</enum> 207 <font>
208 <italic>true</italic>
209 </font>
268 </property> 210 </property>
269 <property name="sizeType"> 211 <property name="text">
270 <enum>QSizePolicy::Expanding</enum> 212 <string>**This will be reset automatically when yuzu closes.</string>
271 </property> 213 </property>
272 <property name="sizeHint" stdset="0"> 214 <property name="indent">
273 <size> 215 <number>20</number>
274 <width>20</width>
275 <height>40</height>
276 </size>
277 </property> 216 </property>
278 </spacer> 217 </widget>
279 </item> 218 </item>
280 </layout> 219 </layout>
281 </widget> 220 </widget>
diff --git a/src/yuzu/configuration/configure_tas.ui b/src/yuzu/configuration/configure_tas.ui
index 8a3ecb834..95575ed9d 100644
--- a/src/yuzu/configuration/configure_tas.ui
+++ b/src/yuzu/configuration/configure_tas.ui
@@ -2,37 +2,23 @@
2<ui version="4.0"> 2<ui version="4.0">
3 <class>ConfigureTas</class> 3 <class>ConfigureTas</class>
4 <widget class="QDialog" name="ConfigureTas"> 4 <widget class="QDialog" name="ConfigureTas">
5 <property name="geometry">
6 <rect>
7 <x>0</x>
8 <y>0</y>
9 <width>800</width>
10 <height>300</height>
11 </rect>
12 </property>
13 <property name="windowTitle">
14 <string>Dialog</string>
15 </property>
16 <layout class="QVBoxLayout" name="verticalLayout_1"> 5 <layout class="QVBoxLayout" name="verticalLayout_1">
17 <item> 6 <item>
18 <layout class="QHBoxLayout" name="horizontalLayout"> 7 <layout class="QHBoxLayout" name="horizontalLayout_1">
19 <item> 8 <item>
20 <widget class="QGroupBox" name="groupBox"> 9 <widget class="QGroupBox" name="groupBox_1">
21 <property name="title"> 10 <property name="title">
22 <string>TAS</string> 11 <string>TAS</string>
23 </property> 12 </property>
24 <layout class="QGridLayout" name="gridLayout"> 13 <layout class="QGridLayout" name="gridLayout_1">
25 <item row="0" column="0" colspan="1"> 14 <item row="0" column="0" colspan="4">
26 <widget class="QLabel" name="label_1"> 15 <widget class="QLabel" name="label_1">
27 <property name="text"> 16 <property name="text">
28 <string>Reads controller input from scripts in the same format as TAS-nx scripts. For a more detailed explanation please consult the FAQ on the yuzu website.</string> 17 <string>Reads controller input from scripts in the same format as TAS-nx scripts.&lt;br/&gt;For a more detailed explanation please consult the FAQ on the yuzu website.</string>
29 </property>
30 <property name="wordWrap">
31 <bool>true</bool>
32 </property> 18 </property>
33 </widget> 19 </widget>
34 </item> 20 </item>
35 <item row="1" column="0" colspan="1"> 21 <item row="1" column="0" colspan="4">
36 <widget class="QLabel" name="label_2"> 22 <widget class="QLabel" name="label_2">
37 <property name="text"> 23 <property name="text">
38 <string>To check which hotkeys control the playback/recording, please refer to the Hotkey settings (General -> Hotkeys).</string> 24 <string>To check which hotkeys control the playback/recording, please refer to the Hotkey settings (General -> Hotkeys).</string>
@@ -42,10 +28,10 @@
42 </property> 28 </property>
43 </widget> 29 </widget>
44 </item> 30 </item>
45 <item row="2" column="0" colspan="1"> 31 <item row="2" column="0" colspan="4">
46 <widget class="QLabel" name="label_2"> 32 <widget class="QLabel" name="label_3">
47 <property name="text"> 33 <property name="text">
48 <string>WARNING: This is an experimental feature. It will not play back scripts frame perfectly with the current, imperfect syncing method.</string> 34 <string>WARNING: This is an experimental feature.&lt;br/&gt;It will not play back scripts frame perfectly with the current, imperfect syncing method.</string>
49 </property> 35 </property>
50 <property name="wordWrap"> 36 <property name="wordWrap">
51 <bool>true</bool> 37 <bool>true</bool>
@@ -58,13 +44,13 @@
58 </layout> 44 </layout>
59 </item> 45 </item>
60 <item> 46 <item>
61 <layout class="QHBoxLayout" name="horizontalLayout"> 47 <layout class="QHBoxLayout" name="horizontalLayout_2">
62 <item> 48 <item>
63 <widget class="QGroupBox" name="groupBox"> 49 <widget class="QGroupBox" name="groupBox_2">
64 <property name="title"> 50 <property name="title">
65 <string>Settings</string> 51 <string>Settings</string>
66 </property> 52 </property>
67 <layout class="QGridLayout" name="gridLayout"> 53 <layout class="QGridLayout" name="gridLayout_2">
68 <item row="0" column="0" colspan="4"> 54 <item row="0" column="0" colspan="4">
69 <widget class="QCheckBox" name="tas_enable"> 55 <widget class="QCheckBox" name="tas_enable">
70 <property name="text"> 56 <property name="text">
@@ -102,15 +88,15 @@
102 </layout> 88 </layout>
103 </item> 89 </item>
104 <item> 90 <item>
105 <layout class="QHBoxLayout" name="horizontalLayout"> 91 <layout class="QHBoxLayout" name="horizontalLayout_3">
106 <item> 92 <item>
107 <widget class="QGroupBox" name="groupBox"> 93 <widget class="QGroupBox" name="groupBox_3">
108 <property name="title"> 94 <property name="title">
109 <string>Script Directory</string> 95 <string>Script Directory</string>
110 </property> 96 </property>
111 <layout class="QGridLayout" name="gridLayout"> 97 <layout class="QGridLayout" name="gridLayout_3">
112 <item row="0" column="0"> 98 <item row="0" column="0">
113 <widget class="QLabel" name="label"> 99 <widget class="QLabel" name="label_4">
114 <property name="text"> 100 <property name="text">
115 <string>Path</string> 101 <string>Path</string>
116 </property> 102 </property>
@@ -126,22 +112,6 @@
126 <item row="0" column="2"> 112 <item row="0" column="2">
127 <widget class="QLineEdit" name="tas_path_edit"/> 113 <widget class="QLineEdit" name="tas_path_edit"/>
128 </item> 114 </item>
129 <item row="0" column="1">
130 <spacer name="horizontalSpacer">
131 <property name="orientation">
132 <enum>Qt::Horizontal</enum>
133 </property>
134 <property name="sizeType">
135 <enum>QSizePolicy::Maximum</enum>
136 </property>
137 <property name="sizeHint" stdset="0">
138 <size>
139 <width>60</width>
140 <height>20</height>
141 </size>
142 </property>
143 </spacer>
144 </item>
145 </layout> 115 </layout>
146 </widget> 116 </widget>
147 </item> 117 </item>
HIC SVNT DRACONES