Skip to content

Commit ad5f970

Browse files
NathanW2NathanW2
committed
[styledock] Swap rendererv2 widget back to qwidget
1 parent 91cd68e commit ad5f970

12 files changed

+34
-50
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,7 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV
430430
mOldClassificationAttribute = attrName;
431431

432432
// setup user interface
433-
setupUi( mWidgetPage );
434-
QMetaObject::connectSlotsByName( this );
433+
setupUi( this );
435434

436435
mExpressionWidget->setLayer( mLayer );
437436

@@ -575,7 +574,7 @@ void QgsCategorizedSymbolRendererV2Widget::changeCategorizedSymbol()
575574
connect( dlg, SIGNAL( symbolModified() ), container, SLOT( emitWidgetChanged() ) );
576575
connect( container, SIGNAL( widgetChanged( QgsRendererWidgetContainer* ) ), this, SLOT( updateSymbolsFromWidget( QgsRendererWidgetContainer* ) ) );
577576
connect( container, SIGNAL( accepted( QgsRendererWidgetContainer* ) ), this, SLOT( cleanUpSymbolSelector( QgsRendererWidgetContainer* ) ) );
578-
emit panelOpened( container );
577+
emit showPanel( container );
579578
}
580579

581580
void QgsCategorizedSymbolRendererV2Widget::updateCategorizedSymbolIcon()
@@ -621,7 +620,7 @@ void QgsCategorizedSymbolRendererV2Widget::changeCategorySymbol()
621620
connect( dlg, SIGNAL( symbolModified() ), container, SLOT( emitWidgetChanged() ) );
622621
connect( container, SIGNAL( widgetChanged( QgsRendererWidgetContainer* ) ), this, SLOT( updateSymbolsFromWidget( QgsRendererWidgetContainer* ) ) );
623622
connect( container, SIGNAL( accepted( QgsRendererWidgetContainer* ) ), this, SLOT( cleanUpSymbolSelector( QgsRendererWidgetContainer* ) ) );
624-
emit panelOpened( container );
623+
emit showPanel( container );
625624
}
626625

627626
static void _createCategories( QgsCategoryList& cats, QList<QVariant>& values, QgsSymbolV2* symbol )
@@ -1005,7 +1004,6 @@ void QgsCategorizedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsRendererWid
10051004

10061005
void QgsCategorizedSymbolRendererV2Widget::updateSymbolsFromWidget( QgsRendererWidgetContainer* container )
10071006
{
1008-
QgsDebugMsg( "UPDATE SYMBOL!!!" );
10091007
QgsSymbolV2SelectorDialog* dlg = qobject_cast<QgsSymbolV2SelectorDialog*>( container->widget() );
10101008
delete mCategorizedSymbol;
10111009
mCategorizedSymbol = dlg->symbol()->clone();

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
433433
}
434434

435435
// setup user interface
436-
setupUi( mWidgetPage );
437-
QMetaObject::connectSlotsByName( this );
436+
setupUi( this );
438437

439438
mModel = new QgsGraduatedSymbolRendererV2Model( this );
440439

@@ -689,22 +688,17 @@ void QgsGraduatedSymbolRendererV2Widget::refreshRanges( bool reset )
689688
emit widgetChanged();
690689
}
691690

692-
void QgsGraduatedSymbolRendererV2Widget::cleanUpSymbolSelector()
691+
void QgsGraduatedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsRendererWidgetContainer *container )
693692
{
694-
QgsRendererWidgetContainer* container = qobject_cast<QgsRendererWidgetContainer*>( this->currentWidget() );
695693
if ( container )
696694
{
697-
this->removeWidget( container );
698695
QgsSymbolV2SelectorDialog* dlg = qobject_cast<QgsSymbolV2SelectorDialog*>( container->widget() );
699696
delete dlg->symbol();
700-
container->deleteLater();
701-
this->setCurrentIndex( 0 );
702697
}
703698
}
704699

