Changeset 1028

Timestamp:

Aug 26, 2011, 2:11:12 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Take style icons for SP_FileIcon & SP_DirIcon from QFileIconProvider.

This makes sure that the icons are consistent (taken from the system theme)
both in QCommonStyle and in QFileIconProvider. Previously, the former would
return the stock Qt icons which are completely different which made the
Projects view in Qt Creator look odd compared to the FileSystem view.

Note that this (as many other similar settings as well) is only done when
QApplication::desktopSettingsAware() is true.

File:

• trunk/src/gui/styles/qcommonstyle.cpp (modified) (3 diffs)

trunk/src/gui/styles/qcommonstyle.cpp

@@ -90 +90 @@
 #ifdef Q_WS_PM
 #   include <qt_os2.h>
+#   include <qfileiconprovider.h>
 #endif
 
@@ -5783 +5784 @@
 #endif // Q_WS_MAC
 
+#if defined(Q_WS_PM)
+    if (QApplication::desktopSettingsAware()) {
+        // Take file/folder icons from QFileProvider as it knows how to get
+        // them from the system theme (see QFileProvider::pmIcon()).
+        switch (standardIcon) {
+        case SP_FileIcon:
+        case SP_FileLinkIcon: {
+            QFileIconProvider fip;
+            static char kernelFilePath[] = "?:\\OS2KRNL";
+            if (kernelFilePath[0] == '?') {
+                ULONG bootDrive = 0;
+                DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE,
+                                (PVOID)&bootDrive, sizeof(bootDrive));
+                kernelFilePath[0] = bootDrive + 'A' - 1;
+            }
+            return fip.icon(QFileInfo(QLatin1String(kernelFilePath)));
+        }
+        case SP_DirIcon:
+        case SP_DirLinkIcon:
+        case SP_DirClosedIcon:
+        case SP_DirOpenIcon: {
+            // TODO: Use WPS to get icons for open folders
+            // (see see QFileProvider::pmIcon() again)
+            QFileIconProvider fip;
+            return fip.icon(QFileInfo(QLatin1String("\\")));
+        }
+        default:
+            break;
+        }
+    }
+#endif
+
     switch (standardIcon) {
 #ifndef QT_NO_IMAGEFORMAT_PNG
@@ -6018 +6051 @@
         case SP_DriveHDIcon:
         case SP_DriveFDIcon:
-        case SP_FileIcon:
-        case SP_FileLinkIcon:
-        case SP_DirLinkIcon:
-        case SP_DirClosedIcon:
         case SP_DesktopIcon:
         case SP_ComputerIcon:
-        case SP_DirOpenIcon:
         case SP_FileDialogNewFolder:
         case SP_DirHomeIcon: