diff options
| author | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
| commit | d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch) | |
| tree | 387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/appearance.cpp | |
| parent | 716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/appearance.cpp')
| -rw-r--r-- | muse2/muse/appearance.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/muse2/muse/appearance.cpp b/muse2/muse/appearance.cpp index 319a8826..0ae3bf6b 100644 --- a/muse2/muse/appearance.cpp +++ b/muse2/muse/appearance.cpp @@ -27,7 +27,6 @@ #include <QFontDialog> #include <QStyleFactory> #include <QToolTip> -#include <QByteArray> #include <QFile> #include <QFileDialog> #include <QFileInfo> @@ -543,7 +542,7 @@ void Appearance::apply() config->fonts[6].setItalic(italic6->isChecked()); config->fonts[6].setBold(bold6->isChecked()); - config->style = themeComboBox->currentText(); + config->style = themeComboBox->currentIndex() == 0 ? QString() : themeComboBox->currentText(); // setting up a new theme might change the fontsize, so re-read fontSize0->setValue(QApplication::font().pointSize()); |