Skip to content

Commit efe6109

Browse files
authoredMay 30, 2017
Merge pull request #4641 from nyalldawson/alpha
Unify opacity UI/API, pt 1
2 parents 9e11082 + e8b11a3 commit efe6109

File tree

167 files changed

+2419
-2493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+2419
-2493
lines changed
 

‎doc/api_break.dox

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,12 @@ QgsAuthMethod {#qgis_api_break_3_0_QgsAuthMethod}
528528
- DataSourceURI has been renamed to DataSourceUri
529529
- GenericDataSourceURI has been renamed to GenericDataSourceUri
530530

531+
QgsBlurEffect {#qgis_api_break_3_0_QgsBlurEffect}
532+
-------------
533+
534+
- setTransparency and transparency were removed. Use setOpacity and opacity instead.
535+
536+
531537
QgsBrowserModel {#qgis_api_break_3_0_QgsBrowserModel}
532538
---------------
533539

@@ -573,6 +579,19 @@ QgsColorButton {#qgis_api_break_3_0_QgsColorButton}
573579
--------------
574580

575581
- Behaviour enum and its corresponding setter/getter have been renamed to Behavior <!--#spellok-->
582+
- setAllowAlpha() and allowAlpha() were removed. Use setAllowOpacity() and allowOpacity() instead.
583+
584+
585+
QgsColorDialog {#qgis_api_break_3_0_QgsColorDialog}
586+
--------------
587+
588+
- setAllowAlpha() was removed. Use setAllowOpacity() instead.
589+
590+
591+
QgsColorEffect {#qgis_api_break_3_0_QgsColorEffect}
592+
-------------
593+
594+
- setTransparency and transparency were removed. Use setOpacity and opacity instead.
576595

577596

578597
QgsColorRampShader {#qgis_api_break_3_0_QgsColorRampShader}
@@ -615,6 +634,12 @@ Use the corresponding methods in QgsComposerUtils instead.
615634
instead.
616635
- lockSymbolSize(), imageSizeConsideringRotation(), cornerPointOnRotatedAndScaledRect(),
617636
sizeChangedByRotation() were removed. No replacement is offered for these methods.
637+
- transparency() and setTransparency() were removed. Use itemOpacity() and setItemOpacity() instead.
638+
639+
QgsComposerItemCommand {#qgis_api_break_3_0_QgsComposerItemCommand}
640+
----------------------
641+
642+
- ItemTransparency was removed. Use ItemOpacity instead.
618643

619644

620645
QgsComposerLabel {#qgis_api_break_3_0_QgsComposerLabel}
@@ -783,6 +808,12 @@ all these item added events.
783808
- addComposerMap no longer takes a setDefaultPreviewStyle argument.
784809
- the mapsToRestore parameter has been removed from addItemsFromXml
785810

811+
QgsCompoundColorWidget {#qgis_api_break_3_0_QgsCompoundColorWidget}
812+
----------------------
813+
814+
- setAllowAlpha() was removed. Use setAllowOpacity() instead.
815+
816+
786817
QgsConditionalLayerStyle {#qgis_api_break_3_0_QgsConditionalLayerStyle}
787818
------------------------
788819

@@ -992,6 +1023,8 @@ QgsDiagramSettings {#qgis_api_break_3_0_QgsDiagramSettings}
9921023

9931024
- The SizeType enum was removed. Use QgsUnitTypes.RenderUnit instead.
9941025
- readXml() and writeXml() do not take QgsVectorLayer as an argument anymore.
1026+
- transparency was removed. Use opacity instead.
1027+
9951028

9961029
QgsDial {#qgis_api_break_3_0_QgsDial}
9971030
-------
@@ -1015,6 +1048,12 @@ willUseEllipsoid() to determine whether ellipsoidal calculations will be perform
10151048
- convertMeasurement was removed. Use QgsUnitTypes for conversion instead.
10161049

10171050

1051+
QgsDrawSourceEffect {#qgis_api_break_3_0_QgsDrawSourceEffect}
1052+
-------------------
1053+
1054+
- setTransparency and transparency were removed. Use setOpacity and opacity instead.
1055+
1056+
10181057
QgsDxfExport {#qgis_api_break_3_0_QgsDxfExport}
10191058
------------
10201059

@@ -1206,6 +1245,12 @@ QgsGeometrySimplifier {#qgis_api_break_3_0_QgsGeometrySimplifier}
12061245
- simplifyGeometry() has been removed and simplify() must be used instead .
12071246

12081247

1248+
QgsGlowEffect {#qgis_api_break_3_0_QgsGlowEffect}
1249+
-------------
1250+
1251+
- setTransparency and transparency were removed. Use setOpacity and opacity instead.
1252+
1253+
12091254
QgsGradientColorRampDialog {#qgis_api_break_3_0_QgsGradientColorRampDialog}
12101255
---------
12111256

@@ -1806,6 +1851,12 @@ QProgressDialog argument will need to be updated using manually created connecti
18061851
signals and the updates to the progress dialog.
18071852

18081853

1854+
QgsRasterFillSymbolLayer {#qgis_api_break_3_0_QgsRasterFillSymbolLayer}
1855+
-----------------
1856+
1857+
- alpha() and setAlpha() were removed. Use opacity() and setOpacity() instead.
1858+
1859+
18091860
QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
18101861
------------------
18111862

@@ -1956,6 +2007,13 @@ QgsServer {#qgis_api_break_3_0_QgsServer}
19562007
- QgsServer::handleRequest( const QString &urlstr ) has been removed in favour of the new
19572008
- QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &response ) has been added
19582009

2010+
2011+
QgsShadowEffect {#qgis_api_break_3_0_QgsShadowEffect}
2012+
---------------
2013+
2014+
- setTransparency and transparency were removed. Use setOpacity and opacity instead.
2015+
2016+
19592017
QgsShortcutsManager {#qgis_api_break_3_0_QgsShortcutsManager}
19602018
-------------------
19612019

@@ -2070,6 +2128,7 @@ than an integer value
20702128
- usedAttributes() now requires a QgsRenderContext argument.
20712129
- setDataDefinedAngle(), dataDefinedAngle(), setDataDefinedSize(), dataDefinedSize(), setDataDefinedWidth() and dataDefinedWidth()
20722130
now work with QgsProperty objects instead of QgsDataDefined.
2131+
- alpha() and setAlpha() were removed. Use opacity() and setOpacity() instead.
20732132

20742133

20752134
QgsSymbolLayer (renamed from QgsSymbolLayerV2) {#qgis_api_break_3_0_QgsSymbolLayer}
@@ -2108,6 +2167,7 @@ QgsSymbolRenderContext (renamed from QgsSymbolV2RenderContext) {#qgis_api
21082167
- The constructor, setRenderHints() and renderHints() now accept and return a QgsSymbol::RenderHints flag rather
21092168
than an integer value
21102169
- fields() now returns a QgsFields value, not a pointer.
2170+
- alpha() and setAlpha() were removed. Use opacity() and setOpacity() instead.
21112171

21122172

21132173
QgsSymbolLayerUtils (renamed from QgsSymbolLayerUtilsV2) {#qgis_api_break_3_0_QgsSymbolLayerUtils}
@@ -2265,6 +2325,7 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
22652325
- addFeature() no longer accepts an alsoUpdateExtent boolean - this extra argument has been ignored for some time
22662326
- addFeatures() no longer accepts a makeSelected boolean, and will not automatically select newly added features. If desired, features must be manually selected by calling selectByIds() after addFeatures()
22672327
- annotationForm() and setAnnotationForm() have been removed. Form path is stored in individual QgsFormAnnotation objects.
2328+
- setLayerTransparency, layerTransparency, and layerTransparencyChanged were removed. Use opacity, setOpacity and opacityChanged instead.
22682329

22692330

22702331
QgsVectorLayerEditBuffer {#qgis_api_break_3_0_QgsVectorLayerEditBuffer}

‎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

0 commit comments

Comments
 (0)
Please sign in to comment.