From b5af453b8e48e6aee688c75e38848dd393a7cdab Mon Sep 17 00:00:00 2001 From: signedav Date: Tue, 18 Aug 2020 16:45:06 +0200 Subject: [PATCH] improved texts for warning message and docs --- python/core/auto_generated/qgsattributeeditorelement.sip.in | 6 +++--- .../editorwidgets/qgsrelationwidgetwrapper.sip.in | 6 +++--- python/gui/auto_generated/qgsrelationeditorwidget.sip.in | 6 +++--- src/core/qgsattributeeditorelement.h | 6 +++--- src/gui/editorwidgets/qgsrelationwidgetwrapper.h | 6 +++--- src/gui/qgsrelationeditorwidget.h | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/python/core/auto_generated/qgsattributeeditorelement.sip.in b/python/core/auto_generated/qgsattributeeditorelement.sip.in index 3dd4cebe633..6a167d19cc3 100644 --- a/python/core/auto_generated/qgsattributeeditorelement.sip.in +++ b/python/core/auto_generated/qgsattributeeditorelement.sip.in @@ -443,15 +443,15 @@ opening of the attribute form dialog when digitizing is completed. QVariant nmRelationId() const; %Docstring -Determines the nmRelationId used for the many-to-many cardinality. +Determines the relation id of the second relation involved in an N:M relation. .. versionadded:: 3.16 %End void setNmRelationId( const QVariant &nmRelationId = QVariant() ); %Docstring -Sets ``nmRelationId`` in a many-to-many cardinality. -If it's empty, then it's considered as a one-to-many relationship. +Sets ``nmRelationId`` for the relation id of the second relation involved in an N:M relation. +If it's empty, then it's considered as a 1:M relationship. .. versionadded:: 3.16 %End diff --git a/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in index f27c41bd1c1..1eba6a9e999 100644 --- a/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in @@ -132,15 +132,15 @@ opening of the attribute form dialog when digitizing is completed. QVariant nmRelationId() const; %Docstring -Determines the nmRelationId used for the many-to-many cardinality. +Determines the relation id of the second relation involved in an N:M relation. .. versionadded:: 3.16 %End void setNmRelationId( const QVariant &nmRelationId = QVariant() ); %Docstring -Sets ``nmRelationId`` in a many-to-many cardinality. -If it's empty, then it's considered as a one-to-many relationship +Sets ``nmRelationId`` for the relation id of the second relation involved in an N:M relation. +If it's empty, then it's considered as a 1:M relationship. .. versionadded:: 3.16 %End diff --git a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in index dee01fae815..f2ecde75739 100644 --- a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in +++ b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in @@ -200,15 +200,15 @@ configured for this widget QVariant nmRelationId() const; %Docstring -Determines the nmRelationId used for the many-to-many cardinality. +Determines the relation id of the second relation involved in an N:M relation. .. versionadded:: 3.16 %End void setNmRelationId( const QVariant &nmRelationId = QVariant() ); %Docstring -Sets ``nmRelationId`` in a many-to-many cardinality. -If it's empty, then it's considered as a one-to-many relationship +Sets ``nmRelationId`` for the relation id of the second relation involved in an N:M relation. +If it's empty, then it's considered as a 1:M relationship. .. versionadded:: 3.16 %End diff --git a/src/core/qgsattributeeditorelement.h b/src/core/qgsattributeeditorelement.h index ede5cc9cb7b..f216f36667c 100644 --- a/src/core/qgsattributeeditorelement.h +++ b/src/core/qgsattributeeditorelement.h @@ -482,14 +482,14 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement void setForceSuppressFormPopup( bool forceSuppressFormPopup ); /** - * Determines the nmRelationId used for the many-to-many cardinality. + * Determines the relation id of the second relation involved in an N:M relation. * \since QGIS 3.16 */ QVariant nmRelationId() const; /** - * Sets \a nmRelationId in a many-to-many cardinality. - * If it's empty, then it's considered as a one-to-many relationship. + * Sets \a nmRelationId for the relation id of the second relation involved in an N:M relation. + * If it's empty, then it's considered as a 1:M relationship. * \since QGIS 3.16 */ void setNmRelationId( const QVariant &nmRelationId = QVariant() ); diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.h b/src/gui/editorwidgets/qgsrelationwidgetwrapper.h index 63a9fe4d2f5..1bb8d308f8c 100644 --- a/src/gui/editorwidgets/qgsrelationwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsrelationwidgetwrapper.h @@ -122,14 +122,14 @@ class GUI_EXPORT QgsRelationWidgetWrapper : public QgsWidgetWrapper void setForceSuppressFormPopup( bool forceSuppressFormPopup ); /** - * Determines the nmRelationId used for the many-to-many cardinality. + * Determines the relation id of the second relation involved in an N:M relation. * \since QGIS 3.16 */ QVariant nmRelationId() const; /** - * Sets \a nmRelationId in a many-to-many cardinality. - * If it's empty, then it's considered as a one-to-many relationship + * Sets \a nmRelationId for the relation id of the second relation involved in an N:M relation. + * If it's empty, then it's considered as a 1:M relationship. * \since QGIS 3.16 */ void setNmRelationId( const QVariant &nmRelationId = QVariant() ); diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h index d913db51d94..f918bacb63f 100644 --- a/src/gui/qgsrelationeditorwidget.h +++ b/src/gui/qgsrelationeditorwidget.h @@ -235,14 +235,14 @@ class GUI_EXPORT QgsRelationEditorWidget : public QgsCollapsibleGroupBox void setForceSuppressFormPopup( bool forceSuppressFormPopup ); /** - * Determines the nmRelationId used for the many-to-many cardinality. + * Determines the relation id of the second relation involved in an N:M relation. * \since QGIS 3.16 */ QVariant nmRelationId() const; /** - * Sets \a nmRelationId in a many-to-many cardinality. - * If it's empty, then it's considered as a one-to-many relationship + * Sets \a nmRelationId for the relation id of the second relation involved in an N:M relation. + * If it's empty, then it's considered as a 1:M relationship. * \since QGIS 3.16 */ void setNmRelationId( const QVariant &nmRelationId = QVariant() );