summaryrefslogtreecommitdiffstats
path: root/gui/pages/LogPage.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-11-11 00:50:17 +0100
committerPetr Mrázek <peterix@gmail.com>2014-11-15 19:45:49 +0100
commit41bd2a66345e670c3ff127584cae3f6766bac743 (patch)
tree8c136f8eca1d1c0b94049819466292839794b060 /gui/pages/LogPage.cpp
parent5711b1be95a826daf0e11b64bec04c4b0d2ea5ef (diff)
downloadMultiMC-41bd2a66345e670c3ff127584cae3f6766bac743.tar
MultiMC-41bd2a66345e670c3ff127584cae3f6766bac743.tar.gz
MultiMC-41bd2a66345e670c3ff127584cae3f6766bac743.tar.lz
MultiMC-41bd2a66345e670c3ff127584cae3f6766bac743.tar.xz
MultiMC-41bd2a66345e670c3ff127584cae3f6766bac743.zip
Add console font size setting and a preview\
Also moves the console settings from the minecraft page.
Diffstat (limited to 'gui/pages/LogPage.cpp')
-rw-r--r--gui/pages/LogPage.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/gui/pages/LogPage.cpp b/gui/pages/LogPage.cpp
index 16d4f941..957c2f72 100644
--- a/gui/pages/LogPage.cpp
+++ b/gui/pages/LogPage.cpp
@@ -21,7 +21,13 @@ LogPage::LogPage(MinecraftProcess *proc, QWidget *parent)
// create the format and set its font
defaultFormat = new QTextCharFormat(ui->text->currentCharFormat());
QString fontFamily = MMC->settings()->get("ConsoleFont").toString();
- defaultFormat->setFont(QFont(fontFamily));
+ bool conversionOk = false;
+ int fontSize = MMC->settings()->get("ConsoleFontSize").toInt(&conversionOk);
+ if(!conversionOk)
+ {
+ fontSize = 11;
+ }
+ defaultFormat->setFont(QFont(fontFamily, fontSize));
auto findShortcut = new QShortcut(QKeySequence(QKeySequence::Find), this);
connect(findShortcut, SIGNAL(activated()), SLOT(findActivated()));