Skip to content

Commit 0e4b6b8

Browse files
signedavsignedav
committedMay 13, 2020
WMSOnlineResource can be defined by an expression. This means it's stored as a QgsProperty.
Functions to read and write QgsProperty.
·
ltr-3_40final-3_14_0
1 parent 7bbfe5a commit 0e4b6b8

File tree

5 files changed

+210
-146
lines changed

5 files changed

+210
-146
lines changed
 

‎python/core/auto_generated/qgsproject.sip.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,18 @@ Write a string list entry to the project file.
401401
Keys are '/'-delimited entries, implying
402402
a hierarchy of keys and corresponding values
403403

404+
.. note::
405+
406+
The key string must be valid xml tag names in order to be saved to the file.
407+
%End
408+
409+
bool writeEntry( const QString &scope, const QString &key, const QgsProperty &value );
410+
%Docstring
411+
Write a QgsProperty entry to the project file.
412+
413+
Keys are '/'-delimited entries, implying
414+
a hierarchy of keys and corresponding values
415+
404416
.. note::
405417

406418
The key string must be valid xml tag names in order to be saved to the file.
@@ -418,6 +430,7 @@ implying a hierarchy of keys and corresponding values
418430
int readNumEntry( const QString &scope, const QString &key, int def = 0, bool *ok = 0 ) const;
419431
double readDoubleEntry( const QString &scope, const QString &key, double def = 0, bool *ok = 0 ) const;
420432
bool readBoolEntry( const QString &scope, const QString &key, bool def = false, bool *ok = 0 ) const;
433+
QgsProperty readPropertyEntry( const QString &scope, const QString &key, QgsProperty def = QgsProperty(), bool *ok = 0 ) const;
421434

422435

423436
bool removeEntry( const QString &scope, const QString &key );

‎src/app/qgsprojectproperties.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
442442
mWMSContactPhone->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPhone" ), QStringLiteral( "/" ), QString() ) );
443443
mWMSAbstract->setPlainText( QgsProject::instance()->readEntry( QStringLiteral( "WMSServiceAbstract" ), QStringLiteral( "/" ), QString() ) );
444444
mWMSOnlineResourceLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSOnlineResource" ), QStringLiteral( "/" ), QString() ) );
445+
mWMSOnlineResourceExpressionButton->setToProperty( QgsProject::instance()->readPropertyEntry( "WMSOnlineResourceExpression", "/" ) );
445446
mWMSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSUrl" ), QStringLiteral( "/" ), QString() ) );
446447
mWMSKeywordList->setText( QgsProject::instance()->readListEntry( QStringLiteral( "WMSKeywordList" ), QStringLiteral( "/" ) ).join( QStringLiteral( ", " ) ) );
447448

@@ -1170,6 +1171,7 @@ void QgsProjectProperties::apply()
11701171
QgsProject::instance()->writeEntry( QStringLiteral( "WMSContactPhone" ), QStringLiteral( "/" ), mWMSContactPhone->text() );
11711172
QgsProject::instance()->writeEntry( QStringLiteral( "WMSServiceAbstract" ), QStringLiteral( "/" ), mWMSAbstract->toPlainText() );
11721173
QgsProject::instance()->writeEntry( QStringLiteral( "WMSOnlineResource" ), QStringLiteral( "/" ), mWMSOnlineResourceLineEdit->text() );
1174+
QgsProject::instance()->writeEntry( QStringLiteral( "WMSOnlineResourceExpression" ), QStringLiteral( "/" ), mWMSOnlineResourceExpressionButton->toProperty() );
11731175
QgsProject::instance()->writeEntry( QStringLiteral( "WMSUrl" ), QStringLiteral( "/" ), mWMSUrlLineEdit->text() );
11741176

11751177
// WMS Contact Position

‎src/core/qgsproject.cpp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2359,6 +2359,17 @@ bool QgsProject::writeEntry( const QString &scope, const QString &key, const QSt
23592359
return success;
23602360
}
23612361

