Restore some more atlas handling

qgis · Jan 5, 2018 · 6506bcd · 6506bcd
1 parent a5ab4e1
commit 6506bcd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/app/layout/qgslayoutpagepropertieswidget.cpp b/src/app/layout/qgslayoutpagepropertieswidget.cpp
@@ -76,6 +76,13 @@ QgsLayoutPagePropertiesWidget::QgsLayoutPagePropertiesWidget( QWidget *parent, Q
 
   mExcludePageDDBtn->registerEnabledWidget( mExcludePageCheckBox, false );
 
+  mSymbolButton->registerExpressionContextGenerator( mPage );
+  mSymbolButton->setLayer( coverageLayer() );
+  if ( mPage->layout() )
+  {
+    connect( &mPage->layout()->context(), &QgsLayoutContext::layerChanged, mSymbolButton, &QgsSymbolButton::setLayer );
+  }
+
   showCurrentPageSize();
 }
 

diff --git a/src/app/layout/qgslayoutpolygonwidget.cpp b/src/app/layout/qgslayoutpolygonwidget.cpp
@@ -46,9 +46,13 @@ QgsLayoutPolygonWidget::QgsLayoutPolygonWidget( QgsLayoutItemPolygon *polygon )
   }
 
   setGuiElementValues();
-#if 0 //TODO
-  mShapeStyleButton->setLayer( atlasCoverageLayer() );
-#endif
+
+  mPolygonStyleButton->registerExpressionContextGenerator( mPolygon );
+  mPolygonStyleButton->setLayer( coverageLayer() );
+  if ( mPolygon->layout() )
+  {
+    connect( &mPolygon->layout()->context(), &QgsLayoutContext::layerChanged, mPolygonStyleButton, &QgsSymbolButton::setLayer );
+  }
 }
 
 bool QgsLayoutPolygonWidget::setNewItem( QgsLayoutItem *item )

diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp
@@ -88,9 +88,12 @@ QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polylin
   }
   setGuiElementValues();
 
-#if 0 //TODO
-  mShapeStyleButton->setLayer( atlasCoverageLayer() );
-#endif
+  mLineStyleButton->registerExpressionContextGenerator( mPolyline );
+  mLineStyleButton->setLayer( coverageLayer() );
+  if ( mPolyline->layout() )
+  {
+    connect( &mPolyline->layout()->context(), &QgsLayoutContext::layerChanged, mLineStyleButton, &QgsSymbolButton::setLayer );
+  }
 }
 
 bool QgsLayoutPolylineWidget::setNewItem( QgsLayoutItem *item )