Skip to content

Commit 5ff5f52

Browse files
signedavsignedav
committedApr 22, 2019
gui fix for default symbol scale
·
final-3_4_15final-3_4_8
1 parent d4effad commit 5ff5f52

File tree

1 file changed

+256
-469
lines changed

1 file changed

+256
-469
lines changed
 

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 256 additions & 469 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
</sizepolicy>
237237
</property>
238238
<property name="currentIndex">
239-
<number>4</number>
239+
<number>8</number>
240240
</property>
241241
<widget class="QWidget" name="mProjOptsGeneral">
242242
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -266,7 +266,7 @@
266266
<x>0</x>
267267
<y>0</y>
268268
<width>590</width>
269-
<height>777</height>
269+
<height>782</height>
270270
</rect>
271271
</property>
272272
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -281,7 +281,7 @@
281281
<property name="title">
282282
<string>General Settings</string>
283283
</property>
284-
<property name="syncGroup" stdset="0">
284+
<property name="syncGroup">
285285
<string notr="true">projgeneral</string>
286286
</property>
287287
<layout class="QGridLayout" name="gridLayout_26">
@@ -546,7 +546,7 @@
546546
<property name="title">
547547
<string>Measurements</string>
548548
</property>
549-
<property name="syncGroup" stdset="0">
549+
<property name="syncGroup">
550550
<string notr="true">projgeneral</string>
551551
</property>
552552
<layout class="QGridLayout" name="gridLayoutMeasureTool">
@@ -615,7 +615,7 @@
615615
<property name="title">
616616
<string>Coordinate Display</string>
617617
</property>
618-
<property name="syncGroup" stdset="0">
618+
<property name="syncGroup">
619619
<string notr="true">projgeneral</string>
620620
</property>
621621
<layout class="QGridLayout" name="gridLayout_18">
@@ -705,7 +705,7 @@
705705
<property name="checked">
706706
<bool>false</bool>
707707
</property>
708-
<property name="syncGroup" stdset="0">
708+
<property name="syncGroup">
709709
<string notr="true">projgeneral</string>
710710
</property>
711711
<layout class="QGridLayout" name="gridLayout_7">
@@ -939,7 +939,7 @@
939939
<x>0</x>
940940
<y>0</y>
941941
<width>290</width>
942-
<height>543</height>
942+
<height>552</height>
943943
</rect>
944944
</property>
945945
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -948,7 +948,7 @@
948948
<property name="title">
949949
<string>Default Symbols</string>
950950
</property>
951-
<property name="syncGroup" stdset="0">
951+
<property name="syncGroup">
952952
<string notr="true">projstyles</string>
953953
</property>
954954
<layout class="QGridLayout" name="gridLayout_11">
@@ -1175,7 +1175,7 @@
11751175
<property name="title">
11761176
<string>Options</string>
11771177
</property>
1178-
<property name="syncGroup" stdset="0">
1178+
<property name="syncGroup">
11791179
<string notr="true">projstyles</string>
11801180
</property>
11811181
<layout class="QVBoxLayout" name="verticalLayout_18">
@@ -1189,7 +1189,7 @@
11891189
</widget>
11901190
</item>
11911191
<item>
1192-
<widget class="QgsOpacityWidget" name="mDefaultOpacityWidget" native="true">
1192+
<widget class="QgsOpacityWidget" name="mDefaultOpacityWidget">
11931193
<property name="focusPolicy">
11941194
<enum>Qt::StrongFocus</enum>
11951195
</property>
@@ -1514,7 +1514,7 @@
15141514
<rect>
15151515
<x>0</x>
15161516
<y>0</y>
1517-
<width>178</width>
1517+
<width>168</width>
15181518
<height>54</height>
15191519
</rect>
15201520
</property>
@@ -1575,9 +1575,9 @@
15751575
<property name="geometry">
15761576
<rect>
15771577
<x>0</x>
1578-
<y>-975</y>
1578+
<y>-1053</y>
15791579
<width>671</width>
1580-
<height>2682</height>
1580+
<height>2645</height>
15811581
</rect>
15821582
</property>
15831583
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1598,13 +1598,13 @@
15981598
<property name="checked">
15991599
<bool>false</bool>
16001600
</property>
1601-
<property name="collapsed" stdset="0">
1601+
<property name="collapsed">
16021602
<bool>false</bool>
16031603
</property>
1604-
<property name="syncGroup" stdset="0">
1604+
<property name="syncGroup">
16051605
<string notr="true">projowsserver</string>
16061606
</property>
1607-
<property name="saveCollapsedState" stdset="0">
1607+
<property name="saveCollapsedState">
16081608
<bool>true</bool>
16091609
</property>
16101610
<layout class="QGridLayout" name="gridLayout_6">
@@ -1841,12 +1841,11 @@
18411841
<property name="title">
18421842
<string>WMS capabilities</string>
18431843
</property>
1844-
<property name="syncGroup" stdset="0">
1844+
<property name="syncGroup">
18451845
<string notr="true">projowsserver</string>
18461846
</property>
18471847
<layout class="QGridLayout" name="gridLayout_13">
1848-
<<<<<<< HEAD
1849-
<item row="1" column="0">
1848+
<item row="0" column="0">
18501849
<widget class="QgsCollapsibleGroupBox" name="grpWMSExt">
18511850
<property name="title">
18521851
<string>Advertised extent</string>
@@ -1857,10 +1856,10 @@
18571856
<property name="checked">
18581857
<bool>false</bool>
18591858
</property>
1860-
<property name="collapsed" stdset="0">
1859+
<property name="collapsed">
18611860
<bool>false</bool>
18621861
</property>
1863-
<property name="saveCollapsedState" stdset="0">
1862+
<property name="saveCollapsedState">
18641863
<bool>true</bool>
18651864
</property>
18661865
<layout class="QGridLayout" name="gridLayout_4">
@@ -1955,99 +1954,87 @@
19551954
</layout>
19561955
</widget>
19571956
</item>
1958-
<item row="2" column="0">
1959-
<widget class="QgsCollapsibleGroupBox" name="mWMSPrintLayoutGroupBox">
1957+
<item row="0" column="1">
1958+
<widget class="QgsCollapsibleGroupBox" name="grpWMSList">
19601959
<property name="title">
1961-
<string>Exclude layouts</string>
1960+
<string>CRS restrictions</string>
19621961
</property>
19631962
<property name="checkable">
19641963
<bool>true</bool>
19651964
</property>
19661965
<property name="checked">
19671966
<bool>false</bool>
19681967
</property>
1969-
<property name="collapsed" stdset="0">
1968+
<property name="collapsed">
19701969
<bool>false</bool>
19711970
</property>
1972-
<property name="saveCollapsedState" stdset="0">
1971+
<property name="saveCollapsedState">
19731972
<bool>true</bool>
19741973
</property>
1975-
<layout class="QGridLayout" name="gridLayout_10">
1976-
<item row="0" column="0" colspan="3">
1977-
<widget class="QListWidget" name="mPrintLayoutListWidget"/>
1978-
</item>
1974+
<layout class="QGridLayout" name="gridLayout_5">
19791975
<item row="1" column="0">
1980-
<widget class="QToolButton" name="mAddWMSPrintLayoutButton">
1976+
<widget class="QToolButton" name="pbnWMSAddSRS">
19811977
<property name="toolTip">
1982-
<string>Add layout to exclude</string>
1983-
</property>
1984-
<property name="text">
1985-
<string/>
1978+
<string>Add new CRS</string>
19861979
</property>
19871980
<property name="icon">
19881981
<iconset resource="../../images/images.qrc">
19891982
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
19901983
</property>
19911984
</widget>
19921985
</item>
1993-
<item row="1" column="1">
1994-
<widget class="QToolButton" name="mRemoveWMSPrintLayoutButton">
1986+
<item row="0" column="0" colspan="4">
1987+
<widget class="QListWidget" name="mWMSList"/>
1988+
</item>
1989+
<item row="1" column="2">
1990+
<widget class="QPushButton" name="pbnWMSSetUsedSRS">
19951991
<property name="toolTip">
1996-
<string>Remove selected layout</string>
1992+
<string>Fetch all CRS's from layers</string>
19971993
</property>
19981994
<property name="text">
1999-
<string/>
1995+
<string>Used</string>
1996+
</property>
1997+
</widget>
1998+
</item>
1999+
<item row="1" column="1">
2000+
<widget class="QToolButton" name="pbnWMSRemoveSRS">
2001+
<property name="toolTip">
2002+
<string>Remove selected CRS</string>
20002003
</property>
20012004
<property name="icon">
20022005
<iconset resource="../../images/images.qrc">
20032006
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
20042007
</property>
20052008
</widget>
20062009
</item>
2007-
<item row="1" column="2">
2008-
<spacer name="horizontalSpacer_2">
2009-
<property name="orientation">
2010-
<enum>Qt::Horizontal</enum>
2011-
</property>
2012-
<property name="sizeHint" stdset="0">
2013-
<size>
2014-
<width>0</width>
2015-
<height>20</height>
2016-
</size>
2017-
</property>
2018-
</spacer>
2019-
</item>
20202010
</layout>
20212011
</widget>
20222012
</item>
2023-
<item row="2" column="1">
2024-
=======
2025-
<item row="1" column="2">
2026-
>>>>>>> 4905e18ec1... backport for default map scale / default map units per mm in project for the case that GetLegendGraphic request does not pass parameters to calculate map unit sized symbol size
2027-
<widget class="QgsCollapsibleGroupBox" name="mLayerRestrictionsGroupBox">
2013+
<item row="1" column="0">
2014+
<widget class="QgsCollapsibleGroupBox" name="mWMSPrintLayoutGroupBox">
20282015
<property name="title">
2029-
<string>Exclude layers</string>
2016+
<string>Exclude layouts</string>
20302017
</property>
20312018
<property name="checkable">
20322019
<bool>true</bool>
20332020
</property>
20342021
<property name="checked">
20352022
<bool>false</bool>
20362023
</property>
2037-
<property name="collapsed" stdset="0">
2024+
<property name="collapsed">
20382025
<bool>false</bool>
20392026
</property>
2040-
<property name="saveCollapsedState" stdset="0">
2027+
<property name="saveCollapsedState">
20412028
<bool>true</bool>
20422029
</property>
2043-
<layout class="QGridLayout" name="gridLayout">
2030+
<layout class="QGridLayout" name="gridLayout_10">
20442031
<item row="0" column="0" colspan="3">
2045-
<widget class="QListWidget" name="mLayerRestrictionsListWidget"/>
2032+
<widget class="QListWidget" name="mPrintLayoutListWidget"/>
20462033
</item>
20472034
<item row="1" column="0">
2048-
<widget class="QToolButton" name="mAddLayerRestrictionButton">
2035+
<widget class="QToolButton" name="mAddWMSPrintLayoutButton">
20492036
<property name="toolTip">
2050-
<string>Add layer to exclude</string>
2037+
<string>Add layout to exclude</string>
20512038
</property>
20522039
<property name="text">
20532040
<string/>
@@ -2059,9 +2046,9 @@
20592046
</widget>
20602047
</item>
20612048
<item row="1" column="1">
2062-
<widget class="QToolButton" name="mRemoveLayerRestrictionButton">
2049+
<widget class="QToolButton" name="mRemoveWMSPrintLayoutButton">
20632050
<property name="toolTip">
2064-
<string>Remove selected layer</string>
2051+
<string>Remove selected layout</string>
20652052
</property>
20662053
<property name="text">
20672054
<string/>
@@ -2073,7 +2060,7 @@
20732060
</widget>
20742061
</item>
20752062
<item row="1" column="2">
2076-
<spacer name="horizontalSpacer_3">
2063+
<spacer name="horizontalSpacer_2">
20772064
<property name="orientation">
20782065
<enum>Qt::Horizontal</enum>
20792066
</property>
@@ -2088,408 +2075,73 @@
20882075
</layout>
20892076
</widget>
20902077
</item>
2091-
<item row="8" column="0" colspan="3">
2092-
<layout class="QGridLayout" name="gridLayout_3">
2093-
<item row="1" column="1">
2094-
<widget class="QLabel" name="mMaxWidthLabel">
2095-
<property name="text">
2096-
<string>Width</string>
2097-
</property>
2098-
</widget>
2099-
</item>
2100-
<item row="1" column="0">
2101-
<spacer name="horizontalSpacer_6">
2102-
<property name="orientation">
2103-
<enum>Qt::Horizontal</enum>
2104-
</property>
2105-
<property name="sizeType">
2106-
<enum>QSizePolicy::Fixed</enum>
2107-
</property>
2108-
<property name="sizeHint" stdset="0">
2109-
<size>
2110-
<width>6</width>
2111-
<height>20</height>
2112-
</size>
2113-
</property>
2114-
</spacer>
2115-
</item>
2116-
<item row="1" column="4">
2117-
<widget class="QLineEdit" name="mMaxHeightLineEdit"/>
2118-
</item>
2119-
<item row="1" column="2">
2120-
<widget class="QLineEdit" name="mMaxWidthLineEdit"/>
2121-
</item>
2122-
<item row="1" column="3">
2123-
<widget class="QLabel" name="mMaxHeightLabel">
2124-
<property name="text">
2125-
<string>Height</string>
2126-
</property>
2127-
</widget>
2128-
</item>
2129-
<item row="0" column="0" colspan="5">
2130-
<widget class="QLabel" name="label_21">
2131-
<property name="text">
2132-
<string>Maximums for GetMap request</string>
2133-
</property>
2134-
</widget>
2135-
</item>
2136-
</layout>
2137-
</item>
2138-
<item row="0" column="2">
2139-
<widget class="QgsCollapsibleGroupBox" name="grpWMSList">
2078+
<item row="1" column="1">
2079+
<widget class="QgsCollapsibleGroupBox" name="mLayerRestrictionsGroupBox">
21402080
<property name="title">
2141-
<string>CRS restrictions</string>
2081+
<string>Exclude layers</string>
21422082
</property>
21432083
<property name="checkable">
21442084
<bool>true</bool>
21452085
</property>
21462086
<property name="checked">
21472087
<bool>false</bool>
21482088
</property>
2149-
<property name="collapsed" stdset="0">
2089+
<property name="collapsed">
21502090
<bool>false</bool>
21512091
</property>
2152-
<property name="saveCollapsedState" stdset="0">
2092+
<property name="saveCollapsedState">
21532093
<bool>true</bool>
21542094
</property>
2155-
<layout class="QGridLayout" name="gridLayout_5">
2095+
<layout class="QGridLayout" name="gridLayout">
2096+
<item row="0" column="0" colspan="3">
2097+
<widget class="QListWidget" name="mLayerRestrictionsListWidget"/>
2098+
</item>
21562099
<item row="1" column="0">
2157-
<widget class="QToolButton" name="pbnWMSAddSRS">
2100+
<widget class="QToolButton" name="mAddLayerRestrictionButton">
21582101
<property name="toolTip">
2159-
<string>Add new CRS</string>
2102+
<string>Add layer to exclude</string>
2103+
</property>
2104+
<property name="text">
2105+
<string/>
21602106
</property>
21612107
<property name="icon">
21622108
<iconset resource="../../images/images.qrc">
21632109
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
21642110
</property>
21652111
</widget>
21662112
</item>
2167-
<item row="0" column="0" colspan="4">
2168-
<widget class="QListWidget" name="mWMSList"/>
2169-
</item>
2170-
<item row="1" column="2">
2171-
<widget class="QPushButton" name="pbnWMSSetUsedSRS">
2113+
<item row="1" column="1">
2114+
<widget class="QToolButton" name="mRemoveLayerRestrictionButton">
21722115
<property name="toolTip">
2173-
<string>Fetch all CRS's from layers</string>
2116+
<string>Remove selected layer</string>
21742117
</property>
21752118
<property name="text">
2176-
<string>Used</string>
2177-
</property>
2178-
</widget>
2179-
</item>
2180-
<item row="1" column="1">
2181-
<widget class="QToolButton" name="pbnWMSRemoveSRS">
2182-
<property name="toolTip">
2183-
<string>Remove selected CRS</string>
2119+
<string/>
21842120
</property>
21852121
<property name="icon">
21862122
<iconset resource="../../images/images.qrc">
21872123
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
21882124
</property>
21892125
</widget>
21902126
</item>
2191-
</layout>
2192-
</widget>
2193-
</item>
2194-
<item row="3" column="0">
2195-
<widget class="QCheckBox" name="mWmsUseLayerIDs">
2196-
<property name="text">
2197-
<string>Use layer ids as names</string>
2198-
</property>
2199-
</widget>
2200-
</item>
2201-
<item row="6" column="0" colspan="3">
2202-
<layout class="QHBoxLayout" name="grpWMSPrecision">
2203-
<item>
2204-
<widget class="QLabel" name="label_5">
2205-
<property name="text">
2206-
<string>GetFeatureInfo geometry precision (decimal places)</string>
2207-
</property>
2208-
</widget>
2209-
</item>
2210-
<item>
2211-
<widget class="QSpinBox" name="mWMSPrecisionSpinBox">
2212-
<property name="minimum">
2213-
<number>1</number>
2214-
</property>
2215-
<property name="maximum">
2216-
<number>17</number>
2217-
</property>
2218-
<property name="value">
2219-
<number>8</number>
2220-
</property>
2221-
</widget>
2222-
</item>
2223-
</layout>
2224-
</item>
2225-
<item row="12" column="0" colspan="3">
2226-
<layout class="QHBoxLayout" name="mWMSDefaultMapUnitsPerMmLayout">
2227-
<item>
2228-
<widget class="QLabel" name="mWMSDefaultMapUnitsPerMmLabel">
2229-
<property name="text">
2230-
<string>Default map units per mm in legend</string>
2231-
</property>
2232-
</widget>
2233-
</item>
2234-
</layout>
2235-
</item>
2236-
<item row="0" column="0" colspan="2">
2237-
<widget class="QgsCollapsibleGroupBox" name="grpWMSExt">
2238-
<property name="title">
2239-
<string>Ad&amp;vertised extent</string>
2240-
</property>
2241-
<property name="checkable">
2242-
<bool>true</bool>
2243-
</property>
2244-
<property name="checked">
2245-
<bool>false</bool>
2246-
</property>
2247-
<property name="collapsed" stdset="0">
2248-
<bool>false</bool>
2249-
</property>
2250-
<property name="saveCollapsedState" stdset="0">
2251-
<bool>true</bool>
2252-
</property>
2253-
<layout class="QGridLayout" name="gridLayout_4">
2254-
<item row="0" column="0">
2255-
<widget class="QLabel" name="label_16">
2256-
<property name="text">
2257-
<string>Min. &amp;X</string>
2258-
</property>
2259-
<property name="buddy">
2260-
<cstring>mWMSExtMinX</cstring>
2261-
</property>
2262-
</widget>
2263-
</item>
2264-
<item row="0" column="1">
2265-
<widget class="QLineEdit" name="mWMSExtMinX">
2266-
<property name="text">
2267-
<string/>
2268-
</property>
2269-
</widget>
2270-
</item>
2271-
<item row="1" column="0">
2272-
<widget class="QLabel" name="label_17">
2273-
<property name="text">
2274-
<string>Min. &amp;Y</string>
2275-
</property>
2276-
<property name="buddy">
2277-
<cstring>mWMSExtMinY</cstring>
2278-
</property>
2279-
</widget>
2280-
</item>
2281-
<item row="1" column="1">
2282-
<widget class="QLineEdit" name="mWMSExtMinY">
2283-
<property name="text">
2284-
<string/>
2285-
</property>
2286-
</widget>
2287-
</item>
2288-
<item row="2" column="0">
2289-
<widget class="QLabel" name="label_18">
2290-
<property name="text">
2291-
<string>Max. X</string>
2292-
</property>
2293-
<property name="buddy">
2294-
<cstring>mWMSExtMaxX</cstring>
2295-
</property>
2296-
</widget>
2297-
</item>
2298-
<item row="2" column="1">
2299-
<widget class="QLineEdit" name="mWMSExtMaxX">
2300-
<property name="text">
2301-
<string/>
2302-
</property>
2303-
</widget>
2304-
</item>
2305-
<item row="3" column="0">
2306-
<widget class="QLabel" name="label_19">
2307-
<property name="text">
2308-
<string>Max. Y</string>
2309-
</property>
2310-
<property name="buddy">
2311-
<cstring>mWMSExtMaxY</cstring>
2312-
</property>
2313-
</widget>
2314-
</item>
2315-
<item row="3" column="1">
2316-
<widget class="QLineEdit" name="mWMSExtMaxY">
2317-
<property name="text">
2318-
<string/>
2319-
</property>
2320-
</widget>
2321-
</item>
2322-
<item row="4" column="0" colspan="2">
2323-
<widget class="QPushButton" name="pbnWMSExtCanvas">
2324-
<property name="text">
2325-
<string>Use Current Canvas Extent</string>
2326-
</property>
2327-
</widget>
2328-
</item>
2329-
<item row="5" column="0" colspan="2">
2330-
<spacer name="verticalSpacer_3">
2127+
<item row="1" column="2">
2128+
<spacer name="horizontalSpacer_3">
23312129
<property name="orientation">
2332-
<enum>Qt::Vertical</enum>
2333-
</property>
2334-
<property name="sizeHint" stdset="0">
2335-
<size>
2336-
<width>20</width>
2337-
<height>40</height>
2338-
</size>
2339-
</property>
2340-
</spacer>
2341-
</item>
2342-
</layout>
2343-
</widget>
2344-
</item>
2345-
<item row="4" column="0" colspan="2">
2346-
<widget class="QCheckBox" name="mAddWktGeometryCheckBox">
2347-
<property name="text">
2348-
<string>Add geometry to feature response</string>
2349-
</property>
2350-
</widget>
2351-
</item>
2352-
<item row="2" column="0" colspan="3">
2353-
<widget class="QgsCollapsibleGroupBox" name="mWMSInspire">
2354-
<property name="title">
2355-
<string>INSPIRE (European directive)</string>
2356-
</property>
2357-
<property name="checkable">
2358-
<bool>true</bool>
2359-
</property>
2360-
<property name="checked">
2361-
<bool>false</bool>
2362-
</property>
2363-
<layout class="QGridLayout" name="gridLayout_14">
2364-
<item row="0" column="1">
2365-
<widget class="QComboBox" name="mWMSInspireLanguage">
2366-
<property name="sizePolicy">
2367-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
2368-
<horstretch>0</horstretch>
2369-
<verstretch>0</verstretch>
2370-
</sizepolicy>
2371-
</property>
2372-
</widget>
2373-
</item>
2374-
<item row="0" column="0">
2375-
<widget class="QLabel" name="label_7">
2376-
<property name="text">
2377-
<string>Service language</string>
2378-
</property>
2379-
</widget>
2380-
</item>
2381-
<item row="4" column="0" colspan="2">
2382-
<widget class="QGroupBox" name="mWMSInspireScenario2">
2383-
<property name="title">
2384-
<string>Scenario &amp;2 - INSPIRE related fields using embedded service metadata</string>
2385-
</property>
2386-
<property name="checkable">
2387-
<bool>true</bool>
2388-
</property>
2389-
<property name="checked">
2390-
<bool>false</bool>
2391-
</property>
2392-
<layout class="QGridLayout" name="gridLayout_17">
2393-
<item row="0" column="1">
2394-
<widget class="QDateEdit" name="mWMSInspireTemporalReference">
2395-
<property name="sizePolicy">
2396-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
2397-
<horstretch>0</horstretch>
2398-
<verstretch>0</verstretch>
2399-
</sizepolicy>
2400-
</property>
2401-
</widget>
2402-
</item>
2403-
<item row="1" column="0">
2404-
<widget class="QLabel" name="label_23">
2405-
<property name="text">
2406-
<string>Metadata date</string>
2407-
</property>
2408-
</widget>
2409-
</item>
2410-
<item row="1" column="1">
2411-
<widget class="QDateEdit" name="mWMSInspireMetadataDate">
2412-
<property name="sizePolicy">
2413-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
2414-
<horstretch>0</horstretch>
2415-
<verstretch>0</verstretch>
2416-
</sizepolicy>
2417-
</property>
2418-
</widget>
2419-
</item>
2420-
<item row="0" column="0">
2421-
<widget class="QLabel" name="label_22">
2422-
<property name="text">
2423-
<string>Last revision date</string>
2424-
</property>
2425-
</widget>
2426-
</item>
2427-
</layout>
2428-
</widget>
2429-
</item>
2430-
<item row="3" column="0" colspan="2">
2431-
<widget class="QGroupBox" name="mWMSInspireScenario1">
2432-
<property name="title">
2433-
<string>Scenario &amp;1 - INSPIRE related fields using referenced external service metadata</string>
2434-
</property>
2435-
<property name="checkable">
2436-
<bool>true</bool>
2130+
<enum>Qt::Horizontal</enum>
24372131
</property>
2438-
<property name="checked">
2439-
<bool>false</bool>
2132+
<property name="sizeHint" stdset="0">
2133+
<size>
2134+
<width>0</width>
2135+
<height>20</height>
2136+
</size>
24402137
</property>
2441-
<layout class="QGridLayout" name="gridLayout_15">
2442-
<item row="0" column="1">
2443-
<widget class="QLineEdit" name="mWMSInspireMetadataUrl"/>
2444-
</item>
2445-
<item row="0" column="0">
2446-
<widget class="QLabel" name="label_8">
2447-
<property name="text">
2448-
<string>Metadata URL</string>
2449-
</property>
2450-
</widget>
2451-
</item>
2452-
<item row="1" column="1">
2453-
<widget class="QComboBox" name="mWMSInspireMetadataUrlType">
2454-
<item>
2455-
<property name="text">
2456-
<string>application/vnd.iso.19139+xml</string>
2457-
</property>
2458-
</item>
2459-
<item>
2460-
<property name="text">
2461-
<string>application/vnd.ogc.csw.GetRecordByIdResponse_xml</string>
2462-
</property>
2463-
</item>
2464-
<item>
2465-
<property name="text">
2466-
<string>application/vnd.ogc.csw_xml</string>
2467-
</property>
2468-
</item>
2469-
</widget>
2470-
</item>
2471-
<item row="1" column="0">
2472-
<widget class="QLabel" name="label_24">
2473-
<property name="text">
2474-
<string>URL mime/type</string>
2475-
</property>
2476-
</widget>
2477-
</item>
2478-
</layout>
2479-
</widget>
2138+
</spacer>
24802139
</item>
24812140
</layout>
24822141
</widget>
24832142
</item>
2484-
<item row="5" column="0" colspan="2">
2485-
<widget class="QCheckBox" name="mSegmentizeFeatureInfoGeometryCheckBox">
2486-
<property name="text">
2487-
<string>Segmentize feature info geometry</string>
2488-
</property>
2489-
</widget>
2490-
</item>
2491-
<item row="1" column="0" colspan="2">
2492-
<widget class="QgsCollapsibleGroupBox" name="mWMSPrintLayoutGroupBox">
2143+
<item row="2" column="0" colspan="2">
2144+
<widget class="QgsCollapsibleGroupBox" name="mWMSInspire">
24932145
<property name="title">
24942146
<string>INSPIRE (European directive)</string>
24952147
</property>
@@ -2620,7 +2272,59 @@
26202272
</layout>
26212273
</widget>
26222274
</item>
2275+
<item row="3" column="0">
2276+
<widget class="QCheckBox" name="mWmsUseLayerIDs">
2277+
<property name="text">
2278+
<string>Use layer ids as names</string>
2279+
</property>
2280+
</widget>
2281+
</item>
2282+
<item row="4" column="0">
2283+
<widget class="QCheckBox" name="mAddWktGeometryCheckBox">
2284+
<property name="text">
2285+
<string>Add geometry to feature response</string>
2286+
</property>
2287+
</widget>
2288+
</item>
2289+
<item row="5" column="0">
2290+
<widget class="QCheckBox" name="mAllowRequestDefinedDataSourcesBox">
2291+
<property name="text">
2292+
<string>Allow defining datasources in server requests</string>
2293+
</property>
2294+
</widget>
2295+
</item>
2296+
<item row="6" column="0">
2297+
<widget class="QCheckBox" name="mSegmentizeFeatureInfoGeometryCheckBox">
2298+
<property name="text">
2299+
<string>Segmentize feature info geometry</string>
2300+
</property>
2301+
</widget>
2302+
</item>
26232303
<item row="7" column="0" colspan="2">
2304+
<layout class="QHBoxLayout" name="grpWMSPrecision">
2305+
<item>
2306+
<widget class="QLabel" name="label_5">
2307+
<property name="text">
2308+
<string>GetFeatureInfo geometry precision (decimal places)</string>
2309+
</property>
2310+
</widget>
2311+
</item>
2312+
<item>
2313+
<widget class="QSpinBox" name="mWMSPrecisionSpinBox">
2314+
<property name="minimum">
2315+
<number>1</number>
2316+
</property>
2317+
<property name="maximum">
2318+
<number>17</number>
2319+
</property>
2320+
<property name="value">
2321+
<number>8</number>
2322+
</property>
2323+
</widget>
2324+
</item>
2325+
</layout>
2326+
</item>
2327+
<item row="8" column="0">
26242328
<layout class="QHBoxLayout" name="horizontalLayout_2">
26252329
<item>
26262330
<widget class="QLabel" name="mWMSUrlLabel">
@@ -2634,7 +2338,54 @@
26342338
</item>
26352339
</layout>
26362340
</item>
2637-
<item row="9" column="0" colspan="3">
2341+
<item row="9" column="0" colspan="2">
2342+
<layout class="QGridLayout" name="gridLayout_3">
2343+
<item row="1" column="1">
2344+
<widget class="QLabel" name="mMaxWidthLabel">
2345+
<property name="text">
2346+
<string>Width</string>
2347+
</property>
2348+
</widget>
2349+
</item>
2350+
<item row="1" column="0">
2351+
<spacer name="horizontalSpacer_6">
2352+
<property name="orientation">
2353+
<enum>Qt::Horizontal</enum>
2354+
</property>
2355+
<property name="sizeType">
2356+
<enum>QSizePolicy::Fixed</enum>
2357+
</property>
2358+
<property name="sizeHint" stdset="0">
2359+
<size>
2360+
<width>6</width>
2361+
<height>20</height>
2362+
</size>
2363+
</property>
2364+
</spacer>
2365+
</item>
2366+
<item row="1" column="4">
2367+
<widget class="QLineEdit" name="mMaxHeightLineEdit"/>
2368+
</item>
2369+
<item row="1" column="2">
2370+
<widget class="QLineEdit" name="mMaxWidthLineEdit"/>
2371+
</item>
2372+
<item row="1" column="3">
2373+
<widget class="QLabel" name="mMaxHeightLabel">
2374+
<property name="text">
2375+
<string>Height</string>
2376+
</property>
2377+
</widget>
2378+
</item>
2379+
<item row="0" column="0" colspan="5">
2380+
<widget class="QLabel" name="label_21">
2381+
<property name="text">
2382+
<string>Maximums for GetMap request</string>
2383+
</property>
2384+
</widget>
2385+
</item>
2386+
</layout>
2387+
</item>
2388+
<item row="10" column="0" colspan="2">
26382389
<layout class="QHBoxLayout" name="horizontalLayout_10">
26392390
<item>
26402391
<widget class="QLabel" name="mWMSImageQualityLabel">
@@ -2661,6 +2412,17 @@
26612412
</item>
26622413
</layout>
26632414
</item>
2415+
<item row="11" column="0" colspan="2">
2416+
<layout class="QHBoxLayout" name="mWMSDefaultMapUnitsPerMmLayout">
2417+
<item>
2418+
<widget class="QLabel" name="mWMSDefaultMapUnitsPerMmLabel">
2419+
<property name="text">
2420+
<string>Default map units per mm in legend</string>
2421+
</property>
2422+
</widget>
2423+
</item>
2424+
</layout>
2425+
</item>
26642426
</layout>
26652427
</widget>
26662428
</item>
@@ -2758,7 +2520,7 @@
27582520
<property name="title">
27592521
<string>WFS capabilities (also influences DXF export)</string>
27602522
</property>
2761-
<property name="syncGroup" stdset="0">
2523+
<property name="syncGroup">
27622524
<string notr="true">projowsserver</string>
27632525
</property>
27642526
<layout class="QGridLayout" name="gridLayout_8">
@@ -2844,17 +2606,44 @@
28442606
<property name="title">
28452607
<string>WCS capabilities</string>
28462608
</property>
2847-
<property name="syncGroup" stdset="0">
2609+
<property name="syncGroup">
28482610
<string notr="true">projowsserver</string>
28492611
</property>
28502612
<layout class="QGridLayout" name="gridLayout_9">
2613+
<item row="0" column="0" colspan="2">
2614+
<widget class="QTableWidget" name="twWCSLayers">
2615+
<property name="sizePolicy">
2616+
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
2617+
<horstretch>0</horstretch>
2618+
<verstretch>0</verstretch>
2619+
</sizepolicy>
2620+
</property>
2621+
<column>
2622+
<property name="text">
2623+
<string>Layer</string>
2624+
</property>
2625+
</column>
2626+
<column>
2627+
<property name="text">
2628+
<string>Published</string>
2629+
</property>
2630+
</column>
2631+
</widget>
2632+
</item>
28512633
<item row="1" column="1">
28522634
<widget class="QPushButton" name="pbnWCSLayersDeselectAll">
28532635
<property name="text">
28542636
<string>Deselect All</string>
28552637
</property>
28562638
</widget>
28572639
</item>
2640+
<item row="1" column="0">
2641+
<widget class="QPushButton" name="pbnWCSLayersSelectAll">
2642+
<property name="text">
2643+
<string>Select All</string>
2644+
</property>
2645+
</widget>
2646+
</item>
28582647
<item row="3" column="0" colspan="2">
28592648
<layout class="QHBoxLayout" name="horizontalLayout_9">
28602649
<item>
@@ -2869,33 +2658,6 @@
28692658
</item>
28702659
</layout>
28712660
</item>
2872-
<item row="1" column="0">
2873-
<widget class="QPushButton" name="pbnWCSLayersSelectAll">
2874-
<property name="text">
2875-
<string>Select All</string>
2876-
</property>
2877-
</widget>
2878-
</item>
2879-
<item row="0" column="0" colspan="2">
2880-
<widget class="QTableWidget" name="twWCSLayers">
2881-
<property name="sizePolicy">
2882-
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
2883-
<horstretch>0</horstretch>
2884-
<verstretch>0</verstretch>
2885-
</sizepolicy>
2886-
</property>
2887-
<column>
2888-
<property name="text">
2889-
<string>Layer</string>
2890-
</property>
2891-
</column>
2892-
<column>
2893-
<property name="text">
2894-
<string>Published</string>
2895-
</property>
2896-
</column>
2897-
</widget>
2898-
</item>
28992661
</layout>
29002662
</widget>
29012663
</item>
@@ -3054,12 +2816,6 @@
30542816
<header>qgsopacitywidget.h</header>
30552817
<container>1</container>
30562818
</customwidget>
3057-
<customwidget>
3058-
<class>QgsColorSchemeList</class>
3059-
<extends>QWidget</extends>
3060-
<header location="global">qgscolorschemelist.h</header>
3061-
<container>1</container>
3062-
</customwidget>
30632819
<customwidget>
30642820
<class>QgsScrollArea</class>
30652821
<extends>QScrollArea</extends>
@@ -3073,9 +2829,9 @@
30732829
<container>1</container>
30742830
</customwidget>
30752831
<customwidget>
3076-
<class>QgsDatumTransformTableWidget</class>
2832+
<class>QgsColorSchemeList</class>
30772833
<extends>QWidget</extends>
3078-
<header>qgsdatumtransformtablewidget.h</header>
2834+
<header location="global">qgscolorschemelist.h</header>
30792835
<container>1</container>
30802836
</customwidget>
30812837
<customwidget>
@@ -3216,6 +2972,37 @@
32162972
</tabstops>
32172973
<resources>
32182974
<include location="../../images/images.qrc"/>
2975+
<include location="../../images/images.qrc"/>
2976+
<include location="../../images/images.qrc"/>
2977+
<include location="../../images/images.qrc"/>
2978+
<include location="../../images/images.qrc"/>
2979+
<include location="../../images/images.qrc"/>
2980+
<include location="../../images/images.qrc"/>
2981+
<include location="../../images/images.qrc"/>
2982+
<include location="../../images/images.qrc"/>
2983+
<include location="../../images/images.qrc"/>
2984+
<include location="../../images/images.qrc"/>
2985+
<include location="../../images/images.qrc"/>
2986+
<include location="../../images/images.qrc"/>
2987+
<include location="../../images/images.qrc"/>
2988+
<include location="../../images/images.qrc"/>
2989+
<include location="../../images/images.qrc"/>
2990+
<include location="../../images/images.qrc"/>
2991+
<include location="../../images/images.qrc"/>
2992+
<include location="../../images/images.qrc"/>
2993+
<include location="../../images/images.qrc"/>
2994+
<include location="../../images/images.qrc"/>
2995+
<include location="../../images/images.qrc"/>
2996+
<include location="../../images/images.qrc"/>
2997+
<include location="../../images/images.qrc"/>
2998+
<include location="../../images/images.qrc"/>
2999+
<include location="../../images/images.qrc"/>
3000+
<include location="../../images/images.qrc"/>
3001+
<include location="../../images/images.qrc"/>
3002+
<include location="../../images/images.qrc"/>
3003+
<include location="../../images/images.qrc"/>
3004+
<include location="../../images/images.qrc"/>
3005+
<include location="../../images/images.qrc"/>
32193006
</resources>
32203007
<connections>
32213008
<connection>

0 commit comments

Comments
 (0)
Please sign in to comment.