diff options
| author | 2018-09-30 14:05:38 -0400 | |
|---|---|---|
| committer | 2018-10-07 14:32:06 -0400 | |
| commit | 8bbc12b9c24b67a08afd2df884da8fb664eb00be (patch) | |
| tree | c84b9f630fc715d756ffac4071c3a4aebf216c6f | |
| parent | settings: Add program_args string setting (diff) | |
| download | yuzu-8bbc12b9c24b67a08afd2df884da8fb664eb00be.tar.gz yuzu-8bbc12b9c24b67a08afd2df884da8fb664eb00be.tar.xz yuzu-8bbc12b9c24b67a08afd2df884da8fb664eb00be.zip | |
qt: Add UI option to configure arguments
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.ui | 23 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 650dd03c0..7fec15991 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -134,6 +134,7 @@ void Config::ReadValues() { | |||
| 134 | qt_config->beginGroup("Debugging"); | 134 | qt_config->beginGroup("Debugging"); |
| 135 | Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool(); | 135 | Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool(); |
| 136 | Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); | 136 | Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); |
| 137 | Settings::values.program_args = qt_config->value("program_args", "").toString().toStdString(); | ||
| 137 | qt_config->endGroup(); | 138 | qt_config->endGroup(); |
| 138 | 139 | ||
| 139 | qt_config->beginGroup("WebService"); | 140 | qt_config->beginGroup("WebService"); |
| @@ -269,6 +270,7 @@ void Config::SaveValues() { | |||
| 269 | qt_config->beginGroup("Debugging"); | 270 | qt_config->beginGroup("Debugging"); |
| 270 | qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub); | 271 | qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub); |
| 271 | qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); | 272 | qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); |
| 273 | qt_config->setValue("program_args", QString::fromStdString(Settings::values.program_args)); | ||
| 272 | qt_config->endGroup(); | 274 | qt_config->endGroup(); |
| 273 | 275 | ||
| 274 | qt_config->beginGroup("WebService"); | 276 | qt_config->beginGroup("WebService"); |
diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 45d84f19a..9e765fc93 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp | |||
| @@ -33,6 +33,7 @@ void ConfigureDebug::setConfiguration() { | |||
| 33 | ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | 33 | ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn()); |
| 34 | ui->toggle_console->setChecked(UISettings::values.show_console); | 34 | ui->toggle_console->setChecked(UISettings::values.show_console); |
| 35 | ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter)); | 35 | ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter)); |
| 36 | ui->homebrew_args_edit->setText(QString::fromStdString(Settings::values.program_args)); | ||
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | void ConfigureDebug::applyConfiguration() { | 39 | void ConfigureDebug::applyConfiguration() { |
| @@ -40,6 +41,7 @@ void ConfigureDebug::applyConfiguration() { | |||
| 40 | Settings::values.gdbstub_port = ui->gdbport_spinbox->value(); | 41 | Settings::values.gdbstub_port = ui->gdbport_spinbox->value(); |
| 41 | UISettings::values.show_console = ui->toggle_console->isChecked(); | 42 | UISettings::values.show_console = ui->toggle_console->isChecked(); |
| 42 | Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); | 43 | Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); |
| 44 | Settings::values.program_args = ui->homebrew_args_edit->text().toStdString(); | ||
| 43 | Debugger::ToggleConsole(); | 45 | Debugger::ToggleConsole(); |
| 44 | Log::Filter filter; | 46 | Log::Filter filter; |
| 45 | filter.ParseFilterString(Settings::values.log_filter); | 47 | filter.ParseFilterString(Settings::values.log_filter); |
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 5ae7276bd..ff4987604 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui | |||
| @@ -107,6 +107,29 @@ | |||
| 107 | </widget> | 107 | </widget> |
| 108 | </item> | 108 | </item> |
| 109 | <item> | 109 | <item> |
| 110 | <widget class="QGroupBox" name="groupBox_3"> | ||
| 111 | <property name="title"> | ||
| 112 | <string>Homebrew</string> | ||
| 113 | </property> | ||
| 114 | <layout class="QVBoxLayout" name="verticalLayout"> | ||
| 115 | <item> | ||
| 116 | <layout class="QHBoxLayout" name="horizontalLayout"> | ||
| 117 | <item> | ||
| 118 | <widget class="QLabel" name="label"> | ||
| 119 | <property name="text"> | ||
| 120 | <string>Arguments String</string> | ||
| 121 | </property> | ||
| 122 | </widget> | ||
| 123 | </item> | ||
| 124 | <item> | ||
| 125 | <widget class="QLineEdit" name="homebrew_args_edit"/> | ||
| 126 | </item> | ||
| 127 | </layout> | ||
| 128 | </item> | ||
| 129 | </layout> | ||
| 130 | </widget> | ||
| 131 | </item> | ||
| 132 | <item> | ||
| 110 | <spacer name="verticalSpacer"> | 133 | <spacer name="verticalSpacer"> |
| 111 | <property name="orientation"> | 134 | <property name="orientation"> |
| 112 | <enum>Qt::Vertical</enum> | 135 | <enum>Qt::Vertical</enum> |