Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix many labeling unit settings are lost on closing dialog
(and also don't trigger auto preview)

(cherry-picked from dc48195)
  • Loading branch information
nyalldawson committed Oct 6, 2016
1 parent 1c225b7 commit 05044ac
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/app/qgslabelinggui.cpp
Expand Up @@ -351,6 +351,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mLineDistanceDDBtn
<< mLineDistanceSpnBx
<< mLineDistanceUnitDDBtn
<< mLineDistanceUnitWidget
<< mMaxCharAngleDDBtn
<< mMaxCharAngleInDSpinBox
<< mMaxCharAngleOutDSpinBox
Expand All @@ -364,6 +365,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mPointAngleSpinBox
<< mPointOffsetDDBtn
<< mPointOffsetUnitsDDBtn
<< mPointOffsetUnitWidget
<< mPointOffsetXSpinBox
<< mPointOffsetYSpinBox
<< mPointPositionOrderDDBtn
Expand All @@ -375,6 +377,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mRepeatDistanceDDBtn
<< mRepeatDistanceSpinBox
<< mRepeatDistanceUnitDDBtn
<< mRepeatDistanceUnitWidget
<< mScaleBasedVisibilityChkBx
<< mScaleBasedVisibilityDDBtn
<< mScaleBasedVisibilityMaxDDBtn
Expand All @@ -393,10 +396,12 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mShadowOffsetGlobalChkBx
<< mShadowOffsetSpnBx
<< mShadowOffsetUnitsDDBtn
<< mShadowOffsetUnitWidget
<< mShadowRadiusAlphaChkBx
<< mShadowRadiusDDBtn
<< mShadowRadiusDblSpnBx
<< mShadowRadiusUnitsDDBtn
<< mShadowRadiusUnitWidget
<< mShadowScaleDDBtn
<< mShadowScaleSpnBx
<< mShadowTranspDDBtn
Expand All @@ -410,6 +415,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mShapeBorderUnitsDDBtn
<< mShapeBorderWidthDDBtn
<< mShapeBorderWidthSpnBx
<< mShapeBorderWidthUnitWidget
<< mShapeDrawChkBx
<< mShapeDrawDDBtn
<< mShapeFillColorBtn
Expand All @@ -418,6 +424,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mShapeOffsetUnitsDDBtn
<< mShapeOffsetXSpnBx
<< mShapeOffsetYSpnBx
<< mShapeOffsetUnitWidget
<< mShapePenStyleCmbBx
<< mShapePenStyleDDBtn
<< mShapeRadiusDDBtn
Expand All @@ -428,11 +435,13 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
<< mShapeRotationDDBtn
<< mShapeRotationDblSpnBx
<< mShapeRotationTypeDDBtn
<< mShapeRadiusUnitWidget
<< mShapeSVGPathDDBtn
<< mShapeSVGPathLineEdit
<< mShapeSizeCmbBx
<< mShapeSizeTypeDDBtn
<< mShapeSizeUnitsDDBtn
<< mShapeSizeUnitWidget
<< mShapeSizeXDDBtn
<< mShapeSizeXSpnBx
<< mShapeSizeYDDBtn
Expand Down Expand Up @@ -504,6 +513,10 @@ void QgsLabelingGui::connectValueChanged( QList<QWidget *> widgets, const char *
{
connect( w, SIGNAL( fieldChanged( QString ) ), this, slot );
}
else if ( QgsUnitSelectionWidget* w = qobject_cast<QgsUnitSelectionWidget*>( widget ) )
{
connect( w, SIGNAL( changed() ), this, slot );
}
else if ( QComboBox* w = qobject_cast<QComboBox*>( widget ) )
{
connect( w, SIGNAL( currentIndexChanged( int ) ), this, slot );
Expand Down

0 comments on commit 05044ac

Please sign in to comment.