Skip to content

Commit 3914651

Browse files
nyalldawsonnyalldawson
committedMay 29, 2017
Change QgsComposerItem to use opacity instead of transparency
·
ltr-3_40final-3_0_0
1 parent b2ba450 commit 3914651

15 files changed

+116
-81
lines changed
 

‎doc/api_break.dox

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,12 @@ Use the corresponding methods in QgsComposerUtils instead.
615615
instead.
616616
- lockSymbolSize(), imageSizeConsideringRotation(), cornerPointOnRotatedAndScaledRect(),
617617
sizeChangedByRotation() were removed. No replacement is offered for these methods.
618+
- transparency() and setTransparency() were removed. Use itemOpacity() and setItemOpacity() instead.
619+
620+
QgsComposerItemCommand {#qgis_api_break_3_0_QgsComposerItemCommand}
621+
----------------------
622+
623+
- ItemTransparency was removed. Use ItemOpacity instead.
618624

619625

620626
QgsComposerLabel {#qgis_api_break_3_0_QgsComposerLabel}

‎python/core/composer/qgscomposeritem.sip

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -404,17 +404,8 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
404404
*/
405405
void setBlendMode( const QPainter::CompositionMode blendMode );
406406

407-
/** Returns the item's transparency
408-
* @returns transparency as integer between 0 (transparent) and 255 (opaque)
409-
* @see setTransparency
410-
*/
411-
int transparency() const;
412-
413-
/** Sets the item's transparency
414-
* @param transparency integer between 0 (transparent) and 255 (opaque)
415-
* @see transparency
416-
*/
417-
void setTransparency( const int transparency );
407+
double itemOpacity() const;
408+
void setItemOpacity( const double opacity );
418409

419410
/** Returns whether effects (e.g., blend modes) are enabled for the item
420411
* @returns true if effects are enabled

‎python/core/composer/qgscomposeritemcommand.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
112112
ItemBackgroundColor,
113113
ItemMove,
114114
ItemRotation,
115-
ItemTransparency,
115+
ItemOpacity,
116116
ItemZoomContent
117117
};
118118

‎python/core/composer/qgscomposerobject.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class QgsComposerObject : QObject, QgsExpressionContextGenerator
3030
ItemHeight, /*!< height of item */
3131
ItemRotation, /*!< rotation of item */
3232
Transparency, /*!< item transparency */
33+
Opacity,
3334
BlendMode, /*!< item blend mode */
3435
ExcludeFromExports, /*!< exclude item from exports */
3536
FrameColor, //!< Item frame color

‎src/app/composer/qgscomposeritemwidget.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ QgsComposerItemWidget::QgsComposerItemWidget( QWidget *parent, QgsComposerItem *
170170
connect( mItem, &QgsComposerItem::sizeChanged, this, &QgsComposerItemWidget::setValuesForGuiPositionElements );
171171
connect( mItem, &QgsComposerObject::itemChanged, this, &QgsComposerItemWidget::setValuesForGuiNonPositionElements );
172172

173-
connect( mTransparencySlider, &QAbstractSlider::valueChanged, mTransparencySpnBx, &QSpinBox::setValue );
173+
connect( mOpacitySlider, &QAbstractSlider::valueChanged, this, [ = ]( int value ) { mOpacitySpnBx->setValue( value / 10.0 ); } );
174174

175175
updateVariables();
176176
connect( mVariableEditor, &QgsVariableEditorWidget::scopeChanged, this, &QgsComposerItemWidget::variablesChanged );
@@ -504,8 +504,8 @@ void QgsComposerItemWidget::setValuesForGuiNonPositionElements()
504504
mBackgroundGroupBox->blockSignals( true );
505505
mItemIdLineEdit->blockSignals( true );
506506
mBlendModeCombo->blockSignals( true );
507-
mTransparencySlider->blockSignals( true );
508-
mTransparencySpnBx->blockSignals( true );
507+
mOpacitySlider->blockSignals( true );
508+
mOpacitySpnBx->blockSignals( true );
509509
mFrameColorButton->blockSignals( true );
510510
mFrameJoinStyleCombo->blockSignals( true );
511511
mBackgroundColorButton->blockSignals( true );
@@ -520,8 +520,8 @@ void QgsComposerItemWidget::setValuesForGuiNonPositionElements()
520520
mFrameGroupBox->setChecked( mItem->hasFrame() );
521521
mBackgroundGroupBox->setChecked( mItem->hasBackground() );
522522
mBlendModeCombo->setBlendMode( mItem->blendMode() );
523-
mTransparencySlider->setValue( mItem->transparency() );
524-
mTransparencySpnBx->setValue( mItem->transparency() );
523+
mOpacitySlider->setValue( mItem->itemOpacity() * 1000.0 );
524+
mOpacitySpnBx->setValue( mItem->itemOpacity() * 100.0 );
525525
mItemRotationSpinBox->setValue( mItem->itemRotation( QgsComposerObject::OriginalValue ) );
526526
mExcludeFromPrintsCheckBox->setChecked( mItem->excludeFromExports( QgsComposerObject::OriginalValue ) );
527527

@@ -533,8 +533,8 @@ void QgsComposerItemWidget::setValuesForGuiNonPositionElements()
533533
mBackgroundGroupBox->blockSignals( false );
534534
mItemIdLineEdit->blockSignals( false );
535535
mBlendModeCombo->blockSignals( false );
536-
mTransparencySlider->blockSignals( false );
537-
mTransparencySpnBx->blockSignals( false );
536+
mOpacitySlider->blockSignals( false );
537+
mOpacitySpnBx->blockSignals( false );
538538
mItemRotationSpinBox->blockSignals( false );
539539
mExcludeFromPrintsCheckBox->blockSignals( false );
540540
}
@@ -546,7 +546,7 @@ void QgsComposerItemWidget::initializeDataDefinedButtons()
546546
mConfigObject->initializeDataDefinedButton( mWidthDDBtn, QgsComposerObject::ItemWidth );
547547
mConfigObject->initializeDataDefinedButton( mHeightDDBtn, QgsComposerObject::ItemHeight );
548548
mConfigObject->initializeDataDefinedButton( mItemRotationDDBtn, QgsComposerObject::ItemRotation );
549-
mConfigObject->initializeDataDefinedButton( mTransparencyDDBtn, QgsComposerObject::Transparency );
549+
mConfigObject->initializeDataDefinedButton( mOpacityDDBtn, QgsComposerObject::Opacity );
550550
mConfigObject->initializeDataDefinedButton( mBlendModeDDBtn, QgsComposerObject::BlendMode );
551551
mConfigObject->initializeDataDefinedButton( mExcludePrintsDDBtn, QgsComposerObject::ExcludeFromExports );
552552
mConfigObject->initializeDataDefinedButton( mItemFrameColorDDBtn, QgsComposerObject::FrameColor );
@@ -591,15 +591,15 @@ void QgsComposerItemWidget::on_mBlendModeCombo_currentIndexChanged( int index )
591591
}
592592
}
593593

594-
void QgsComposerItemWidget::on_mTransparencySpnBx_valueChanged( int value )
594+
void QgsComposerItemWidget::on_mOpacitySpnBx_valueChanged( double value )
595595
{
596-
mTransparencySlider->blockSignals( true );
597-
mTransparencySlider->setValue( value );
598-
mTransparencySlider->blockSignals( false );
596+
mOpacitySlider->blockSignals( true );
597+
mOpacitySlider->setValue( value * 10 );
598+
mOpacitySlider->blockSignals( false );
599599
if ( mItem )
600600
{
601-
mItem->beginCommand( tr( "Item transparency changed" ), QgsComposerMergeCommand::ItemTransparency );
602-
mItem->setTransparency( value );
601+
mItem->beginCommand( tr( "Item opacity changed" ), QgsComposerMergeCommand::ItemOpacity );
602+
mItem->setItemOpacity( value / 100.0 );
603603
mItem->endCommand();
604604
}
605605
}

‎src/app/composer/qgscomposeritemwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class QgsComposerItemWidget: public QWidget, private Ui::QgsComposerItemWidgetBa
172172
void on_mLowerRightCheckBox_stateChanged( int state );
173173

174174
void on_mBlendModeCombo_currentIndexChanged( int index );
175-
void on_mTransparencySpnBx_valueChanged( int value );
175+
void on_mOpacitySpnBx_valueChanged( double value );
176176

