Changeset 1021 for trunk/src/gui

Timestamp:

Aug 22, 2011, 6:33:24 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

Include higher res pixmaps in icons returned by QCommonStyle::standardIcon().

The pixmaps are already there, it must be an accident that they were not used. This
in partcular fixes the My Computer icon used by Qt Creator on platforms that don't
provide a native icon for that purpose (e.g. OS/2).

File:

• trunk/src/gui/styles/qcommonstyle.cpp (modified) (1 diff)

trunk/src/gui/styles/qcommonstyle.cpp

@@ -5979 +5979 @@
         icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/media-volume-muted-16.png"), QSize(16, 16));
         break;
+    case SP_ComputerIcon:
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/computer-16.png"), QSize(16, 16));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/computer-32.png"), QSize(32, 32));
+        break;
+    case SP_DesktopIcon:
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/desktop-16.png"), QSize(16, 16));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/desktop-32.png"), QSize(32, 32));
+        break;
+    case SP_DriveFDIcon:
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/floppy-16.png"), QSize(16, 16));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/floppy-32.png"), QSize(32, 32));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/floppy-128.png"), QSize(128, 128));
+        break;
+    case SP_DriveHDIcon:
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/harddrive-16.png"), QSize(16, 16));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/harddrive-32.png"), QSize(32, 32));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/harddrive-128.png"), QSize(128, 128));
+        break;
+    case SP_DriveNetIcon:
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/networkdrive-16.png"), QSize(16, 16));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/networkdrive-32.png"), QSize(32, 32));
+        icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/networkdrive-128.png"), QSize(128, 128));
+        break;
 #endif // QT_NO_IMAGEFORMAT_PNG
     default: