When a panel widget opens a new panel, the new panel should inherit

nyalldawson · nyalldawson · commit 01ec0e423c9d · 2016-09-14T11:05:23.000+10:00
the dock mode of the previous panel
diff --git a/src/gui/qgspanelwidget.cpp b/src/gui/qgspanelwidget.cpp
@@ -62,6 +62,9 @@ QgsPanelWidget*QgsPanelWidget::findParentPanel( QWidget* widget )
 
 void QgsPanelWidget::openPanel( QgsPanelWidget* panel )
 {
+  //panel dock mode inherits from this panel
+  panel->setDockMode( dockMode() );
+
   if ( mDockMode )
   {
     emit showPanel( panel );
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
@@ -549,7 +549,6 @@ void QgsCategorizedSymbolRendererWidget::changeCategorizedSymbol()
 {
   QgsSymbol* newSymbol = mCategorizedSymbol->clone();
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
 
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
@@ -594,7 +593,6 @@ void QgsCategorizedSymbolRendererWidget::changeCategorySymbol()
   }
 
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( symbol, mStyle, mLayer, nullptr );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
   connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget* ) ) );
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
@@ -907,7 +907,6 @@ void QgsGraduatedSymbolRendererWidget::changeRangeSymbol( int rangeIdx )
 {
   QgsSymbol* newSymbol = mRenderer->ranges()[rangeIdx].symbol()->clone();
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
 
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );
diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
@@ -215,7 +215,6 @@ void QgsPointDisplacementRendererWidget::on_mRendererSettingsButton_clicked()
     QgsRendererWidget* w = m->createRendererWidget( mLayer, mStyle, mRenderer->embeddedRenderer()->clone() );
     w->setMapCanvas( mMapCanvas );
     connect( w, SIGNAL( widgetChanged() ), this, SLOT( updateRendererFromWidget() ) );
-    w->setDockMode( this->dockMode() );
     openPanel( w );
   }
 }
@@ -351,7 +350,6 @@ void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked()
   }
   QgsMarkerSymbol* markerSymbol = mRenderer->centerSymbol()->clone();
   QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( markerSymbol, QgsStyle::defaultStyle(), mLayer, this );
-  dlg->setDockMode( this->dockMode() );
   dlg->setMapCanvas( mMapCanvas );
   connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateCenterSymbolFromWidget() ) );
   connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget* ) ) );
diff --git a/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp
@@ -260,7 +260,6 @@ void QgsRuleBasedRendererWidget::refineRuleCategoriesGui( const QModelIndexList&
   QgsCategorizedSymbolRendererWidget* w = new QgsCategorizedSymbolRendererWidget( mLayer, mStyle, nullptr );
   w->setPanelTitle( tr( "Add categories to rules" ) );
   connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleCategoriesAccepted( QgsPanelWidget* ) ) );
-  w->setDockMode( this->dockMode() );
   w->setMapCanvas( mMapCanvas );
   openPanel( w );
 }
@@ -271,7 +270,6 @@ void QgsRuleBasedRendererWidget::refineRuleRangesGui( const QModelIndexList& )
   w->setPanelTitle( tr( "Add ranges to rules" ) );
   connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleRangesAccepted( QgsPanelWidget* ) ) );
   w->setMapCanvas( mMapCanvas );
