Editorwidgets: Save "label on top" and "editable" settings to project

m-kuhn · m-kuhn · commit 39e5c85202f3 · 2014-06-23T10:31:10.000+02:00
Fix #10667
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -155,6 +155,8 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle
         cfg = mWidgetFactories[ewv2Type]->readEditorConfig( ewv2CfgElem, vectorLayer, idx );
       }
 
+      vectorLayer->setFieldEditable( idx, ewv2CfgElem.attribute( "fieldEditable" ) == "1" );
+      vectorLayer->setLabelOnTop( idx, ewv2CfgElem.attribute( "labelOnTop" ) == "1" );
       vectorLayer->setEditorWidgetV2Config( idx, cfg );
     }
     else
@@ -213,6 +215,8 @@ void QgsEditorWidgetRegistry::writeMapLayer( QgsMapLayer* mapLayer, QDomElement&
       if ( mWidgetFactories.contains( widgetType ) )
       {
         QDomElement ewv2CfgElem = doc.createElement( "widgetv2config" );
+        ewv2CfgElem.setAttribute( "fieldEditable", vectorLayer->fieldEditable( idx ) );
+        ewv2CfgElem.setAttribute( "labelOnTop", vectorLayer->labelOnTop( idx ) );
 
         mWidgetFactories[widgetType]->writeConfig( vectorLayer->editorWidgetV2Config( idx ), ewv2CfgElem, doc, vectorLayer, idx );
 

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle`
`155`	`155`	`cfg = mWidgetFactories[ewv2Type]->readEditorConfig( ewv2CfgElem, vectorLayer, idx );`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ vectorLayer->setFieldEditable( idx, ewv2CfgElem.attribute( "fieldEditable" ) == "1" );`
	`159`	`+ vectorLayer->setLabelOnTop( idx, ewv2CfgElem.attribute( "labelOnTop" ) == "1" );`
`158`	`160`	`vectorLayer->setEditorWidgetV2Config( idx, cfg );`
`159`	`161`	`}`
`160`	`162`	`else`
`@@ -213,6 +215,8 @@ void QgsEditorWidgetRegistry::writeMapLayer( QgsMapLayer* mapLayer, QDomElement&`
`213`	`215`	`if ( mWidgetFactories.contains( widgetType ) )`
`214`	`216`	`{`
`215`	`217`	`QDomElement ewv2CfgElem = doc.createElement( "widgetv2config" );`
	`218`	`+ ewv2CfgElem.setAttribute( "fieldEditable", vectorLayer->fieldEditable( idx ) );`
	`219`	`+ ewv2CfgElem.setAttribute( "labelOnTop", vectorLayer->labelOnTop( idx ) );`
`216`	`220`
`217`	`221`	`mWidgetFactories[widgetType]->writeConfig( vectorLayer->editorWidgetV2Config( idx ), ewv2CfgElem, doc, vectorLayer, idx );`
`218`	`222`