summaryrefslogtreecommitdiffstats
path: root/application/pages/global
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-11-04 00:19:32 +0100
committerPetr Mrázek <peterix@gmail.com>2016-11-04 00:19:32 +0100
commit3780a25d27ae5c803ce9ed075928fff365104987 (patch)
treef59f3c2bbb77b7a1bdfecb408bafa2f793030673 /application/pages/global
parent6ebf6e7785da79f7f3eb28176951d0e9d22a20e8 (diff)
downloadMultiMC-3780a25d27ae5c803ce9ed075928fff365104987.tar
MultiMC-3780a25d27ae5c803ce9ed075928fff365104987.tar.gz
MultiMC-3780a25d27ae5c803ce9ed075928fff365104987.tar.lz
MultiMC-3780a25d27ae5c803ce9ed075928fff365104987.tar.xz
MultiMC-3780a25d27ae5c803ce9ed075928fff365104987.zip
NOISSUE add an option to show console on error and default other options to false
Diffstat (limited to 'application/pages/global')
-rw-r--r--application/pages/global/MultiMCPage.cpp2
-rw-r--r--application/pages/global/MultiMCPage.ui10
2 files changed, 11 insertions, 1 deletions
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 9694fab5..e9b19ac6 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -317,6 +317,7 @@ void MultiMCPage::applySettings()
// Console settings
s->set("ShowConsole", ui->showConsoleCheck->isChecked());
s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());
+ s->set("ShowConsoleOnError", ui->showConsoleErrorCheck->isChecked());
QString consoleFontFamily = ui->consoleFont->currentFont().family();
s->set("ConsoleFont", consoleFontFamily);
s->set("ConsoleFontSize", ui->fontSizeBox->value());
@@ -413,6 +414,7 @@ void MultiMCPage::loadSettings()
// Console settings
ui->showConsoleCheck->setChecked(s->get("ShowConsole").toBool());
ui->autoCloseConsoleCheck->setChecked(s->get("AutoCloseConsole").toBool());
+ ui->showConsoleErrorCheck->setChecked(s->get("ShowConsoleOnError").toBool());
QString fontFamily = MMC->settings()->get("ConsoleFont").toString();
QFont consoleFont(fontFamily);
ui->consoleFont->setCurrentFont(consoleFont);
diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index 2d6f45f0..5336afdb 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>487</width>
- <height>557</height>
+ <height>614</height>
</rect>
</property>
<property name="sizePolicy">
@@ -456,6 +456,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QCheckBox" name="showConsoleErrorCheck">
+ <property name="text">
+ <string>Show console when the game crashes?</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -588,6 +595,7 @@
<tabstop>themeComboBoxColors</tabstop>
<tabstop>showConsoleCheck</tabstop>
<tabstop>autoCloseConsoleCheck</tabstop>
+ <tabstop>showConsoleErrorCheck</tabstop>
<tabstop>lineLimitSpinBox</tabstop>
<tabstop>checkStopLogging</tabstop>
<tabstop>consoleFont</tabstop>