Skip to content

Commit f468f65

Browse files
committedFeb 17, 2016
Merge pull request #2791 from nirvn/labeling_icons_v2
[ui] add rule-based labeling and obstacle icons
2 parents d2679d6 + b4ee36d commit f468f65

File tree

5 files changed

+817
-2
lines changed

5 files changed

+817
-2
lines changed
 

‎images/images.qrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,9 @@
487487
<file>themes/default/rendererHeatmapSymbol.svg</file>
488488
<file>themes/default/renderer25dSymbol.svg</file>
489489
<file>themes/default/rendererGrassSymbol.svg</file>
490+
<file>themes/default/labelingSingle.svg</file>
491+
<file>themes/default/labelingRuleBased.svg</file>
492+
<file>themes/default/labelingObstacle.svg</file>
490493
<file>themes/default/repositoryConnected.png</file>
491494
<file>themes/default/repositoryDisabled.png</file>
492495
<file>themes/default/repositoryUnavailable.png</file>

‎images/themes/default/labelingObstacle.svg

Lines changed: 612 additions & 0 deletions
Loading
Lines changed: 110 additions & 0 deletions
Loading
Lines changed: 86 additions & 0 deletions
Loading

‎src/ui/qgslabelingwidget.ui

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</property>
3333
<property name="icon">
3434
<iconset resource="../../images/images.qrc">
35-
<normaloff>:/images/themes/default/propertyicons/labels.svg</normaloff>:/images/themes/default/propertyicons/labels.svg</iconset>
35+
<normaloff>:/images/themes/default/labelingSingle.svg</normaloff>:/images/themes/default/labelingSingle.svg</iconset>
3636
</property>
3737
</item>
3838
<item>
@@ -41,13 +41,17 @@
4141
</property>
4242
<property name="icon">
4343
<iconset resource="../../images/images.qrc">
44-
<normaloff>:/images/themes/default/propertyicons/labels.svg</normaloff>:/images/themes/default/propertyicons/labels.svg</iconset>
44+
<normaloff>:/images/themes/default/labelingRuleBased.svg</normaloff>:/images/themes/default/labelingRuleBased.svg</iconset>
4545
</property>
4646
</item>
4747
<item>
4848
<property name="text">
4949
<string>Discourage other labels from covering features in this layer</string>
5050
</property>
51+
<property name="icon">
52+
<iconset resource="../../images/images.qrc">
53+
<normaloff>:/images/themes/default/labelingObstacle.svg</normaloff>:/images/themes/default/labelingObstacle.svg</iconset>
54+
</property>
5155
</item>
5256
</widget>
5357
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.