2362+
bool QgsProject::writeEntry( const QString &scope, const QString &key, const QgsProperty &value )
2363+
{
2364+
bool propertiesModified;
2365+
bool success = addKey_( scope, key, &mProperties, value.toVariant(), propertiesModified );
2366+
2367+
if ( propertiesModified )
2368+
setDirty( true );
2369+
2370+
return success;
2371+
}
2372+
23622373
QStringList QgsProject::readListEntry( const QString &scope,
23632374
const QString &key,
23642375
const QStringList &def,
@@ -2477,6 +2488,25 @@ bool QgsProject::readBoolEntry( const QString &scope, const QString &key, bool d
24772488
return def;
24782489
}
24792490

2491+
QgsProperty QgsProject::readPropertyEntry( const QString &scope, const QString &key, QgsProperty def, bool *ok ) const
2492+
{
2493+
QgsProjectProperty *property = findKey_( scope, key, mProperties );
2494+
2495+
if ( property )
2496+
{
2497+
QgsProperty qgsproperty;
2498+
QVariant value = property->value();
2499+
bool loaded = qgsproperty.loadVariant( value );
2500+
if ( ok )
2501+
*ok = loaded;
2502+
2503+
if ( loaded )
2504+
return qgsproperty;
2505+
}
2506+
2507+
return def;
2508+
}
2509+
24802510

24812511
bool QgsProject::removeEntry( const QString &scope, const QString &key )
24822512
{

‎src/core/qgsproject.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,16 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
423423
*/
424424
bool writeEntry( const QString &scope, const QString &key, const QStringList &value );
425425

426+
/**
427+
* Write a QgsProperty entry to the project file.
428+
*
429+
* Keys are '/'-delimited entries, implying
430+
* a hierarchy of keys and corresponding values
431+
*
432+
* \note The key string must be valid xml tag names in order to be saved to the file.
433+
*/
434+
bool writeEntry( const QString &scope, const QString &key, const QgsProperty &value );
435+
426436
/**
427437
* Key value accessors
428438
*
@@ -435,6 +445,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
435445
int readNumEntry( const QString &scope, const QString &key, int def = 0, bool *ok = nullptr ) const;
436446
double readDoubleEntry( const QString &scope, const QString &key, double def = 0, bool *ok = nullptr ) const;
437447
bool readBoolEntry( const QString &scope, const QString &key, bool def = false, bool *ok = nullptr ) const;
448+
QgsProperty readPropertyEntry( const QString &scope, const QString &key, QgsProperty def = QgsProperty(), bool *ok = nullptr ) const;
438449

439450

440451
//! Remove the given key

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 154 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
</sizepolicy>
246246
</property>
247247
<property name="currentIndex">
248-
<number>0</number>
248+
<number>8</number>
249249
</property>
250250
<widget class="QWidget" name="mProjOptsGeneral">
251251
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -275,7 +275,7 @@
275275
<x>0</x>
276276
<y>0</y>
277277
<width>671</width>
278-
<height>865</height>
278+
<height>828</height>
279279
</rect>
280280
</property>
281281
<layout class="QVBoxLayout" name="verticalLayout">
@@ -897,8 +897,8 @@
897897
<rect>
898898
<x>0</x>
899899
<y>0</y>
900-
<width>587</width>
901-
<height>167</height>
900+
<width>685</width>
901+
<height>681</height>
902902
</rect>
903903
</property>
904904
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -972,8 +972,8 @@
972972
<rect>
973973
<x>0</x>
974974
<y>0</y>
975-
<width>288</width>
976-
<height>563</height>
975+
<width>685</width>
976+
<height>681</height>
977977
</rect>
978978
</property>
979979
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1548,8 +1548,8 @@
15481548
<rect>
15491549
<x>0</x>
15501550
<y>0</y>
1551-
<width>177</width>
1552-
<height>56</height>
1551+
<width>178</width>
1552+
<height>54</height>
15531553
</rect>
15541554
</property>
15551555
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -1610,8 +1610,8 @@
16101610
<rect>
16111611
<x>0</x>
16121612
<y>0</y>
1613-
<width>643</width>
1614-
<height>2818</height>
1613+
<width>671</width>
1614+
<height>2718</height>
16151615
</rect>
16161616
</property>
16171617
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1642,54 +1642,40 @@
16421642
<bool>true</bool>
16431643
</property>
16441644
<layout class="QGridLayout" name="gridLayout_6">
1645-
<item row="1" column="0">
1646-
<widget class="QLabel" name="label_10">
1647-
<property name="text">
1648-
<string>Title</string>
1649-
</property>
1650-
<property name="buddy">
1651-
<cstring>mWMSTitle</cstring>
1652-
</property>
1653-
</widget>
1654-
</item>
1655-
<item row="3" column="1">
1656-
<widget class="QLineEdit" name="mWMSOnlineResourceLineEdit">
1645+
<item row="14" column="1">
1646+
<widget class="QComboBox" name="mWMSAccessConstraintsCb">
16571647
<property name="toolTip">
1658-
<string>The web site URL of the service provider.</string>
1648+
<string>Access constraints applied to the service.</string>
16591649
</property>
1660-
<property name="placeholderText">
1661-
<string>The web site URL of the service provider.</string>
1650+
<property name="editable">
1651+
<bool>true</bool>
16621652
</property>
16631653
</widget>
16641654
</item>
1665-
<item row="3" column="0">
1666-
<widget class="QLabel" name="mWMSOnlineResourceLabel">
1667-
<property name="text">
1668-
<string>Online resource</string>
1655+
<item row="12" column="1">
1656+
<widget class="QTextEdit" name="mWMSAbstract">
1657+
<property name="toolTip">
1658+
<string>The abstract is a descriptive narrative providing more information about the service.</string>
16691659
</property>
1670-
</widget>
1671-
</item>
1672-
<item row="4" column="0">
1673-
<widget class="QLabel" name="label_9">
1674-
<property name="text">
1675-
<string>&amp;Person</string>
1660+
<property name="whatsThis">
1661+
<string/>
16761662
</property>
1677-
<property name="buddy">
1678-
<cstring>mWMSContactPerson</cstring>
1663+
<property name="documentTitle">
1664+
<string/>
16791665
</property>
16801666
</widget>
16811667
</item>
1682-
<item row="6" column="1">
1683-
<widget class="QLineEdit" name="mWMSContactMail">
1668+
<item row="0" column="1">
1669+
<widget class="QLineEdit" name="mWMSName">
16841670
<property name="toolTip">
1685-
<string>The contact person e-mail for the service.</string>
1671+
<string>A name used to identify the root layer. The short name is a text string used for machine-to-machine communication.</string>
16861672
</property>
16871673
<property name="placeholderText">
1688-
<string>The contact person e-mail for the service.</string>
1674+
<string>A name used to identify the root layer. The short name is a text string used for machine-to-machine communication.</string>
16891675
</property>
16901676
</widget>
16911677
</item>
1692-
<item row="4" column="1">
1678+
<item row="8" column="1">
16931679
<widget class="QLineEdit" name="mWMSContactPerson">
16941680
<property name="toolTip">
16951681
<string>The contact person name for the service.</string>
@@ -1699,30 +1685,13 @@
16991685
</property>
17001686
</widget>
17011687
</item>
1702-
<item row="6" column="0">
1703-
<widget class="QLabel" name="label_13">
1704-
<property name="text">
1705-
<string>E-Mail</string>
1706-
</property>
1707-
</widget>
1708-
</item>
1709-
<item row="2" column="1">
1710-
<widget class="QLineEdit" name="mWMSContactOrganization">
1688+
<item row="13" column="1">
1689+
<widget class="QComboBox" name="mWMSFeesCb">
17111690
<property name="toolTip">
1712-
<string>The name of the service provider.</string>
1713-
</property>
1714-
<property name="placeholderText">
1715-
<string>The name of the service provider.</string>
1716-
</property>
1717-
</widget>
1718-
</item>
1719-
<item row="7" column="0">
1720-
<widget class="QLabel" name="label_12">
1721-
<property name="text">
1722-
<string>Phone</string>
1691+
<string>Fees applied to the service.</string>
17231692
</property>
1724-
<property name="buddy">
1725-
<cstring>mWMSContactPhone</cstring>
1693+
<property name="editable">
1694+
<bool>true</bool>
17261695
</property>
17271696
</widget>
17281697
</item>
@@ -1736,134 +1705,176 @@
17361705
</property>
17371706
</widget>
17381707
</item>
1739-
<item row="8" column="0">
1740-
<widget class="QLabel" name="label_15">
1708+
<item row="15" column="0">
1709+
<widget class="QLabel" name="mWMSKeywordListLabel">
17411710
<property name="text">
1742-
<string>Abstract</string>
1743-
</property>
1744-
<property name="buddy">
1745-
<cstring>mWMSAbstract</cstring>
1711+
<string>Keyword list</string>
17461712
</property>
17471713
</widget>
17481714
</item>
1749-
<item row="7" column="1">
1750-
<widget class="QLineEdit" name="mWMSContactPhone">
1751-
<property name="toolTip">
1752-
<string>The contact person phone for the service.</string>
1715+
<item row="1" column="0">
1716+
<widget class="QLabel" name="label_10">
1717+
<property name="text">
1718+
<string>Title</string>
17531719
</property>
1754-
<property name="placeholderText">
1755-
<string>The contact person phone for the service.</string>
1720+
<property name="buddy">
1721+
<cstring>mWMSTitle</cstring>
17561722
</property>
17571723
</widget>
17581724
</item>
1759-
<item row="8" column="1">
1760-
<widget class="QTextEdit" name="mWMSAbstract">
1761-
<property name="toolTip">
1762-
<string>The abstract is a descriptive narrative providing more information about the service.</string>
1763-
</property>
1764-
<property name="whatsThis">
1765-
<string/>
1725+
<item row="2" column="0">
1726+
<widget class="QLabel" name="label_11">
1727+
<property name="text">
1728+
<string>Or&amp;ganization</string>
17661729
</property>
1767-
<property name="documentTitle">
1768-
<string/>
1730+
<property name="buddy">
1731+
<cstring>mWMSContactOrganization</cstring>
17691732
</property>
17701733
</widget>
17711734
</item>
1772-
<item row="11" column="0">
1773-
<widget class="QLabel" name="mWMSKeywordListLabel">
1735+
<item row="13" column="0">
1736+
<widget class="QLabel" name="mWMSFeesLabel">
17741737
<property name="text">
1775-
<string>Keyword list</string>
1738+
<string>Fees</string>
17761739
</property>
17771740
</widget>
17781741
</item>
1779-
<item row="11" column="1">
1780-
<widget class="QLineEdit" name="mWMSKeywordList">
1742+
<item row="2" column="1">
1743+
<widget class="QLineEdit" name="mWMSContactOrganization">
17811744
<property name="toolTip">
1782-
<string>List of keywords separated by comma to help catalog searching.</string>
1745+
<string>The name of the service provider.</string>
17831746
</property>
17841747
<property name="placeholderText">
1785-
<string>List of keywords separated by comma to help catalog searching.</string>
1748+
<string>The name of the service provider.</string>
17861749
</property>
17871750
</widget>
17881751
</item>
1789-
<item row="2" column="0">
1790-
<widget class="QLabel" name="label_11">
1752+
<item row="9" column="0">
1753+
<widget class="QLabel" name="label_20">
17911754
<property name="text">
1792-
<string>Or&amp;ganization</string>
1793-
</property>
1794-
<property name="buddy">
1795-
<cstring>mWMSContactOrganization</cstring>
1755+
<string>Position</string>
17961756
</property>
17971757
</widget>
17981758
</item>
1799-
<item row="10" column="0">
1800-
<widget class="QLabel" name="mWMSAccessConstraintsLabel">
1759+
<item row="11" column="0">
1760+
<widget class="QLabel" name="label_12">
18011761
<property name="text">
1802-
<string>Access constraints</string>
1762+
<string>Phone</string>
1763+
</property>
1764+
<property name="buddy">
1765+
<cstring>mWMSContactPhone</cstring>
18031766
</property>
18041767
</widget>
18051768
</item>
1806-
<item row="9" column="0">
1807-
<widget class="QLabel" name="mWMSFeesLabel">
1769+
<item row="10" column="0">
1770+
<widget class="QLabel" name="label_13">
18081771
<property name="text">
1809-
<string>Fees</string>
1772+
<string>E-Mail</string>
18101773
</property>
18111774
</widget>
18121775
</item>
18131776
<item row="9" column="1">
1814-
<widget class="QComboBox" name="mWMSFeesCb">
1777+
<widget class="QComboBox" name="mWMSContactPositionCb">
18151778
<property name="toolTip">
1816-
<string>Fees applied to the service.</string>
1779+
<string>The contact person position for the service.</string>
1780+
</property>
1781+
<property name="accessibleDescription">
1782+
<string/>
18171783
</property>
18181784
<property name="editable">
18191785
<bool>true</bool>
18201786
</property>
18211787
</widget>
18221788
</item>
1823-
<item row="10" column="1">
1824-
<widget class="QComboBox" name="mWMSAccessConstraintsCb">
1789+
<item row="15" column="1">
1790+
<widget class="QLineEdit" name="mWMSKeywordList">
18251791
<property name="toolTip">
1826-
<string>Access constraints applied to the service.</string>
1792+
<string>List of keywords separated by comma to help catalog searching.</string>
18271793
</property>
1828-
<property name="editable">
1829-
<bool>true</bool>
1794+
<property name="placeholderText">
1795+
<string>List of keywords separated by comma to help catalog searching.</string>
18301796
</property>
18311797
</widget>
18321798
</item>
1833-
<item row="5" column="0">
1834-
<widget class="QLabel" name="label_20">
1799+
<item row="0" column="0">
1800+
<widget class="QLabel" name="label_6">
18351801
<property name="text">
1836-
<string>Position</string>
1802+
<string>Short name</string>
18371803
</property>
18381804
</widget>
18391805
</item>
1840-
<item row="5" column="1">
1841-
<widget class="QComboBox" name="mWMSContactPositionCb">
1842-
<property name="toolTip">
1843-
<string>The contact person position for the service.</string>
1806+
<item row="12" column="0">
1807+
<widget class="QLabel" name="label_15">
1808+
<property name="text">
1809+
<string>Abstract</string>
18441810
</property>
1845-
<property name="accessibleDescription">
1846-
<string/>
1811+
<property name="buddy">
1812+
<cstring>mWMSAbstract</cstring>
18471813
</property>
1848-
<property name="editable">
1849-
<bool>true</bool>
1814+
</widget>
1815+
</item>
1816+
<item row="8" column="0">
1817+
<widget class="QLabel" name="label_9">
1818+
<property name="text">
1819+
<string>&amp;Person</string>
1820+
</property>
1821+
<property name="buddy">
1822+
<cstring>mWMSContactPerson</cstring>
18501823
</property>
18511824
</widget>
18521825
</item>
1853-
<item row="0" column="1">
1854-
<widget class="QLineEdit" name="mWMSName">
1826+
<item row="11" column="1">
1827+
<widget class="QLineEdit" name="mWMSContactPhone">
18551828
<property name="toolTip">
1856-
<string>A name used to identify the root layer. The short name is a text string used for machine-to-machine communication.</string>
1829+
<string>The contact person phone for the service.</string>
18571830
</property>
18581831
<property name="placeholderText">
1859-
<string>A name used to identify the root layer. The short name is a text string used for machine-to-machine communication.</string>
1832+
<string>The contact person phone for the service.</string>
18601833
</property>
18611834
</widget>
18621835
</item>
1863-
<item row="0" column="0">
1864-
<widget class="QLabel" name="label_6">
1836+
<item row="10" column="1">
1837+
<widget class="QLineEdit" name="mWMSContactMail">
1838+
<property name="toolTip">
1839+
<string>The contact person e-mail for the service.</string>
1840+
</property>
1841+
<property name="placeholderText">
1842+
<string>The contact person e-mail for the service.</string>
1843+
</property>
1844+
</widget>
1845+
</item>
1846+
<item row="14" column="0">
1847+
<widget class="QLabel" name="mWMSAccessConstraintsLabel">
18651848
<property name="text">
1866-
<string>Short name</string>
1849+
<string>Access constraints</string>
1850+
</property>
1851+
</widget>
1852+
</item>
1853+
<item row="4" column="1">
1854+
<layout class="QGridLayout" name="wmsOnlineResourceGrid">
1855+
<item row="0" column="0">
1856+
<widget class="QLineEdit" name="mWMSOnlineResourceLineEdit">
1857+
<property name="toolTip">
1858+
<string>The web site URL of the service provider.</string>
1859+
</property>
1860+
<property name="placeholderText">
1861+
<string>The web site URL of the service provider.</string>
1862+
</property>
1863+
</widget>
1864+
</item>
1865+
<item row="0" column="1">
1866+
<widget class="QgsPropertyOverrideButton" name="mWMSOnlineResourceExpressionButton">
1867+
<property name="text">
1868+
<string>...</string>
1869+
</property>
1870+
</widget>
1871+
</item>
1872+
</layout>
1873+
</item>
1874+
<item row="4" column="0">
1875+
<widget class="QLabel" name="mWMSOnlineResourceLabel">
1876+
<property name="text">
1877+
<string>Online resource</string>
18671878
</property>
18681879
</widget>
18691880
</item>
@@ -2009,14 +2020,14 @@
20092020
<bool>true</bool>
20102021
</property>
20112022
<layout class="QGridLayout" name="gridLayout_5">
2012-
<item row="1" column="0">
2013-
<widget class="QToolButton" name="pbnWMSAddSRS">
2023+
<item row="1" column="1">
2024+
<widget class="QToolButton" name="pbnWMSRemoveSRS">
20142025
<property name="toolTip">
2015-
<string>Add new CRS</string>
2026+
<string>Remove selected CRS</string>
20162027
</property>
20172028
<property name="icon">
20182029
<iconset resource="../../images/images.qrc">
2019-
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
2030+
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
20202031
</property>
20212032
</widget>
20222033
</item>
@@ -2033,14 +2044,14 @@
20332044
</property>
20342045
</widget>
20352046
</item>
2036-
<item row="1" column="1">
2037-
<widget class="QToolButton" name="pbnWMSRemoveSRS">
2047+
<item row="1" column="0">
2048+
<widget class="QToolButton" name="pbnWMSAddSRS">
20382049
<property name="toolTip">
2039-
<string>Remove selected CRS</string>
2050+
<string>Add new CRS</string>
20402051
</property>
20412052
<property name="icon">
20422053
<iconset resource="../../images/images.qrc">
2043-
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
2054+
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
20442055
</property>
20452056
</widget>
20462057
</item>
@@ -2990,6 +3001,12 @@
29903001
</layout>
29913002
</widget>
29923003
<customwidgets>
3004+
<customwidget>
3005+
<class>QgsCollapsibleGroupBox</class>
3006+
<extends>QGroupBox</extends>
3007+
<header>qgscollapsiblegroupbox.h</header>
3008+
<container>1</container>
3009+
</customwidget>
29933010
<customwidget>
29943011
<class>QgsFilterLineEdit</class>
29953012
<extends>QLineEdit</extends>
@@ -3007,12 +3024,6 @@
30073024
<header>qgsscrollarea.h</header>
30083025
<container>1</container>
30093026
</customwidget>
3010-
<customwidget>
3011-
<class>QgsCollapsibleGroupBox</class>
3012-
<extends>QGroupBox</extends>
3013-
<header>qgscollapsiblegroupbox.h</header>
3014-
<container>1</container>
3015-
</customwidget>
30163027
<customwidget>
30173028
<class>QgsDateTimeEdit</class>
30183029
<extends>QDateTimeEdit</extends>
@@ -3112,7 +3123,6 @@
31123123
<tabstop>mWMSName</tabstop>
31133124
<tabstop>mWMSTitle</tabstop>
31143125
<tabstop>mWMSContactOrganization</tabstop>
3115-
<tabstop>mWMSOnlineResourceLineEdit</tabstop>
31163126
<tabstop>mWMSContactPerson</tabstop>
31173127
<tabstop>mWMSContactPositionCb</tabstop>
31183128
<tabstop>mWMSContactMail</tabstop>
@@ -3172,8 +3182,6 @@
31723182
</tabstops>
31733183
<resources>
31743184
<include location="../../images/images.qrc"/>
3175-
<include location="../../images/images.qrc"/>
3176-
<include location="../../images/images.qrc"/>
31773185
</resources>
31783186
<connections>
31793187
<connection>

0 commit comments

Comments
 (0)
Please sign in to comment.