Changeset 239 for trunk

Timestamp:

Oct 17, 2009, 1:26:01 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Use fonts and colors from the system palette for Qt widgets by default to make them look more native.

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -148 +148 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static void qt_set_pm_resources()
 {
-    // @todo later: take colors, fonts, etc. from the system theme
+    QFont menuFont = qt_sysfont2qfont("Menus");
+    QFont iconFont = qt_sysfont2qfont("IconText");
+    QFont titleFont = qt_sysfont2qfont("WindowTitles");
+
+    QApplication::setFont(menuFont, "QMenu");
+    QApplication::setFont(menuFont, "QMenuBar");
+    QApplication::setFont(titleFont, "Q3TitleBar");
+    QApplication::setFont(titleFont, "QWorkspaceTitleBar");
+    QApplication::setFont(iconFont, "QAbstractItemView");
+    QApplication::setFont(iconFont, "QDockWidgetTitle");
+
+    QPalette pal;
+
+    pal.setColor(QPalette::WindowText,
+                 QColor(qt_sysclr2qrgb(SYSCLR_WINDOWTEXT)));
+    pal.setColor(QPalette::Window,
+                 QColor(qt_sysclr2qrgb(SYSCLR_DIALOGBACKGROUND)));
+    pal.setColor(QPalette::ButtonText,
+                 QColor(qt_sysclr2qrgb(SYSCLR_MENUTEXT)));
+    pal.setColor(QPalette::Button,
+                 QColor(qt_sysclr2qrgb(SYSCLR_BUTTONMIDDLE)));
+    pal.setColor(QPalette::Light,
+                 QColor(qt_sysclr2qrgb(SYSCLR_BUTTONLIGHT)));
+    pal.setColor(QPalette::Dark,
+                 QColor(qt_sysclr2qrgb(SYSCLR_BUTTONDARK)));
+    pal.setColor(QPalette::Midlight,
+                 QColor((pal.light().color().red()   + pal.button().color().red())   / 2,
+                        (pal.light().color().green() + pal.button().color().green()) / 2,
+                        (pal.light().color().blue()  + pal.button().color().blue())  / 2));
+    pal.setColor(QPalette::Mid,
+                 QColor((pal.dark().color().red()    + pal.button().color().red())   / 2,
+                        (pal.dark().color().green()  + pal.button().color().green()) / 2,
+                        (pal.dark().color().blue()   + pal.button().color().blue())  / 2));
+    pal.setColor(QPalette::Shadow, // note: SYSCLR_SHADOW often = SYSCLR_BUTTONDARK
+                 QColor(qt_sysclr2qrgb(SYSCLR_BUTTONDEFAULT)));
+    pal.setColor(QPalette::Text,
+                 QColor(qt_sysclr2qrgb(SYSCLR_WINDOWTEXT)));
+    pal.setColor(QPalette::Base,
+                 QColor(qt_sysclr2qrgb(SYSCLR_ENTRYFIELD)));
+    pal.setColor(QPalette::BrightText,
+                 QColor(qt_sysclr2qrgb(SYSCLR_BUTTONLIGHT)));
+    pal.setColor(QPalette::Highlight,
+                 QColor(qt_sysclr2qrgb(SYSCLR_HILITEBACKGROUND)));
+    pal.setColor(QPalette::HighlightedText,
+                 QColor(qt_sysclr2qrgb(SYSCLR_HILITEFOREGROUND)));
+    // these colors are not present in the PM system palette
+    pal.setColor(QPalette::Link, Qt::blue);
+    pal.setColor(QPalette::LinkVisited, Qt::magenta);
+
+    // disabled colors
+    // note: it should be SYSCLR_MENUDISABLEDTEXT but many styles use etched
+    // appearance for disabled elements (in combination with QPalette::Light)
+    // which gives weakly readable text. Make it somewhat darker.
+    pal.setColor(QPalette::Disabled, QPalette::WindowText,
+                  QColor(qt_sysclr2qrgb(SYSCLR_BUTTONDARK)));
+    pal.setColor(QPalette::Disabled, QPalette::ButtonText,
+                  QColor(qt_sysclr2qrgb(SYSCLR_BUTTONDARK)));
+    pal.setColor(QPalette::Disabled, QPalette::Text,
+                  QColor(qt_sysclr2qrgb(SYSCLR_BUTTONDARK)));
+
+    QApplicationPrivate::setSystemPalette(pal);
+
+    // special palete: menus
+    QPalette spal = pal;
+    spal.setColor(QPalette::Window,
+                  QColor(qt_sysclr2qrgb(SYSCLR_MENU)));
+    spal.setColor(QPalette::WindowText,
+                  QColor(qt_sysclr2qrgb(SYSCLR_MENUTEXT)));
+    spal.setColor(QPalette::Highlight,
+                  QColor(qt_sysclr2qrgb( SYSCLR_MENUHILITEBGND)));
+    spal.setColor(QPalette::HighlightedText,
+                  QColor(qt_sysclr2qrgb(SYSCLR_MENUHILITE)));
+
+    QApplication::setPalette(spal, "QMenu");
+    QApplication::setPalette(spal, "QMenuBar");
+
+    // special palete: static widget text
+    spal = pal;
+    QColor staticTextCol(qt_sysclr2qrgb( SYSCLR_WINDOWSTATICTEXT));
+    spal.setColor(QPalette::WindowText, staticTextCol);
+    spal.setColor(QPalette::Text, staticTextCol);
+
+    QApplication::setPalette(spal, "QLabel");
+    QApplication::setPalette(spal, "QGroupBox");
 };
 
@@ -194 +361 @@
     qApp->setObjectName(priv->appName());
 
-    // default font (HELV.PFB series should always be present)
-    QApplicationPrivate::setSystemFont(QFont(QLatin1String("Helvetica"), 10));
+    // @todo search for QTPM_USE_WINDOWFONT in Qt3 for OS/2 sources for a
+    // discussion on whether to use PM_Fonts/DefaultFont or WindowText as the
+    // default one. So far, the latter is used.
+    QApplicationPrivate::setSystemFont(qt_sysfont2qfont("WindowText"));
 
     // QFont::locale_init();  ### Uncomment when it does something on OS/2
@@ -2074 +2243 @@
         USHORT vk = SHORT2FROMMP(qmsg.mp2);
         str += QString().
-            sprintf(" rep %02d scan %02X ch %04X (%ls) vk %04X",
+            sprintf(" rep %02d scan %02X ch %04X (%s) vk %04X",
                     repeat, scan, ch, (ch > 32 && ch < 254) ?
-                    QString::fromLocal8Bit((char *)&ch, 1).utf16() :
-                    QString(QChar(' ')).utf16(), vk);
+                    ) :
+                    ), vk);
         QString flstr;
         myDefFlagEx(fl, KC_CHAR, flstr, "CHAR");