[QGIS Commit] r13323 - in trunk/qgis/src: gui/symbology-ng ui/symbollayer

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-04-18 14:58:50 -0400 (Sun, 18 Apr 2010)
New Revision: 13323

Modified:
   trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
   trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui
Log:
Fixed simple symbol marker sizes in the symbol layer widget


Modified: trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp	2010-04-18 17:30:11 UTC (rev 13322)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp	2010-04-18 18:58:50 UTC (rev 13323)
@@ -156,11 +156,11 @@
   QStringList names;
   names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle"
   << "equilateral_triangle" << "star" << "regular_star" << "arrow" << "line";
-  double markerSize = size.width() - 1; // keep some space around
+  double markerSize = DEFAULT_POINT_SIZE * 2;
   for ( int i = 0; i < names.count(); ++i )
   {
     QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( names[i], QColor( 200, 200, 200 ), QColor( 0, 0, 0 ), markerSize );
-    QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size ); //todo: unit needs to be a parameter
+    QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size );
     QListWidgetItem* item = new QListWidgetItem( icon, QString(), lstNames );
     item->setData( Qt::UserRole, names[i] );
     delete lyr;

Modified: trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui
===================================================================
--- trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui	2010-04-18 17:30:11 UTC (rev 13322)
+++ trunk/qgis/src/ui/symbollayer/widget_simplemarker.ui	2010-04-18 18:58:50 UTC (rev 13323)
@@ -168,9 +168,6 @@
      <property name="viewMode">
       <enum>QListView::IconMode</enum>
      </property>
-     <property name="uniformItemSizes">
-      <bool>true</bool>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>