Added icons for save and load buttons; Open and Save buttons hiden for now

Author: NathanW2

src/gui/qgsexpressionbuilderwidget.cpp

@@ -25,8 +25,10 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
 {
   setupUi( this );
 
-  mValueListWidget->hide();
-  mValueListLabel->hide();
+  mValueGroupBox->hide();
+  // The open and save button are for future.
+  btnOpen->hide();
+  btnSave->hide();
 
   mModel = new QStandardItemModel( );
   mProxyModel = new QgsExpressionItemSearchProxy();
@@ -112,8 +114,7 @@ void QgsExpressionBuilderWidget::on_expressionTree_clicked( const QModelIndex &i
   else
   {
     // Show the help for the current item.
-    mValueListWidget->hide();
-    mValueListLabel->hide();
+    mValueGroupBox->hide();
     mValueListWidget->clear();
     txtHelpText->setText( item->getHelpText() );
     txtHelpText->setToolTip( txtHelpText->text() );
@@ -327,8 +328,7 @@ void QgsExpressionBuilderWidget::loadSampleValues()
   if ( !mLayer )
     return;
 
-  mValueListWidget->show();
-  mValueListLabel->show();
+  mValueGroupBox->show();
   int fieldIndex = mLayer->fieldNameIndex( item->text() );
   fillFieldValues( fieldIndex, 10 );
 }
@@ -342,8 +342,7 @@ void QgsExpressionBuilderWidget::loadAllValues()
   if ( !mLayer )
     return;
 
-  mValueListWidget->show();
-  mValueListLabel->show();
+  mValueGroupBox->show();
   int fieldIndex = mLayer->fieldNameIndex( item->text() );
   fillFieldValues( fieldIndex, -1 );
 }

src/ui/qgsexpressionbuilder.ui

@@ -167,8 +167,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>270</width>
-               <height>137</height>
+               <width>264</width>
+               <height>153</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_4">
@@ -214,7 +214,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
+        <widget class="QGroupBox" name="mValueGroupBox">
          <property name="title">
           <string>Field Values</string>
          </property>
@@ -432,7 +432,7 @@
      <property name="maximumSize">
       <size>
        <width>16777215</width>
-       <height>150</height>
+       <height>120</height>
       </size>
      </property>
      <property name="baseSize">
@@ -478,8 +478,8 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset>
-            <normaloff>../../images/themes/gis/mActionFileOpen.png</normaloff>../../images/themes/gis/mActionFileOpen.png</iconset>
+           <iconset resource="../../images/images.qrc">
+            <normaloff>:/images/themes/gis/mActionFileOpen.png</normaloff>:/images/themes/gis/mActionFileOpen.png</iconset>
           </property>
          </widget>
         </item>
@@ -489,8 +489,8 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset>
-            <normaloff>../../images/themes/gis/mActionFileSave.png</normaloff>../../images/themes/gis/mActionFileSave.png</iconset>
+           <iconset resource="../../images/images.qrc">
+            <normaloff>:/images/themes/default/mActionFileSave.png</normaloff>:/images/themes/default/mActionFileSave.png</iconset>
           </property>
          </widget>
         </item>
@@ -585,6 +585,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../images/images.qrc"/>
+ </resources>
  <connections/>
 </ui>