diff options
| author | 2022-03-17 18:03:13 -0400 | |
|---|---|---|
| committer | 2022-03-17 18:03:13 -0400 | |
| commit | fa46fb90fb9ff34c7208983e1395ca60d43190fc (patch) | |
| tree | ab02e202cd9f63faf5fa20bff5c32d4be8c36228 | |
| parent | yuzu: Move disable_web_applet to UISettings (diff) | |
| download | yuzu-fa46fb90fb9ff34c7208983e1395ca60d43190fc.tar.gz yuzu-fa46fb90fb9ff34c7208983e1395ca60d43190fc.tar.xz yuzu-fa46fb90fb9ff34c7208983e1395ca60d43190fc.zip | |
configure_debug: Add option to set disable_web_applet
Allow the user to configure the web applet usage ahead of booting the
application.
| -rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.ui | 91 |
2 files changed, 57 insertions, 42 deletions
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index c1cf4050c..c2e6bf8d1 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp | |||
| @@ -59,6 +59,13 @@ void ConfigureDebug::SetConfiguration() { | |||
| 59 | ui->disable_loop_safety_checks->setChecked( | 59 | ui->disable_loop_safety_checks->setChecked( |
| 60 | Settings::values.disable_shader_loop_safety_checks.GetValue()); | 60 | Settings::values.disable_shader_loop_safety_checks.GetValue()); |
| 61 | ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue()); | 61 | ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue()); |
| 62 | |||
| 63 | #ifdef YUZU_USE_QT_WEB_ENGINE | ||
| 64 | ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet); | ||
| 65 | #else | ||
| 66 | ui->disable_web_applet->setEnabled(false); | ||
| 67 | ui->disable_web_applet->setText(QString::fromUtf8("Web applet not compiled")); | ||
| 68 | #endif | ||
| 62 | } | 69 | } |
| 63 | 70 | ||
| 64 | void ConfigureDebug::ApplyConfiguration() { | 71 | void ConfigureDebug::ApplyConfiguration() { |
| @@ -80,6 +87,7 @@ void ConfigureDebug::ApplyConfiguration() { | |||
| 80 | ui->disable_loop_safety_checks->isChecked(); | 87 | ui->disable_loop_safety_checks->isChecked(); |
| 81 | Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked(); | 88 | Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked(); |
| 82 | Settings::values.extended_logging = ui->extended_logging->isChecked(); | 89 | Settings::values.extended_logging = ui->extended_logging->isChecked(); |
| 90 | UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked(); | ||
| 83 | Debugger::ToggleConsole(); | 91 | Debugger::ToggleConsole(); |
| 84 | Common::Log::Filter filter; | 92 | Common::Log::Filter filter; |
| 85 | filter.ParseFilterString(Settings::values.log_filter.GetValue()); | 93 | filter.ParseFilterString(Settings::values.log_filter.GetValue()); |
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 4dd870855..edb525e82 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui | |||
| @@ -8,49 +8,49 @@ | |||
| 8 | <property name="title"> | 8 | <property name="title"> |
| 9 | <string>Logging</string> | 9 | <string>Logging</string> |
| 10 | </property> | 10 | </property> |
| 11 | <layout class="QGridLayout" name="gridLayout_1"> | 11 | <layout class="QGridLayout" name="gridLayout_1"> |
| 12 | <item row="0" column="0" colspan="2"> | 12 | <item row="0" column="0" colspan="2"> |
| 13 | <layout class="QHBoxLayout" name="horizontalLayout_1"> | 13 | <layout class="QHBoxLayout" name="horizontalLayout_1"> |
| 14 | <item> | 14 | <item> |
| 15 | <widget class="QLabel" name="label_1"> | 15 | <widget class="QLabel" name="label_1"> |
| 16 | <property name="text"> | ||
| 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> | ||
| 44 | </property> | ||
| 45 | <property name="toolTip"> | ||
| 46 | <string>When checked, the max size of the log increases from 100 MB to 1 GB</string> | ||
| 47 | </property> | ||
| 48 | <property name="text"> | 16 | <property name="text"> |
| 49 | <string>Enable Extended Logging**</string> | 17 | <string>Global Log Filter</string> |
| 50 | </property> | 18 | </property> |
| 51 | </widget> | 19 | </widget> |
| 52 | </item> | 20 | </item> |
| 53 | </layout> | 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> | ||
| 44 | </property> | ||
| 45 | <property name="toolTip"> | ||
| 46 | <string>When checked, the max size of the log increases from 100 MB to 1 GB</string> | ||
| 47 | </property> | ||
| 48 | <property name="text"> | ||
| 49 | <string>Enable Extended Logging**</string> | ||
| 50 | </property> | ||
| 51 | </widget> | ||
| 52 | </item> | ||
| 53 | </layout> | ||
| 54 | </widget> | 54 | </widget> |
| 55 | </item> | 55 | </item> |
| 56 | <item> | 56 | <item> |
| @@ -183,7 +183,7 @@ | |||
| 183 | <string>Advanced</string> | 183 | <string>Advanced</string> |
| 184 | </property> | 184 | </property> |
| 185 | <layout class="QGridLayout" name="gridLayout_4"> | 185 | <layout class="QGridLayout" name="gridLayout_4"> |
| 186 | <item> row="0" column="0"> | 186 | <item row="0" column="0"> |
| 187 | <widget class="QCheckBox" name="quest_flag"> | 187 | <widget class="QCheckBox" name="quest_flag"> |
| 188 | <property name="text"> | 188 | <property name="text"> |
| 189 | <string>Kiosk (Quest) Mode</string> | 189 | <string>Kiosk (Quest) Mode</string> |
| @@ -218,6 +218,13 @@ | |||
| 218 | </property> | 218 | </property> |
| 219 | </widget> | 219 | </widget> |
| 220 | </item> | 220 | </item> |
| 221 | <item row="2" column="1"> | ||
| 222 | <widget class="QCheckBox" name="disable_web_applet"> | ||
| 223 | <property name="text"> | ||
| 224 | <string>Disable Web Applet**</string> | ||
| 225 | </property> | ||
| 226 | </widget> | ||
| 227 | </item> | ||
| 221 | </layout> | 228 | </layout> |
| 222 | </widget> | 229 | </widget> |
| 223 | </item> | 230 | </item> |