Changeset 129 in tspsg-svn

Timestamp:

Sep 3, 2010, 5:06:43 PM (14 years ago)

Author:

laleppa

Message:

+ TSPSG now uses DejaVu? LGC Sans Mono as the default font and comes with it "embedded" in the executable.

• Updated tspsg.tag file.

Location:

trunk

Files:

• docs/tspsg.tag (modified) (4 diffs)
• resources/DejaVuLGCSansMono.ttf (added)
• resources/common.qrc (modified) (1 diff)
• src/defaults.h (modified) (1 diff)
• src/globals.h (modified) (1 diff)
• src/main.cpp (modified) (1 diff)
• src/mainwindow.cpp (modified) (2 diffs)
• src/settingsdialog.cpp (modified) (2 diffs)

trunk/docs/tspsg.tag

@@ -29 +29 @@
     <member kind="define">
       <type>#define</type>
+      <name>DEF_SAVE_LAST_USED</name>
+      <anchorfile>defaults_8h.html</anchorfile>
+      <anchor>a02da61748796e418a0919b08a513eaed</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>DEF_USE_NATIVE_DIALOGS</name>
       <anchorfile>defaults_8h.html</anchorfile>
@@ -99 +106 @@
     <member kind="define">
       <type>#define</type>
+      <name>DEF_HQ_GRAPH</name>
+      <anchorfile>defaults_8h.html</anchorfile>
+      <anchor>a351e58750bbb3904d900734fb5ab1ca8</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>DEF_SHOW_MATRIX</name>
       <anchorfile>defaults_8h.html</anchorfile>
@@ -123 +137 @@
       <anchorfile>defaults_8h.html</anchorfile>
       <anchor>a6831bc2c2f11c3a14382c8fbe8d87efe</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>DEF_FONT_FACE</name>
+      <anchorfile>defaults_8h.html</anchorfile>
+      <anchor>afdd3c568d87924da83cb8bfcedb3722d</anchor>
       <arglist></arglist>
     </member>
@@ -246 +267 @@
       <anchor>a594842d2fcaf774c3c42b944f3f031d2</anchor>
       <arglist>(double x)</arglist>
-    </member>
-    <member kind="function">
-      <type>QString</type>
-      <name>getDefaultFont</name>
-      <anchorfile>globals_8h.html</anchorfile>
-      <anchor>a0b35409ae9db3b8db49ca9937447fc5b</anchor>
-      <arglist>()</arglist>
     </member>
     <member kind="function">

trunk/resources/common.qrc

@@ -20 +20 @@
     <qresource prefix="/files">
         <file>COPYING</file>
+        <file>DejaVuLGCSansMono.ttf</file>
     </qresource>
 </RCC>

trunk/src/defaults.h

@@ -81 +81 @@
 //! Default for "Scroll to the end of output after solving"
 #define DEF_SCROLL_TO_END false
+//! Default font face
+#define DEF_FONT_FACE "DejaVu LGC Sans Mono"
 /*!
  * \def DEF_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/main.cpp

@@ -53 +53 @@
         qsrand(QDateTime::currentDateTime().toTime_t() ^ QCursor::pos().x() ^ QCursor::pos().y());
 
+        QFontDatabase::addApplicationFont(":/files/DejaVuLGCSansMono.ttf");
+
 QTranslator en;
         if (en.load("tspsg_en", PATH_L10N))

trunk/src/mainwindow.cpp

@@ -748 +748 @@
                 pic.begin(&graph);
                 pic.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
-QFont font = settings->value("Output/Font", QFont(getDefaultFont(), 9)).value<QFont>();
+QFont font = settings->value("Output/Font", QFont(DEF_FONT_FACE, 9)).value<QFont>();
                 if (settings->value("Output/HQGraph", DEF_HQ_GRAPH).toBool()) {
                         font.setWeight(QFont::DemiBold);
@@ -1145 +1145 @@
 void MainWindow::initDocStyleSheet()
 {
-        solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(getDefaultFont(), DEF_FONT_SIZE)).value<QFont>());
+        solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(DEF_FONT_FACE, DEF_FONT_SIZE)).value<QFont>());
 
         fmt_paragraph.setTopMargin(0);

trunk/src/settingsdialog.cpp

@@ -255 +255 @@
         cbScrollToEnd->setChecked(settings->value("ScrollToEnd", DEF_SCROLL_TO_END).toBool());
 
-        font = settings->value("Font", QFont(getDefaultFont(), DEF_FONT_SIZE)).value<QFont>();
+        font = settings->value("Font", QFont(DEF_FONT_FACE, DEF_FONT_SIZE)).value<QFont>();
         color = settings->value("Colors/Text", DEF_TEXT_COLOR).value<QColor>();
         settings->endGroup();
@@ -301 +301 @@
         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(getDefaultFont(), DEF_FONT_SIZE));
+                        _newFont = (font != QFont(DEF_FONT_FACE, DEF_FONT_SIZE));
                         _newColor = (color != DEF_TEXT_COLOR);
                         settings->remove("");