Nice icons for ring combo box

nyalldawson · nyalldawson · commit 13d0ba2b7e54 · 2018-12-03T06:16:58.000+10:00
(cherry picked from commit c32bfc5)
diff --git a/images/images.qrc b/images/images.qrc
@@ -725,6 +725,9 @@
         <file>themes/default/mIconFolderOpen.svg</file>
         <file>themes/default/mIconFolderProject.svg</file>
         <file>themes/default/mActionActive.svg</file>
+        <file>themes/default/mIconAllRings.svg</file>
+        <file>themes/default/mIconExteriorRing.svg</file>
+        <file>themes/default/mIconInteriorRings.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
diff --git a/images/themes/default/mIconAllRings.svg b/images/themes/default/mIconAllRings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M7.959 2.434C5.14 2.48 2.672 3.688 1.676 6.627c-.989 2.917.361 8.833 5.404 7.184 3.977-1.3 6.81-1.927 7.724-4.646.914-2.718.399-4.876-1.656-5.669-1.694-.692-3.498-1.09-5.19-1.062zm1.344 1.904c2.671.21 3.42 1.491 3.254 2.844-.153.801-.544 1.374-2.313 2.125-1.116.503-2.506.651-3.937.198-.563-.424-1.347-1.576-.894-2.492.667-1.362 1.379-2.752 3.89-2.675z" fill="#7c9dc4" fill-rule="evenodd"/><path d="M7.959 2.434C5.14 2.48 2.672 3.688 1.676 6.627c-.989 2.917.361 8.833 5.404 7.184 3.977-1.3 6.81-1.927 7.724-4.646.914-2.718.399-4.876-1.656-5.669-1.694-.692-3.498-1.09-5.19-1.062z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><path d="M9.303 4.338c2.671.21 3.42 1.491 3.254 2.844-.153.801-.544 1.374-2.313 2.125-1.116.503-2.506.651-3.937.198-.563-.424-1.347-1.576-.894-2.492.667-1.362 1.379-2.752 3.89-2.675z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/images/themes/default/mIconExteriorRing.svg b/images/themes/default/mIconExteriorRing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M7.959 2.434C5.14 2.48 2.672 3.688 1.676 6.627c-.989 2.917.361 8.833 5.404 7.184 3.977-1.3 6.81-1.927 7.724-4.646.914-2.718.399-4.876-1.656-5.669-1.694-.692-3.498-1.09-5.19-1.062zm1.344 1.904c2.671.21 3.42 1.491 3.254 2.844-.153.801-.544 1.374-2.313 2.125-1.116.503-2.506.651-3.937.198-.563-.424-1.347-1.576-.894-2.492.667-1.362 1.379-2.752 3.89-2.675z" fill="#7c9dc4" fill-rule="evenodd"/><path d="M7.959 2.434C5.14 2.48 2.672 3.688 1.676 6.627c-.989 2.917.361 8.833 5.404 7.184 3.977-1.3 6.81-1.927 7.724-4.646.914-2.718.399-4.876-1.656-5.669-1.694-.692-3.498-1.09-5.19-1.062z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/images/themes/default/mIconInteriorRings.svg b/images/themes/default/mIconInteriorRings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M7.959 2.434C5.14 2.48 2.672 3.688 1.676 6.627c-.989 2.917.361 8.833 5.404 7.184 3.977-1.3 6.81-1.927 7.724-4.646.914-2.718.399-4.876-1.656-5.669-1.694-.692-3.498-1.09-5.19-1.062zm1.344 1.904c2.671.21 3.42 1.491 3.254 2.844-.153.801-.544 1.374-2.313 2.125-1.116.503-2.506.651-3.937.198-.563-.424-1.347-1.576-.894-2.492.667-1.362 1.379-2.752 3.89-2.675z" fill="#7c9dc4" fill-rule="evenodd"/><path d="M9.303 4.338c2.671.21 3.42 1.491 3.254 2.844-.153.801-.544 1.374-2.313 2.125-1.116.503-2.506.651-3.937.198-.563-.424-1.347-1.576-.894-2.492.667-1.362 1.379-2.752 3.89-2.675z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp
@@ -194,9 +194,9 @@ QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( QgsVectorLayer *
   btnChangeColor->setColorDialogTitle( tr( "Select Line Color" ) );
   btnChangeColor->setContext( QStringLiteral( "symbology" ) );
 
-  mRingFilterComboBox->addItem( tr( "All Rings" ), QgsLineSymbolLayer::AllRings );
-  mRingFilterComboBox->addItem( tr( "Exterior Ring Only" ), QgsLineSymbolLayer::ExteriorRingOnly );
-  mRingFilterComboBox->addItem( tr( "Interior Rings Only" ), QgsLineSymbolLayer::InteriorRingsOnly );
+  mRingFilterComboBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconAllRings.svg" ) ), tr( "All Rings" ), QgsLineSymbolLayer::AllRings );
+  mRingFilterComboBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconExteriorRing.svg" ) ), tr( "Exterior Ring Only" ), QgsLineSymbolLayer::ExteriorRingOnly );
+  mRingFilterComboBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconInteriorRings.svg" ) ), tr( "Interior Rings Only" ), QgsLineSymbolLayer::InteriorRingsOnly );
   connect( mRingFilterComboBox, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), this, [ = ]( int )
   {
     if ( mLayer )
@@ -1661,9 +1661,9 @@ QgsMarkerLineSymbolLayerWidget::QgsMarkerLineSymbolLayerWidget( QgsVectorLayer *
   mOffsetAlongLineUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMetersInMapUnits << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
                                         << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
 
-  mRingFilterComboBox->addItem( tr( "All Rings" ), QgsLineSymbolLayer::AllRings );
-  mRingFilterComboBox->addItem( tr( "Exterior Ring Only" ), QgsLineSymbolLayer::ExteriorRingOnly );
-  mRingFilterComboBox->addItem( tr( "Interior Rings Only" ), QgsLineSymbolLayer::InteriorRingsOnly );
+  mRingFilterComboBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconAllRings.svg" ) ), tr( "All Rings" ), QgsLineSymbolLayer::AllRings );
+  mRingFilterComboBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconExteriorRing.svg" ) ), tr( "Exterior Ring Only" ), QgsLineSymbolLayer::ExteriorRingOnly );
+  mRingFilterComboBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "mIconInteriorRings.svg" ) ), tr( "Interior Rings Only" ), QgsLineSymbolLayer::InteriorRingsOnly );
   connect( mRingFilterComboBox, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), this, [ = ]( int )
   {
     if ( mLayer )
