4706.patch

Nathan Woodrow, 2011-12-27 05:27 PM

Download (2.57 KB)

View differences:

src/gui/qgsexpressionbuilderwidget.cpp
41 41

  
42 42
  expressionTree->setContextMenuPolicy( Qt::CustomContextMenu );
43 43
  connect( expressionTree, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );
44
  connect( btnPlusPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
45
  connect( btnMinusPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
46
  connect( btnDividePushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
47
  connect( btnMultiplyPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
48
  connect( btnExpButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
49
  connect( btnConcatButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
50
  connect( btnOpenBracketPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
51
  connect( btnCloseBracketPushButton, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
52 44

  
45
  foreach (QPushButton* button, this->mOperatorsGroupBox->findChildren<QPushButton *>())
46
  {
47
      connect( button, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
48
  }
53 49

  
54 50
  // TODO Can we move this stuff to QgsExpression, like the functions?
55 51
  registerItem( tr( "Operators" ), "+", " + " );
src/ui/qgsexpressionbuilder.ui
284 284
       <number>0</number>
285 285
      </property>
286 286
      <item>
287
       <widget class="QPushButton" name="btnEqualPushButton">
288
        <property name="text">
289
         <string>=</string>
290
        </property>
291
       </widget>
292
      </item>
293
      <item>
287 294
       <widget class="QPushButton" name="btnPlusPushButton">
288 295
        <property name="sizePolicy">
289 296
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
290
-