Skip to content

Commit 13ed4e0

Browse files
committed
Merge diagram icons
Conflicts: src/app/qgsdiagramproperties.cpp
2 parents 033bd79 + d845a0a commit 13ed4e0

File tree

8 files changed

+2776
-463
lines changed

8 files changed

+2776
-463
lines changed

images/images.qrc

Lines changed: 463 additions & 460 deletions
Large diffs are not rendered by default.

images/themes/default/histogram.png

510 Bytes
Loading

images/themes/default/histogram.svg

Lines changed: 786 additions & 0 deletions
Loading

images/themes/default/pie-chart.png

960 Bytes
Loading

images/themes/default/pie-chart.svg

Lines changed: 755 additions & 0 deletions
Loading

images/themes/default/text.png

659 Bytes
Loading

images/themes/default/text.svg

Lines changed: 766 additions & 0 deletions
Loading

src/app/qgsdiagramproperties.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,12 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
9090
mLineOptionsLabel->setVisible( false );
9191
}
9292

93-
mDiagramTypeComboBox->addItem( tr( "Pie chart" ), DIAGRAM_NAME_PIE );
94-
mDiagramTypeComboBox->addItem( tr( "Text diagram" ), DIAGRAM_NAME_TEXT );
95-
mDiagramTypeComboBox->addItem( tr( "Histogram" ), DIAGRAM_NAME_HISTOGRAM );
93+
QPixmap pix = QgsApplication::getThemePixmap( "pie-chart" );
94+
mDiagramTypeComboBox->addItem( pix, tr( "Pie chart" ) );
95+
pix = QgsApplication::getThemePixmap( "text" );
96+
mDiagramTypeComboBox->addItem( pix, tr( "Text diagram" ) );
97+
pix = QgsApplication::getThemePixmap( "histogram" );
98+
mDiagramTypeComboBox->addItem( pix, tr( "Histogram" ) );
9699

97100
mLabelPlacementComboBox->addItem( tr( "Height" ), QgsDiagramSettings::Height );
98101
mLabelPlacementComboBox->addItem( tr( "x-height" ), QgsDiagramSettings::XHeight );

0 commit comments

Comments
 (0)