[QGIS Commit] r12778 - trunk/qgis/src/gui/symbology-ng

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-01-16 09:17:45 -0500 (Sat, 16 Jan 2010)
New Revision: 12778

Modified:
   trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
   trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.h
Log:
Display polygon outline icon on button for svg fill symbol layer

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp	2010-01-16 12:55:17 UTC (rev 12777)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.cpp	2010-01-16 14:17:45 UTC (rev 12778)
@@ -508,6 +508,7 @@
   mLayer = 0;
   setupUi( this );
   insertIcons();
+  updateOutlineIcon();
 }
 
 void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )
@@ -529,6 +530,7 @@
     mTextureWidthSpinBox->setValue( width );
     mSVGLineEdit->setText( mLayer->svgFilePath() );
   }
+  updateOutlineIcon();
 }
 
 QgsSymbolLayerV2* QgsSVGFillSymbolLayerWidget::symbolLayer()
@@ -604,10 +606,20 @@
 void QgsSVGFillSymbolLayerWidget::on_mChangeOutlinePushButton_clicked()
 {
   QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), this );
-  if ( dlg.exec() == 0 )
+  if ( dlg.exec() == QDialog::Rejected )
   {
     return;
   }
 
+  updateOutlineIcon();
   emit changed();
 }
+
+void QgsSVGFillSymbolLayerWidget::updateOutlineIcon()
+{
+  if ( mLayer )
+  {
+    QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mLayer->subSymbol(), mChangeOutlinePushButton->iconSize() );
+    mChangeOutlinePushButton->setIcon( icon );
+  }
+}

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.h	2010-01-16 12:55:17 UTC (rev 12777)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbollayerv2widget.h	2010-01-16 14:17:45 UTC (rev 12778)
@@ -230,6 +230,7 @@
     //sets new output unit. Is called on combo box or spin box change
     void setOutputUnit();
     void insertIcons();
+    void updateOutlineIcon();
 
   private slots:
     void on_mBrowseToolButton_clicked();