Changeset 8b0661d1ee in tspsg for src/settingsdialog.cpp

Timestamp:

May 3, 2010, 4:35:38 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

bcd2a3b47a

Parents:

7bb19df196

git-author:

Oleksii Serdiuk <contacts@…> (05/03/10 16:35:38)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:41:43)

Message:

• Improved the default font selection logic: The system default monospace (desktop systems)/sans-serif (handheld devices) font is now selected.
• Two icons were mixed. Corrected this.

File:

• src/settingsdialog.cpp (modified) (2 diffs)

src/settingsdialog.cpp

@@ -223 +223 @@
         cbScrollToEnd->setChecked(settings->value("ScrollToEnd", DEF_SCROLL_TO_END).toBool());
 
-        font = settings->value("Font",QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE)).value<QFont>();
+        font = settings->value("Font", QFont(getDefaultFont(), DEF_FONT_SIZE)).value<QFont>();
         color = settings->value("Colors/Text", DEF_TEXT_COLOR).value<QColor>();
         settings->endGroup();
@@ -269 +269 @@
         if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
                 if (QMessageBox::question(this, tr("Settings Reset"), tr("Do you really want to <b>reset all application settings to their defaults</b>?"), QMessageBox::RestoreDefaults | QMessageBox::Cancel) == QMessageBox::RestoreDefaults) {
-                        _newFont = (font != QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE));
+                        _newFont = (font != QFont(getDefaultFont(), DEF_FONT_SIZE));
                         _newColor = (color != DEF_TEXT_COLOR);
                         settings->remove("");