@@ -120,6 +120,18 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog( QgsVectorLayer* la
120
120
connect ( btnOrderBy, SIGNAL ( clicked ( bool ) ), this , SLOT ( showOrderByDialog () ) );
121
121
122
122
syncToLayer ();
123
+
124
+ QList<QWidget*> widgets;
125
+ widgets << mLayerTransparencySpnBx
126
+ << cboRenderers
127
+ << checkboxEnableOrderBy
128
+ << lineEditOrderBy
129
+ << mBlendModeComboBox
130
+ << mFeatureBlendComboBox
131
+ << mEffectWidget ;
132
+
133
+
134
+ connectValueChanged ( widgets, SIGNAL ( widgetChanged () ) );
123
135
}
124
136
125
137
void QgsRendererV2PropertiesDialog::connectValueChanged ( QList<QWidget *> widgets, const char *slot )
@@ -158,49 +170,13 @@ void QgsRendererV2PropertiesDialog::connectValueChanged( QList<QWidget *> widget
158
170
else if ( QLineEdit* w = qobject_cast<QLineEdit*>( widget ) )
159
171
{
160
172
connect ( w, SIGNAL ( textEdited ( QString ) ), this , slot );
173
+ connect ( w, SIGNAL ( textChanged ( QString ) ), this , slot );
161
174
}
162
- }
163
- }
164
-
165
- void QgsRendererV2PropertiesDialog::disconnectValueChanged ( QList<QWidget *> widgets, const char *slot )
166
- {
167
- Q_FOREACH ( QWidget* widget, widgets )
168
- {
169
- if ( QgsDataDefinedButton* w = qobject_cast<QgsDataDefinedButton*>( widget ) )
170
- {
171
- disconnect ( w, SIGNAL ( dataDefinedActivated ( bool ) ), this , slot );
172
- disconnect ( w, SIGNAL ( dataDefinedChanged ( QString ) ), this , slot );
173
- }
174
- else if ( QgsFieldExpressionWidget* w = qobject_cast<QgsFieldExpressionWidget*>( widget ) )
175
- {
176
- disconnect ( w, SIGNAL ( fieldChanged ( QString ) ), this , slot );
177
- }
178
- else if ( QComboBox* w = qobject_cast<QComboBox*>( widget ) )
179
- {
180
- disconnect ( w, SIGNAL ( currentIndexChanged ( int ) ), this , slot );
181
- }
182
- else if ( QSpinBox* w = qobject_cast<QSpinBox*>( widget ) )
183
- {
184
- disconnect ( w, SIGNAL ( valueChanged ( int ) ), this , slot );
185
- }
186
- else if ( QDoubleSpinBox* w = qobject_cast<QDoubleSpinBox*>( widget ) )
187
- {
188
- disconnect ( w , SIGNAL ( valueChanged ( double ) ), this , slot );
189
- }
190
- else if ( QgsColorButtonV2* w = qobject_cast<QgsColorButtonV2*>( widget ) )
191
- {
192
- disconnect ( w, SIGNAL ( colorChanged ( QColor ) ), this , slot );
193
- }
194
- else if ( QCheckBox* w = qobject_cast<QCheckBox*>( widget ) )
175
+ else if ( QgsEffectStackCompactWidget* w = qobject_cast<QgsEffectStackCompactWidget*>( widget ) )
195
176
{
196
- disconnect ( w, SIGNAL ( toggled ( bool ) ), this , slot );
197
- }
198
- else if ( QLineEdit* w = qobject_cast<QLineEdit*>( widget ) )
199
- {
200
- disconnect ( w, SIGNAL ( textEdited ( QString ) ), this , slot );
177
+ connect ( w, SIGNAL ( changed () ), this , slot );
201
178
}
202
179
}
203
-
204
180
}
205
181
206
182
QgsRendererV2PropertiesDialog::~QgsRendererV2PropertiesDialog ()
@@ -312,8 +288,6 @@ void QgsRendererV2PropertiesDialog::onOK()
312
288
313
289
void QgsRendererV2PropertiesDialog::syncToLayer ()
314
290
{
315
- QgsDebugMsg ( " SYNC TO LAYER!!" );
316
- disconnectValueChanged ( findChildren<QWidget*>(), SIGNAL ( widgetChanged () ) );
317
291
// Blend mode
318
292
mBlendModeComboBox ->setBlendMode ( mLayer ->blendMode () );
319
293
@@ -324,7 +298,6 @@ void QgsRendererV2PropertiesDialog::syncToLayer()
324
298
mLayerTransparencySlider ->setValue ( mLayer ->layerTransparency () );
325
299
mLayerTransparencySpnBx ->setValue ( mLayer ->layerTransparency () );
326
300
327
- QgsDebugMsg ( QString ( " VALUE: %1" ).arg ( mLayer ->layerTransparency () ) );
328
301
// paint effect widget
329
302
if ( mLayer ->rendererV2 () )
330
303
{
@@ -362,7 +335,6 @@ void QgsRendererV2PropertiesDialog::syncToLayer()
362
335
// no renderer found... this mustn't happen
363
336
Q_ASSERT ( rendererIdx != -1 && " there must be a renderer!" );
364
337
365
- connectValueChanged ( findChildren<QWidget*>(), SIGNAL ( widgetChanged () ) );
366
338
}
367
339
368
340
void QgsRendererV2PropertiesDialog::showOrderByDialog ()
0 commit comments