diff options
Diffstat (limited to 'src/yuzu/configuration')
| -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() {      ui->disable_loop_safety_checks->setChecked(          Settings::values.disable_shader_loop_safety_checks.GetValue());      ui->extended_logging->setChecked(Settings::values.extended_logging.GetValue()); + +#ifdef YUZU_USE_QT_WEB_ENGINE +    ui->disable_web_applet->setChecked(UISettings::values.disable_web_applet); +#else +    ui->disable_web_applet->setEnabled(false); +    ui->disable_web_applet->setText(QString::fromUtf8("Web applet not compiled")); +#endif  }  void ConfigureDebug::ApplyConfiguration() { @@ -80,6 +87,7 @@ void ConfigureDebug::ApplyConfiguration() {          ui->disable_loop_safety_checks->isChecked();      Settings::values.disable_macro_jit = ui->disable_macro_jit->isChecked();      Settings::values.extended_logging = ui->extended_logging->isChecked(); +    UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();      Debugger::ToggleConsole();      Common::Log::Filter filter;      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 @@       <property name="title">        <string>Logging</string>       </property> -        <layout class="QGridLayout" name="gridLayout_1"> -         <item row="0" column="0" colspan="2"> -          <layout class="QHBoxLayout" name="horizontalLayout_1"> -          <item> -           <widget class="QLabel" name="label_1"> -           <property name="text"> -            <string>Global Log Filter</string> -           </property> -           </widget> -          </item> -          <item> -           <widget class="QLineEdit" name="log_filter_edit"/> -         </item> -        </layout> -         </item> -         <item row="1" column="0"> -          <widget class="QCheckBox" name="toggle_console"> -           <property name="text"> -            <string>Show Log in Console</string> -           </property> -          </widget> -         </item> -         <item row="1" column="1"> -           <widget class="QPushButton" name="open_log_button"> -            <property name="text"> -             <string>Open Log Location</string> -            </property> -           </widget> -          </item> -         <item row="2" column="0"> -          <widget class="QCheckBox" name="extended_logging"> -          <property name="enabled"> -           <bool>true</bool> -          </property> -          <property name="toolTip"> -           <string>When checked, the max size of the log increases from 100 MB to 1 GB</string> -          </property> +     <layout class="QGridLayout" name="gridLayout_1"> +      <item row="0" column="0" colspan="2"> +       <layout class="QHBoxLayout" name="horizontalLayout_1"> +        <item> +         <widget class="QLabel" name="label_1">            <property name="text"> -           <string>Enable Extended Logging**</string> +           <string>Global Log Filter</string>            </property> -          </widget> -         </item> -        </layout> +         </widget> +        </item> +        <item> +         <widget class="QLineEdit" name="log_filter_edit"/> +        </item> +       </layout> +      </item> +      <item row="1" column="0"> +       <widget class="QCheckBox" name="toggle_console"> +        <property name="text"> +         <string>Show Log in Console</string> +        </property> +       </widget> +      </item> +      <item row="1" column="1"> +       <widget class="QPushButton" name="open_log_button"> +        <property name="text"> +         <string>Open Log Location</string> +        </property> +       </widget> +      </item> +      <item row="2" column="0"> +       <widget class="QCheckBox" name="extended_logging"> +        <property name="enabled"> +         <bool>true</bool> +        </property> +        <property name="toolTip"> +         <string>When checked, the max size of the log increases from 100 MB to 1 GB</string> +        </property> +        <property name="text"> +         <string>Enable Extended Logging**</string> +        </property> +       </widget> +      </item> +     </layout>      </widget>     </item>     <item> @@ -183,7 +183,7 @@        <string>Advanced</string>       </property>       <layout class="QGridLayout" name="gridLayout_4"> -      <item> row="0" column="0"> +      <item row="0" column="0">         <widget class="QCheckBox" name="quest_flag">          <property name="text">           <string>Kiosk (Quest) Mode</string> @@ -218,6 +218,13 @@          </property>         </widget>        </item> +      <item row="2" column="1"> +       <widget class="QCheckBox" name="disable_web_applet"> +        <property name="text"> +         <string>Disable Web Applet**</string> +        </property> +       </widget> +      </item>       </layout>      </widget>     </item> | 
