Changeset 642

Timestamp:

Mar 6, 2010, 12:32:46 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Use native file icons in standard Qt file dialogs.

Location:

trunk/src/gui

Files:

• itemviews/qfileiconprovider.cpp (modified) (3 diffs)
• styles/qcommonstyle.cpp (modified) (5 diffs)
• styles/qwindowsstyle.cpp (modified) (2 diffs)

trunk/src/gui/itemviews/qfileiconprovider.cpp

@@ -99 +99 @@
 #ifdef Q_WS_WIN
     QIcon getWinIcon(const QFileInfo &fi) const;
+
+
 #elif defined(Q_WS_MAC)
     QIcon getMacIcon(const QFileInfo &fi) const;
@@ -319 +321 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #elif defined(Q_WS_MAC)
 QIcon QFileIconProviderPrivate::getMacIcon(const QFileInfo &fi) const
@@ -410 +458 @@
     if (!icon.isNull())
         return icon;
+
+
+
+
+
+
 #endif
     if (info.isRoot())

trunk/src/gui/styles/qcommonstyle.cpp

@@ -89 +89 @@
 #endif
 
+
+
+
+
 QT_BEGIN_NAMESPACE
 
@@ -3038 +3042 @@
         if (const QStyleOptionToolBar *tbopt = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             if (tbopt->features & QStyleOptionToolBar::Movable) {
-                ///we need to access the widget here because the style option doesn't 
+                ///we need to access the widget here because the style option doesn't
                 //have all the information we need (ie. the layout's margin)
                 const QToolBar *tb = qobject_cast<const QToolBar*>(widget);
@@ -4668 +4672 @@
         break;
 
+
+
+
+
+
+
+
+
+
+
     case PM_ButtonIconSize:
     case PM_SmallIconSize:
         ret = int(QStyleHelper::dpiScaled(16.));
         break;
+
     case PM_IconViewIconSize:
         ret = proxy()->pixelMetric(PM_LargeIconSize, opt, widget);
@@ -4677 +4692 @@
 
     case PM_LargeIconSize:
+
+
+
+
+
+
         ret = int(QStyleHelper::dpiScaled(32.));
+
         break;
 
@@ -5954 +5976 @@
         break;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     return icon;
 }

trunk/src/gui/styles/qwindowsstyle.cpp

@@ -438 +438 @@
 
     case PM_SmallIconSize:
+
+
+
+
         ret = int(QStyleHelper::dpiScaled(16.));
         break;
 
     case PM_LargeIconSize:
+
+
+
+
         ret = int(QStyleHelper::dpiScaled(32.));
         break;
@@ -1390 +1398 @@
             QPixmap pixmap;
             QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-") + QLatin1String(metaObject()->className()), opt, QSize(size, size))
-                  + QLatin1Char('-') + QString::number(pe);                               
+                  + QLatin1Char('-') + QString::number(pe);
             if (!QPixmapCache::find(pixmapName, pixmap)) {
                 int border = size/5;