Changeset 14195

Timestamp:

Sep 8, 2013, 6:53:11 PM (10 years ago)

Author:

jordan

Message:

(trunk, qt) #5483: use native windows icons, more win portability goodness from mikedld

Location:

trunk/qt

Files:

• utils.cc (modified) (5 diffs)
• utils.h (modified) (1 diff)

trunk/qt/utils.cc

@@ -13 +13 @@
 #include <iostream>
 
+#ifdef WIN32
+ #include <windows.h>
+ #include <shellapi.h>
+#endif
+
 #include <QApplication>
 #include <QDataStream>
@@ -20 +25 @@
 #include <QInputDialog>
 #include <QObject>
+#include <QPixmapCache>
 #include <QSet>
 #include <QStyle>
@@ -31 +37 @@
 ****
 ***/
+
+#if defined(WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+// Should be in QtWinExtras soon, but for now let's import it manually
+extern QPixmap qt_pixmapFromWinHICON(HICON icon);
+#endif
 
 QString
@@ -56 +67 @@
 }
 
-const QIcon&
+#ifdef WIN32
+namespace
+{
+  void
+  addAssociatedFileIcon (const QFileInfo& fileInfo, UINT iconSize, QIcon& icon)
+  {
+    QString const pixmapCacheKey = QLatin1String ("tr_file_ext_") +
+      QString::number (iconSize) + "_" + fileInfo.suffix ();
+    QPixmap pixmap;
+    if (!QPixmapCache::find (pixmapCacheKey, &pixmap))
+      {
+        const QString filename = fileInfo.fileName ();
+
+        SHFILEINFO shellFileInfo;
+        if (::SHGetFileInfoW ((const wchar_t*) filename.utf16 (), FILE_ATTRIBUTE_NORMAL,
+                              &shellFileInfo, sizeof(shellFileInfo),
+                              SHGFI_ICON | iconSize | SHGFI_USEFILEATTRIBUTES) != 0)
+          {
+            if (shellFileInfo.hIcon != NULL)
+              {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+                pixmap = qt_pixmapFromWinHICON (shellFileInfo.hIcon);
+#else
+                pixmap = QPixmap::fromWinHICON (shellFileInfo.hIcon);
+#endif
+                ::DestroyIcon (shellFileInfo.hIcon);
+              }
+          }
+
+        QPixmapCache::insert (pixmapCacheKey, pixmap);
+      }
+
+    if (!pixmap.isNull ())
+      icon.addPixmap (pixmap);
+  }
+} // namespace
+#endif
+
+QIcon
 Utils :: guessMimeIcon( const QString& filename )
 {
+#ifdef WIN32
+  QIcon icon;
+
+  if (!filename.isEmpty ())
+    {
+      const QFileInfo fileInfo (filename);
+
+      addAssociatedFileIcon (fileInfo, SHGFI_SMALLICON, icon);
+      addAssociatedFileIcon (fileInfo, 0, icon);
+      addAssociatedFileIcon (fileInfo, SHGFI_LARGEICON, icon);
+    }
+
+  if (icon.isNull ())
+    icon = QApplication::style ()->standardIcon (QStyle::SP_FileIcon);
+
+  return icon;
+#else
     enum { DISK, DOCUMENT, PICTURE, VIDEO, ARCHIVE, AUDIO, APP, TYPE_COUNT };
     static QIcon fallback;
@@ -117 +183 @@
 
     return fallback;
+#endif
 }
 

trunk/qt/utils.h

@@ -32 +32 @@
     public:
         static QString remoteFileChooser( QWidget * parent, const QString& title, const QString& myPath, bool dir, bool local );
-        static const QIcon& guessMimeIcon( const QString& filename );
+        static QIcon guessMimeIcon( const QString& filename );
         // Test if string is UTF-8 or not
         static bool isValidUtf8 ( const char *s );