Skip to content

Commit 7aff3e7

Browse files
nyalldawsonnyalldawson
committed
Flip panel connects to new style
1 parent ecc4925 commit 7aff3e7

20 files changed

+31
-31
lines changed

‎src/app/composer/qgscomposerarrowwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void QgsComposerArrowWidget::on_mLineStyleButton_clicked()
340340
d->setContext( symbolContext );
341341

342342
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateLineStyleFromWidget() ) );
343-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpLineStyleSelector( QgsPanelWidget * ) ) );
343+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsComposerArrowWidget::cleanUpLineStyleSelector );
344344
openPanel( d );
345345
mArrow->beginCommand( tr( "Arrow line style changed" ) );
346346
}

‎src/app/composer/qgscomposermapgridwidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@ void QgsComposerMapGridWidget::on_mGridLineStyleButton_clicked()
641641
symbolContext.setExpressionContext( &context );
642642
d->setContext( symbolContext );
643643

644-
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateGridLineStyleFromWidget() ) );
645-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpGridLineStyleSelector( QgsPanelWidget * ) ) );
644+
connect( d, &QgsPanelWidget::widgetChanged, this, &QgsComposerMapGridWidget::updateGridLineStyleFromWidget );
645+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsComposerMapGridWidget::cleanUpGridLineStyleSelector );
646646
openPanel( d );
647647
mComposerMap->beginCommand( tr( "Grid line style changed" ) );
648648
}

‎src/app/composer/qgscomposermapwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ void QgsComposerMapWidget::on_mOverviewFrameStyleButton_clicked()
16521652
d->setContext( symbolContext );
16531653

16541654
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateOverviewFrameStyleFromWidget() ) );
1655-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpOverviewFrameStyleSelector( QgsPanelWidget * ) ) );
1655+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsComposerMapWidget::cleanUpOverviewFrameStyleSelector );
16561656
openPanel( d );
16571657
mComposerMap->beginCommand( tr( "Overview frame style changed" ) );
16581658
}

‎src/app/composer/qgscomposerpolygonwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void QgsComposerPolygonWidget::on_mPolygonStyleButton_clicked()
6868
d->setContext( symbolContext );
6969

7070
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateStyleFromWidget() ) );
71-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpStyleSelector( QgsPanelWidget * ) ) );
71+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsComposerPolygonWidget::cleanUpStyleSelector );
7272
openPanel( d );
7373
mComposerPolygon->beginCommand( tr( "Polygon style changed" ) );
7474
}

‎src/app/composer/qgscomposerpolylinewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void QgsComposerPolylineWidget::on_mLineStyleButton_clicked()
6363
d->setContext( symbolContext );
6464

6565
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateStyleFromWidget() ) );
66-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpStyleSelector( QgsPanelWidget * ) ) );
66+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsComposerPolylineWidget::cleanUpStyleSelector );
6767
openPanel( d );
6868
mComposerPolyline->beginCommand( tr( "Polyline style changed" ) );
6969
}

‎src/app/composer/qgscomposershapewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void QgsComposerShapeWidget::on_mShapeStyleButton_clicked()
117117
d->setContext( symbolContext );
118118

119119
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolFromWidget() ) );
120-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget * ) ) );
120+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsComposerShapeWidget::cleanUpSymbolSelector );
121121
openPanel( d );
122122
mComposerShape->beginCommand( tr( "Shape style changed" ) );
123123
}

‎src/app/composer/qgscompositionwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ void QgsCompositionWidget::on_mPageStyleButton_clicked()
548548
d->setContext( symbolContext );
549549

550550
connect( d, SIGNAL( widgetChanged() ), this, SLOT( updateStyleFromWidget() ) );
551-
connect( d, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpStyleSelector( QgsPanelWidget * ) ) );
551+
connect( d, &QgsPanelWidget::panelAccepted, this, &QgsCompositionWidget::cleanUpStyleSelector );
552552
openPanel( d );
553553
}
554554

‎src/app/qgslabelingwidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ void QgsLabelingWidget::labelModeChanged( int index )
156156

