limit shapefile fieldname to 10 in fieldcalculator and add attribute …

…dialog (fixes #8235)
qgis · Jul 9, 2013 · 7ccd3d0 · 7ccd3d0
1 parent 36bf49d
commit 7ccd3d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/app/qgsaddattrdialog.cpp b/src/app/qgsaddattrdialog.cpp
@@ -24,12 +24,12 @@
 
 QgsAddAttrDialog::QgsAddAttrDialog( QgsVectorLayer *vlayer, QWidget *parent, Qt::WFlags fl )
     : QDialog( parent, fl )
+    , mIsShapeFile( vlayer && vlayer->providerType() == "ogr" && vlayer->storageType() == "ESRI Shapefile" )
 {
   setupUi( this );
 
   //fill data types into the combo box
   const QList< QgsVectorDataProvider::NativeType > &typelist = vlayer->dataProvider()->nativeTypes();
-  mLayerType = vlayer->storageType();
 
   for ( int i = 0; i < typelist.size(); i++ )
   {
@@ -50,6 +50,9 @@ QgsAddAttrDialog::QgsAddAttrDialog( QgsVectorLayer *vlayer, QWidget *parent, Qt:
   }
 
   on_mTypeBox_currentIndexChanged( 0 );
+
+  if ( mIsShapeFile )
+    mNameEdit->setMaxLength( 10 );
 }
 
 void QgsAddAttrDialog::on_mTypeBox_currentIndexChanged( int idx )
@@ -86,7 +89,7 @@ void QgsAddAttrDialog::setPrecisionMinMax()
 
 void QgsAddAttrDialog::accept()
 {
-  if ( mLayerType == "ESRI Shapefile" && mNameEdit->text().toLower() == "shape" )
+  if ( mIsShapeFile && mNameEdit->text().toLower() == "shape" )
   {
     QMessageBox::warning( this, tr( "Warning" ),
                           tr( "Invalid field name. This field name is reserved and cannot be used." ) );

diff --git a/src/app/qgsaddattrdialog.h b/src/app/qgsaddattrdialog.h
@@ -41,7 +41,7 @@ class QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogBase
     void accept();
 
   private:
-    QString mLayerType;
+    bool mIsShapeFile;
 
     void setPrecisionMinMax();
 };

diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -47,6 +47,11 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
   mOutputFieldWidthSpinBox->setValue( 10 );
   mOutputFieldPrecisionSpinBox->setValue( 3 );
 
+  if ( vl->providerType() == "ogr" && vl->storageType() == "ESRI Shapefile" )
+  {
+    mOutputFieldNameLineEdit->setMaxLength( 10 );
+  }
+
   mUpdateExistingGroupBox->setEnabled( vl->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues );
   mNewFieldGroupBox->setEnabled( vl->dataProvider()->capabilities() & QgsVectorDataProvider::AddAttributes );