Skip to content
Permalink
Browse files

Flip Transparency property type to Opacity

  • Loading branch information
nyalldawson committed May 29, 2017
1 parent 07b45cd commit b7352bb2b538dde542eb17de18e93cde0a99322d
Showing with 5 additions and 5 deletions.
  1. +1 −1 python/core/qgsproperty.sip
  2. +2 −2 src/core/composer/qgscomposerobject.cpp
  3. +1 −1 src/core/qgsproperty.cpp
  4. +1 −1 src/core/qgsproperty.h
@@ -37,7 +37,7 @@ class QgsPropertyDefinition
Double0To1,
Rotation,
String,
Transparency,
Opacity,
RenderUnits,
ColorWithAlpha,
ColorNoAlpha,
@@ -50,8 +50,8 @@ void QgsComposerObject::initPropertyDefinitions()
{ QgsComposerObject::ItemWidth, QgsPropertyDefinition( "dataDefinedWidth", QObject::tr( "Width" ), QgsPropertyDefinition::DoublePositive ) },
{ QgsComposerObject::ItemHeight, QgsPropertyDefinition( "dataDefinedHeight", QObject::tr( "Height" ), QgsPropertyDefinition::DoublePositive ) },
{ QgsComposerObject::ItemRotation, QgsPropertyDefinition( "dataDefinedRotation", QObject::tr( "Rotation angle" ), QgsPropertyDefinition::Rotation ) },
{ QgsComposerObject::Transparency, QgsPropertyDefinition( "dataDefinedTransparency", QObject::tr( "Transparency" ), QgsPropertyDefinition::Transparency ) },
{ QgsComposerObject::Opacity, QgsPropertyDefinition( "dataDefinedOpacity", QObject::tr( "Opacity" ), QgsPropertyDefinition::Transparency ) },
{ QgsComposerObject::Transparency, QgsPropertyDefinition( "dataDefinedTransparency", QObject::tr( "Transparency" ), QgsPropertyDefinition::Opacity ) },
{ QgsComposerObject::Opacity, QgsPropertyDefinition( "dataDefinedOpacity", QObject::tr( "Opacity" ), QgsPropertyDefinition::Opacity ) },
{ QgsComposerObject::BlendMode, QgsPropertyDefinition( "dataDefinedBlendMode", QObject::tr( "Blend mode" ), QgsPropertyDefinition::BlendMode ) },
{ QgsComposerObject::ExcludeFromExports, QgsPropertyDefinition( "dataDefinedExcludeExports", QObject::tr( "Exclude item from exports" ), QgsPropertyDefinition::Boolean ) },
{ QgsComposerObject::FrameColor, QgsPropertyDefinition( "dataDefinedFrameColor", QObject::tr( "Frame color" ), QgsPropertyDefinition::ColorWithAlpha ) },
@@ -79,7 +79,7 @@ QgsPropertyDefinition::QgsPropertyDefinition( const QString &name, const QString
mHelpText = QObject::tr( "string of variable length" );
break;

case Transparency:
case Opacity:
mTypes = DataTypeNumeric;
mHelpText = QObject::tr( "int [0-100]" );
break;
@@ -59,7 +59,7 @@ class CORE_EXPORT QgsPropertyDefinition
Double0To1, //!< Double value between 0-1 (inclusive)
Rotation, //!< Rotation (value between 0-360 degrees)
String, //!< Any string value
Transparency, //!< Transparency (0-100)
Opacity, //!< Opacity (0-100)
RenderUnits, //!< Render units (eg mm/pixels/map units)
ColorWithAlpha, //!< Color with alpha channel
ColorNoAlpha, //!< Color with no alpha channel

0 comments on commit b7352bb

Please sign in to comment.
You can’t perform that action at this time.