diff options
author | swirl <swurl@swurl.xyz> | 2022-02-03 13:44:09 -0500 |
---|---|---|
committer | swirl <swurl@swurl.xyz> | 2022-02-03 13:44:09 -0500 |
commit | fcc4420cfec3fcd970ff1f35b8848559c7b5b6ef (patch) | |
tree | 0f916be4404c7cf0908f89128e4ab40f55ffd8f0 /launcher/ui | |
parent | 1f176fcb7b2cf9281ac95880d85c1cf7597618e6 (diff) | |
parent | f5358aa1ca4b7d44dfe75d8e55e26d4b22e09dc6 (diff) | |
download | PrismLauncher-fcc4420cfec3fcd970ff1f35b8848559c7b5b6ef.tar.gz PrismLauncher-fcc4420cfec3fcd970ff1f35b8848559c7b5b6ef.tar.bz2 PrismLauncher-fcc4420cfec3fcd970ff1f35b8848559c7b5b6ef.zip |
Merge branch 'feature/close_after_launch' into develop
Diffstat (limited to 'launcher/ui')
-rw-r--r-- | launcher/ui/pages/global/MinecraftPage.cpp | 5 | ||||
-rw-r--r-- | launcher/ui/pages/global/MinecraftPage.ui | 20 |
2 files changed, 24 insertions, 1 deletions
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp index c763f8ac..5470a586 100644 --- a/launcher/ui/pages/global/MinecraftPage.cpp +++ b/launcher/ui/pages/global/MinecraftPage.cpp @@ -71,6 +71,9 @@ void MinecraftPage::applySettings() s->set("ShowGameTime", ui->showGameTime->isChecked()); s->set("ShowGlobalGameTime", ui->showGlobalGameTime->isChecked()); s->set("RecordGameTime", ui->recordGameTime->isChecked()); + + // Miscellaneous + s->set("CloseAfterLaunch", ui->closeAfterLaunchCheck->isChecked()); } void MinecraftPage::loadSettings() @@ -88,4 +91,6 @@ void MinecraftPage::loadSettings() ui->showGameTime->setChecked(s->get("ShowGameTime").toBool()); ui->showGlobalGameTime->setChecked(s->get("ShowGlobalGameTime").toBool()); ui->recordGameTime->setChecked(s->get("RecordGameTime").toBool()); + + ui->closeAfterLaunchCheck->setChecked(s->get("CloseAfterLaunch").toBool()); } diff --git a/launcher/ui/pages/global/MinecraftPage.ui b/launcher/ui/pages/global/MinecraftPage.ui index 857b8cfb..a28b1f59 100644 --- a/launcher/ui/pages/global/MinecraftPage.ui +++ b/launcher/ui/pages/global/MinecraftPage.ui @@ -165,6 +165,25 @@ </widget> </item> <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Miscellaneous</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="closeAfterLaunchCheck"> + <property name="toolTip"> + <string><html><head/><body><p>PolyMC will automatically reopen when the game crashes or exits.</p></body></html></string> + </property> + <property name="text"> + <string>Close PolyMC after game window opens</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <spacer name="verticalSpacerMinecraft"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -184,7 +203,6 @@ </layout> </widget> <tabstops> - <tabstop>tabWidget</tabstop> <tabstop>maximizedCheckBox</tabstop> <tabstop>windowWidthSpinBox</tabstop> <tabstop>windowHeightSpinBox</tabstop> |