705-
void QgsGraduatedSymbolRendererV2Widget::updateSymbolsFromWidget()
700+
void QgsGraduatedSymbolRendererV2Widget::updateSymbolsFromWidget( QgsRendererWidgetContainer *container )
706701
{
707-
QgsRendererWidgetContainer* container = qobject_cast<QgsRendererWidgetContainer*>( this->currentWidget() );
708702
QgsSymbolV2SelectorDialog* dlg = qobject_cast<QgsSymbolV2SelectorDialog*>( container->widget() );
709703
delete mGraduatedSymbol;
710704
mGraduatedSymbol = dlg->symbol()->clone();
@@ -838,9 +832,10 @@ void QgsGraduatedSymbolRendererV2Widget::changeGraduatedSymbol()
838832
dlg->setMapCanvas( mMapCanvas );
839833

840834
QgsRendererWidgetContainer* container = new QgsRendererWidgetContainer( dlg, "Select Symbol", nullptr );
841-
connect( dlg, SIGNAL( symbolModified() ), this, SLOT( updateSymbolsFromWidget() ) );
842-
connect( container, SIGNAL( accepted() ), this, SLOT( cleanUpSymbolSelector() ) );
843-
emit panelOpened( container );
835+
connect( dlg, SIGNAL( symbolModified() ), container, SLOT( emitWidgetChanged() ) );
836+
connect( container, SIGNAL( widgetChanged( QgsRendererWidgetContainer* ) ), this, SLOT( updateSymbolsFromWidget( QgsRendererWidgetContainer* ) ) );
837+
connect( container, SIGNAL( accepted( QgsRendererWidgetContainer* ) ), this, SLOT( cleanUpSymbolSelector( QgsRendererWidgetContainer* ) ) );
838+
emit showPanel( container );
844839
}
845840

846841
void QgsGraduatedSymbolRendererV2Widget::updateGraduatedSymbolIcon()
@@ -917,9 +912,10 @@ void QgsGraduatedSymbolRendererV2Widget::changeRangeSymbol( int rangeIdx )
917912
dlg->setMapCanvas( mMapCanvas );
918913

919914
QgsRendererWidgetContainer* container = new QgsRendererWidgetContainer( dlg, "Select Symbol", nullptr );
920-
connect( dlg, SIGNAL( symbolModified() ), this, SLOT( updateSymbolsFromWidget() ) );
921-
connect( container, SIGNAL( accepted() ), this, SLOT( cleanUpSymbolSelector() ) );
922-
emit panelOpened( container );
915+
connect( dlg, SIGNAL( symbolModified() ), container, SLOT( emitWidgetChanged() ) );
916+
connect( container, SIGNAL( widgetChanged( QgsRendererWidgetContainer* ) ), this, SLOT( updateSymbolsFromWidget( QgsRendererWidgetContainer* ) ) );
917+
connect( container, SIGNAL( accepted( QgsRendererWidgetContainer* ) ), this, SLOT( cleanUpSymbolSelector( QgsRendererWidgetContainer* ) ) );
918+
emit showPanel( container );
923919
}
924920

925921
void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx )

‎src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget
119119
void refreshRanges( bool reset = false );
120120

121121
private slots:
122-
123-
void cleanUpSymbolSelector();
124-
void updateSymbolsFromWidget();
122+
void cleanUpSymbolSelector( QgsRendererWidgetContainer* container );
123+
void updateSymbolsFromWidget( QgsRendererWidgetContainer *container );
125124

126125
protected:
127126
void updateUiFromRenderer( bool updateCount = true );

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,11 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt
7373
QLabel* label = new QLabel( tr( "The heatmap renderer only applies to point and multipoint layers. \n"
7474
"'%1' is not a point layer and cannot be rendered as a heatmap." )
7575
.arg( layer->name() ), this );
76-
mWidgetPage->layout()->addWidget( label );
76+
layout()->addWidget( label );
7777
return;
7878
}
7979

80-
setupUi( mWidgetPage );
81-
QMetaObject::connectSlotsByName( this );
80+
setupUi( this );
8281

8382
mRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
8483
mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this );

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay
4646
QLabel* label = new QLabel( tr( "The inverted polygon renderer only applies to polygon and multipolygon layers. \n"
4747
"'%1' is not a polygon layer and then cannot be displayed" )
4848
.arg( layer->name() ), this );
49-
mWidgetPage->setLayout( layout );
49+
this->setLayout( layout );
5050
layout->addWidget( label );
5151
return;
5252
}
53-
setupUi( mWidgetPage );
54-
QMetaObject::connectSlotsByName( this );
53+
setupUi( this );
5554

5655
// try to recognize the previous renderer
5756
// (null renderer means "no previous renderer")
@@ -130,12 +129,12 @@ void QgsInvertedPolygonRendererWidget::on_mRendererComboBox_currentIndexChanged(
130129
connect( mEmbeddedRendererWidget.data(), SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) );
131130
mEmbeddedRendererWidget->setMapCanvas( mMapCanvas );
132131

133-
if ( mWidgetPage->layout()->count() > 2 )
132+
if ( layout()->count() > 2 )
134133
{
135134
// remove the current renderer widget
136-
mWidgetPage->layout()->takeAt( 2 );
135+
layout()->takeAt( 2 );
137136
}
138-
mWidgetPage->layout()->addWidget( mEmbeddedRendererWidget.data() );
137+
layout()->addWidget( mEmbeddedRendererWidget.data() );
139138
}
140139
}
141140

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer* layer,
3737
mRenderer = new QgsNullSymbolRenderer();
3838
}
3939

