fix #2978

jef · jef · commit fe9b70966889 · 2010-09-02T16:15:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14183 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp
@@ -156,7 +156,10 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
         mypLabel->setText( myFieldName + tr( " (txt)" ) );
       }
 
-      myWidget->setEnabled( vl->isEditable() );
+      if ( vl->editType( it.key() ) != QgsVectorLayer::Immutable )
+      {
+        myWidget->setEnabled( vl->isEditable() );
+      }
 
       mypInnerLayout->addWidget( myWidget, index, 1 );
       mpIndizes << it.key();
@@ -181,7 +184,10 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
 
       QgsAttributeEditor::createAttributeEditor( mDialog, myWidget, vl, it.key(), it.value() );
 
-      myWidget->setEnabled( vl->isEditable() );
+      if ( vl->editType( it.key() ) != QgsVectorLayer::Immutable )
+      {
+        myWidget->setEnabled( vl->isEditable() );
+      }
 
       mpIndizes << it.key();
       mpWidgets << myWidget;
diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
@@ -318,6 +318,7 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
     case QgsVectorLayer::LineEdit:
     case QgsVectorLayer::TextEdit:
     case QgsVectorLayer::UniqueValuesEditable:
+    case QgsVectorLayer::Immutable:
     {
       QLineEdit *le = NULL;
       QTextEdit *te = NULL;
@@ -381,6 +382,11 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
       {
         myWidget = pte;
       }
+
+      if ( myWidget )
+      {
+        myWidget->setDisabled( editType == QgsVectorLayer::Immutable );
+      }
     }
     break;
 
@@ -428,9 +434,6 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
       }
     }
     break;
-
-    case QgsVectorLayer::Immutable:
-      return NULL;
   }
 
   setValue( myWidget, vl, idx, value );

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ QWidget QgsAttributeEditor::createAttributeEditor( QWidget parent, QWidget *ed`
`318`	`318`	`case QgsVectorLayer::LineEdit:`
`319`	`319`	`case QgsVectorLayer::TextEdit:`
`320`	`320`	`case QgsVectorLayer::UniqueValuesEditable:`
	`321`	`+ case QgsVectorLayer::Immutable:`
`321`	`322`	`{`
`322`	`323`	`QLineEdit *le = NULL;`
`323`	`324`	`QTextEdit *te = NULL;`
`@@ -381,6 +382,11 @@ QWidget QgsAttributeEditor::createAttributeEditor( QWidget parent, QWidget *ed`
`381`	`382`	`{`
`382`	`383`	`myWidget = pte;`
`383`	`384`	`}`
	`385`	`+`
	`386`	`+ if ( myWidget )`
	`387`	`+ {`
	`388`	`+ myWidget->setDisabled( editType == QgsVectorLayer::Immutable );`
	`389`	`+ }`
`384`	`390`	`}`
`385`	`391`	`break;`
`386`	`392`
`@@ -428,9 +434,6 @@ QWidget QgsAttributeEditor::createAttributeEditor( QWidget parent, QWidget *ed`
`428`	`434`	`}`
`429`	`435`	`}`
`430`	`436`	`break;`
`431`		`-`
`432`		`- case QgsVectorLayer::Immutable:`
`433`		`- return NULL;`
`434`	`437`	`}`
`435`	`438`
`436`	`439`	`setValue( myWidget, vl, idx, value );`