Skip to content

Commit 68cbb44

Browse files
nyalldawsonnyalldawson
committedJan 22, 2016
Merge pull request #2712 from nirvn/renderer_icons_v2
[ui] add missing renderer icons
·
ltr-3_40archive/master_2
2 parents 28b541a + 36d2e7b commit 68cbb44

13 files changed

+806
-12
lines changed
 

‎images/images.qrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,17 @@
460460
<file>themes/default/propertyicons/system.svg</file>
461461
<file>themes/default/propertyicons/transparency.png</file>
462462
<file>themes/default/rendererCategorizedSymbol.png</file>
463+
<file>themes/default/rendererCategorizedSymbol.svg</file>
463464
<file>themes/default/rendererGraduatedSymbol.png</file>
465+
<file>themes/default/rendererGraduatedSymbol.svg</file>
464466
<file>themes/default/rendererSingleSymbol.png</file>
467+
<file>themes/default/rendererSingleSymbol.svg</file>
468+
<file>themes/default/rendererRuleBasedSymbol.svg</file>
469+
<file>themes/default/rendererPointDisplacementSymbol.svg</file>
470+
<file>themes/default/rendererInvertedSymbol.svg</file>
471+
<file>themes/default/rendererHeatmapSymbol.svg</file>
472+
<file>themes/default/renderer25dSymbol.svg</file>
473+
<file>themes/default/rendererGrassSymbol.svg</file>
465474
<file>themes/default/repositoryConnected.png</file>
466475
<file>themes/default/repositoryDisabled.png</file>
467476
<file>themes/default/repositoryUnavailable.png</file>

‎images/themes/default/renderer25dSymbol.svg

Lines changed: 90 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererCategorizedSymbol.svg

Lines changed: 84 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererGraduatedSymbol.svg

Lines changed: 84 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererGrassSymbol.svg

Lines changed: 88 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererHeatmapSymbol.svg

Lines changed: 96 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererInvertedSymbol.svg

Lines changed: 77 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererPointDisplacementSymbol.svg

Lines changed: 88 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererRuleBasedSymbol.svg

Lines changed: 94 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎images/themes/default/rendererSingleSymbol.svg

Lines changed: 84 additions & 0 deletions

Error rendering embedded code

Invalid image source.

‎src/core/symbology-ng/qgsrendererv2registry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ QgsRendererV2Registry::QgsRendererV2Registry()
4646
QgsRuleBasedRendererV2::createFromSld ) );
4747

4848
addRenderer( new QgsRendererV2Metadata( "pointDisplacement",
49-
QObject::tr( "Point displacement" ),
49+
QObject::tr( "Point Displacement" ),
5050
QgsPointDisplacementRenderer::create ) );
5151

5252
addRenderer( new QgsRendererV2Metadata( "invertedPolygonRenderer",
53-
QObject::tr( "Inverted polygons" ),
53+
QObject::tr( "Inverted Polygons" ),
5454
QgsInvertedPolygonRenderer::create ) );
5555

5656
addRenderer( new QgsRendererV2Metadata( "heatmapRenderer",

‎src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static bool _initRenderer( const QString& name, QgsRendererV2WidgetFunc f, const
5151
{
5252
QString iconPath = QgsApplication::defaultThemePath() + iconName;
5353
QPixmap pix;
54-
if ( pix.load( iconPath, "png" ) )
54+
if ( pix.load( iconPath ) )
5555
m->setIcon( pix );
5656
}
5757

@@ -65,14 +65,14 @@ static void _initRendererWidgetFunctions()
6565
if ( initialized )
6666
return;
6767

68-
_initRenderer( "singleSymbol", QgsSingleSymbolRendererV2Widget::create, "rendererSingleSymbol.png" );
69-
_initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.png" );
70-
_initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.png" );
71-
_initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create );
72-
_initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create );
73-
_initRenderer( "invertedPolygonRenderer", QgsInvertedPolygonRendererWidget::create );
74-
_initRenderer( "heatmapRenderer", QgsHeatmapRendererWidget::create );
75-
_initRenderer( "25dRenderer", Qgs25DRendererWidget::create, "rendererSingleSymbol.png" );
68+
_initRenderer( "singleSymbol", QgsSingleSymbolRendererV2Widget::create, "rendererSingleSymbol.svg" );
69+
_initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.svg" );
70+
_initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.svg" );
71+
_initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create, "rendererRuleBasedSymbol.svg" );
72+
_initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create, "rendererPointDisplacementSymbol.svg" );
73+
_initRenderer( "invertedPolygonRenderer", QgsInvertedPolygonRendererWidget::create, "rendererInvertedSymbol.svg" );
74+
_initRenderer( "heatmapRenderer", QgsHeatmapRendererWidget::create, "rendererHeatmapSymbol.svg" );
75+
_initRenderer( "25dRenderer", Qgs25DRendererWidget::create, "renderer25dSymbol.svg" );
7676
initialized = true;
7777
}
7878

‎src/plugins/grass/qgsgrassplugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void QgsGrassPlugin::initGui()
296296
QgsRendererV2Registry::instance()->addRenderer( new QgsRendererV2Metadata( "grassEdit",
297297
QObject::tr( "GRASS Edit" ),
298298
QgsGrassEditRenderer::create,
299-
QIcon(),
299+
QIcon( QgsApplication::defaultThemePath() + "rendererGrassSymbol.svg" ),
300300
QgsGrassEditRendererWidget::create ) );
301301
}
302302

0 commit comments

Comments
 (0)
Please sign in to comment.