Merge pull request #2981 from nirvn/symbol_label_diagram_sync

[ui] add missing icons for no labels and no diagram
qgis · Apr 8, 2016 · 85d472e · 85d472e
2 parents a6a77ee + f0a2d60
commit 85d472e
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 11 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -439,7 +439,8 @@
         <file>themes/default/mMessageLog.svg</file>
         <file>themes/default/mMessageLogRead.svg</file>
         <file>themes/default/north_arrow.png</file>
-        <file>themes/default/pie-chart.png</file>
+        <file>themes/default/diagramNone.svg</file>
+        <file>themes/default/pie-chart.svg</file>
         <file>themes/default/plugin.png</file>
         <file>themes/default/pluginExperimental.png</file>
         <file>themes/default/pluginDeprecated.png</file>
@@ -495,6 +496,7 @@
         <file>themes/default/rendererHeatmapSymbol.svg</file>
         <file>themes/default/renderer25dSymbol.svg</file>
         <file>themes/default/rendererGrassSymbol.svg</file>
+        <file>themes/default/labelingNone.svg</file>
         <file>themes/default/labelingSingle.svg</file>
         <file>themes/default/labelingRuleBased.svg</file>
         <file>themes/default/labelingObstacle.svg</file>

diff --git a/images/themes/default/diagramNone.svg b/images/themes/default/diagramNone.svg
diff --git a/images/themes/default/labelingNone.svg b/images/themes/default/labelingNone.svg
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -66,8 +66,9 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
   mDiagramOptionsListWidget->setAttribute( Qt::WA_MacShowFocusRect, false );
 
   mDiagramTypeComboBox->blockSignals( true );
-  mDiagramTypeComboBox->addItem( tr( "No diagrams" ), "None" );
-  QPixmap pix = QgsApplication::getThemePixmap( "pie-chart" );
+  QPixmap pix = QgsApplication::getThemePixmap( "diagramNone" );
+  mDiagramTypeComboBox->addItem( pix, tr( "No diagrams" ), "None" );
+  pix = QgsApplication::getThemePixmap( "pie-chart" );
   mDiagramTypeComboBox->addItem( pix, tr( "Pie chart" ), DIAGRAM_NAME_PIE );
   pix = QgsApplication::getThemePixmap( "text" );
   mDiagramTypeComboBox->addItem( pix, tr( "Text diagram" ), DIAGRAM_NAME_TEXT );

diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp
@@ -28,8 +28,12 @@
 QgsRendererV2Registry::QgsRendererV2Registry()
 {
   // add default renderers
+  addRenderer( new QgsRendererV2Metadata( "nullSymbol",
+                                          QObject::tr( "No symbols" ),
+                                          QgsNullSymbolRenderer::create ) );
+
   addRenderer( new QgsRendererV2Metadata( "singleSymbol",
-                                          QObject::tr( "Single Symbol" ),
+                                          QObject::tr( "Single symbol" ),
                                           QgsSingleSymbolRendererV2::create,
                                           QgsSingleSymbolRendererV2::createFromSld ) );
 
@@ -47,11 +51,11 @@ QgsRendererV2Registry::QgsRendererV2Registry()
                                           QgsRuleBasedRendererV2::createFromSld ) );
 
   addRenderer( new QgsRendererV2Metadata( "pointDisplacement",
-                                          QObject::tr( "Point Displacement" ),
+                                          QObject::tr( "Point displacement" ),
                                           QgsPointDisplacementRenderer::create ) );
 
   addRenderer( new QgsRendererV2Metadata( "invertedPolygonRenderer",
-                                          QObject::tr( "Inverted Polygons" ),
+                                          QObject::tr( "Inverted polygons" ),
                                           QgsInvertedPolygonRenderer::create ) );
 
   addRenderer( new QgsRendererV2Metadata( "heatmapRenderer",
@@ -62,10 +66,6 @@ QgsRendererV2Registry::QgsRendererV2Registry()
   addRenderer( new QgsRendererV2Metadata( "25dRenderer",
                                           QObject::tr( "2.5 D" ),
                                           Qgs25DRenderer::create ) );
-
-  addRenderer( new QgsRendererV2Metadata( "nullSymbol",
-                                          QObject::tr( "No Symbols" ),
-                                          QgsNullSymbolRenderer::create ) );
 }
 
 QgsRendererV2Registry::~QgsRendererV2Registry()

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -294,7 +294,7 @@ void QgsGrassPlugin::initGui()
   if ( !QgsRendererV2Registry::instance()->renderersList().contains( "grassEdit" ) )
   {
     QgsRendererV2Registry::instance()->addRenderer( new QgsRendererV2Metadata( "grassEdit",
-        QObject::tr( "GRASS Edit" ),
+        QObject::tr( "GRASS edit" ),
         QgsGrassEditRenderer::create,
         QIcon( QgsApplication::defaultThemePath() + "rendererGrassSymbol.svg" ),
         QgsGrassEditRendererWidget::create ) );

diff --git a/src/ui/qgslabelingwidget.ui b/src/ui/qgslabelingwidget.ui
@@ -25,6 +25,10 @@
         <property name="text">
          <string>No labels</string>
         </property>
+        <property name="icon">
+         <iconset resource="../../images/images.qrc">
+          <normaloff>:/images/themes/default/labelingNone.svg</normaloff>:/images/themes/default/labelingNone.svg</iconset>
+        </property>
        </item>
        <item>
         <property name="text">