sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[composer] Add undo/redo support for item transparency and blend modes, symbol change for shapes, overviews and grid styles

Browse Source
This commit is contained in:
Nyall Dawson 2014-04-13 22:19:47 +10:00
parent 20bac72234
commit 5bd87c81e8
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/composer/qgscomposeritemcommand.sip
View File

@ -90,7 +90,8 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
//item
ItemOutlineWidth,
ItemMove,
ItemRotation
ItemRotation,
ItemTransparency
};
QgsComposerMergeCommand( Context c, QgsComposerItem* item, const QString& text );

4
src/app/composer/qgscomposeritemwidget.cpp
View File

@ -401,7 +401,9 @@ void QgsComposerItemWidget::on_mBlendModeCombo_currentIndexChanged( int index )
Q_UNUSED( index );
if ( mItem )
{
mItem->beginCommand( tr( "Item blend mode changed" ) );
mItem->setBlendMode( mBlendModeCombo->blendMode() );
mItem->endCommand();
}
}
@ -409,7 +411,9 @@ void QgsComposerItemWidget::on_mTransparencySlider_valueChanged( int value )
{
if ( mItem )
{
mItem->beginCommand( tr( "Item transparency changed" ), QgsComposerMergeCommand::ItemTransparency );
mItem->setTransparency( value );
mItem->endCommand();
}
}

12
src/app/composer/qgscomposermapwidget.cpp
View File

@ -773,12 +773,18 @@ void QgsComposerMapWidget::on_mOverviewFrameStyleButton_clicked()
return;
}
mComposerMap->beginCommand( tr( "Overview frame style changed" ) );
QgsSymbolV2SelectorDialog d( mComposerMap->overviewFrameMapSymbol(), QgsStyleV2::defaultStyle(), 0 );
//QgsSymbolV2PropertiesDialog d( mComposerMap->overviewFrameMapSymbol(), 0, this );
if ( d.exec() == QDialog::Accepted )
{
updateOverviewSymbolMarker();
mComposerMap->endCommand();
}
else
{
mComposerMap->cancelCommand();
}
}
@ -892,10 +898,16 @@ void QgsComposerMapWidget::on_mGridLineStyleButton_clicked()
return;
}
mComposerMap->beginCommand( tr( "Grid line style changed" ) );
QgsSymbolV2SelectorDialog d( mComposerMap->gridLineSymbol(), QgsStyleV2::defaultStyle(), 0 );
if ( d.exec() == QDialog::Accepted )
{
updateLineSymbolMarker();
mComposerMap->endCommand();
}
else
{
mComposerMap->cancelCommand();
}
mComposerMap->update();

6
src/app/composer/qgscomposershapewidget.cpp
View File

@ -111,11 +111,17 @@ void QgsComposerShapeWidget::on_mShapeStyleButton_clicked()
coverageLayer = mComposerShape->composition()->atlasComposition().coverageLayer();
}
mComposerShape->beginCommand( tr( "Shape style changed" ) );
QgsSymbolV2SelectorDialog d( mComposerShape->shapeStyleSymbol(), QgsStyleV2::defaultStyle(), coverageLayer );
if ( d.exec() == QDialog::Accepted )
{
updateShapeStyle();
mComposerShape->endCommand();
}
else
{
mComposerShape->cancelCommand();
}
}

3
src/core/composer/qgscomposeritemcommand.h
View File

@ -118,7 +118,8 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
//item
ItemOutlineWidth,
ItemMove,
ItemRotation
ItemRotation,
ItemTransparency
};
QgsComposerMergeCommand( Context c, QgsComposerItem* item, const QString& text );