Add = to operators box; Refector connecting of push button signals; F…

…ixes #4706
qgis · Dec 30, 2011 · 3c9d1a3 · 3c9d1a3
1 parent 494cde4
commit 3c9d1a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -41,15 +41,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
 
   expressionTree->setContextMenuPolicy( Qt::CustomContextMenu );
   connect( expressionTree, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );
-  connect( btnPlusPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnMinusPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnDividePushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnMultiplyPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnExpButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnConcatButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnOpenBracketPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
-  connect( btnCloseBracketPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
 
+  foreach (QPushButton* button, this->mOperatorsGroupBox->findChildren<QPushButton *>())
+  {
+      connect( button, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
+  }
 
   // TODO Can we move this stuff to QgsExpression, like the functions?
   registerItem( tr( "Operators" ), "+", " + " );

diff --git a/src/ui/qgsexpressionbuilder.ui b/src/ui/qgsexpressionbuilder.ui
@@ -283,6 +283,13 @@
       <property name="bottomMargin">
        <number>0</number>
       </property>
+      <item>
+       <widget class="QPushButton" name="btnEqualPushButton">
+        <property name="text">
+         <string>=</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QPushButton" name="btnPlusPushButton">
         <property name="sizePolicy">