Fix combo name in fielc calc bar

NathanW2 · NathanW2 · commit d8f6fd0ff79a · 2014-05-23T09:18:47.000+10:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -157,6 +157,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mAttributeViewButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ) );
   mExpressionSelectButton->setIcon( QgsApplication::getThemeIcon( "/mIconExpressionSelect.svg" ) );
   mAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );
+  mOpenExpressionWidget->setIcon( QgsApplication::getThemeIcon( "/mIconExpression.svg" ) );
 
   // toggle editing
   bool canChangeAttributes = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues;
@@ -203,7 +204,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
 
   mFieldModel = new QgsFieldModel();
   mFieldModel->setLayer( mLayer );
-  mFieldComboButton->setModel( mFieldModel );
+  mFieldCombo->setModel( mFieldModel );
   connect( mOpenExpressionWidget, SIGNAL( clicked() ), this, SLOT( openExpressionBuilder() ) );
   connect( mRunFieldCalc, SIGNAL( clicked() ), this, SLOT( updateFieldFromExpression() ) );
   editingToggled();
@@ -294,7 +295,7 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
 
   mLayer->beginEditCommand( "Field calculator" );
 
-  QModelIndex modelindex = mFieldModel->indexFromName( mFieldComboButton->currentText() );
+  QModelIndex modelindex = mFieldModel->indexFromName( mFieldCombo->currentText() );
   int fieldindex = modelindex.data( QgsFieldModel::FieldIndexRole ).toInt();
 
   bool calculationSuccess = true;
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -551,7 +551,7 @@
        <number>1</number>
       </property>
       <item>
-       <widget class="QComboBox" name="mFieldComboButton"/>
+       <widget class="QComboBox" name="mFieldCombo"/>
       </item>
       <item>
        <widget class="QLabel" name="label">
