Display polygon outline icon on button for svg fill symbol layer

mhugent · mhugent · commit e43fe56ecd0f · 2010-01-16T14:17:45.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12778 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -508,6 +508,7 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( QWidget* parent ): Qgs
   mLayer = 0;
   setupUi( this );
   insertIcons();
+  updateOutlineIcon();
 }
 
 void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )
@@ -529,6 +530,7 @@ void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )
     mTextureWidthSpinBox->setValue( width );
     mSVGLineEdit->setText( mLayer->svgFilePath() );
   }
+  updateOutlineIcon();
 }
 
 QgsSymbolLayerV2* QgsSVGFillSymbolLayerWidget::symbolLayer()
@@ -604,10 +606,20 @@ void QgsSVGFillSymbolLayerWidget::insertIcons()
 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 );
+  }
+}
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.h b/src/gui/symbology-ng/qgssymbollayerv2widget.h
@@ -230,6 +230,7 @@ class GUI_EXPORT QgsSVGFillSymbolLayerWidget : public QgsSymbolLayerV2Widget, pr
     //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();

Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,7 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( QWidget* parent ): Qgs`
`508`	`508`	`mLayer = 0;`
`509`	`509`	`setupUi( this );`
`510`	`510`	`insertIcons();`
	`511`	`+ updateOutlineIcon();`
`511`	`512`	`}`
`512`	`513`
`513`	`514`	`void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )`
`@@ -529,6 +530,7 @@ void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )`
`529`	`530`	`mTextureWidthSpinBox->setValue( width );`
`530`	`531`	`mSVGLineEdit->setText( mLayer->svgFilePath() );`
`531`	`532`	`}`
	`533`	`+ updateOutlineIcon();`
`532`	`534`	`}`
`533`	`535`
`534`	`536`	`QgsSymbolLayerV2* QgsSVGFillSymbolLayerWidget::symbolLayer()`
`@@ -604,10 +606,20 @@ void QgsSVGFillSymbolLayerWidget::insertIcons()`
`604`	`606`	`void QgsSVGFillSymbolLayerWidget::on_mChangeOutlinePushButton_clicked()`
`605`	`607`	`{`
`606`	`608`	`QgsSymbolV2PropertiesDialog dlg( mLayer->subSymbol(), this );`
`607`		`- if ( dlg.exec() == 0 )`
	`609`	`+ if ( dlg.exec() == QDialog::Rejected )`
`608`	`610`	`{`
`609`	`611`	`return;`
`610`	`612`	`}`
`611`	`613`
	`614`	`+ updateOutlineIcon();`
`612`	`615`	`emit changed();`
`613`	`616`	`}`
	`617`	`+`
	`618`	`+void QgsSVGFillSymbolLayerWidget::updateOutlineIcon()`
	`619`	`+{`
	`620`	`+ if ( mLayer )`
	`621`	`+ {`
	`622`	`+ QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mLayer->subSymbol(), mChangeOutlinePushButton->iconSize() );`
	`623`	`+ mChangeOutlinePushButton->setIcon( icon );`
	`624`	`+ }`
	`625`	`+}`