Support for readonly layer property

opengisch · Mar 29, 2016 · 107ab34 · 107ab34
1 parent 71a53c4
commit 107ab34
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 13 deletions.
diff --git a/src/feature.cpp b/src/feature.cpp
@@ -50,3 +50,8 @@ QString Feature::displayText() const
   else
     return mFeature.attribute( mLayer->displayField() ).toString();
 }
+
+bool Feature::readOnly() const
+{
+  return mLayer->readOnly();
+}
diff --git a/src/feature.h b/src/feature.h
@@ -15,14 +15,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSEXTENDEDFEATURE_H
-#define QGSEXTENDEDFEATURE_H
+#ifndef FEATURE_H
+#define FEATURE_H
 
 #include <qgsfeature.h>
 #include <qgsvectorlayer.h>
 
 class Feature
 {
+    Q_GADGET
+
   public:
     Feature( const QgsFeature& feature, QgsVectorLayer* layer );
     Feature();
@@ -74,12 +76,13 @@ class Feature
 
     QString displayText() const;
 
+    Q_INVOKABLE bool readOnly() const;
+
   private:
-    // TODO: Use implicity sharing for this
     QgsFeature mFeature;
     QgsVectorLayer* mLayer;
 };
 
 Q_DECLARE_METATYPE( Feature )
 
-#endif // QGSEXTENDEDFEATURE_H
+#endif // FEATURE_H
diff --git a/src/featurelistextentcontroller.cpp b/src/featurelistextentcontroller.cpp
@@ -37,7 +37,7 @@ void FeatureListExtentController::zoomToSelected() const
 {
   if ( mModel && mSelection && mMapSettings )
   {
-    Feature feat = mSelection->selectedFeature().value<Feature>();
+    Feature feat = mSelection->selectedFeature();
 
     QgsCoordinateTransform transf( feat.layer()->crs(), mMapSettings->crs()->crs() );
     QgsGeometry geom( *feat.qgsFeature().constGeometry() );

diff --git a/src/featurelistmodelselection.cpp b/src/featurelistmodelselection.cpp
@@ -62,11 +62,11 @@ void FeatureListModelSelection::setModel( FeatureListModel* model )
   }
 }
 
-const QVariant FeatureListModelSelection::selectedFeature() const
+const Feature FeatureListModelSelection::selectedFeature() const
 {
   if ( mSelection->selectedIndexes().count() )
   {
-    return mModel->data( mSelection->selectedIndexes().first(), FeatureListModel::FeatureRole );
+    return mModel->data( mSelection->selectedIndexes().first(), FeatureListModel::FeatureRole ).value<Feature>();
   }
-  return QVariant();
+  return Feature();
 }
diff --git a/src/featurelistmodelselection.h b/src/featurelistmodelselection.h
@@ -28,7 +28,7 @@ class FeatureListModelSelection : public QObject
     Q_OBJECT
     Q_PROPERTY( FeatureListModel* model READ model WRITE setModel NOTIFY modelChanged )
     Q_PROPERTY( int selection READ selection WRITE setSelection NOTIFY selectionChanged )
-    Q_PROPERTY( QVariant selectedFeature READ selectedFeature NOTIFY selectionChanged )
+    Q_PROPERTY( Feature selectedFeature READ selectedFeature NOTIFY selectionChanged )
 
   public:
     explicit FeatureListModelSelection( QObject *parent = 0 );
@@ -39,7 +39,7 @@ class FeatureListModelSelection : public QObject
     FeatureListModel* model() const;
     void setModel( FeatureListModel* model );
 
-    const QVariant selectedFeature() const;
+    const Feature selectedFeature() const;
 
   signals:
     void modelChanged();

diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -113,7 +113,6 @@ Rectangle {
             anchors { leftMargin: 5; right: parent.right; left: txtAttributeName.right }
             height: childrenRect.height
 
-            visible: EditorWidget !== "Hidden"
 
             /* attribute value */
             Loader {

diff --git a/src/qml/LayerSelector.qml b/src/qml/LayerSelector.qml
@@ -14,7 +14,7 @@ ComboBox {
   ModelHelper {
     id: modelHelper
     model: MapLayerModel {
-      filters: MapLayerModel.PointLayer
+      filters: MapLayerModel.PointLayer | MapLayerModel.WritableLayer
     }
   }
 

diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml
@@ -158,9 +158,11 @@ Rectangle {
   Button {
     id: editButton
 
+    property bool readOnly: false
+
     anchors.right: nextButton.left
 
-    width: ( parent.state == "Navigation" ? 48*dp : 0 )
+    width: ( parent.state == "Navigation" && !readOnly ? 48*dp : 0 )
     height: 48*dp
     clip: true
 
@@ -175,6 +177,15 @@ Rectangle {
         easing.type: Easing.InQuart
       }
     }
+
+    Connections {
+      target: selection
+
+      onSelectionChanged:
+      {
+        editButton.readOnly = selection.selectedFeature.readOnly()
+      }
+    }
   }
 
   Button {