Fix many labeling unit settings are lost on closing dialog

nyalldawson · nyalldawson · commit 31dc608a6bae · 2016-10-06T22:19:30.000+10:00
(and also don't trigger auto preview) (cherry-picked from dc48195)
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -354,6 +354,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mLineDistanceDDBtn
   << mLineDistanceSpnBx
   << mLineDistanceUnitDDBtn
+  << mLineDistanceUnitWidget
   << mMaxCharAngleDDBtn
   << mMaxCharAngleInDSpinBox
   << mMaxCharAngleOutDSpinBox
@@ -367,6 +368,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mPointAngleSpinBox
   << mPointOffsetDDBtn
   << mPointOffsetUnitsDDBtn
+  << mPointOffsetUnitWidget
   << mPointOffsetXSpinBox
   << mPointOffsetYSpinBox
   << mPointPositionOrderDDBtn
@@ -378,6 +380,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mRepeatDistanceDDBtn
   << mRepeatDistanceSpinBox
   << mRepeatDistanceUnitDDBtn
+  << mRepeatDistanceUnitWidget
   << mScaleBasedVisibilityChkBx
   << mScaleBasedVisibilityDDBtn
   << mScaleBasedVisibilityMaxDDBtn
@@ -396,10 +399,12 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShadowOffsetGlobalChkBx
   << mShadowOffsetSpnBx
   << mShadowOffsetUnitsDDBtn
+  << mShadowOffsetUnitWidget
   << mShadowRadiusAlphaChkBx
   << mShadowRadiusDDBtn
   << mShadowRadiusDblSpnBx
   << mShadowRadiusUnitsDDBtn
+  << mShadowRadiusUnitWidget
   << mShadowScaleDDBtn
   << mShadowScaleSpnBx
   << mShadowTranspDDBtn
@@ -413,6 +418,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShapeBorderUnitsDDBtn
   << mShapeBorderWidthDDBtn
   << mShapeBorderWidthSpnBx
+  << mShapeBorderWidthUnitWidget
   << mShapeDrawChkBx
   << mShapeDrawDDBtn
   << mShapeFillColorBtn
@@ -421,6 +427,7 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShapeOffsetUnitsDDBtn
   << mShapeOffsetXSpnBx
   << mShapeOffsetYSpnBx
+  << mShapeOffsetUnitWidget
   << mShapePenStyleCmbBx
   << mShapePenStyleDDBtn
   << mShapeRadiusDDBtn
@@ -431,11 +438,13 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
   << mShapeRotationDDBtn
   << mShapeRotationDblSpnBx
   << mShapeRotationTypeDDBtn
+  << mShapeRadiusUnitWidget
   << mShapeSVGPathDDBtn
   << mShapeSVGPathLineEdit
   << mShapeSizeCmbBx
   << mShapeSizeTypeDDBtn
   << mShapeSizeUnitsDDBtn
+  << mShapeSizeUnitWidget
   << mShapeSizeXDDBtn
   << mShapeSizeXSpnBx
   << mShapeSizeYDDBtn
@@ -509,6 +518,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 );
