Skip to content

Commit f6998e2

Browse files
committedJun 16, 2016
[gui] proper geometry type for move feature icon
1 parent 7f7b9f9 commit f6998e2

File tree

5 files changed

+1918
-74
lines changed

5 files changed

+1918
-74
lines changed
 

‎images/images.qrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@
261261
<file>themes/default/mActionMergeFeatures.png</file>
262262
<file>themes/default/mActionMoveFeature.png</file>
263263
<file>themes/default/mActionMoveFeature.svg</file>
264+
<file>themes/default/mActionMoveFeatureLine.svg</file>
265+
<file>themes/default/mActionMoveFeaturePoint.svg</file>
264266
<file>themes/default/mActionMoveItemContent.png</file>
265267
<file>themes/default/mActionMoveItemContent.svg</file>
266268
<file>themes/default/mActionMoveItemsToBottom.png</file>

‎images/themes/default/mActionCalculateField.svg

Lines changed: 3 additions & 73 deletions
Loading

‎images/themes/default/mActionMoveFeatureLine.svg

Lines changed: 1171 additions & 0 deletions
Loading

‎images/themes/default/mActionMoveFeaturePoint.svg

Lines changed: 738 additions & 0 deletions
Loading

‎src/app/qgisapp.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2511,7 +2511,7 @@ void QgisApp::setTheme( const QString& theThemeName )
25112511
mActionCopyFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.svg" ) );
25122512
mActionPasteFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.svg" ) );
25132513
mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePoint.svg" ) );
2514-
mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeature.svg" ) );
2514+
mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeaturePoint.svg" ) );
25152515
mActionRotateFeature->setIcon( QgsApplication::getThemeIcon( "/mActionRotateFeature.png" ) );
25162516
mActionReshapeFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionReshape.png" ) );
25172517
mActionSplitFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionSplitFeatures.svg" ) );
@@ -10553,6 +10553,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
1055310553
if ( vlayer->geometryType() == QGis::Point )
1055410554
{
1055510555
mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePoint.svg" ) );
10556+
mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeaturePoint.svg" ) );
1055610557

1055710558
mActionAddRing->setEnabled( false );
1055810559
mActionFillRing->setEnabled( false );
@@ -10580,6 +10581,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
1058010581
else if ( vlayer->geometryType() == QGis::Line )
1058110582
{
1058210583
mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCaptureLine.svg" ) );
10584+
mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeatureLine.svg" ) );
1058310585

1058410586
mActionReshapeFeatures->setEnabled( isEditable && canChangeGeometry );
1058510587
mActionSplitFeatures->setEnabled( isEditable && canAddFeatures );
@@ -10594,6 +10596,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
1059410596
else if ( vlayer->geometryType() == QGis::Polygon )
1059510597
{
1059610598
mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePolygon.svg" ) );
10599+
mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeature.svg" ) );
1059710600

1059810601
mActionAddRing->setEnabled( isEditable && canChangeGeometry );
1059910602
mActionFillRing->setEnabled( isEditable && canChangeGeometry );

0 commit comments

Comments
 (0)
Please sign in to comment.