[QGIS Commit] r9451 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-10-07 09:46:34 -0400 (Tue, 07 Oct 2008)
New Revision: 9451

Modified:
   trunk/qgis/src/app/qgsattributedialog.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
Log:
fix filename entry and range specification for vector attributes

Modified: trunk/qgis/src/app/qgsattributedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsattributedialog.cpp	2008-10-07 12:27:38 UTC (rev 9450)
+++ trunk/qgis/src/app/qgsattributedialog.cpp	2008-10-07 13:46:34 UTC (rev 9451)
@@ -370,7 +370,7 @@
       myFieldValue = QString::number( dsb->value() );
     }
 
-    le = mpWidgets.value( myIndex )->findChild<QLineEdit *>( "lineEdit" );
+    le = mpWidgets.value( myIndex )->findChild<QLineEdit *>();
     if ( le )
     {
       myFieldValue = le->text();

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2008-10-07 12:27:38 UTC (rev 9450)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2008-10-07 13:46:34 UTC (rev 9451)
@@ -501,13 +501,14 @@
   {
     int idx = tblAttributes->item( i, 0 )->text().toInt();
     const QgsField &field = layer->pendingFields()[idx];
-    QgsVectorLayer::EditType editType = layer->editType( idx );
 
     QComboBox *cb = dynamic_cast<QComboBox*>( tblAttributes->cellWidget( i, 6 ) );
     if ( !cb )
       continue;
-    layer->setEditType( idx, ( QgsVectorLayer::EditType ) cb->itemData( cb->currentIndex() ).toInt() );
 
+    QgsVectorLayer::EditType editType = ( QgsVectorLayer::EditType ) cb->itemData( cb->currentIndex() ).toInt();
+    layer->setEditType( idx, editType );
+
     if ( editType == QgsVectorLayer::ValueMap )
     {
       QMap<QString, QVariant> &map = layer->valueMap( idx );