diff options
| author | flow <flowlnlnln@gmail.com> | 2022-05-15 17:40:53 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 17:40:53 -0300 |
| commit | a67f3131e7585615d7d759963bfc7676d2728e67 (patch) | |
| tree | 75a754df541a58360d74ea3a31a7dccff9a2a78d /launcher/ui | |
| parent | e5d00971167d46e6ac5111798d4dc53a52735676 (diff) | |
| parent | 3aea639fe4359259a27e971ae357e308ae50e69d (diff) | |
| download | PrismLauncher-a67f3131e7585615d7d759963bfc7676d2728e67.tar.gz PrismLauncher-a67f3131e7585615d7d759963bfc7676d2728e67.tar.bz2 PrismLauncher-a67f3131e7585615d7d759963bfc7676d2728e67.zip | |
Merge pull request #560 from kthchew/feature/close-pmc-override
Add instance overrides for miscellaneous settings
Diffstat (limited to 'launcher/ui')
| -rw-r--r-- | launcher/ui/pages/instance/InstanceSettingsPage.cpp | 19 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/InstanceSettingsPage.ui | 29 |
2 files changed, 48 insertions, 0 deletions
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp index a48c4d69..b4562843 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp +++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp @@ -101,6 +101,20 @@ void InstanceSettingsPage::applySettings() { SettingsObject::Lock lock(m_settings); + // Miscellaneous + bool miscellaneous = ui->miscellaneousSettingsBox->isChecked(); + m_settings->set("OverrideMiscellaneous", miscellaneous); + if (miscellaneous) + { + m_settings->set("CloseAfterLaunch", ui->closeAfterLaunchCheck->isChecked()); + m_settings->set("QuitAfterGameStop", ui->quitAfterGameStopCheck->isChecked()); + } + else + { + m_settings->reset("CloseAfterLaunch"); + m_settings->reset("QuitAfterGameStop"); + } + // Console bool console = ui->consoleSettingsBox->isChecked(); m_settings->set("OverrideConsole", console); @@ -247,6 +261,11 @@ void InstanceSettingsPage::applySettings() void InstanceSettingsPage::loadSettings() { + // Miscellaneous + ui->miscellaneousSettingsBox->setChecked(m_settings->get("OverrideMiscellaneous").toBool()); + ui->closeAfterLaunchCheck->setChecked(m_settings->get("CloseAfterLaunch").toBool()); + ui->quitAfterGameStopCheck->setChecked(m_settings->get("QuitAfterGameStop").toBool()); + // Console ui->consoleSettingsBox->setChecked(m_settings->get("OverrideConsole").toBool()); ui->showConsoleCheck->setChecked(m_settings->get("ShowConsole").toBool()); diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui index 5db2d147..cb66b3ce 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.ui +++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui @@ -350,6 +350,35 @@ </widget> </item> <item> + <widget class="QGroupBox" name="miscellaneousSettingsBox"> + <property name="title"> + <string>Miscellaneous</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_12"> + <item> + <widget class="QCheckBox" name="closeAfterLaunchCheck"> + <property name="text"> + <string>Close the launcher after game window opens</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="quitAfterGameStopCheck"> + <property name="text"> + <string>Quit the launcher after game window closes</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer name="verticalSpacerMinecraft_2"> <property name="orientation"> <enum>Qt::Vertical</enum> |