Skip to content
Permalink
Browse files

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

  • Loading branch information
mhugent committed Apr 1, 2013
2 parents 2b34ae5 + 9b0c455 commit 7c8006341e4c3bd2aa5e2c7730edce6d32067e75
Showing with 11 additions and 8 deletions.
  1. +1 −2 src/app/qgsfieldsproperties.cpp
  2. +10 −6 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -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();
@@ -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>

0 comments on commit 7c80063

Please sign in to comment.
You can’t perform that action at this time.