157157
QgsRuleBasedLabelingWidget *ruleWidget = new QgsRuleBasedLabelingWidget( mLayer, mCanvas, this );
158158
ruleWidget->setDockMode( dockMode() );
159-
connect( ruleWidget, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
160-
connect( ruleWidget, SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) );
159+
connect( ruleWidget, &QgsPanelWidget::showPanel, this, &QgsPanelWidget::openPanel );
160+
connect( ruleWidget, &QgsRuleBasedLabelingWidget::widgetChanged, this, &QgsLabelingWidget::widgetChanged );
161161
mWidget = ruleWidget;
162162
mStackedWidget->addWidget( mWidget );
163163
mStackedWidget->setCurrentWidget( mWidget );

‎src/app/qgslayerstylingwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
356356
connect( styleWidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) );
357357
QgsPanelWidgetWrapper *wrapper = new QgsPanelWidgetWrapper( styleWidget, mStackedWidget );
358358
wrapper->setDockMode( true );
359-
connect( styleWidget, SIGNAL( showPanel( QgsPanelWidget * ) ), wrapper, SLOT( openPanel( QgsPanelWidget * ) ) );
359+
connect( styleWidget, &QgsRendererPropertiesDialog::showPanel, wrapper, &QgsPanelWidget::openPanel );
360360
mWidgetStack->setMainPanel( wrapper );
361361
break;
362362
}

‎src/app/qgsrulebasedlabelingwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void QgsRuleBasedLabelingWidget::editRule( const QModelIndex &index )
167167

168168
QgsLabelingRulePropsWidget *widget = new QgsLabelingRulePropsWidget( rule, mLayer, this, mCanvas );
169169
widget->setPanelTitle( tr( "Edit rule" ) );
170-
connect( widget, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( ruleWidgetPanelAccepted( QgsPanelWidget * ) ) );
170+
connect( widget, &QgsPanelWidget::panelAccepted, this, &QgsRuleBasedLabelingWidget::ruleWidgetPanelAccepted );
171171
connect( widget, SIGNAL( widgetChanged() ), this, SLOT( liveUpdateRuleFromPanel() ) );
172172
openPanel( widget );
173173
}

‎src/app/qgsvectorlayerproperties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ void QgsVectorLayerProperties::updateSymbologyPage()
12641264
mRendererDialog = new QgsRendererPropertiesDialog( mLayer, QgsStyle::defaultStyle(), true, this );
12651265
mRendererDialog->setDockMode( false );
12661266
mRendererDialog->setMapCanvas( QgisApp::instance()->mapCanvas() );
1267-
connect( mRendererDialog, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
1267+
connect( mRendererDialog, &QgsRendererPropertiesDialog::showPanel, this, &QgsVectorLayerProperties::openPanel );
12681268
connect( mRendererDialog, SIGNAL( layerVariablesChanged() ), this, SLOT( updateVariableEditor() ) );
12691269

12701270
// display the menu to choose the output format (fix #5136)

‎src/gui/effects/qgseffectstackpropertieswidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ void QgsEffectStackCompactWidget::showDialog()
467467
widget->setPreviewPicture( *mPreviewPicture );
468468
}
469469
connect( widget, SIGNAL( widgetChanged() ), this, SLOT( updateEffectLive() ) );
470-
connect( widget, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( updateAcceptWidget( QgsPanelWidget * ) ) );
470+
connect( widget, &QgsPanelWidget::panelAccepted, this, &QgsEffectStackCompactWidget::updateAcceptWidget );
471471
openPanel( widget );
472472
}
473473

‎src/gui/qgspanelwidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ void QgsPanelWidget::connectChildPanels( const QList<QgsPanelWidget *> &panels )
3838

3939
void QgsPanelWidget::connectChildPanel( QgsPanelWidget *panel )
4040
{
41-
connect( panel, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
42-
connect( panel, SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) );
41+
connect( panel, &QgsPanelWidget::showPanel, this, &QgsPanelWidget::openPanel );
42+
connect( panel, &QgsPanelWidget::widgetChanged, this, &QgsPanelWidget::widgetChanged );
4343
}
4444

4545
void QgsPanelWidget::setDockMode( bool dockMode )