177177
void on_mItemRotationSpinBox_valueChanged( double val );
178178
void on_mExcludeFromPrintsCheckBox_toggled( bool checked );

‎src/core/composer/qgscomposeritem.cpp

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ QgsComposerItem::QgsComposerItem( QgsComposition *composition, bool manageZValue
6060
, mEvaluatedItemRotation( 0 )
6161
, mBlendMode( QPainter::CompositionMode_SourceOver )
6262
, mEffectsEnabled( true )
63-
, mTransparency( 0 )
6463
, mExcludeFromExports( false )
6564
, mEvaluatedExcludeFromExports( false )
6665
, mLastUsedPositionMode( UpperLeft )
@@ -89,7 +88,6 @@ QgsComposerItem::QgsComposerItem( qreal x, qreal y, qreal width, qreal height, Q
8988
, mEvaluatedItemRotation( 0 )
9089
, mBlendMode( QPainter::CompositionMode_SourceOver )
9190
, mEffectsEnabled( true )
92-
, mTransparency( 0 )
9391
, mExcludeFromExports( false )
9492
, mEvaluatedExcludeFromExports( false )
9593
, mLastUsedPositionMode( UpperLeft )
@@ -228,8 +226,8 @@ bool QgsComposerItem::_writeXml( QDomElement &itemElem, QDomDocument &doc ) cons
228226
//blend mode
229227
composerItemElem.setAttribute( QStringLiteral( "blendMode" ), QgsPainting::getBlendModeEnum( mBlendMode ) );
230228

231-
//transparency
232-
composerItemElem.setAttribute( QStringLiteral( "transparency" ), QString::number( mTransparency ) );
229+
//opacity
230+
composerItemElem.setAttribute( QStringLiteral( "opacity" ), QString::number( mOpacity ) );
233231

234232
composerItemElem.setAttribute( QStringLiteral( "excludeFromExports" ), mExcludeFromExports );
235233

@@ -386,8 +384,15 @@ bool QgsComposerItem::_readXml( const QDomElement &itemElem, const QDomDocument
386384
//blend mode
387385
setBlendMode( QgsPainting::getCompositionMode( static_cast< QgsPainting::BlendMode >( itemElem.attribute( QStringLiteral( "blendMode" ), QStringLiteral( "0" ) ).toUInt() ) ) );
388386

389-
//transparency
390-
setTransparency( itemElem.attribute( QStringLiteral( "transparency" ), QStringLiteral( "0" ) ).toInt() );
387+
//opacity
388+
if ( itemElem.hasAttribute( QStringLiteral( "opacity" ) ) )
389+
{
390+
setItemOpacity( itemElem.attribute( QStringLiteral( "opacity" ), QStringLiteral( "1" ) ).toDouble() );
391+
}
392+
else
393+
{
394+
setItemOpacity( 1.0 - itemElem.attribute( QStringLiteral( "transparency" ), QStringLiteral( "0" ) ).toInt() / 100.0 );
395+
}
391396

392397
mExcludeFromExports = itemElem.attribute( QStringLiteral( "excludeFromExports" ), QStringLiteral( "0" ) ).toInt();
393398
mEvaluatedExcludeFromExports = mExcludeFromExports;
@@ -895,20 +900,20 @@ void QgsComposerItem::refreshBlendMode( const QgsExpressionContext &context )
895900
mEffect->setCompositionMode( blendMode );
896901
}
897902

898-
void QgsComposerItem::setTransparency( const int transparency )
903+
void QgsComposerItem::setItemOpacity( const double opacity )
899904
{
900-
mTransparency = transparency;
905+
mOpacity = opacity;
901906
QgsExpressionContext context = createExpressionContext();
902-
refreshTransparency( true, context );
907+
refreshOpacity( true, context );
903908
}
904909

905-
void QgsComposerItem::refreshTransparency( const bool updateItem, const QgsExpressionContext &context )
910+
void QgsComposerItem::refreshOpacity( const bool updateItem, const QgsExpressionContext &context )
906911
{
907-
//data defined transparency set?
908-
int transparency = mDataDefinedProperties.valueAsInt( QgsComposerObject::Transparency, context, mTransparency );
912+
//data defined opacity set?
913+
double opacity = mDataDefinedProperties.valueAsDouble( QgsComposerObject::Opacity, context, mOpacity * 100.0 );
909914

910915
// Set the QGraphicItem's opacity
911-
setOpacity( 1. - ( transparency / 100. ) );
916+
setOpacity( opacity / 100.0 );
912917

913918
if ( updateItem )
914919
{
@@ -1140,9 +1145,9 @@ void QgsComposerItem::refreshDataDefinedProperty( const QgsComposerObject::DataD
11401145
{
11411146
refreshRotation( false, true, *evalContext );
11421147
}
1143-
if ( property == QgsComposerObject::Transparency || property == QgsComposerObject::AllProperties )
1148+
if ( property == QgsComposerObject::Opacity || property == QgsComposerObject::AllProperties )
11441149
{
1145-
refreshTransparency( false, *evalContext );
1150+
refreshOpacity( false, *evalContext );
11461151
}
11471152
if ( property == QgsComposerObject::BlendMode || property == QgsComposerObject::AllProperties )
11481153
{

‎src/core/composer/qgscomposeritem.h

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -364,30 +364,34 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
364364
*/
365365
void setBlendMode( const QPainter::CompositionMode blendMode );
366366

367-
/** Returns the item's transparency
368-
* \returns transparency as integer between 0 (transparent) and 255 (opaque)
369-
* \see setTransparency
367+
/** Returns the item's opacity. This method should be used instead of
368+
* QGraphicsItem::opacity() as any data defined overrides will be
369+
* respected.
370+
* \returns opacity as double between 1.0 (opaque) and 0 (transparent).
371+
* \see setItemOpacity()
370372
*/
371-
int transparency() const { return mTransparency; }
373+
double itemOpacity() const { return mOpacity; }
372374

373-
/** Sets the item's transparency
374-
* \param transparency integer between 0 (transparent) and 255 (opaque)
375-
* \see transparency
375+
/** Sets the item's \a opacity. This method should be used instead of
376+
* QGraphicsItem::setOpacity() as any data defined overrides will be
377+
* respected.
378+
* \param opacity double between 1.0 (opaque) and 0 (transparent).
379+
* \see itemOpacity()
376380
*/
377-
void setTransparency( const int transparency );
381+
void setItemOpacity( const double itemOpacity );
378382

379383
/** Returns whether effects (e.g., blend modes) are enabled for the item
380384
* \returns true if effects are enabled
381385
* \see setEffectsEnabled
382-
* \see transparency
386+
* \see itemOpacity()
383387
* \see blendMode
384388
*/
385389
bool effectsEnabled() const { return mEffectsEnabled; }
386390

387391
/** Sets whether effects (e.g., blend modes) are enabled for the item
388392
* \param effectsEnabled set to true to enable effects
389393
* \see effectsEnabled
390-
* \see setTransparency
394+
* \see setItemOpacity()
391395
* \see setBlendMode
392396
*/
393397
void setEffectsEnabled( const bool effectsEnabled );
@@ -621,8 +625,8 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
621625
bool mEffectsEnabled;
622626
QgsComposerEffect *mEffect = nullptr;
623627

624-
//! Item transparency
625-
int mTransparency;
628+
//! Item opacity, between 0 and 1
629+
double mOpacity = 1.0;
626630

627631
//! Whether item should be excluded in exports
628632
bool mExcludeFromExports;
@@ -734,25 +738,25 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
734738
*/
735739
void refreshRotation( const bool updateItem = true, const bool rotateAroundCenter = false, const QgsExpressionContext &context = QgsExpressionContext() );
736740

737-
/** Refresh item's transparency, considering data defined transparency
741+
/** Refresh item's opacity, considering data defined opacity
738742
* \param updateItem set to false to prevent the item being automatically updated
739-
* after the transparency is set
740-
* \param context expression context for evaulating data defined transparency
743+
* after the opacity is set
744+
* \param context expression context for evaulating data defined opacity
741745
* \since QGIS 2.5
742746
*/
743-
void refreshTransparency( const bool updateItem = true, const QgsExpressionContext &context = QgsExpressionContext() );
747+
void refreshOpacity( const bool updateItem = true, const QgsExpressionContext &context = QgsExpressionContext() );
744748

745-
/** Refresh item's frame color, considering data defined transparency
749+
/** Refresh item's frame color, considering data defined colors
746750
* \param updateItem set to false to prevent the item being automatically updated
747751
* after the frame color is set
748-
* \param context expression context for evaulating data defined transparency
752+
* \param context expression context for evaulating data defined color
749753
*/
750754
void refreshFrameColor( const bool updateItem = true, const QgsExpressionContext &context = QgsExpressionContext() );
751755

752-
/** Refresh item's transparency, considering data defined transparency
756+
/** Refresh item's background color, considering data defined colors
753757
* \param updateItem set to false to prevent the item being automatically updated
754758
* after the background color is set
755-
* \param context expression context for evaulating data defined transparency
759+
* \param context expression context for evaulating data defined color
756760
*/
757761
void refreshBackgroundColor( const bool updateItem = true, const QgsExpressionContext &context = QgsExpressionContext() );
758762

‎src/core/composer/qgscomposeritemcommand.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
154154
ItemBackgroundColor,
155155
ItemMove,
156156
ItemRotation,
157-
ItemTransparency,
157+
ItemOpacity, //!< Item opacity
158158
ItemZoomContent
159159
};
160160

‎src/core/composer/qgscomposermultiframe.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ QgsComposerFrame *QgsComposerMultiFrame::createNewFrame( QgsComposerFrame *curre
213213
newFrame->setFrameStrokeColor( currentFrame->frameStrokeColor() );
214214
newFrame->setFrameJoinStyle( currentFrame->frameJoinStyle() );
215215
newFrame->setFrameStrokeWidth( currentFrame->frameStrokeWidth() );
216-
newFrame->setTransparency( currentFrame->transparency() );
216+
newFrame->setItemOpacity( currentFrame->itemOpacity() );
217217
newFrame->setHideBackgroundIfEmpty( currentFrame->hideBackgroundIfEmpty() );
218218

219219
addFrame( newFrame, false );

‎src/core/composer/qgscomposerobject.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ void QgsComposerObject::initPropertyDefinitions()
5151
{ QgsComposerObject::ItemHeight, QgsPropertyDefinition( "dataDefinedHeight", QObject::tr( "Height" ), QgsPropertyDefinition::DoublePositive ) },
5252
{ QgsComposerObject::ItemRotation, QgsPropertyDefinition( "dataDefinedRotation", QObject::tr( "Rotation angle" ), QgsPropertyDefinition::Rotation ) },
5353
{ QgsComposerObject::Transparency, QgsPropertyDefinition( "dataDefinedTransparency", QObject::tr( "Transparency" ), QgsPropertyDefinition::Transparency ) },
54+
{ QgsComposerObject::Opacity, QgsPropertyDefinition( "dataDefinedOpacity", QObject::tr( "Opacity" ), QgsPropertyDefinition::Transparency ) },
5455
{ QgsComposerObject::BlendMode, QgsPropertyDefinition( "dataDefinedBlendMode", QObject::tr( "Blend mode" ), QgsPropertyDefinition::BlendMode ) },
5556
{ QgsComposerObject::ExcludeFromExports, QgsPropertyDefinition( "dataDefinedExcludeExports", QObject::tr( "Exclude item from exports" ), QgsPropertyDefinition::Boolean ) },
5657
{ QgsComposerObject::FrameColor, QgsPropertyDefinition( "dataDefinedFrameColor", QObject::tr( "Frame color" ), QgsPropertyDefinition::ColorWithAlpha ) },
@@ -142,6 +143,14 @@ bool QgsComposerObject::readXml( const QDomElement &itemElem, const QDomDocument
142143
{
143144
mDataDefinedProperties.readXml( propsNode.toElement(), sPropertyDefinitions );
144145
}
146+
if ( mDataDefinedProperties.isActive( QgsComposerObject::Transparency ) )
147+
{
148+
// upgrade transparency -> opacity
149+
QString exp = mDataDefinedProperties.property( QgsComposerObject::Transparency ).asExpression();
150+
exp = QStringLiteral( "100.0 - (%1)" ).arg( exp );
151+
mDataDefinedProperties.setProperty( QgsComposerObject::Opacity, QgsProperty::fromExpression( exp ) );
152+
mDataDefinedProperties.setProperty( QgsComposerObject::Transparency, QgsProperty() );
153+
}
145154

146155
//custom properties
147156
mCustomProperties.readXml( itemElem );

‎src/core/composer/qgscomposerobject.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ class CORE_EXPORT QgsComposerObject: public QObject, public QgsExpressionContext
5757
ItemWidth, //!< Width of item
5858
ItemHeight, //!< Height of item
5959
ItemRotation, //!< Rotation of item
60-
Transparency, //!< Item transparency
60+
Transparency, //!< Item transparency (deprecated)
61+
Opacity, //!< Item opacity
6162
BlendMode, //!< Item blend mode
6263
ExcludeFromExports, //!< Exclude item from exports
6364
FrameColor, //!< Item frame color

‎src/ui/composer/qgscomposeritemwidgetbase.ui

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>290</width>
10-
<height>1017</height>
9+
<width>309</width>
10+
<height>1135</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -658,37 +658,55 @@
658658
<item row="1" column="0">
659659
<widget class="QLabel" name="labelTransparency">
660660
<property name="text">
661-
<string>Transparency</string>
661+
<string>Opacity</string>
662662
</property>
663663
</widget>
664664
</item>
665665
<item row="1" column="1">
666666
<layout class="QHBoxLayout" name="horizontalLayout_2">
667667
<item>
668-
<widget class="QSlider" name="mTransparencySlider">
668+
<widget class="QSlider" name="mOpacitySlider">
669669
<property name="maximum">
670+
<number>1000</number>
671+
</property>
672+
<property name="singleStep">
673+
<number>10</number>
674+
</property>
675+
<property name="pageStep">
670676
<number>100</number>
671677
</property>
678+
<property name="value">
679+
<number>1000</number>
680+
</property>
672681
<property name="orientation">
673682
<enum>Qt::Horizontal</enum>
674683
</property>
675684
</widget>
676685
</item>
677686
<item>
678-
<widget class="QgsSpinBox" name="mTransparencySpnBx">
687+
<widget class="QgsDoubleSpinBox" name="mOpacitySpnBx">
679688
<property name="minimumSize">
680689
<size>
681-
<width>80</width>
690+
<width>100</width>
682691
<height>25</height>
683692
</size>
684693
</property>
694+
<property name="suffix">
695+
<string> %</string>
696+
</property>
697+
<property name="decimals">
698+
<number>1</number>
699+
</property>
685700
<property name="maximum">
686-
<number>100</number>
701+
<double>100.000000000000000</double>
702+
</property>
703+
<property name="value">
704+
<double>100.000000000000000</double>
687705
</property>
688706
</widget>
689707
</item>
690708
<item>
691-
<widget class="QgsPropertyOverrideButton" name="mTransparencyDDBtn">
709+
<widget class="QgsPropertyOverrideButton" name="mOpacityDDBtn">
692710
<property name="text">
693711
<string>...</string>
694712
</property>
@@ -841,9 +859,9 @@
841859
<tabstop>groupRendering</tabstop>
842860
<tabstop>mBlendModeCombo</tabstop>
843861
<tabstop>mBlendModeDDBtn</tabstop>
844-
<tabstop>mTransparencySlider</tabstop>
845-
<tabstop>mTransparencySpnBx</tabstop>
846-
<tabstop>mTransparencyDDBtn</tabstop>
862+
<tabstop>mOpacitySlider</tabstop>
863+
<tabstop>mOpacitySpnBx</tabstop>
864+
<tabstop>mOpacityDDBtn</tabstop>
847865
<tabstop>mExcludeFromPrintsCheckBox</tabstop>
848866
<tabstop>mExcludePrintsDDBtn</tabstop>
849867
</tabstops>

‎tests/src/core/testqgscomposereffects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void TestQgsComposerEffects::blend_modes()
111111

112112
void TestQgsComposerEffects::transparency()
113113
{
114-
mComposerRect2->setTransparency( 50 );
114+
mComposerRect2->setItemOpacity( 0.5 );
115115

116116
QgsCompositionChecker checker( QStringLiteral( "composereffects_transparency" ), mComposition );
117117
checker.setControlPathPrefix( QStringLiteral( "composer_effects" ) );

‎tests/src/core/testqgscomposermultiframe.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void TestQgsComposerMultiFrame::addFrame()
109109
frame1->setBackgroundEnabled( true );
110110
frame1->setBackgroundColor( QColor( Qt::green ) );
111111
frame1->setBlendMode( QPainter::CompositionMode_ColorBurn );
112-
frame1->setTransparency( 50 );
112+
frame1->setItemOpacity( 0.5 );
113113

114114
QgsComposerFrame *frame2 = htmlItem->createNewFrame( frame1, QPointF( 50, 55 ), QSizeF( 70, 120 ) );
115115

@@ -126,7 +126,7 @@ void TestQgsComposerMultiFrame::addFrame()
126126
QCOMPARE( frame2->hasBackground(), frame1->hasBackground() );
127127
QCOMPARE( frame2->backgroundColor(), frame1->backgroundColor() );
128128
QCOMPARE( frame2->blendMode(), frame1->blendMode() );
129-
QCOMPARE( frame2->transparency(), frame1->transparency() );
129+
QCOMPARE( frame2->itemOpacity(), frame1->itemOpacity() );
130130

131131
//check non-inherited properties
132132
QVERIFY( !frame2->hidePageIfEmpty() );
@@ -252,10 +252,10 @@ void TestQgsComposerMultiFrame::undoRedo()
252252
mComposition->endMultiFrameCommand();
253253

254254
//another frame command
255-
frame1->beginCommand( QStringLiteral( "bgcolor" ), QgsComposerMergeCommand::ItemTransparency );
255+
frame1->beginCommand( QStringLiteral( "bgcolor" ), QgsComposerMergeCommand::ItemOpacity );
256256
frame1->setBackgroundColor( QColor( 255, 255, 0 ) );
257257
frame1->endCommand();
258-
frame1->beginCommand( QStringLiteral( "bgcolor" ), QgsComposerMergeCommand::ItemTransparency );
258+
frame1->beginCommand( QStringLiteral( "bgcolor" ), QgsComposerMergeCommand::ItemOpacity );
259259
frame1->setBackgroundColor( QColor( 255, 0, 0 ) );
260260
frame1->endCommand();
261261

0 commit comments

Comments
 (0)
Please sign in to comment.