Skip to content

Commit 324070f

Browse files
mhugentmhugent
committedApr 22, 2014
Merge branch 'server_legend_url'
·
ltr-3_40archive/master_2
2 parents 2f47bba + d6535a8 commit 324070f

8 files changed

+300
-67
lines changed
 

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ void QgsRasterLayerProperties::sync()
737737
mRasterLayer->dataUrlFormat()
738738
)
739739
);
740+
740741
//layer attribution and metadataUrl
741742
mLayerAttributionLineEdit->setText( mRasterLayer->attribution() );
742743
mLayerAttributionUrlLineEdit->setText( mRasterLayer->attributionUrl() );
@@ -752,6 +753,8 @@ void QgsRasterLayerProperties::sync()
752753
)
753754
);
754755

756+
mLayerLegendUrlLineEdit->setText( mRasterLayer->legendUrl() );
757+
mLayerLegendUrlFormatComboBox->setCurrentIndex( mLayerLegendUrlFormatComboBox->findText( mRasterLayer->legendUrlFormat() ) );
755758
} // QgsRasterLayerProperties::sync()
756759

757760
/*
@@ -925,6 +928,8 @@ void QgsRasterLayerProperties::apply()
925928
mRasterLayer->setMetadataUrl( mLayerMetadataUrlLineEdit->text() );
926929
mRasterLayer->setMetadataUrlType( mLayerMetadataUrlTypeComboBox->currentText() );
927930
mRasterLayer->setMetadataUrlFormat( mLayerMetadataUrlFormatComboBox->currentText() );
931+
mRasterLayer->setLegendUrl( mLayerLegendUrlLineEdit->text() );
932+
mRasterLayer->setLegendUrlFormat( mLayerLegendUrlFormatComboBox->currentText() );
928933

929934
// update symbology
930935
emit refreshLegend( mRasterLayer->id(), false );

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,12 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
248248
layer->metadataUrlFormat()
249249
)
250250
);
251+
mLayerLegendUrlLineEdit->setText( layer->legendUrl() );
252+
mLayerLegendUrlFormatComboBox->setCurrentIndex(
253+
mLayerLegendUrlFormatComboBox->findText(
254+
layer->legendUrlFormat()
255+
)
256+
);
251257
}
252258

253259
QSettings settings;
@@ -556,6 +562,8 @@ void QgsVectorLayerProperties::apply()
556562
layer->setMetadataUrl( mLayerMetadataUrlLineEdit->text() );
557563
layer->setMetadataUrlType( mLayerMetadataUrlTypeComboBox->currentText() );
558564
layer->setMetadataUrlFormat( mLayerMetadataUrlFormatComboBox->currentText() );
565+
layer->setLegendUrl( mLayerLegendUrlLineEdit->text() );
566+
layer->setLegendUrlFormat( mLayerLegendUrlFormatComboBox->currentText() );
559567

560568
//layer simplify drawing configuration
561569
QgsVectorSimplifyMethod::SimplifyHints simplifyHints = QgsVectorSimplifyMethod::NoSimplification;

‎src/core/qgsmaplayer.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,14 @@ bool QgsMapLayer::readLayerXML( const QDomElement& layerElement )
376376
mDataUrlFormat = dataUrlElem.attribute( "format", "" );
377377
}
378378

379+
//legendUrl
380+
QDomElement legendUrlElem = layerElement.firstChildElement( "legendUrl" );
381+
if ( !legendUrlElem.isNull() )
382+
{
383+
mLegendUrl = legendUrlElem.text();
384+
mLegendUrlFormat = legendUrlElem.attribute( "format", "" );
385+
}
386+
379387
//attribution
380388
QDomElement attribElem = layerElement.firstChildElement( "attribution" );
381389
if ( !attribElem.isNull() )
@@ -518,6 +526,17 @@ bool QgsMapLayer::writeLayerXML( QDomElement& layerElement, QDomDocument& docume
518526
layerElement.appendChild( layerDataUrl );
519527
}
520528

529+
// layer legendUrl
530+
QString aLegendUrl = legendUrl();
531+
if ( !aLegendUrl.isEmpty() )
532+
{
533+
QDomElement layerLegendUrl = document.createElement( "legendUrl" ) ;
534+
QDomText layerLegendUrlText = document.createTextNode( aLegendUrl );
535+
layerLegendUrl.appendChild( layerLegendUrlText );
536+
layerLegendUrl.setAttribute( "format", legendUrlFormat() );
537+
layerElement.appendChild( layerLegendUrl );
538+
}
539+
521540
// layer attribution
522541
QString aAttribution = attribution();
523542
if ( !aAttribution.isEmpty() )

‎src/core/qgsmaplayer.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,12 @@ class CORE_EXPORT QgsMapLayer : public QObject
369369
/** Return pointer to layer's undo stack */
370370
QUndoStack *undoStack();
371371

