sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ui conflict and Fixed UI options

Browse Source
This commit is contained in:
elpaso 2014-08-11 17:02:57 +02:00 committed by Marco Hugentobler
parent 324826e6d3
commit 6148bba073
9 changed files with 381 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/qgsprojectproperties.cpp
View File

@ -272,6 +272,13 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
mWMSAccessConstraints->setText( QgsProject::instance()->readEntry( "WMSAccessConstraints", "/", "" ) );
mWMSKeywordList->setText( QgsProject::instance()->readListEntry( "WMSKeywordList", "/" ).join( "," ) );
// WMS GetFeatureInfo precision
int WMSprecision = QgsProject::instance()->readNumEntry( "WMSPrecision", "/", -1 );
if ( WMSprecision != -1 )
{
mWMSPrecisionSpinBox->setValue( WMSprecision );
}
bool ok;
QStringList values;
@ -743,6 +750,9 @@ void QgsProjectProperties::apply()
QgsProject::instance()->removeEntry( "WMSKeywordList", "/" );
}
// WMS GetFeatureInfo geometry precision (decimal places)
QgsProject::instance()->writeEntry( "WMSPrecision", "/", mWMSPrecisionSpinBox->text());
if ( grpWMSExt->isChecked() )
{
QgsProject::instance()->writeEntry( "WMSExtent", "/",

9
src/mapserver/qgssldconfigparser.cpp
View File

@ -678,6 +678,15 @@ double QgsSLDConfigParser::imageQuality() const
return -1;
}
int QgsSLDConfigParser::WMSPrecision() const
{
if ( mFallbackParser )
{
return mFallbackParser->WMSPrecision();
}
return -1;
}
QgsComposition* QgsSLDConfigParser::createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const
{
if ( mFallbackParser )

1
src/mapserver/qgssldconfigparser.h
View File

@ -99,6 +99,7 @@ class QgsSLDConfigParser : public QgsWMSConfigParser
double maxWidth() const;
double maxHeight() const;
double imageQuality() const;
int WMSPrecision() const;
//printing

3
src/mapserver/qgswmsconfigparser.h
View File

@ -98,6 +98,9 @@ class QgsWMSConfigParser
virtual double maxHeight() const = 0;
virtual double imageQuality() const = 0;
// WMS GetFeatureInfo precision (decimal places)
virtual int WMSPrecision() const = 0;
//printing
/**Creates a print composition, usually for a GetPrint request. Replaces map and label parameters*/

15
src/mapserver/qgswmsprojectparser.cpp
View File

@ -353,6 +353,21 @@ double QgsWMSProjectParser::imageQuality() const
return imageQuality;
}
int QgsWMSProjectParser::WMSPrecision() const
{
int WMSPrecision = -1;
QDomElement propertiesElem = mProjectParser.propertiesElem();
if ( !propertiesElem.isNull() )
{
QDomElement WMSPrecisionElem = propertiesElem.firstChildElement( "WMSPrecision" );
if ( !WMSPrecisionElem.isNull() )
{
WMSPrecision = WMSPrecisionElem.text().toInt();
}
}
return WMSPrecision;
}
QgsComposition* QgsWMSProjectParser::initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap*>& mapList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlList ) const
{
//Create composition from xml

1
src/mapserver/qgswmsprojectparser.h
View File

@ -56,6 +56,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
double maxWidth() const;
double maxHeight() const;
double imageQuality() const;
int WMSPrecision() const;
//printing
QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap*>& mapList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const;

32
src/mapserver/qgswmsserver.cpp
View File

@ -1830,10 +1830,10 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
{
QDomElement bBoxElem = infoDocument.createElement( "BoundingBox" );
bBoxElem.setAttribute( version == "1.1.1" ? "SRS" : "CRS", outputCrs.authid() );
bBoxElem.setAttribute( "minx", qgsDoubleToString( box.xMinimum(), 8 ) );
bBoxElem.setAttribute( "maxx", qgsDoubleToString( box.xMaximum(), 8 ) );
bBoxElem.setAttribute( "miny", qgsDoubleToString( box.yMinimum(), 8 ) );
bBoxElem.setAttribute( "maxy", qgsDoubleToString( box.yMaximum(), 8 ) );
bBoxElem.setAttribute( "minx", qgsDoubleToString( box.xMinimum(), getWMSPrecision( 8 ) ) );
bBoxElem.setAttribute( "maxx", qgsDoubleToString( box.xMaximum(), getWMSPrecision( 8 ) ) );
bBoxElem.setAttribute( "miny", qgsDoubleToString( box.yMinimum(), getWMSPrecision( 8 ) ) );
bBoxElem.setAttribute( "maxy", qgsDoubleToString( box.yMaximum(), getWMSPrecision( 8 ) ) );
featureElement.appendChild( bBoxElem );
}
@ -1851,7 +1851,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
}
QDomElement geometryElement = infoDocument.createElement( "Attribute" );
geometryElement.setAttribute( "name", "geometry" );
geometryElement.setAttribute( "value", geom->exportToWkt( 8 ) );
geometryElement.setAttribute( "value", geom->exportToWkt( getWMSPrecision( 8 ) ) );
geometryElement.setAttribute( "type", "derived" );
featureElement.appendChild( geometryElement );
}
@ -3020,3 +3020,25 @@ int QgsWMSServer::getImageQuality( ) const
}
return imageQuality;
}
int QgsWMSServer::getWMSPrecision( int defaultValue = 8) const
{
// First taken from QGIS project
int WMSPrecision = mConfigParser->WMSPrecision();
// Then checks if a parameter is given, if so use it instead
if ( mParameters.contains( "WMS_PRECISION" ) )
{
bool conversionSuccess;
int WMSPrecisionParameter;
WMSPrecisionParameter = mParameters[ "WMS_PRECISION" ].toInt( &conversionSuccess );
if ( conversionSuccess )
{
WMSPrecision = WMSPrecisionParameter;
}
}
if ( WMSPrecision == -1 ){
WMSPrecision = defaultValue;
}
return WMSPrecision;
}

