Merge pull request #2956 from pblottiere/diagrams

Update label toolbar to manage diagrams too
qgis · Apr 14, 2016 · a7f08fd · a7f08fd
2 parents 0f048b5 + 0232819
commit a7f08fd
Show file tree

Hide file tree

Showing 18 changed files with 1,149 additions and 237 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -237,6 +237,7 @@
         <file>themes/default/mActionLabel.png</file>
         <file>themes/default/mActionLabel.svg</file>
         <file>themes/default/mActionLabeling.png</file>
+        <file>themes/default/mActionDiagramProperties.svg</file>
         <file>themes/default/mActionLocalCumulativeCutStretch.png</file>
         <file>themes/default/mActionLocalHistogramStretch.png</file>
         <file>themes/default/mActionLowerItems.png</file>