372+
/* Layer legendUrl information */
373+
void setLegendUrl( const QString& legendUrl ) { mLegendUrl = legendUrl; }
374+
const QString& legendUrl() const { return mLegendUrl; }
375+
void setLegendUrlFormat( const QString& legendUrlFormat ) { mLegendUrlFormat = legendUrlFormat; }
376+
const QString& legendUrlFormat() const { return mLegendUrlFormat; }
377+
372378
/** @deprecated since 2.4 - returns NULL */
373379
Q_DECL_DEPRECATED QImage *cacheImage() { return 0; }
374380
/** @deprecated since 2.4 - caches listen to repaintRequested() signal to invalidate the cached image */
@@ -508,6 +514,10 @@ class CORE_EXPORT QgsMapLayer : public QObject
508514
QString mMetadataUrlType;
509515
QString mMetadataUrlFormat;
510516

517+
/**WMS legend*/
518+
QString mLegendUrl;
519+
QString mLegendUrlFormat;
520+
511521
/** \brief Error */
512522
QgsError mError;
513523

‎src/mapserver/qgswmsprojectparser.cpp

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,70 @@ void QgsWMSProjectParser::addLayers( QDomDocument &doc,
969969
styleTitleElem.appendChild( styleTitleText );
970970
styleElem.appendChild( styleNameElem );
971971
styleElem.appendChild( styleTitleElem );
972+
973+
// QString LegendURL for explicit layerbased GetLegendGraphic request
974+
QDomElement getLayerLegendGraphicElem = doc.createElement( "LegendURL" );
975+
QString hrefString = currentLayer->legendUrl();
976+
bool customHrefString;
977+
if ( !hrefString.isEmpty() )
978+
{
979+
customHrefString = true;
980+
}
981+
else
982+
{
983+
customHrefString = false;
984+
hrefString = serviceUrl();
985+
}
986+
if ( hrefString.isEmpty() )
987+
{
988+
hrefString = getCapaServiceUrl( doc );
989+
}
990+
if ( !hrefString.isEmpty() )
991+
{
992+
QStringList getLayerLegendGraphicFormats;
993+
if ( customHrefString == false )
994+
{
995+
getLayerLegendGraphicFormats << "image/png"; // << "jpeg" << "image/jpeg"
996+
997+
}
998+
else
999+
{
1000+
getLayerLegendGraphicFormats << currentLayer->legendUrlFormat();
1001+
}
1002+
1003+
for ( int i = 0; i < getLayerLegendGraphicFormats.size(); ++i )
1004+
{
1005+
QDomElement getLayerLegendGraphicFormatElem = doc.createElement( "Format" );
1006+
QString getLayerLegendGraphicFormat = getLayerLegendGraphicFormats[i];
1007+
QDomText getLayerLegendGraphicFormatText = doc.createTextNode( getLayerLegendGraphicFormat );
1008+
getLayerLegendGraphicFormatElem.appendChild( getLayerLegendGraphicFormatText );
1009+
getLayerLegendGraphicElem.appendChild( getLayerLegendGraphicFormatElem );
1010+
}
1011+
1012+
// no parameters on custom hrefUrl, because should link directly to graphic
1013+
if ( customHrefString == false )
1014+
{
1015+
QUrl mapUrl( hrefString );
1016+
mapUrl.addQueryItem( "SERVICE", "WMS" );
1017+
mapUrl.addQueryItem( "VERSION", version );
1018+
mapUrl.addQueryItem( "REQUEST", "GetLegendGraphic" );
1019+
mapUrl.addQueryItem( "LAYER", currentLayer->name() );
1020+
mapUrl.addQueryItem( "FORMAT", "image/png" );
1021+
mapUrl.addQueryItem( "STYLE", styleNameText.data() );
1022+
if ( version == "1.3.0" )
1023+
{
1024+
mapUrl.addQueryItem( "SLD_VERSION", "1.1.0" );
1025+
}
1026+
hrefString = mapUrl.toString();
1027+
}
1028+
1029+
QDomElement getLayerLegendGraphicORElem = doc.createElement( "OnlineResource" );
1030+
getLayerLegendGraphicORElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
1031+
getLayerLegendGraphicORElem.setAttribute( "xlink:type", "simple" );
1032+
getLayerLegendGraphicORElem.setAttribute( "xlink:href", hrefString );
1033+
getLayerLegendGraphicElem.appendChild( getLayerLegendGraphicORElem );
1034+
styleElem.appendChild( getLayerLegendGraphicElem );
1035+
}
9721036
layerElem.appendChild( styleElem );
9731037

9741038
//min/max scale denominatormScaleBasedVisibility
@@ -1802,3 +1866,21 @@ void QgsWMSProjectParser::cleanupTextAnnotationItems()
18021866
}
18031867
mTextAnnotationItems.clear();
18041868
}
1869+
1870+
QString QgsWMSProjectParser::getCapaServiceUrl( QDomDocument& doc ) const
1871+
{
1872+
QString url;
1873+
QDomNodeList getCapNodeList = doc.elementsByTagName( "GetCapabilities" );
1874+
if ( getCapNodeList.count() > 0 )
1875+
{
1876+
QDomElement getCapElem = getCapNodeList.at( 0 ).toElement();
1877+
QDomNodeList getCapORNodeList = getCapElem.elementsByTagName( "OnlineResource" );
1878+
if ( getCapORNodeList.count() > 0 )
1879+
{
1880+
url = getCapORNodeList.at( 0 ).toElement().attribute( "xlink:href", "" );
1881+
}
1882+
1883+
}
1884+
1885+
return url;
1886+
}

