Changeset 7ed8b57eea in tspsg for src/settingsdialog.cpp

Timestamp:

Aug 31, 2013, 11:52:34 PM (11 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

2a5e50e0a9

Parents:

1241232377

Message:

[BB10] UI fixes:

• added proxy style and stylesheet to fix some UI issues on BlackBerry?;
• removed style selection option because most styles have UI issues and removed About Qt menu item because About Qt dialog is too big;
• load bigger (128x128) icons on BlackBerry? 10;
• removed printing related items from menu as there's no printer;
• made dialogs to be shown maximized;
• made solution graph smaller;
• made font smaller;
• made output text color black;
• start editing table cells on single tap;
• don't show keyboard in about dialog.

Cherry-picks from
aa64ad40827cde0a444cd8198b0f3457aa191f8f
95b0ef73dcb4517ac2ae08867494204bbe8d7ea6
ccdffe3a5f84f12fba2e2f19ab249c31f1fcf35d
628500a5d687889823197e476953859d529af4f0

File:

• src/settingsdialog.cpp (modified) (1 diff)

src/settingsdialog.cpp

@@ -546 +546 @@
 void SettingsDialog::buttonFontClicked()
 {
-bool ok;
-QFont font = QFontDialog::getFont(&ok, this->font, this);
-    if (ok && (this->font != font)) {
-        this->font = font;
-        QFont f = font;
-        f.setPointSize(labelFontExample->font().pointSize());
-        labelFontExample->setFont(f);
-        labelFontExample->setText(font.family());
-        _fontChanged = true;
-    }
+    QFont newFont;
+#ifdef Q_OS_BLACKBERRY
+    QFontDialog fd(font, this);
+    fd.setWindowState(Qt::WindowMaximized);
+    if ((fd.exec() != QDialog::Accepted) || (fd.selectedFont() == font))
+        return;
+    newFont = fd.selectedFont();
+#else
+    bool ok;
+    newFont = QFontDialog::getFont(&ok, font, this);
+    if (!ok || (font == newFont))
+        return;
+#endif
+    font = newFont;
+    QFont f = font;
+    f.setPointSize(labelFontExample->font().pointSize());
+    labelFontExample->setFont(f);
+    labelFontExample->setText(font.family());
+    _fontChanged = true;
 }