Fix many labeling unit settings are lost on closing dialog

nyalldawson · nyalldawson · commit dc481955a584 · 2016-10-03T11:42:53.000+10:00
(and also don't trigger auto preview)
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -352,6 +352,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mLineDistanceDDBtn
   << mLineDistanceSpnBx
   << mLineDistanceUnitDDBtn
+  << mLineDistanceUnitWidget
   << mMaxCharAngleDDBtn
   << mMaxCharAngleInDSpinBox
   << mMaxCharAngleOutDSpinBox
@@ -365,6 +366,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mPointAngleSpinBox
   << mPointOffsetDDBtn
   << mPointOffsetUnitsDDBtn
+  << mPointOffsetUnitWidget
   << mPointOffsetXSpinBox
   << mPointOffsetYSpinBox
   << mPointPositionOrderDDBtn
@@ -376,6 +378,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mRepeatDistanceDDBtn
   << mRepeatDistanceSpinBox
   << mRepeatDistanceUnitDDBtn
+  << mRepeatDistanceUnitWidget
   << mScaleBasedVisibilityChkBx
   << mScaleBasedVisibilityDDBtn
   << mScaleBasedVisibilityMaxDDBtn
@@ -394,10 +397,12 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShadowOffsetGlobalChkBx
   << mShadowOffsetSpnBx
   << mShadowOffsetUnitsDDBtn
+  << mShadowOffsetUnitWidget
   << mShadowRadiusAlphaChkBx
   << mShadowRadiusDDBtn
   << mShadowRadiusDblSpnBx
   << mShadowRadiusUnitsDDBtn
+  << mShadowRadiusUnitWidget
   << mShadowScaleDDBtn
   << mShadowScaleSpnBx
   << mShadowTranspDDBtn
@@ -411,6 +416,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShapeBorderUnitsDDBtn
   << mShapeBorderWidthDDBtn
   << mShapeBorderWidthSpnBx
+  << mShapeBorderWidthUnitWidget
   << mShapeDrawChkBx
   << mShapeDrawDDBtn
   << mShapeFillColorBtn
@@ -419,6 +425,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShapeOffsetUnitsDDBtn
   << mShapeOffsetXSpnBx
   << mShapeOffsetYSpnBx
+  << mShapeOffsetUnitWidget
   << mShapePenStyleCmbBx
   << mShapePenStyleDDBtn
   << mShapeRadiusDDBtn
@@ -429,11 +436,13 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShapeRotationDDBtn
   << mShapeRotationDblSpnBx
   << mShapeRotationTypeDDBtn
+  << mShapeRadiusUnitWidget
   << mShapeSVGPathDDBtn
   << mShapeSVGPathLineEdit
   << mShapeSizeCmbBx
   << mShapeSizeTypeDDBtn
   << mShapeSizeUnitsDDBtn
+  << mShapeSizeUnitWidget
   << mShapeSizeXDDBtn
   << mShapeSizeXSpnBx
   << mShapeSizeYDDBtn
@@ -507,6 +516,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 );
