Flip Transparency property type to Opacity

Author: nyalldawson

python/core/qgsproperty.sip

@@ -37,7 +37,7 @@ class QgsPropertyDefinition
       Double0To1,
       Rotation,
       String,
-      Transparency,
+      Opacity,
       RenderUnits,
       ColorWithAlpha,
       ColorNoAlpha,

src/core/composer/qgscomposerobject.cpp

@@ -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 ) },

src/core/qgsproperty.cpp

@@ -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;

src/core/qgsproperty.h

@@ -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