Simplify whitespaces in saved expression labels

qgis · Aug 12, 2021 · 5f7a067 · 5f7a067
1 parent 8eca166
commit 5f7a067
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/python/gui/auto_generated/qgsexpressionstoredialog.sip.in b/python/gui/auto_generated/qgsexpressionstoredialog.sip.in
@@ -47,6 +47,11 @@ Returns the label text
     QString helpText() const;
 %Docstring
 Returns the help text
+%End
+
+    bool isLabelModified();
+%Docstring
+Returns whether the label text was modified
 %End
 
 };

diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -912,7 +912,7 @@ void QgsExpressionBuilderWidget::storeCurrentUserExpression()
   QgsExpressionStoreDialog dlg { expression, expression, QString( ), mExpressionTreeView->userExpressionLabels() };
   if ( dlg.exec() == QDialog::DialogCode::Accepted )
   {
-    mExpressionTreeView->saveToUserExpressions( dlg.label(), dlg.expression(), dlg.helpText() );
+    mExpressionTreeView->saveToUserExpressions( dlg.label().simplified(), dlg.expression(), dlg.helpText() );
   }
 }
 
@@ -931,17 +931,17 @@ void QgsExpressionBuilderWidget::editSelectedUserExpression()
 
   QgsSettings settings;
   QString helpText = settings.value( QStringLiteral( "user/%1/helpText" ).arg( item->text() ), "", QgsSettings::Section::Expressions ).toString();
-  QgsExpressionStoreDialog dlg { item->text(), item->getExpressionText(), helpText };
+  QgsExpressionStoreDialog dlg { item->text(), item->getExpressionText(), helpText, mExpressionTreeView->userExpressionLabels() };
 
   if ( dlg.exec() == QDialog::DialogCode::Accepted )
   {
     // label has changed removed the old one before adding the new one
-    if ( dlg.label() != item->text() )
+    if ( dlg.isLabelModified() )
     {
       mExpressionTreeView->removeFromUserExpressions( item->text() );
     }
 
-    mExpressionTreeView->saveToUserExpressions( dlg.label(), dlg.expression(), dlg.helpText() );
+    mExpressionTreeView->saveToUserExpressions( dlg.label().simplified(), dlg.expression(), dlg.helpText() );
   }
 }
 

diff --git a/src/gui/qgsexpressionstoredialog.cpp b/src/gui/qgsexpressionstoredialog.cpp
@@ -20,6 +20,7 @@
 QgsExpressionStoreDialog::QgsExpressionStoreDialog( const QString &label, const QString &expression, const QString &helpText, const QStringList &existingLabels, QWidget *parent )
   : QDialog( parent )
   , mExistingLabels( existingLabels )
+  , mOriginalLabel( label )
 {
   setupUi( this );
   mExpression->setText( expression );
@@ -33,7 +34,8 @@ QgsExpressionStoreDialog::QgsExpressionStoreDialog( const QString &label, const
   connect( mLabel, &QLineEdit::textChanged, this, [ = ]( const QString & text )
   {
     QString errorMessage;
-    if ( mExistingLabels.contains( text ) )
+    if ( mOriginalLabel.simplified() != text.simplified() &&
+         mExistingLabels.contains( text.simplified() ) )
     {
       errorMessage = tr( "A stored expression with this name already exists" );
     }
@@ -56,7 +58,7 @@ QgsExpressionStoreDialog::QgsExpressionStoreDialog( const QString &label, const
   // No slashes in labels!
   QString labelFixed { label };
   labelFixed.remove( '/' ).remove( '\\' );
-  mLabel->setText( labelFixed );
+  mLabel->setText( labelFixed.simplified() );
 }
 
 QString QgsExpressionStoreDialog::helpText() const

diff --git a/src/gui/qgsexpressionstoredialog.h b/src/gui/qgsexpressionstoredialog.h
@@ -57,9 +57,15 @@ class GUI_EXPORT QgsExpressionStoreDialog : public QDialog, private Ui::QgsExpre
      */
     QString helpText() const;
 
+    /**
+     * Returns whether the label text was modified
+     */
+    bool isLabelModified() { return mLabel->text() != mOriginalLabel; }
+
   private:
 
     QStringList mExistingLabels;
+    QString mOriginalLabel;
 
 };