add concat button to field calculator

git-svn-id: http://svn.osgeo.org/qgis/trunk@14138 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 24, 2010 · 4d0c9288a86032cafe458a9da127b90bfbe42e39 · 4d0c928
1 parent 81dd940
commit 4d0c9288a86032cafe458a9da127b90bfbe42e39
Showing with 13 additions and 0 deletions.

+5 −0 src/app/qgsfieldcalculator.cpp

+1 −0 src/app/qgsfieldcalculator.h

+7 −0 src/ui/qgsfieldcalculatorbase.ui
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -397,6 +397,11 @@ void QgsFieldCalculator::on_mRowNumButton_clicked()
   mExpressionTextEdit->insertPlainText( "$rownum" );
 }
 
+void QgsFieldCalculator::on_mConcatButton_clicked()
+{
+  mExpressionTextEdit->insertPlainText( "||" );
+}
+
 void QgsFieldCalculator::on_mSamplePushButton_clicked()
 {
   getFieldValues( 25 );

diff --git a/src/app/qgsfieldcalculator.h b/src/app/qgsfieldcalculator.h
@@ -54,6 +54,7 @@ class QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalculatorBase
     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 );

diff --git a/src/ui/qgsfieldcalculatorbase.ui b/src/ui/qgsfieldcalculatorbase.ui
@@ -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>