-  w->setDockMode( this->dockMode() );
   openPanel( w );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ QgsPanelWidgetQgsPanelWidget::findParentPanel( QWidget widget )`
`62`	`62`
`63`	`63`	`void QgsPanelWidget::openPanel( QgsPanelWidget* panel )`
`64`	`64`	`{`
	`65`	`+ //panel dock mode inherits from this panel`
	`66`	`+ panel->setDockMode( dockMode() );`
	`67`	`+`
`65`	`68`	`if ( mDockMode )`
`66`	`69`	`{`
`67`	`70`	`emit showPanel( panel );`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,6 @@ void QgsCategorizedSymbolRendererWidget::changeCategorizedSymbol()`
`549`	`549`	`{`
`550`	`550`	`QgsSymbol* newSymbol = mCategorizedSymbol->clone();`
`551`	`551`	`QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr );`
`552`		`- dlg->setDockMode( this->dockMode() );`
`553`	`552`	`dlg->setMapCanvas( mMapCanvas );`
`554`	`553`
`555`	`554`	`connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );`
`@@ -594,7 +593,6 @@ void QgsCategorizedSymbolRendererWidget::changeCategorySymbol()`
`594`	`593`	`}`
`595`	`594`
`596`	`595`	`QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( symbol, mStyle, mLayer, nullptr );`
`597`		`- dlg->setDockMode( this->dockMode() );`
`598`	`596`	`dlg->setMapCanvas( mMapCanvas );`
`599`	`597`	`connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );`
`600`	`598`	`connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget* ) ) );`
Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,6 @@ void QgsGraduatedSymbolRendererWidget::changeRangeSymbol( int rangeIdx )`
`907`	`907`	`{`
`908`	`908`	`QgsSymbol* newSymbol = mRenderer->ranges()[rangeIdx].symbol()->clone();`
`909`	`909`	`QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr );`
`910`		`- dlg->setDockMode( this->dockMode() );`
`911`	`910`	`dlg->setMapCanvas( mMapCanvas );`
`912`	`911`
`913`	`912`	`connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateSymbolsFromWidget() ) );`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,6 @@ void QgsPointDisplacementRendererWidget::on_mRendererSettingsButton_clicked()`
`215`	`215`	`QgsRendererWidget* w = m->createRendererWidget( mLayer, mStyle, mRenderer->embeddedRenderer()->clone() );`
`216`	`216`	`w->setMapCanvas( mMapCanvas );`
`217`	`217`	`connect( w, SIGNAL( widgetChanged() ), this, SLOT( updateRendererFromWidget() ) );`
`218`		`- w->setDockMode( this->dockMode() );`
`219`	`218`	`openPanel( w );`
`220`	`219`	`}`
`221`	`220`	`}`
`@@ -351,7 +350,6 @@ void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked()`
`351`	`350`	`}`
`352`	`351`	`QgsMarkerSymbol* markerSymbol = mRenderer->centerSymbol()->clone();`
`353`	`352`	`QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( markerSymbol, QgsStyle::defaultStyle(), mLayer, this );`
`354`		`- dlg->setDockMode( this->dockMode() );`
`355`	`353`	`dlg->setMapCanvas( mMapCanvas );`
`356`	`354`	`connect( dlg, SIGNAL( widgetChanged() ), this, SLOT( updateCenterSymbolFromWidget() ) );`
`357`	`355`	`connect( dlg, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( cleanUpSymbolSelector( QgsPanelWidget* ) ) );`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,6 @@ void QgsRuleBasedRendererWidget::refineRuleCategoriesGui( const QModelIndexList&`
`260`	`260`	`QgsCategorizedSymbolRendererWidget* w = new QgsCategorizedSymbolRendererWidget( mLayer, mStyle, nullptr );`
`261`	`261`	`w->setPanelTitle( tr( "Add categories to rules" ) );`
`262`	`262`	`connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleCategoriesAccepted( QgsPanelWidget* ) ) );`
`263`		`- w->setDockMode( this->dockMode() );`
`264`	`263`	`w->setMapCanvas( mMapCanvas );`
`265`	`264`	`openPanel( w );`
`266`	`265`	`}`
`@@ -271,7 +270,6 @@ void QgsRuleBasedRendererWidget::refineRuleRangesGui( const QModelIndexList& )`
`271`	`270`	`w->setPanelTitle( tr( "Add ranges to rules" ) );`
`272`	`271`	`connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleRangesAccepted( QgsPanelWidget* ) ) );`
`273`	`272`	`w->setMapCanvas( mMapCanvas );`
`274`		`- w->setDockMode( this->dockMode() );`
`275`	`273`	`openPanel( w );`
`276`	`274`	`}`
`277`	`275`