Merge pull request #7752 from 3nids/project_layers

Legend tree in 'Identify Layers'
qgis · Sep 3, 2018 · 3f85938 · 3f85938 · andreasneumann · Sep 3, 2018
2 parents 3c58d09 + 0ef33d8
commit 3f85938
Show file tree

Hide file tree

Showing 10 changed files with 620 additions and 241 deletions.
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -1496,6 +1496,18 @@ If you need only the count of committed features call this method on this layer'
 Make layer read-only (editing disabled) or not
 
 :return: false if the layer is in editing yet
+%End
+
+    bool searchable() const;
+%Docstring
+Returns true if the provider is in read-only mode
+%End
+
+    void setSearchable( bool searchable );
+%Docstring
+Make layer searchable or not
+
+.. versionadded:: 3.4
 %End
 
     bool changeGeometry( QgsFeatureId fid, QgsGeometry &geometry, bool skipDefaultValue = false );
@@ -2581,6 +2593,13 @@ Emitted when the read only state of this layer is changed.
 Only applies to manually set readonly state, not to the edit mode.
 
 .. versionadded:: 3.0
+%End
+
+    void searchableChanged();
+%Docstring
+Emitted when the search state of this layer is changed.
+
+.. versionadded:: 3.4
 %End
 
     void symbolFeatureCountMapChanged();

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -54,6 +54,7 @@ SET(QGIS_APP_SRCS
   qgslabelengineconfigdialog.cpp
   qgslabelinggui.cpp
   qgslabelingwidget.cpp
+  qgslayercapabilitiesmodel.cpp
   qgslayertreeviewembeddedindicator.cpp
   qgslayertreeviewfilterindicator.cpp
   qgslayertreeviewmemoryindicator.cpp
@@ -275,6 +276,7 @@ SET (QGIS_APP_MOC_HDRS
   qgslabelinggui.h
   qgslabelingwidget.h
   qgslabelpropertydialog.h
+  qgslayercapabilitiesmodel.h
   qgslayertreeviewembeddedindicator.h
   qgslayertreeviewmemoryindicator.h
   qgslayertreeviewfilterindicator.h