Skip to content

Commit 3dd05e6

Browse files
dakcartodakcarto
committedAug 12, 2012
Split off part of pin/unpin label tool's function to new show/hide label tool
- Show/Hide Labels (uses new Show label data defined column) - Click or marquee on feature to show label - Hold Shift+click or marquee on label to hide it - Hide label function of pin/unpin label tool removed
·
ltr-3_40Before-merge-new_vector_api
1 parent 1da6556 commit 3dd05e6

12 files changed

+1638
-11
lines changed
 

‎images/images.qrc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<file>themes/default/mActionFileSmall.png</file>
7878
<file>themes/default/mActionFolder.png</file>
7979
<file>themes/default/mActionFormAnnotation.png</file>
80-
<file>themes/default/mActionPinLabels.svg</file>
8180
<file>themes/default/mActionFromSelectedFeature.png</file>
8281
<file>themes/default/mActionFullCumulativeCutStretch.png</file>
8382
<file>themes/default/mActionFullHistogramStretch.png</file>
@@ -119,6 +118,7 @@
119118
<file>themes/default/mActionPan.png</file>
120119
<file>themes/default/mActionPanToSelected.png</file>
121120
<file>themes/default/mActionPanToSelected.svg</file>
121+
<file>themes/default/mActionPinLabels.svg</file>
122122
<file>themes/default/mActionShowRasterCalculator.png</file>
123123
<file>themes/default/mAction.png</file>
124124
<file>themes/default/mActionProjectProperties.png</file>
@@ -149,6 +149,7 @@
149149
<file>themes/default/mActionSelectRectangle.png</file>
150150
<file>themes/default/mActionShowAllLayers.png</file>
151151
<file>themes/default/mActionShowBookmarks.png</file>
152+
<file>themes/default/mActionShowHideLabels.svg</file>
152153
<file>themes/default/mActionShowPinnedLabels.svg</file>
153154
<file>themes/default/mActionShowPluginManager.png</file>
154155
<file>themes/default/mActionSimplify.png</file>
@@ -295,7 +296,6 @@
295296
<file>themes/gis/mActionFileSave.png</file>
296297
<file>themes/gis/mActionFolder.png</file>
297298
<file>themes/gis/mActionFormAnnotation.png</file>
298-
<file>themes/gis/mActionPinLabels.svg</file>
299299
<file>themes/gis/mActionGroupItems.png</file>
300300
<file>themes/gis/mActionHelpContents.png</file>
301301
<file>themes/gis/mActionHideAllLayers.png</file>
@@ -326,6 +326,7 @@
326326
<file>themes/gis/mActionPan.png</file>
327327
<file>themes/gis/mActionPanToSelected.png</file>
328328
<file>themes/gis/mActionPanToSelected.svg</file>
329+
<file>themes/gis/mActionPinLabels.svg</file>
329330
<file>themes/gis/mActionShowRasterCalculator.png</file>
330331
<file>themes/gis/mActionRaiseItems.png</file>
331332
<file>themes/gis/mActionRedo.png</file>
@@ -348,6 +349,7 @@
348349
<file>themes/gis/mActionSelectRectangle.png</file>
349350
<file>themes/gis/mActionShowAllLayers.png</file>
350351
<file>themes/gis/mActionShowBookmarks.png</file>
352+
<file>themes/gis/mActionShowHideLabels.svg</file>
351353
<file>themes/gis/mActionShowPinnedLabels.svg</file>
352354
<file>themes/gis/mActionSimplify.png</file>
353355
<file>themes/gis/mActionSplitFeatures.png</file>

0 commit comments

Comments
 (0)
Please sign in to comment.