QgsMapLayerComboBox: allow setting filters within QtDesigner

qgis · May 12, 2014 · 105155b · 105155b
1 parent ebe1f2e
commit 105155b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/python/gui/qgsmaplayercombobox.sip b/python/gui/qgsmaplayercombobox.sip
@@ -16,25 +16,20 @@ class QgsMapLayerComboBox : QComboBox
      */
     explicit QgsMapLayerComboBox( QWidget *parent /TransferThis/ = 0 );
 
-    /**
-     * @brief setFilters allows fitering according to layer type and/or geometry type.
-     */
+    //! setFilters allows fitering according to layer type and/or geometry type.
     void setFilters( QgsMapLayerProxyModel::Filters filters );
 
-    /**
-     * @brief currentLayer returns the current layer selected in the combo box
-     */
+    //! currently used filter on list layers
+    QgsMapLayerProxyModel::Filters getFilters();
+
+    ///! currentLayer returns the current layer selected in the combo box
     QgsMapLayer* currentLayer();
 
   public slots:
-    /**
-     * @brief setLayer set the current layer selected in the combo
-     */
+    //! setLayer set the current layer selected in the combo
     void setLayer( QgsMapLayer* layer );
 
   signals:
-    /**
-     * @brief layerChanged this signal is emitted whenever the currently selected layer changes
-     */
+    //! layerChanged this signal is emitted whenever the currently selected layer changes
     void layerChanged( QgsMapLayer* layer );
 };
diff --git a/src/customwidgets/qgsmaplayercomboboxplugin.h b/src/customwidgets/qgsmaplayercomboboxplugin.h
@@ -43,4 +43,5 @@ class CUSTOMWIDGETS_EXPORT QgsMapLayerComboBoxPlugin : public QObject, public QD
     QString whatsThis() const;
     QString domXml() const;
 };
+
 #endif // QGSMAPLAYERCOMBOBOXPLUGIN_H
diff --git a/src/gui/qgsmaplayercombobox.h b/src/gui/qgsmaplayercombobox.h
@@ -30,33 +30,31 @@ class QgsVectorLayer;
 class GUI_EXPORT QgsMapLayerComboBox : public QComboBox
 {
     Q_OBJECT
+    Q_FLAGS( QgsMapLayerProxyModel::Filters )
+    Q_PROPERTY( QgsMapLayerProxyModel::Filters filters READ getFilters WRITE setFilters )
+
   public:
     /**
      * @brief QgsMapLayerComboBox creates a combo box to dislpay the list of layers (currently in the registry).
      * The layers can be filtered and/or ordered.
      */
     explicit QgsMapLayerComboBox( QWidget *parent = 0 );
 
-    /**
-     * @brief setFilters allows fitering according to layer type and/or geometry type.
-     */
+    //! setFilters allows fitering according to layer type and/or geometry type.
     void setFilters( QgsMapLayerProxyModel::Filters filters );
 
-    /**
-     * @brief currentLayer returns the current layer selected in the combo box
-     */
+    //! currently used filter on list layers
+    QgsMapLayerProxyModel::Filters getFilters() {return mProxyModel->filters();}
+
+    //! currentLayer returns the current layer selected in the combo box
     QgsMapLayer* currentLayer();
 
   public slots:
-    /**
-     * @brief setLayer set the current layer selected in the combo
-     */
+    //! setLayer set the current layer selected in the combo
     void setLayer( QgsMapLayer* layer );
 
   signals:
-    /**
-     * @brief layerChanged this signal is emitted whenever the currently selected layer changes
-     */
+    //! layerChanged this signal is emitted whenever the currently selected layer changes
     void layerChanged( QgsMapLayer* layer );
 
   protected slots:

diff --git a/src/gui/qgsmaplayerproxymodel.h b/src/gui/qgsmaplayerproxymodel.h
@@ -27,6 +27,7 @@ class QgsMapLayerModel;
 class GUI_EXPORT QgsMapLayerProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    Q_FLAGS( Filters )
   public:
     enum Filter
     {