Changeset 119 in tspsg-svn for trunk/src

Timestamp:

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

Author:

laleppa

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.

Location:

trunk/src

Files:

• 3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/go-up.png (moved) (moved from trunk/resources/icons/go-up.png) (1 prop)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.qrc (modified) (1 diff)
• defaults.h (modified) (1 diff)
• globals.h (modified) (1 diff)
• mainwindow.cpp (modified) (7 diffs)
• settingsdialog.cpp (modified) (2 diffs)

trunk/src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.qrc

@@ -3 +3 @@
         <file>images/icons/go-down.png</file>
         <file>images/icons/go-next.png</file>
-        <file>images/icons/go-previous.png</file>
+        <file>images/icons/go-up.png</file>
         <file>images/icons/list-add.png</file>
         <file>images/icons/list-remove.png</file>

trunk/src/defaults.h

@@ -78 +78 @@
 #define DEF_SCROLL_TO_END false
 /*!
- * \def DEF_FONT_FAMILY
- * \brief Default font name.
- */
-#ifdef Q_OS_WINCE_WM
-        #define DEF_FONT_FAMILY "Tahoma"
-#else
-        #define DEF_FONT_FAMILY "monospace"
-#endif // Q_OS_WINCE_WM
-/*!
  * \def DEF_FONT_SIZE
  * \brief Default font size

trunk/src/globals.h

@@ -108 +108 @@
 }
 
+/*!
+ * \brief Returns the default font for solution output.
+ * \return The family name of the default font.
+ */
+inline QString getDefaultFont()
+{
+QFont f;
+#ifdef HANDHELD
+        f.setStyleHint(QFont::SansSerif);
+#else // HANDHELD
+        f.setStyleHint(QFont::TypeWriter);
+#endif // HANDHELD
+        return f.defaultFamily();
+}
+
 #ifdef Q_OS_WIN32
 /*!

trunk/src/mainwindow.cpp

@@ -621 +621 @@
                 pic.begin(&graph);
                 pic.setRenderHint(QPainter::Antialiasing);
-                pic.setFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, 9)).value<QFont>());
+                pic.setFont(settings->value("Output/Font", QFont(getDefaultFont(), 9)).value<QFont>());
                 pic.setBrush(QBrush(QColor(Qt::white)));
                 pic.setBackgroundMode(Qt::OpaqueMode);
@@ -936 +936 @@
 void MainWindow::initDocStyleSheet()
 {
-        solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE)).value<QFont>());
+        solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(getDefaultFont(), DEF_FONT_SIZE)).value<QFont>());
 
         fmt_paragraph.setTopMargin(0);
@@ -953 +953 @@
         fmt_cell.setAlignment(Qt::AlignHCenter);
 
-QColor color = settings->value("Output/Colors/Text", DEF_TEXT_COLOR).value<QColor>();
+        settings->beginGroup("Output/Colors");
+
+QColor color = settings->value("Text", DEF_TEXT_COLOR).value<QColor>();
 QColor hilight;
         if (color.value() < 192)
@@ -963 +965 @@
         fmt_default.setForeground(QBrush(color));
 
-        fmt_selected.setForeground(QBrush(settings->value("Output/Colors/Selected", DEF_SELECTED_COLOR).value<QColor>()));
+        fmt_selected.setForeground(QBrush(settings->value("Selected", DEF_SELECTED_COLOR).value<QColor>()));
         fmt_selected.setFontWeight(QFont::Bold);
 
-        fmt_alternate.setForeground(QBrush(settings->value("Output/Colors/Alternate", DEF_ALTERNATE_COLOR).value<QColor>()));
+        fmt_alternate.setForeground(QBrush(settings->value("Alternate", DEF_ALTERNATE_COLOR).value<QColor>()));
         fmt_alternate.setFontWeight(QFont::Bold);
         fmt_altlist.setForeground(QBrush(hilight));
+
+        settings->endGroup();
 
         solutionText->setTextColor(color);
@@ -1166 +1170 @@
         loadToolbarList();
 
-#ifndef HANDHELD
-        actionSettingsToolbarsConfigure->setText(tr("Configure..."));
-        actionSettingsToolbarsConfigure->setToolTip(tr("Customize toolbars"));
-#endif // HANDHELD
-
 #ifndef QT_NO_PRINTER
         actionFilePrintPreview->setText(tr("P&rint Preview..."));
@@ -1189 +1188 @@
         actionFilePrint->setShortcut(tr("Ctrl+P"));
 #endif // QT_NO_PRINTER
+
+#ifndef HANDHELD
+        actionSettingsToolbarsConfigure->setText(tr("Configure..."));
+#ifndef QT_NO_STATUSTIP
+        actionSettingsToolbarsConfigure->setStatusTip(tr("Customize toolbars"));
+#endif // QT_NO_STATUSTIP
+#endif // HANDHELD
+
 #ifdef Q_OS_WIN32
         actionHelpCheck4Updates->setText(tr("Check for &Updates..."));
-#ifndef QT_NO_TOOLTIP
-        actionHelpCheck4Updates->setToolTip(tr("Check for %1 updates").arg(QApplication::applicationName()));
-#endif // QT_NO_TOOLTIP
 #ifndef QT_NO_STATUSTIP
         actionHelpCheck4Updates->setStatusTip(tr("Check for %1 updates").arg(QApplication::applicationName()));
@@ -1265 +1269 @@
         }
 
-        solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE)).value<QFont>());
+//      solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE)).value<QFont>());
         solutionText->setWordWrapMode(QTextOption::WordWrap);
 

trunk/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("");