‎src/gui/qgspanelwidgetstack.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ QgsPanelWidgetStack::QgsPanelWidgetStack( QWidget *parent )
2929
setupUi( this );
3030
clear();
3131

32-
connect( mBackButton, SIGNAL( pressed() ), this, SLOT( acceptCurrentPanel() ) );
32+
connect( mBackButton, &QAbstractButton::pressed, this, &QgsPanelWidgetStack::acceptCurrentPanel );
3333
}
3434

3535
void QgsPanelWidgetStack::setMainPanel( QgsPanelWidget *panel )
3636
{
3737
// TODO Don't allow adding another main widget or else that would be strange for the user.
38-
connect( panel, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( showPanel( QgsPanelWidget * ) ),
38+
connect( panel, &QgsPanelWidget::showPanel, this, &QgsPanelWidgetStack::showPanel,
3939
// using unique connection because addMainPanel() may be called multiple times
4040
// for a panel, so showPanel() slot could be invoked more times from one signal
4141
Qt::UniqueConnection );
@@ -118,8 +118,8 @@ void QgsPanelWidgetStack::showPanel( QgsPanelWidget *panel )
118118
{
119119
mTitles.push( panel->panelTitle() );
120120

121-
connect( panel, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( closePanel( QgsPanelWidget * ) ) );
122-
connect( panel, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( showPanel( QgsPanelWidget * ) ) );
121+
connect( panel, &QgsPanelWidget::panelAccepted, this, &QgsPanelWidgetStack::closePanel );
122+
connect( panel, &QgsPanelWidget::showPanel, this, &QgsPanelWidgetStack::showPanel );
123123

124124
int index = mStackedWidget->addWidget( panel );
125125
mStackedWidget->setCurrentIndex( index );

‎src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ void QgsCategorizedSymbolRendererWidget::changeCategorizedSymbol()
544544
dlg->setContext( mContext );
545545

546546
connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
547-
connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget * ) ) );
547+
connect( dlg, &QgsPanelWidget::panelAccepted, this, &QgsCategorizedSymbolRendererWidget::cleanUpSymbolSelector );
548548
openPanel( dlg );
549549
}
550550

@@ -587,7 +587,7 @@ void QgsCategorizedSymbolRendererWidget::changeCategorySymbol()
587587
QgsSymbolSelectorWidget *dlg = new QgsSymbolSelectorWidget( symbol, mStyle, mLayer, nullptr );
588588
dlg->setContext( mContext );
589589
connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
590-
connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget * ) ) );
590+
connect( dlg, &QgsPanelWidget::panelAccepted, this, &QgsCategorizedSymbolRendererWidget::cleanUpSymbolSelector );
591591
openPanel( dlg );
592592
}
593593

‎src/gui/symbology-ng/qgspointclusterrendererwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void QgsPointClusterRendererWidget::on_mCenterSymbolPushButton_clicked()
202202
dlg->setContext( context );
203203

204204
connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateCenterSymbolFromWidget() ) );
205-
connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget * ) ) );
205+
connect( dlg, &QgsPanelWidget::panelAccepted, this, &QgsPointClusterRendererWidget::cleanUpSymbolSelector );
206206
openPanel( dlg );
207207
}
208208

‎src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked()
376376
dlg->setContext( context );
377377

378378
connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateCenterSymbolFromWidget() ) );
379-
connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget * ) ) );
379+
connect( dlg, &QgsPanelWidget::panelAccepted, this, &QgsPointDisplacementRendererWidget::cleanUpSymbolSelector );
380380
openPanel( dlg );
381381
}
382382

‎src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ QgsRendererPropertiesDialog::QgsRendererPropertiesDialog( QgsVectorLayer *layer,
134134
<< mEffectWidget;
135135

136136
connectValueChanged( widgets, SIGNAL( widgetChanged() ) );
137-
connect( mEffectWidget, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
137+
connect( mEffectWidget, &QgsPanelWidget::showPanel, this, &QgsRendererPropertiesDialog::openPanel );
138138
}
139139

140140
void QgsRendererPropertiesDialog::connectValueChanged( const QList<QWidget *> &widgets, const char *slot )
@@ -260,7 +260,7 @@ void QgsRendererPropertiesDialog::rendererChanged()
260260
connect( mActiveWidget, SIGNAL( layerVariablesChanged() ), this, SIGNAL( layerVariablesChanged() ) );
261261
}
262262
connect( mActiveWidget, SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) );
263-
connect( mActiveWidget, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
263+
connect( mActiveWidget, &QgsPanelWidget::showPanel, this, &QgsRendererPropertiesDialog::openPanel );
264264
w->setDockMode( mDockMode );
265265
}
266266
else

