fixup

Author: signedav

python/PyQt6/core/auto_additions/qgsattributetableconfig.py

@@ -4,12 +4,12 @@
 QgsAttributeTableConfig.ButtonList = QgsAttributeTableConfig.ActionWidgetStyle.ButtonList
 QgsAttributeTableConfig.DropDown = QgsAttributeTableConfig.ActionWidgetStyle.DropDown
 # monkey patching scoped based enum
-QgsAttributeTableConfig.AddFeatureMethod.None.__doc__ = "No mod e set yet in the current layer"
+QgsAttributeTableConfig.AddFeatureMethod.Unset.__doc__ = "No method set for current layer"
 QgsAttributeTableConfig.AddFeatureMethod.Form.__doc__ = "Opens a new Attributeform-Dialog"
 QgsAttributeTableConfig.AddFeatureMethod.Table.__doc__ = "Adds a new row (or a form embedded in the attribute table depending on the view)"
 QgsAttributeTableConfig.AddFeatureMethod.__doc__ = """The way how to add features in the attribute table
 
-* ``None``: No mod e set yet in the current layer
+* ``Unset``: No method set for current layer
 * ``Form``: Opens a new Attributeform-Dialog
 * ``Table``: Adds a new row (or a form embedded in the attribute table depending on the view)
 

python/PyQt6/core/auto_generated/qgsattributetableconfig.sip.in

@@ -50,7 +50,7 @@ The configuration is specific for one vector layer.
 
     enum class AddFeatureMethod /BaseType=IntEnum/
     {
-      None,
+      Unset,
       Form,
       Table
     };
@@ -148,8 +148,8 @@ Set the sort expression used for sorting.
 
     AddFeatureMethod addFeatureMethod() const;
 %Docstring
-Gets the addFeatureMethod that defines how features are added (single
-form or embedded in a table).
+Returns the method that defines how features are added (single form or
+embedded in a table).
 
 .. seealso:: :py:func:`setAddFeatureMethod`
 

src/app/qgsattributetabledialog.cpp

@@ -168,10 +168,10 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr
   mAddFeatureButton->addAction( mActionAddFeatureViaAttributeForm );
 
   //set the add feature method according to the layer settings or as fall back use the last one
-  QgsAttributeTableConfig::AddFeatureMethod method = QgsAttributeTableConfig::AddFeatureMethod::None;
+  QgsAttributeTableConfig::AddFeatureMethod method = QgsAttributeTableConfig::AddFeatureMethod::Unset;
   if ( mLayer )
     method = mLayer->attributeTableConfig().addFeatureMethod();
-  if ( method == QgsAttributeTableConfig::AddFeatureMethod::None )
+  if ( method == QgsAttributeTableConfig::AddFeatureMethod::Unset )
   {
     const QString lastMethod = settings.value( u"/qgis/attributeTableLastAddFeatureMethod"_s ).toString();
     method = ( lastMethod == "attributeForm"_L1 ) ? QgsAttributeTableConfig::AddFeatureMethod::Form : QgsAttributeTableConfig::AddFeatureMethod::Table;

src/core/qgsattributetableconfig.cpp

@@ -288,7 +288,8 @@ void QgsAttributeTableConfig::writeXml( QDomNode &node ) const
 
   configElement.setAttribute( u"sortOrder"_s, mSortOrder );
 
-  configElement.setAttribute( u"addFeatureMethod"_s, mAddFeatureMethod == AddFeatureMethod::Form ? "form" : "table" );
+  if ( mAddFeatureMethod != AddFeatureMethod::Unset )
+    configElement.setAttribute( u"addFeatureMethod"_s, mAddFeatureMethod == AddFeatureMethod::Form ? "form" : "table" );
 
   QDomElement columnsElement  = doc.createElement( u"columns"_s );
 

src/core/qgsattributetableconfig.h

@@ -82,9 +82,9 @@ class CORE_EXPORT QgsAttributeTableConfig
     */
     enum class AddFeatureMethod : int
     {
-      None, //!< No mod e set yet in the current layer
-      Form,      //!< Opens a new Attributeform-Dialog
-      Table   //!< Adds a new row (or a form embedded in the attribute table depending on the view)
+      Unset,   //!< No method set for current layer
+      Form,    //!< Opens a new Attributeform-Dialog
+      Table    //!< Adds a new row (or a form embedded in the attribute table depending on the view)
     };
 
     QgsAttributeTableConfig() = default;
@@ -178,7 +178,7 @@ class CORE_EXPORT QgsAttributeTableConfig
     void setSortExpression( const QString &sortExpression );
 
     /**
-     * Gets the addFeatureMethod that defines how features are added (single form or embedded in a table).
+     * Returns the method that defines how features are added (single form or embedded in a table).
      * \see setAddFeatureMethod()
      * \since QGIS 4.2
      */
@@ -342,7 +342,7 @@ class CORE_EXPORT QgsAttributeTableConfig
     ActionWidgetStyle mActionWidgetStyle = DropDown;
     QString mSortExpression;
     Qt::SortOrder mSortOrder = Qt::AscendingOrder;
-    AddFeatureMethod mAddFeatureMethod = AddFeatureMethod::None;
+    AddFeatureMethod mAddFeatureMethod = AddFeatureMethod::Unset;
 
 };