[QGIS Commit] r14138 - in trunk/qgis/src: app ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-24 00:14:03 +0000 (Tue, 24 Aug 2010)
New Revision: 14138

Modified:
   trunk/qgis/src/app/qgsfieldcalculator.cpp
   trunk/qgis/src/app/qgsfieldcalculator.h
   trunk/qgis/src/ui/qgsfieldcalculatorbase.ui
Log:
add concat button to field calculator

Modified: trunk/qgis/src/app/qgsfieldcalculator.cpp
===================================================================
--- trunk/qgis/src/app/qgsfieldcalculator.cpp	2010-08-23 17:54:03 UTC (rev 14137)
+++ trunk/qgis/src/app/qgsfieldcalculator.cpp	2010-08-24 00:14:03 UTC (rev 14138)
@@ -397,6 +397,11 @@
   mExpressionTextEdit->insertPlainText( "$rownum" );
 }
 
+void QgsFieldCalculator::on_mConcatButton_clicked()
+{
+  mExpressionTextEdit->insertPlainText( "||" );
+}
+
 void QgsFieldCalculator::on_mSamplePushButton_clicked()
 {
   getFieldValues( 25 );

Modified: trunk/qgis/src/app/qgsfieldcalculator.h
===================================================================
--- trunk/qgis/src/app/qgsfieldcalculator.h	2010-08-23 17:54:03 UTC (rev 14137)
+++ trunk/qgis/src/app/qgsfieldcalculator.h	2010-08-24 00:14:03 UTC (rev 14138)
@@ -54,6 +54,7 @@
     void on_mLengthButton_clicked();
     void on_mAreaButton_clicked();
     void on_mRowNumButton_clicked();
+    void on_mConcatButton_clicked();
     void on_mSamplePushButton_clicked();
     void on_mAllPushButton_clicked();
     void on_mOutputFieldNameLineEdit_textChanged( const QString& text );

Modified: trunk/qgis/src/ui/qgsfieldcalculatorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsfieldcalculatorbase.ui	2010-08-23 17:54:03 UTC (rev 14137)
+++ trunk/qgis/src/ui/qgsfieldcalculatorbase.ui	2010-08-24 00:14:03 UTC (rev 14138)
@@ -276,6 +276,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="6">
+       <widget class="QPushButton" name="mConcatButton">
+        <property name="text">
+         <string>||</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>