Merge diagram icons

Conflicts: src/app/qgsdiagramproperties.cpp
qgis · Aug 16, 2012 · 13ed4e05413177544e67516aeb7de4fa921ab624 · 13ed4e0
2 parents 033bd79 + d845a0a
commit 13ed4e05413177544e67516aeb7de4fa921ab624
diff --git a/images/images.qrc b/images/images.qrc
diff --git a/images/themes/default/histogram.png b/images/themes/default/histogram.png
diff --git a/images/themes/default/histogram.svg b/images/themes/default/histogram.svg
diff --git a/images/themes/default/pie-chart.png b/images/themes/default/pie-chart.png
diff --git a/images/themes/default/pie-chart.svg b/images/themes/default/pie-chart.svg
diff --git a/images/themes/default/text.png b/images/themes/default/text.png
diff --git a/images/themes/default/text.svg b/images/themes/default/text.svg
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -90,9 +90,12 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
     mLineOptionsLabel->setVisible( false );
   }
 
-  mDiagramTypeComboBox->addItem( tr( "Pie chart" ), DIAGRAM_NAME_PIE );
-  mDiagramTypeComboBox->addItem( tr( "Text diagram" ), DIAGRAM_NAME_TEXT );
-  mDiagramTypeComboBox->addItem( tr( "Histogram" ), DIAGRAM_NAME_HISTOGRAM );
+  QPixmap pix = QgsApplication::getThemePixmap( "pie-chart" );
+  mDiagramTypeComboBox->addItem( pix, tr( "Pie chart" ) );
+  pix = QgsApplication::getThemePixmap( "text" );
+  mDiagramTypeComboBox->addItem( pix, tr( "Text diagram" ) );
+  pix = QgsApplication::getThemePixmap( "histogram" );
+  mDiagramTypeComboBox->addItem( pix, tr( "Histogram" ) );
 
   mLabelPlacementComboBox->addItem( tr( "Height" ), QgsDiagramSettings::Height );
   mLabelPlacementComboBox->addItem( tr( "x-height" ), QgsDiagramSettings::XHeight );