Adding search widget capability

qgis · May 21, 2015 · 06b2b66 · 06b2b66
1 parent 1e3b820
commit 06b2b66
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 5 deletions.
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -42,6 +42,8 @@
 #include "qgsexpressionselectiondialog.h"
 #include "qgsfeaturelistmodel.h"
 #include "qgsrubberband.h"
+#include "qgsfield.h"
+#include "qgseditorwidgetregistry.h"
 
 class QgsAttributeTableDock : public QDockWidget
 {
@@ -64,6 +66,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
     , mDock( 0 )
     , mLayer( theLayer )
     , mRubberBand( 0 )
+    , mCurrentSearchWidget( 0 )
 {
   setupUi( this );
 
@@ -407,7 +410,24 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )
   mFilterButton->setDefaultAction( qobject_cast<QAction *>( filterAction ) );
   mFilterButton->setPopupMode( QToolButton::InstantPopup );
   mCbxCaseSensitive->setVisible( true );
-  mFilterQuery->setVisible( true );
+  // replace the search line edit with a search widget that is suited to the selected field
+  mFilterQuery->setVisible( false );
+  // delete previous widget
+  if ( mCurrentSearchWidget != 0 )
+  {
+    //mFilterContainer->removeWidget(mCurrentSearchWidget);  
+    delete mCurrentSearchWidget;
+  }
+  QString fieldName = mFilterButton->defaultAction()->text();
+  // get the search widget
+  int fldIdx = mLayer->fieldNameIndex( fieldName );
+    if ( fldIdx < 0 )
+      return;
+  const QString widgetType = mLayer->editorWidgetV2( fldIdx );
+  const QgsEditorWidgetConfig widgetConfig = mLayer->editorWidgetV2Config( fldIdx );
+  QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( widgetType, mLayer, fldIdx, widgetConfig, 0 , mFilterContainer);
+  mCurrentSearchWidget = eww->widget();
+
   mApplyFilterButton->setVisible( true );
 }
 
@@ -677,7 +697,6 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )
   else
   {
     QString fieldName = mFilterButton->defaultAction()->text();
-
     const QgsFields& flds = mLayer->pendingFields();
     int fldIndex = mLayer->fieldNameIndex( fieldName );
     if ( fldIndex < 0 )

diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h
@@ -207,7 +207,8 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
     QgsVectorLayer* mLayer;
     QgsFieldModel* mFieldModel;
 
-    QgsRubberBand *mRubberBand;
+    QgsRubberBand* mRubberBand;
+    QWidget* mCurrentSearchWidget;
 };
 
 #endif
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgseditorwidgetfactory.h"
+#include "qgsfilterlineedit.h"
 
 #include <QSettings>
 
@@ -26,6 +27,11 @@ QgsEditorWidgetFactory::~QgsEditorWidgetFactory()
 {
 }
 
+QgsEditorWidgetWrapper* QgsEditorWidgetFactory::createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ){
+
+    return create(vl, fieldIdx, 0, parent);
+}
+
 QString QgsEditorWidgetFactory::name()
 {
   return mName;

diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h
@@ -60,6 +60,12 @@ class GUI_EXPORT QgsEditorWidgetFactory
      */
     virtual QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const = 0;
 
+    /**
+     * Override this in your implementation, to get
+     * something different than a QLineEdit
+     */
+    QgsEditorWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent );
+
     /**
      * Return The human readable identifier name of this widget type
      *

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -541,7 +541,16 @@
       </widget>
      </item>
      <item>
-      <widget class="QgsFilterLineEdit" name="mFilterQuery"/>
+      <widget class="QWidget" name="mFilterContainer" native="true">
+       <layout class="QGridLayout" name="gridLayout_2">
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <item row="0" column="0">
+         <widget class="QgsFilterLineEdit" name="mFilterQuery"/>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
       <widget class="QWidget" name="mSpacer" native="true"/>
@@ -656,7 +665,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QgsFieldExpressionWidget" name="mUpdateExpressionText" native="true">
+       <widget class="QgsFieldExpressionWidget" name="mUpdateExpressionText">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>