40-
QGridLayout* layout = new QGridLayout( mWidgetPage );
40+
QGridLayout* layout = new QGridLayout( this );
4141
QLabel* label = new QLabel( tr( "No symbols will be rendered for features in this layer." ) );
4242
layout->addWidget( label );
4343
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
4848
setupBlankUi( layer->name() );
4949
return;
5050
}
51-
setupUi( mWidgetPage );
52-
QMetaObject::connectSlotsByName( this );
51+
setupUi( this );
5352

5453
mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
5554

@@ -384,8 +383,7 @@ void QgsPointDisplacementRendererWidget::updateCenterIcon()
384383
void QgsPointDisplacementRendererWidget::setupBlankUi( const QString& layerName )
385384
{
386385
QLabel* label = new QLabel( tr( "The point displacement renderer only applies to (single) point layers. \n'%1' is not a point layer and cannot be displayed by the point displacement renderer" ).arg( layerName ), this );
387-
QVBoxLayout* layout = new QVBoxLayout;
386+
QVBoxLayout* layout = new QVBoxLayout( this );
388387
layout->setContentsMargins( 0, 0, 0, 0 );
389-
mWidgetPage->setLayout( layout );
390-
mWidgetPage->layout()->addWidget( label );
388+
layout->addWidget( label );
391389
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ void QgsRendererV2PropertiesDialog::rendererChanged()
245245
connect( mActiveWidget, SIGNAL( layerVariablesChanged() ), this, SIGNAL( layerVariablesChanged() ) );
246246
}
247247
connect( mActiveWidget, SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) );
248-
connect( mActiveWidget, SIGNAL( panelOpened( QgsRendererWidgetContainer* ) ), this, SLOT( showPanel( QgsRendererWidgetContainer* ) ) );
248+
connect( mActiveWidget, SIGNAL( showPanel( QgsRendererWidgetContainer* ) ), this, SLOT( showPanel( QgsRendererWidgetContainer* ) ) );
249249
}
250250
else
251251
{

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@
2525
#include <QMenu>
2626

2727
QgsRendererV2Widget::QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style )
28-
: QStackedWidget()
28+
: QWidget()
2929
, mLayer( layer )
3030
, mStyle( style )
3131
, mMapCanvas( nullptr )
3232
{
33-
mWidgetPage = new QWidget();
34-
this->addWidget( mWidgetPage );
35-
3633
contextMenu = new QMenu( tr( "Renderer Options" ), this );
3734

3835
mCopyAction = contextMenu->addAction( tr( "Copy" ), this, SLOT( copy() ) );

‎src/gui/symbology-ng/qgsrendererv2widget.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class QgsRendererWidgetContainer;
3939
- on any change of renderer type, create some default (dummy?) version and change the stacked widget
4040
- when clicked ok/apply, get the renderer from active widget and clone it for the layer
4141
*/
42-
class GUI_EXPORT QgsRendererV2Widget : public QStackedWidget
42+
class GUI_EXPORT QgsRendererV2Widget : public QWidget
4343
{
4444
Q_OBJECT
4545
public:
@@ -97,10 +97,9 @@ class GUI_EXPORT QgsRendererV2Widget : public QStackedWidget
9797
* The renderer can open inline sub panels instead of dialogs.
9898
* @param opened True of the a sub panel is opened.
9999
*/
100-
void panelOpened( QgsRendererWidgetContainer* widget );
100+
void showPanel( QgsRendererWidgetContainer* widget );
101101

102102
protected:
103-
QWidget* mWidgetPage;
104103
QgsVectorLayer* mLayer;
105104
QgsStyleV2* mStyle;
106105
QMenu* contextMenu;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye
6363
mRenderer = new QgsRuleBasedRendererV2( symbol );
6464
}
6565

66-
setupUi( mWidgetPage );
67-
QMetaObject::connectSlotsByName( this );
66+
setupUi( this );
6867

6968
mModel = new QgsRuleBasedRendererV2Model( mRenderer );
7069
#ifdef ENABLE_MODELTEST

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ QgsSingleSymbolRendererV2Widget::QgsSingleSymbolRendererV2Widget( QgsVectorLayer
5454
mSelector = new QgsSymbolV2SelectorDialog( mSingleSymbol, mStyle, mLayer, nullptr, true );
5555
connect( mSelector, SIGNAL( symbolModified() ), this, SLOT( changeSingleSymbol() ) );
5656

57-
QVBoxLayout* layout = new QVBoxLayout( mWidgetPage );
57+
QVBoxLayout* layout = new QVBoxLayout( this );
5858
layout->setContentsMargins( 0, 0, 0, 0 );
59-
mWidgetPage->layout()->addWidget( mSelector );
59+
layout->addWidget( mSelector );
6060

6161
// advanced actions - data defined rendering
6262
QMenu* advMenu = mSelector->advancedMenu();

0 commit comments

Comments
 (0)