From 9684d3b0a087b44b39ae8b007c08f82d3ddc6d8f Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Thu, 11 Jun 2015 01:49:13 +0200 Subject: GH-1008 implement log window max line count Defaults to 100k lines --- application/pages/global/MultiMCPage.cpp | 4 +++ application/pages/global/MultiMCPage.ui | 45 +++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) (limited to 'application/pages/global') diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp index 65f258b5..b5389e25 100644 --- a/application/pages/global/MultiMCPage.cpp +++ b/application/pages/global/MultiMCPage.cpp @@ -299,6 +299,8 @@ void MultiMCPage::applySettings() QString consoleFontFamily = ui->consoleFont->currentFont().family(); s->set("ConsoleFont", consoleFontFamily); s->set("ConsoleFontSize", ui->fontSizeBox->value()); + s->set("ConsoleMaxLines", ui->lineLimitSpinBox->value()); + s->set("ConsoleOverflowStop", ui->checkStopLogging->checkState() != Qt::Unchecked); // FTB s->set("TrackFTBInstances", ui->trackFtbBox->isChecked()); @@ -388,6 +390,8 @@ void MultiMCPage::loadSettings() } ui->fontSizeBox->setValue(fontSize); refreshFontPreview(); + ui->lineLimitSpinBox->setValue(s->get("ConsoleMaxLines").toInt()); + ui->checkStopLogging->setChecked(s->get("ConsoleOverflowStop").toBool()); // FTB ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool()); diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui index 3faafc6e..cf748812 100644 --- a/application/pages/global/MultiMCPage.ui +++ b/application/pages/global/MultiMCPage.ui @@ -7,7 +7,7 @@ 0 0 487 - 519 + 557 @@ -433,6 +433,47 @@ + + + + History limit + + + + + + Stop logging when log overflows + + + + + + + + 0 + 0 + + + + lines + + + 10000 + + + 1000000 + + + 10000 + + + 100000 + + + + + + @@ -520,6 +561,8 @@ themeComboBox showConsoleCheck autoCloseConsoleCheck + lineLimitSpinBox + checkStopLogging consoleFont fontSizeBox fontPreview -- cgit