Merge branch 'master' of github.com:qgis/Quantum-GIS

Author: mhugent

src/app/qgsfieldsproperties.cpp

@@ -318,8 +318,7 @@ void QgsFieldsProperties::loadRows()
   mAttributesList->setHorizontalHeaderItem( attrWFSCol, new QTableWidgetItem( "WFS" ) );
   mAttributesList->setHorizontalHeaderItem( attrAliasCol, new QTableWidgetItem( tr( "Alias" ) ) );
 
-  mAttributesList->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
-  mAttributesList->horizontalHeader()->setResizeMode( 7, QHeaderView::Stretch );
+  mAttributesList->setSortingEnabled( true );
   mAttributesList->setSelectionBehavior( QAbstractItemView::SelectRows );
   mAttributesList->setSelectionMode( QAbstractItemView::ExtendedSelection );
   mAttributesList->verticalHeader()->hide();

src/ui/qgsvectorlayerpropertiesbase.ui

@@ -257,6 +257,9 @@
        <string>Fields</string>
       </attribute>
       <layout class="QGridLayout" name="mFieldsGridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QFrame" name="mFieldsFrame">
          <property name="frameShape">
@@ -297,8 +300,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>906</width>
-            <height>720</height>
+            <width>914</width>
+            <height>746</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -796,8 +799,8 @@ p, li { white-space: pre-wrap; }
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>866</width>
-            <height>688</height>
+            <width>896</width>
+            <height>728</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout">
@@ -908,8 +911,8 @@ p, li { white-space: pre-wrap; }
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>866</width>
-            <height>688</height>
+            <width>896</width>
+            <height>728</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_17">
@@ -1017,6 +1020,7 @@ p, li { white-space: pre-wrap; }
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>
+  <include location="../../images/images.qrc"/>
  </resources>
  <connections>
   <connection>