‎src/mapserver/qgswmsprojectparser.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ class QgsWMSProjectParser: public QgsWMSConfigParser
146146
void createSvgAnnotationItems();
147147
void cleanupSvgAnnotationItems();
148148
void cleanupTextAnnotationItems();
149+
150+
QString getCapaServiceUrl( QDomDocument& doc ) const;
149151
};
150152

151153
#endif // QGSWMSPROJECTPARSER_H

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 86 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@
202202
<rect>
203203
<x>0</x>
204204
<y>0</y>
205-
<width>700</width>
206-
<height>686</height>
205+
<width>713</width>
206+
<height>705</height>
207207
</rect>
208208
</property>
209209
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -369,12 +369,12 @@
369369
<string notr="true">rastergeneral</string>
370370
</property>
371371
<layout class="QGridLayout" name="_5">
372-
<property name="margin">
373-
<number>11</number>
374-
</property>
375372
<property name="verticalSpacing">
376373
<number>6</number>
377374
</property>
375+
<property name="margin">
376+
<number>11</number>
377+
</property>
378378
<item row="0" column="4">
379379
<widget class="QLabel" name="textLabel1_2_2_2">
380380
<property name="toolTip">
@@ -663,8 +663,8 @@
663663
<rect>
664664
<x>0</x>
665665
<y>0</y>
666-
<width>700</width>
667-
<height>686</height>
666+
<width>713</width>
667+
<height>705</height>
668668
</rect>
669669
</property>
670670
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1168,8 +1168,8 @@
11681168
<rect>
11691169
<x>0</x>
11701170
<y>0</y>
1171-
<width>700</width>
1172-
<height>686</height>
1171+
<width>713</width>
1172+
<height>705</height>
11731173
</rect>
11741174
</property>
11751175
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1575,8 +1575,8 @@
15751575
<rect>
15761576
<x>0</x>
15771577
<y>0</y>
1578-
<width>700</width>
1579-
<height>686</height>
1578+
<width>713</width>
1579+
<height>705</height>
15801580
</rect>
15811581
</property>
15821582
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1639,8 +1639,8 @@
16391639
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
16401640
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
16411641
p, li { white-space: pre-wrap; }
1642-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
1643-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1642+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
1643+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
16441644
</property>
16451645
</widget>
16461646
</item>
@@ -1736,8 +1736,8 @@ p, li { white-space: pre-wrap; }
17361736
<rect>
17371737
<x>0</x>
17381738
<y>0</y>
1739-
<width>700</width>
1740-
<height>686</height>
1739+
<width>713</width>
1740+
<height>705</height>
17411741
</rect>
17421742
</property>
17431743
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1786,18 +1786,12 @@ p, li { white-space: pre-wrap; }
17861786
<rect>
17871787
<x>0</x>
17881788
<y>0</y>
1789-
<width>700</width>
1790-
<height>686</height>
1789+
<width>713</width>
1790+
<height>705</height>
17911791
</rect>
17921792
</property>
1793-
<layout class="QVBoxLayout" name="verticalLayout_10">
1794-
<property name="topMargin">
1795-
<number>0</number>
1796-
</property>
1797-
<property name="bottomMargin">
1798-
<number>0</number>
1799-
</property>
1800-
<item>
1793+
<layout class="QGridLayout" name="gridLayout_12">
1794+
<item row="0" column="0">
18011795
<widget class="QgsCollapsibleGroupBox" name="mMetaDescriptionGrpBx">
18021796
<property name="title">
18031797
<string>Description</string>
@@ -1885,7 +1879,7 @@ p, li { white-space: pre-wrap; }
18851879
</layout>
18861880
</widget>
18871881
</item>
1888-
<item>
1882+
<item row="1" column="0">
18891883
<widget class="QgsCollapsibleGroupBox" name="mMetaAttributionGrpBx">
18901884
<property name="title">
18911885
<string>Attribution</string>
@@ -1917,7 +1911,7 @@ p, li { white-space: pre-wrap; }
19171911
</layout>
19181912
</widget>
19191913
</item>
1920-
<item>
1914+
<item row="2" column="0">
19211915
<widget class="QgsCollapsibleGroupBox" name="mMetaMetaUrlGrpBx">
19221916
<property name="title">
19231917
<string>MetadataUrl</string>
@@ -2008,7 +2002,65 @@ p, li { white-space: pre-wrap; }
20082002
</layout>
20092003
</widget>
20102004
</item>
2011-
<item>
2005+
<item row="3" column="0">
2006+
<widget class="QgsCollapsibleGroupBox" name="mMetaLegendGrpBx">
2007+
<property name="title">
2008+
<string>LegendUrl</string>
2009+
</property>
2010+
<layout class="QGridLayout" name="gridLayout_10">
2011+
<item row="0" column="0">
2012+
<layout class="QHBoxLayout" name="horizontalLayout_11">
2013+
<item>
2014+
<widget class="QLabel" name="mLayerLegendUrlLabel">
2015+
<property name="text">
2016+
<string>Url</string>
2017+
</property>
2018+
</widget>
2019+
</item>
2020+
<item>
2021+
<widget class="QLineEdit" name="mLayerLegendUrlLineEdit"/>
2022+
</item>
2023+
<item>
2024+
<widget class="QLabel" name="mLayerLegendUrlFormatLabel">
2025+
<property name="text">
2026+
<string>Format</string>
2027+
</property>
2028+
</widget>
2029+
</item>
2030+
<item>
2031+
<widget class="QComboBox" name="mLayerLegendUrlFormatComboBox">
2032+
<property name="minimumSize">
2033+
<size>
2034+
<width>137</width>
2035+
<height>0</height>
2036+
</size>
2037+
</property>
2038+
<property name="currentIndex">
2039+
<number>0</number>
2040+
</property>
2041+
<item>
2042+
<property name="text">
2043+
<string>image/png</string>
2044+
</property>
2045+
</item>
2046+
<item>
2047+
<property name="text">
2048+
<string>image/jpeg</string>
2049+
</property>
2050+
</item>
2051+
<item>
2052+
<property name="text">
2053+
<string>image/jpg</string>
2054+
</property>
2055+
</item>
2056+
</widget>
2057+
</item>
2058+
</layout>
2059+
</item>
2060+
</layout>
2061+
</widget>
2062+
</item>
2063+
<item row="4" column="0">
20122064
<widget class="QgsCollapsibleGroupBox" name="mMetaPropertiesGrpBx">
20132065
<property name="sizePolicy">
20142066
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -2029,7 +2081,7 @@ p, li { white-space: pre-wrap; }
20292081
</layout>
20302082
</widget>
20312083
</item>
2032-
<item>
2084+
<item row="5" column="0">
20332085
<spacer name="verticalSpacer_4">
20342086
<property name="orientation">
20352087
<enum>Qt::Vertical</enum>
@@ -2116,6 +2168,11 @@ p, li { white-space: pre-wrap; }
21162168
</layout>
21172169
</widget>
21182170
<customwidgets>
2171+
<customwidget>
2172+
<class>QgsScaleComboBox</class>
2173+
<extends>QComboBox</extends>
2174+
<header>qgsscalecombobox.h</header>
2175+
</customwidget>
21192176
<customwidget>
21202177
<class>QgsCollapsibleGroupBox</class>
21212178
<extends>QGroupBox</extends>
@@ -2132,11 +2189,6 @@ p, li { white-space: pre-wrap; }
21322189
<extends>QPushButton</extends>
21332190
<header>qgscolorbutton.h</header>
21342191
</customwidget>
2135-
<customwidget>
2136-
<class>QgsScaleComboBox</class>
2137-
<extends>QComboBox</extends>
2138-
<header>qgsscalecombobox.h</header>
2139-
</customwidget>
21402192
</customwidgets>
21412193
<resources>
21422194
<include location="../../images/images.qrc"/>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 88 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@
266266
<rect>
267267
<x>0</x>
268268
<y>0</y>
269-
<width>427</width>
270-
<height>525</height>
269+
<width>383</width>
270+
<height>504</height>
271271
</rect>
272272
</property>
273273
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -467,12 +467,12 @@
467467
<string notr="true">vectorgeneral</string>
468468
</property>
469469
<layout class="QGridLayout" name="_5">
470-
<property name="margin">
471-
<number>11</number>
472-
</property>
473470
<property name="verticalSpacing">
474471
<number>6</number>
475472
</property>
473+
<property name="margin">
474+
<number>11</number>
475+
</property>
476476
<item row="0" column="4">
477477
<widget class="QLabel" name="textLabel1_2_2_2">
478478
<property name="toolTip">
@@ -769,8 +769,8 @@
769769
<rect>
770770
<x>0</x>
771771
<y>0</y>
772-
<width>121</width>
773-
<height>38</height>
772+
<width>101</width>
773+
<height>35</height>
774774
</rect>
775775
</property>
776776
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -875,8 +875,8 @@
875875
<rect>
876876
<x>0</x>
877877
<y>0</y>
878-
<width>702</width>
879-
<height>171</height>
878+
<width>574</width>
879+
<height>144</height>
880880
</rect>
881881
</property>
882882
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -1018,8 +1018,8 @@
10181018
<rect>
10191019
<x>0</x>
10201020
<y>0</y>
1021-
<width>476</width>
1022-
<height>182</height>
1021+
<width>768</width>
1022+
<height>506</height>
10231023
</rect>
10241024
</property>
10251025
<layout class="QVBoxLayout" name="verticalLayout_26">
@@ -1179,8 +1179,8 @@
11791179
<rect>
11801180
<x>0</x>
11811181
<y>0</y>
1182-
<width>755</width>
1183-
<height>487</height>
1182+
<width>768</width>
1183+
<height>506</height>
11841184
</rect>
11851185
</property>
11861186
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -1227,8 +1227,8 @@
12271227
<rect>
12281228
<x>0</x>
12291229
<y>0</y>
1230-
<width>755</width>
1231-
<height>487</height>
1230+
<width>768</width>
1231+
<height>506</height>
12321232
</rect>
12331233
</property>
12341234
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1325,8 +1325,8 @@
13251325
<rect>
13261326
<x>0</x>
13271327
<y>0</y>
1328-
<width>100</width>
1329-
<height>30</height>
1328+
<width>768</width>
1329+
<height>506</height>
13301330
</rect>
13311331
</property>
13321332
<layout class="QVBoxLayout" name="verticalLayout_24">
@@ -1367,15 +1367,12 @@
13671367
<rect>
13681368
<x>0</x>
13691369
<y>0</y>
1370-
<width>375</width>
1371-
<height>519</height>
1370+
<width>751</width>
1371+
<height>552</height>
13721372
</rect>
13731373
</property>
1374-
<layout class="QVBoxLayout" name="verticalLayout_8">
1375-
<property name="margin">
1376-
<number>0</number>
1377-
</property>
1378-
<item>
1374+
<layout class="QGridLayout" name="gridLayout_3">
1375+
<item row="0" column="0">
13791376
<widget class="QgsCollapsibleGroupBox" name="mMetaDescriptionGrpBx">
13801377
<property name="title">
13811378
<string>Description</string>
@@ -1470,7 +1467,7 @@
14701467
</layout>
14711468
</widget>
14721469
</item>
1473-
<item>
1470+
<item row="1" column="0">
14741471
<widget class="QgsCollapsibleGroupBox" name="mMetaAttributionGrpBx">
14751472
<property name="title">
14761473
<string>Attribution</string>
@@ -1502,7 +1499,7 @@
15021499
</layout>
15031500
</widget>
15041501
</item>
1505-
<item>
1502+
<item row="2" column="0">
15061503
<widget class="QgsCollapsibleGroupBox" name="mMetaMetaUrlGrpBx">
15071504
<property name="title">
15081505
<string>MetadataUrl</string>
@@ -1593,7 +1590,65 @@
15931590
</layout>
15941591
</widget>
15951592
</item>
1596-
<item>
1593+
<item row="3" column="0">
1594+
<widget class="QgsCollapsibleGroupBox" name="mMetaLegendGrpBx">
1595+
<property name="title">
1596+
<string>LegendUrl</string>
1597+
</property>
1598+
<layout class="QGridLayout" name="gridLayout_2">
1599+
<item row="0" column="0">
1600+
<layout class="QHBoxLayout" name="horizontalLayout_2">
1601+
<item>
1602+
<widget class="QLabel" name="mLayerLegendUrlLabel">
1603+
<property name="text">
1604+
<string>Url</string>
1605+
</property>
1606+
</widget>
1607+
</item>
1608+
<item>
1609+
<widget class="QLineEdit" name="mLayerLegendUrlLineEdit"/>
1610+
</item>
1611+
<item>
1612+
<widget class="QLabel" name="mLayerLegendUrlFormatLabel">
1613+
<property name="text">
1614+
<string>Format</string>
1615+
</property>
1616+
</widget>
1617+
</item>
1618+
<item>
1619+
<widget class="QComboBox" name="mLayerLegendUrlFormatComboBox">
1620+
<property name="minimumSize">
1621+
<size>
1622+
<width>137</width>
1623+
<height>0</height>
1624+
</size>
1625+
</property>
1626+
<property name="currentIndex">
1627+
<number>0</number>
1628+
</property>
1629+
<item>
1630+
<property name="text">
1631+
<string>image/png</string>
1632+
</property>
1633+
</item>
1634+
<item>
1635+
<property name="text">
1636+
<string>image/jpeg</string>
1637+
</property>
1638+
</item>
1639+
<item>
1640+
<property name="text">
1641+
<string>image/jpg</string>
1642+
</property>
1643+
</item>
1644+
</widget>
1645+
</item>
1646+
</layout>
1647+
</item>
1648+
</layout>
1649+
</widget>
1650+
</item>
1651+
<item row="4" column="0">
15971652
<widget class="QgsCollapsibleGroupBox" name="mMetaPropertiesGrpBx">
15981653
<property name="sizePolicy">
15991654
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -1621,7 +1676,7 @@
16211676
</layout>
16221677
</widget>
16231678
</item>
1624-
<item>
1679+
<item row="5" column="0">
16251680
<spacer name="verticalSpacer_3">
16261681
<property name="orientation">
16271682
<enum>Qt::Vertical</enum>
@@ -1712,17 +1767,17 @@
17121767
</layout>
17131768
</widget>
17141769
<customwidgets>
1770+
<customwidget>
1771+
<class>QgsScaleComboBox</class>
1772+
<extends>QComboBox</extends>
1773+
<header>qgsscalecombobox.h</header>
1774+
</customwidget>
17151775
<customwidget>
17161776
<class>QgsCollapsibleGroupBox</class>
17171777
<extends>QGroupBox</extends>
17181778
<header>qgscollapsiblegroupbox.h</header>
17191779
<container>1</container>
17201780
</customwidget>
1721-
<customwidget>
1722-
<class>QgsScaleComboBox</class>
1723-
<extends>QComboBox</extends>
1724-
<header>qgsscalecombobox.h</header>
1725-
</customwidget>
17261781
</customwidgets>
17271782
<resources>
17281783
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)
Please sign in to comment.