Changeset 607

Timestamp:

Feb 26, 2010, 2:25:56 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Select the correct icon for the drive letter in standard file dialogs depending on the drive type (floppy, hard disk etc) [patch by rudi].

Location:

trunk/src

Files:

• corelib/global/qt_os2.h (modified) (1 diff)
• gui/itemviews/qfileiconprovider.cpp (modified) (2 diffs)

trunk/src/corelib/global/qt_os2.h

@@ -45 +45 @@
 #define QT_OS2_H
 
-#define OS2EMX_PLAIN_CHAR
+#if defined(__EMX__)
+# define OS2EMX_PLAIN_CHAR
+#endif
 #define INCL_BASE
+#define INCL_DOSDEVIOCTL
 #define INCL_PM
 #include <os2.h>

trunk/src/gui/itemviews/qfileiconprovider.cpp

@@ -52 +52 @@
 #  include <commctrl.h>
 #  include <objbase.h>
+#elif defined(Q_WS_PM)
+#  include <qt_os2.h>
 #elif defined(Q_WS_MAC)
 #  include <private/qt_cocoa_helpers_mac_p.h>
@@ -429 +431 @@
         }
     }
+#elif defined(Q_WS_PM)
+    {
+        UCHAR ioc_parm[2];
+        BIOSPARAMETERBLOCK bpb;
+        ioc_parm[0] = 0;
+        ioc_parm[1] = info.absoluteFilePath().at(0).cell() - 'A';
+        APIRET arc = DosDevIOCtl((HFILE) - 1, IOCTL_DISK, DSK_GETDEVICEPARAMS,
+                                 ioc_parm, sizeof(ioc_parm), NULL,
+                                 &bpb, sizeof(bpb), NULL);
+
+        if (arc == ERROR_NOT_SUPPORTED)
+            return d->getIcon(QStyle::SP_DriveNetIcon);
+
+        if (arc == NO_ERROR && bpb.bDeviceType != DEVTYPE_FIXED) {
+            if (bpb.fsDeviceAttr & 0x10)    // floppy format
+                return d->getIcon(QStyle::SP_DriveFDIcon);
+            if (!(bpb.fsDeviceAttr & 0x08))     // partitionable removable
+                return d->getIcon(QStyle::SP_DriveCDIcon);
+        }
+
+        return d->getIcon(QStyle::SP_DriveHDIcon);
+    }
 #else
     return d->getIcon(QStyle::SP_DriveHDIcon);