[QGIS Commit] r14500 - in trunk/qgis/src: app ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-03 15:10:34 -0700 (Wed, 03 Nov 2010)
New Revision: 14500

Modified:
   trunk/qgis/src/app/qgssinglesymboldialog.cpp
   trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
Log:
also use pixmap cache in old symbology

Modified: trunk/qgis/src/app/qgssinglesymboldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgssinglesymboldialog.cpp	2010-11-03 21:11:02 UTC (rev 14499)
+++ trunk/qgis/src/app/qgssinglesymboldialog.cpp	2010-11-03 22:10:34 UTC (rev 14500)
@@ -32,6 +32,7 @@
 #include <QFileDialog>
 #include <QKeyEvent>
 #include <QAbstractListModel>
+#include <QPixmapCache>
 
 #define DO_NOT_USE_STR "<off>"
 
@@ -55,9 +56,17 @@
 
       if ( role == Qt::DecorationRole ) // icon
       {
-        QPen pen( QColor( 0, 0, 255 ) );
-        QBrush brush( QColor( 220, 220, 220 ), Qt::SolidPattern );
-        return QPixmap::fromImage( QgsMarkerCatalogue::instance()->imageMarker( marker, 18, pen, brush ) );
+        QPixmap pixmap;
+
+        if ( !QPixmapCache::find( "ssd_" + marker, pixmap ) )
+        {
+          QPen pen( QColor( 0, 0, 255 ) );
+          QBrush brush( QColor( 220, 220, 220 ), Qt::SolidPattern );
+          pixmap = QPixmap::fromImage( QgsMarkerCatalogue::instance()->imageMarker( marker, 18, pen, brush ) );
+          QPixmapCache::insert( "ssd_" + marker, pixmap );
+        }
+
+        return pixmap;
       }
       else if ( role == Qt::UserRole || role == Qt::ToolTipRole )
       {

Modified: trunk/qgis/src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssinglesymboldialogbase.ui	2010-11-03 21:11:02 UTC (rev 14499)
+++ trunk/qgis/src/ui/qgssinglesymboldialogbase.ui	2010-11-03 22:10:34 UTC (rev 14500)
@@ -109,6 +109,9 @@
             <property name="resizeMode">
              <enum>QListView::Adjust</enum>
             </property>
+            <property name="layoutMode">
+             <enum>QListView::Batched</enum>
+            </property>
             <property name="viewMode">
              <enum>QListView::IconMode</enum>
             </property>