3
src/mapserver/qgswmsserver.h
View File

@ -258,6 +258,9 @@ class QgsWMSServer: public QgsOWSServer
/** Return the image quality to use for getMap request */
int getImageQuality() const;
/** Return precision to use for GetFeatureInfo request */
int getWMSPrecision(int defaultValue ) const;
};
#endif

504
src/ui/qgsprojectpropertiesbase.ui
View File

@ -42,7 +42,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -179,7 +188,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -191,11 +209,20 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>1</number>
<number>4</number>
</property>
<widget class="QWidget" name="mProjOpts_01">
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -211,8 +238,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>779</height>
<width>637</width>
<height>696</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
@ -609,7 +636,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -782,7 +818,16 @@
</widget>
<widget class="QWidget" name="mProjOpts_02">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -798,8 +843,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>779</height>
<width>328</width>
<height>54</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
@ -832,7 +877,16 @@
</widget>
<widget class="QWidget" name="mProjOpts_03">
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -848,8 +902,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>779</height>
<width>141</width>
<height>100</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
@ -904,7 +958,16 @@
</widget>
<widget class="QWidget" name="mProjOpts_04">
<layout class="QVBoxLayout" name="verticalLayout_11">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -920,8 +983,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>779</height>
<width>379</width>
<height>570</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
@ -1320,7 +1383,16 @@
</widget>
<widget class="QWidget" name="mProjOpts_05">
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -1335,9 +1407,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>667</width>
<height>1570</height>
<y>-330</y>
<width>671</width>
<height>1624</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
@ -1368,15 +1440,11 @@
<string notr="true">projowsserver</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="3" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Person</string>
</property>
<property name="buddy">
<cstring>mWMSContactPerson</cstring>
</property>
</widget>
<item row="7" column="1">
<widget class="QLineEdit" name="mWMSFees"/>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="mWMSAccessConstraints"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_10">
@ -1388,21 +1456,8 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mWMSTitle"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Organization</string>
</property>
<property name="buddy">
<cstring>mWMSContactOrganization</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mWMSContactOrganization"/>
<item row="2" column="1">
<widget class="QLineEdit" name="mWMSOnlineResourceLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mWMSOnlineResourceLabel">
@ -1411,8 +1466,18 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="mWMSOnlineResourceLineEdit"/>
<item row="3" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Person</string>
</property>
<property name="buddy">
<cstring>mWMSContactPerson</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="mWMSContactMail"/>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="mWMSContactPerson"/>
@ -1424,8 +1489,8 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="mWMSContactMail"/>
<item row="1" column="1">
<widget class="QLineEdit" name="mWMSContactOrganization"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_12">
@ -1437,8 +1502,8 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="mWMSContactPhone"/>
<item row="0" column="1">
<widget class="QLineEdit" name="mWMSTitle"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_15">
@ -1450,21 +1515,31 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="mWMSContactPhone"/>
</item>
<item row="6" column="1">
<widget class="QTextEdit" name="mWMSAbstract"/>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="mWMSFees"/>
</item>
<item row="7" column="0">
<widget class="QLabel" name="mWMSFeesLabel">
<item row="9" column="0">
<widget class="QLabel" name="mWMSKeywordListLabel">
<property name="text">
<string>Fees</string>
<string>Keyword list</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="mWMSAccessConstraints"/>
<item row="9" column="1">
<widget class="QLineEdit" name="mWMSKeywordList"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Organization</string>
</property>
<property name="buddy">
<cstring>mWMSContactOrganization</cstring>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="mWMSAccessConstraintsLabel">
@ -1473,13 +1548,10 @@
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="mWMSKeywordList"/>
</item>
<item row="9" column="0">
<widget class="QLabel" name="mWMSKeywordListLabel">
<item row="7" column="0">
<widget class="QLabel" name="mWMSFeesLabel">
<property name="text">
<string>Keyword list</string>
<string>Fees</string>
</property>
</widget>
</item>
@ -1494,55 +1566,8 @@
<property name="syncGroup" stdset="0">
<string notr="true">projowsserver</string>
</property>
<layout class="QGridLayout" name="gridLayout_14">
<item row="0" column="1" colspan="2">
<widget class="QgsCollapsibleGroupBox" name="grpWMSList">
<property name="title">
<string>CRS restrictions</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<property name="saveCollapsedState" stdset="0">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="0">
<widget class="QToolButton" name="pbnWMSAddSRS">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionSignPlus.png</normaloff>:/images/themes/default/mActionSignPlus.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0" colspan="4">
<widget class="QListWidget" name="mWMSList"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pbnWMSSetUsedSRS">
<property name="text">
<string>Used</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="pbnWMSRemoveSRS">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_12">
<item row="2" column="0">
<widget class="QgsCollapsibleGroupBox" name="mWMSComposerGroupBox">
<property name="title">
<string>Exclude composers</string>
@ -1601,7 +1626,7 @@
</layout>
</widget>
</item>
<item row="1" column="1" colspan="2">
<item row="2" column="1">
<widget class="QgsCollapsibleGroupBox" name="mLayerRestrictionsGroupBox">
<property name="title">
<string>Exclude layers</string>
@ -1660,68 +1685,7 @@
</layout>
</widget>
</item>
<item row="4" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="mWMSUrlLabel">
<property name="text">
<string>Advertised URL</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mWMSUrlLineEdit"/>
</item>
</layout>
</item>
<item row="5" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="1">
<widget class="QLabel" name="mMaxWidthLabel">
<property name="text">
<string>Width</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>6</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="mMaxHeightLineEdit"/>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="mMaxWidthLineEdit"/>
</item>
<item row="1" column="3">
<widget class="QLabel" name="mMaxHeightLabel">
<property name="text">
<string>Height</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Maximums for GetMap request</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<item row="1" column="0">
<widget class="QgsCollapsibleGroupBox" name="grpWMSExt">
<property name="title">
<string>Advertised extent</string>
@ -1830,7 +1794,61 @@
</layout>
</widget>
</item>
<item row="6" column="0" colspan="3">
<item row="1" column="1">
<widget class="QgsCollapsibleGroupBox" name="grpWMSList">
<property name="title">
<string>CRS restrictions</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<property name="saveCollapsedState" stdset="0">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="0">
<widget class="QToolButton" name="pbnWMSAddSRS">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionSignPlus.png</normaloff>:/images/themes/default/mActionSignPlus.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0" colspan="4">
<widget class="QListWidget" name="mWMSList"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pbnWMSSetUsedSRS">
<property name="text">
<string>Used</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="pbnWMSRemoveSRS">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mWmsUseLayerIDs">
<property name="text">
<string>Use layer ids as names</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="mWMSImageQualityLabel">
@ -1857,19 +1875,97 @@
</item>
</layout>
</item>
<item row="2" column="0">
<item row="4" column="0">
<widget class="QCheckBox" name="mAddWktGeometryCheckBox">
<property name="text">
<string>Add geometry to feature response</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QCheckBox" name="mWmsUseLayerIDs">
<property name="text">
<string>Use layer ids as names</string>
</property>
</widget>
<item row="7" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="1">
<widget class="QLabel" name="mMaxWidthLabel">
<property name="text">
<string>Width</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>6</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="mMaxHeightLineEdit"/>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="mMaxWidthLineEdit"/>
</item>
<item row="1" column="3">
<widget class="QLabel" name="mMaxHeightLabel">
<property name="text">
<string>Height</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Maximums for GetMap request</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0" colspan="2">
<layout class="QHBoxLayout" name="grpWMSPrecision">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>GetFeatureInfo geometry precision (decimal places)</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="mWMSPrecisionSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>17</number>
</property>
<property name="value">
<number>8</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="mWMSUrlLabel">
<property name="text">
<string>Advertised URL</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mWMSUrlLineEdit"/>
</item>
</layout>
</item>
</layout>
</widget>
@ -2042,7 +2138,16 @@
</widget>
<widget class="QWidget" name="mProjOpts_06">
<layout class="QVBoxLayout" name="verticalLayout_15">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -2058,8 +2163,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>779</height>
<width>170</width>
<height>54</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
@ -2095,7 +2200,16 @@
</widget>
<widget class="QWidget" name="mTabRelations">
<layout class="QGridLayout" name="gridLayout_16">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
@ -2121,7 +2235,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -2221,7 +2344,6 @@
<tabstop>mButtonImportColors</tabstop>
<tabstop>mButtonExportColors</tabstop>
<tabstop>scrollArea_5</tabstop>
<tabstop>mWmsUseLayerIDs</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>mWMSAccessConstraints</tabstop>
<tabstop>mWMSKeywordList</tabstop>
@ -2229,8 +2351,6 @@
<tabstop>mComposerListWidget</tabstop>
<tabstop>mAddWMSComposerButton</tabstop>
<tabstop>mRemoveWMSComposerButton</tabstop>
<tabstop>mAddWktGeometryCheckBox</tabstop>
<tabstop>mLayerRestrictionsGroupBox</tabstop>
<tabstop>mLayerRestrictionsListWidget</tabstop>
<tabstop>mAddLayerRestrictionButton</tabstop>
<tabstop>mRemoveLayerRestrictionButton</tabstop>