‎src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void QgsRuleBasedRendererWidget::editRule( const QModelIndex &index )
183183

184184
QgsRendererRulePropsWidget *widget = new QgsRendererRulePropsWidget( rule, mLayer, mStyle, this, mContext );
185185
widget->setPanelTitle( tr( "Edit rule" ) );
186-
connect( widget, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( ruleWidgetPanelAccepted( QgsPanelWidget * ) ) );
186+
connect( widget, &QgsPanelWidget::panelAccepted, this, &QgsRuleBasedRendererWidget::ruleWidgetPanelAccepted );
187187
connect( widget, SIGNAL( widgetChanged() ), this, SLOT( liveUpdateRuleFromPanel() ) );
188188
openPanel( widget );
189189
}
@@ -260,7 +260,7 @@ void QgsRuleBasedRendererWidget::refineRuleCategoriesGui()
260260
{
261261
QgsCategorizedSymbolRendererWidget *w = new QgsCategorizedSymbolRendererWidget( mLayer, mStyle, nullptr );
262262
w->setPanelTitle( tr( "Add categories to rules" ) );
263-
connect( w, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( refineRuleCategoriesAccepted( QgsPanelWidget * ) ) );
263+
connect( w, &QgsPanelWidget::panelAccepted, this, &QgsRuleBasedRendererWidget::refineRuleCategoriesAccepted );
264264
w->setContext( mContext );
265265
openPanel( w );
266266
}
@@ -269,7 +269,7 @@ void QgsRuleBasedRendererWidget::refineRuleRangesGui()
269269
{
270270
QgsGraduatedSymbolRendererWidget *w = new QgsGraduatedSymbolRendererWidget( mLayer, mStyle, nullptr );
271271
w->setPanelTitle( tr( "Add ranges to rules" ) );
272-
connect( w, SIGNAL( panelAccepted( QgsPanelWidget * ) ), this, SLOT( refineRuleRangesAccepted( QgsPanelWidget * ) ) );
272+
connect( w, &QgsPanelWidget::panelAccepted, this, &QgsRuleBasedRendererWidget::refineRuleRangesAccepted );
273273
w->setContext( mContext );
274274
openPanel( w );
275275
}
@@ -642,7 +642,7 @@ QgsRendererRulePropsWidget::QgsRendererRulePropsWidget( QgsRuleBasedRenderer::Ru
642642
mSymbolSelector = new QgsSymbolSelectorWidget( mSymbol, style, mLayer, this );
643643
mSymbolSelector->setContext( mContext );
644644
connect( mSymbolSelector, SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) );
645-
connect( mSymbolSelector, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
645+
connect( mSymbolSelector, &QgsPanelWidget::showPanel, this, &QgsPanelWidget::openPanel );
646646

647647
QVBoxLayout *l = new QVBoxLayout;
648648
l->addWidget( mSymbolSelector );

‎src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer *la
5353
// setup ui
5454
mSelector = new QgsSymbolSelectorWidget( mSingleSymbol, mStyle, mLayer, nullptr );
5555
connect( mSelector, SIGNAL( symbolModified() ), this, SLOT( changeSingleSymbol() ) );
56-
connect( mSelector, SIGNAL( showPanel( QgsPanelWidget * ) ), this, SLOT( openPanel( QgsPanelWidget * ) ) );
56+
connect( mSelector, &QgsPanelWidget::showPanel, this, &QgsPanelWidget::openPanel );
5757

5858
QVBoxLayout *layout = new QVBoxLayout( this );
5959
layout->setContentsMargins( 0, 0, 0, 0 );

0 commit comments

Comments
 (0)