[QGIS Commit] r14878 - in trunk/qgis: . src/gui/symbology-ng src/ui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-12-09 10:28:56 -0800 (Thu, 09 Dec 2010)
New Revision: 14878

Modified:
   trunk/qgis/CONTRIBUTORS
   trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
   trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
   trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui
Log:
Added query builder to rule properties dialog (rule-based renderer). Patch from #3303 - contributed by Nathan Woodrow


Modified: trunk/qgis/CONTRIBUTORS
===================================================================
--- trunk/qgis/CONTRIBUTORS	2010-12-09 16:07:27 UTC (rev 14877)
+++ trunk/qgis/CONTRIBUTORS	2010-12-09 18:28:56 UTC (rev 14878)
@@ -39,6 +39,7 @@
 Matt Amos
 Maurizio Napolitano
 Milena Nowotarska
+Nathan Woodrow
 Nikos Alexandris
 Paul Ramsey
 Richard Duivenvoorde

Modified: trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp	2010-12-09 16:07:27 UTC (rev 14877)
+++ trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp	2010-12-09 18:28:56 UTC (rev 14878)
@@ -176,6 +176,7 @@
 #include "qgscategorizedsymbolrendererv2widget.h"
 #include "qgsgraduatedsymbolrendererv2.h"
 #include "qgsgraduatedsymbolrendererv2widget.h"
+#include "qgssearchquerybuilder.h"
 #include <QDialogButtonBox>
 #include <QInputDialog>
 
@@ -315,9 +316,19 @@
   l->addWidget( symbolSel );
   groupSymbol->setLayout( l );
 
+  connect( btnExpressionBuilder, SIGNAL( clicked() ), this, SLOT( buildExpreesion() ) );
   connect( btnTestFilter, SIGNAL( clicked() ), this, SLOT( testFilter() ) );
 }
 
+void QgsRendererRulePropsDialog::buildExpreesion()
+{
+  QgsSearchQueryBuilder dlg( mLayer, this );
+  dlg.setSearchString( editFilter->text() );
+
+  if ( dlg.exec() )
+    editFilter->setText( dlg.searchString() );
+}
+
 void QgsRendererRulePropsDialog::testFilter()
 {
   QgsSearchString filterParsed;

Modified: trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h	2010-12-09 16:07:27 UTC (rev 14877)
+++ trunk/qgis/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h	2010-12-09 18:28:56 UTC (rev 14878)
@@ -110,6 +110,7 @@
 
   public slots:
     void testFilter();
+    void buildExpreesion();
 
   protected:
     QgsRuleBasedRendererV2::Rule mRule;

Modified: trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui	2010-12-09 16:07:27 UTC (rev 14877)
+++ trunk/qgis/src/ui/qgsrendererrulepropsdialogbase.ui	2010-12-09 18:28:56 UTC (rev 14878)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>547</width>
-    <height>300</height>
+    <width>545</width>
+    <height>298</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,6 +16,9 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -27,6 +30,19 @@
       <widget class="QLineEdit" name="editFilter"/>
      </item>
      <item>
+      <widget class="QPushButton" name="btnExpressionBuilder">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="QPushButton" name="btnTestFilter">
        <property name="text">
         <string>Test</string>