Skip to content

Commit

Permalink
revert 7a9e682 and 983b1c9
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Feb 3, 2014
1 parent 983b1c9 commit f9861f8
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8447,7 +8447,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
mActionMoveLabel->setEnabled( enableMove );
mActionRotateLabel->setEnabled( enableRotate );
mActionChangeLabelProperties->setEnabled( enableChange );

mMenuPasteAs->setEnabled( clipboard() && !clipboard()->empty() );
mActionPasteAsNewVector->setEnabled( clipboard() && !clipboard()->empty() );
mActionPasteAsNewMemoryVector->setEnabled( clipboard() && !clipboard()->empty() );

updateLayerModifiedActions();

Expand Down Expand Up @@ -8481,8 +8484,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
mActionCutFeatures->setEnabled( false );
mActionCopyFeatures->setEnabled( false );
mActionPasteFeatures->setEnabled( false );
mActionPasteAsNewVector->setEnabled( false );
mActionPasteAsNewMemoryVector->setEnabled( false );
mActionCopyStyle->setEnabled( false );
mActionPasteStyle->setEnabled( false );

Expand Down Expand Up @@ -8594,8 +8595,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
}

mActionPasteFeatures->setEnabled( isEditable && canAddFeatures && !clipboard()->empty() );
mActionPasteAsNewVector->setEnabled( !clipboard()->empty() );
mActionPasteAsNewMemoryVector->setEnabled( !clipboard()->empty() );

mActionAddFeature->setEnabled( isEditable && canAddFeatures );

Expand Down Expand Up @@ -8746,8 +8745,6 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
mActionCopyFeatures->setEnabled( false );
mActionCutFeatures->setEnabled( false );
mActionPasteFeatures->setEnabled( false );
mActionPasteAsNewVector->setEnabled( false );
mActionPasteAsNewMemoryVector->setEnabled( false );
mActionRotatePointSymbols->setEnabled( false );
mActionDeletePart->setEnabled( false );
mActionDeleteRing->setEnabled( false );
Expand Down

0 comments on commit f9861f8

Please sign in to comment.