diff options
| author | german77 <juangerman-13@hotmail.com> | 2021-07-25 20:52:19 -0500 |
|---|---|---|
| committer | MonsterDruide1 <5958456@gmail.com> | 2021-09-18 23:23:03 +0200 |
| commit | 75d8ec1e9f474ce6c2bfc0b8ebe574ca44f9f3d8 (patch) | |
| tree | a11be198f5f4933a68c8cc5cfc183e08c3b01fcb /src/yuzu/configuration | |
| parent | 5401cf6eb583092ed144d0f30fb6221a0ab25fed (diff) | |
UI: Relocate tas menu and add brief description
Diffstat (limited to 'src/yuzu/configuration')
| -rw-r--r-- | src/yuzu/configuration/configure_tas.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_tas.ui | 47 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_vibration.cpp | 2 |
3 files changed, 47 insertions, 4 deletions
diff --git a/src/yuzu/configuration/configure_tas.cpp b/src/yuzu/configuration/configure_tas.cpp index 00d6c1ba5..b666b175a 100644 --- a/src/yuzu/configuration/configure_tas.cpp +++ b/src/yuzu/configuration/configure_tas.cpp @@ -55,7 +55,7 @@ void ConfigureTasDialog::SetDirectory(DirectoryTarget target, QLineEdit* edit) { QString str = QFileDialog::getExistingDirectory(this, caption, edit->text()); - if (str.isNull() || str.isEmpty()) { + if (str.isEmpty()) { return; } diff --git a/src/yuzu/configuration/configure_tas.ui b/src/yuzu/configuration/configure_tas.ui index 445904d8f..8a3ecb834 100644 --- a/src/yuzu/configuration/configure_tas.ui +++ b/src/yuzu/configuration/configure_tas.ui @@ -19,7 +19,50 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string>TAS Settings</string> + <string>TAS</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="1"> + <widget class="QLabel" name="label_1"> + <property name="text"> + <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> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0" colspan="1"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>To check which hotkeys control the playback/recording, please refer to the Hotkey settings (General -> Hotkeys).</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0" colspan="1"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>WARNING: This is an experimental feature. It will not play back scripts frame perfectly with the current, imperfect syncing method.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Settings</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0" colspan="4"> @@ -63,7 +106,7 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string>TAS Directories</string> + <string>Script Directory</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> diff --git a/src/yuzu/configuration/configure_vibration.cpp b/src/yuzu/configuration/configure_vibration.cpp index 9d92c4949..46a0f3025 100644 --- a/src/yuzu/configuration/configure_vibration.cpp +++ b/src/yuzu/configuration/configure_vibration.cpp @@ -99,7 +99,7 @@ void ConfigureVibration::SetVibrationDevices(std::size_t player_index) { const auto guid = param.Get("guid", ""); const auto port = param.Get("port", ""); - if (engine.empty() || engine == "keyboard" || engine == "mouse") { + if (engine.empty() || engine == "keyboard" || engine == "mouse" || engine == "tas") { continue; } |