Skip to content

Commit 2f7197c

Browse files
author
timlinux
committedJan 11, 2010
[FEATURE] Made wms search server user configurable
git-svn-id: http://svn.osgeo.org/qgis/trunk@12740 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 44c174c commit 2f7197c

File tree

3 files changed

+170
-144
lines changed

3 files changed

+170
-144
lines changed
 

‎src/app/qgsoptions.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
114114
}
115115
}
116116

117+
//wms search server
118+
leWmsSearch->setText( settings.value( "/qgis/WMSSearchUrl", "http://geopole.org/wms/search?search=%1&type=rss" ).toString() );
119+
120+
117121
// set the current theme
118122
cmbTheme->setItemText( cmbTheme->currentIndex(), settings.value( "/Themes" ).toString() );
119123

@@ -438,6 +442,9 @@ void QgsOptions::saveOptions()
438442
}
439443
settings.setValue( "proxy/proxyExcludedUrls", proxyExcludeString );
440444

445+
//wms search url
446+
settings.setValue( "/qgis/WMSSearchUrl", leWmsSearch->text() );
447+
441448
//general settings
442449
settings.setValue( "/Map/identifyMode", cmbIdentifyMode->itemData( cmbIdentifyMode->currentIndex() ).toInt() );
443450
settings.setValue( "/Map/identifyAutoFeatureForm", cbxAutoFeatureForm->isChecked() );

‎src/app/qgswmssourceselect.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,9 @@ bool QgsWMSSourceSelect::retrieveSearchResults( const QString& searchTerm, QByte
821821
}
822822
// Get username/password from settings for protected WMS
823823

824-
QUrl url( QString( "http://geopole.org/wms/search?search=%1&type=rss" ).arg( searchTerm ) );
824+
QString mySearchUrl = settings.value("/qgis/WMSSearchUrl", "http://geopole.org/wms/search?search=%1&type=rss").toString();
825+
QUrl url( mySearchUrl.arg( searchTerm ) );
826+
QgsDebugMsg( url.toString() );
825827
QgsHttpTransaction http( url.toEncoded(),
826828
proxyHost, proxyPort, proxyUser, proxyPassword, proxyType );
827829

‎src/ui/qgsoptionsbase.ui

Lines changed: 160 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,152 @@
2020
<bool>true</bool>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_3">
23+
<item row="0" column="0">
24+
<widget class="QListWidget" name="listWidget">
25+
<property name="minimumSize">
26+
<size>
27+
<width>110</width>
28+
<height>0</height>
29+
</size>
30+
</property>
31+
<property name="maximumSize">
32+
<size>
33+
<width>110</width>
34+
<height>16777215</height>
35+
</size>
36+
</property>
37+
<property name="frameShape">
38+
<enum>QFrame::NoFrame</enum>
39+
</property>
40+
<property name="frameShadow">
41+
<enum>QFrame::Plain</enum>
42+
</property>
43+
<property name="horizontalScrollBarPolicy">
44+
<enum>Qt::ScrollBarAlwaysOff</enum>
45+
</property>
46+
<property name="editTriggers">
47+
<set>QAbstractItemView::NoEditTriggers</set>
48+
</property>
49+
<property name="showDropIndicator" stdset="0">
50+
<bool>false</bool>
51+
</property>
52+
<property name="alternatingRowColors">
53+
<bool>false</bool>
54+
</property>
55+
<property name="iconSize">
56+
<size>
57+
<width>64</width>
58+
<height>64</height>
59+
</size>
60+
</property>
61+
<property name="textElideMode">
62+
<enum>Qt::ElideNone</enum>
63+
</property>
64+
<property name="flow">
65+
<enum>QListView::TopToBottom</enum>
66+
</property>
67+
<property name="isWrapping" stdset="0">
68+
<bool>false</bool>
69+
</property>
70+
<property name="resizeMode">
71+
<enum>QListView::Adjust</enum>
72+
</property>
73+
<property name="spacing">
74+
<number>9</number>
75+
</property>
76+
<property name="viewMode">
77+
<enum>QListView::IconMode</enum>
78+
</property>
79+
<property name="uniformItemSizes">
80+
<bool>false</bool>
81+
</property>
82+
<property name="wordWrap">
83+
<bool>true</bool>
84+
</property>
85+
<item>
86+
<property name="text">
87+
<string>General</string>
88+
</property>
89+
<property name="textAlignment">
90+
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
91+
</property>
92+
<property name="icon">
93+
<iconset resource="../../images/images.qrc">
94+
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
95+
</property>
96+
</item>
97+
<item>
98+
<property name="text">
99+
<string>Rendering &amp; SVG</string>
100+
</property>
101+
<property name="textAlignment">
102+
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
103+
</property>
104+
<property name="icon">
105+
<iconset resource="../../images/images.qrc">
106+
<normaloff>:/images/themes/default/propertyicons/rendering.png</normaloff>:/images/themes/default/propertyicons/rendering.png</iconset>
107+
</property>
108+
</item>
109+
<item>
110+
<property name="text">
111+
<string>Map tools</string>
112+
</property>
113+
<property name="icon">
114+
<iconset resource="../../images/images.qrc">
115+
<normaloff>:/images/themes/default/propertyicons/map_tools.png</normaloff>:/images/themes/default/propertyicons/map_tools.png</iconset>
116+
</property>
117+
</item>
118+
<item>
119+
<property name="text">
120+
<string>Overlay</string>
121+
</property>
122+
<property name="icon">
123+
<iconset resource="../../images/images.qrc">
124+
<normaloff>:/images/themes/default/propertyicons/overlay.png</normaloff>:/images/themes/default/propertyicons/overlay.png</iconset>
125+
</property>
126+
</item>
127+
<item>
128+
<property name="text">
129+
<string>Digitising</string>
130+
</property>
131+
<property name="icon">
132+
<iconset resource="../../images/images.qrc">
133+
<normaloff>:/images/themes/default/propertyicons/digitising.png</normaloff>:/images/themes/default/propertyicons/digitising.png</iconset>
134+
</property>
135+
</item>
136+
<item>
137+
<property name="text">
138+
<string>CRS</string>
139+
</property>
140+
<property name="icon">
141+
<iconset resource="../../images/images.qrc">
142+
<normaloff>:/images/themes/default/propertyicons/CRS.png</normaloff>:/images/themes/default/propertyicons/CRS.png</iconset>
143+
</property>
144+
</item>
145+
<item>
146+
<property name="text">
147+
<string>Locale</string>
148+
</property>
149+
<property name="icon">
150+
<iconset resource="../../images/images.qrc">
151+
<normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
152+
</property>
153+
</item>
154+
<item>
155+
<property name="text">
156+
<string>Network &amp; Proxy</string>
157+
</property>
158+
<property name="icon">
159+
<iconset resource="../../images/images.qrc">
160+
<normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</iconset>
161+
</property>
162+
</item>
163+
</widget>
164+
</item>
23165
<item row="0" column="1">
24166
<widget class="QStackedWidget" name="stackedWidget">
25167
<property name="currentIndex">
26-
<number>0</number>
168+
<number>7</number>
27169
</property>
28170
<widget class="QWidget" name="stackedWidgetPage1">
29171
<layout class="QGridLayout">
@@ -1255,6 +1397,23 @@
12551397
</layout>
12561398
</widget>
12571399
</item>
1400+
<item row="2" column="0">
1401+
<layout class="QHBoxLayout" name="horizontalLayout_2">
1402+
<item>
1403+
<widget class="QLabel" name="label_9">
1404+
<property name="text">
1405+
<string>WMS search address</string>
1406+
</property>
1407+
<property name="buddy">
1408+
<cstring>leWmsSearch</cstring>
1409+
</property>
1410+
</widget>
1411+
</item>
1412+
<item>
1413+
<widget class="QLineEdit" name="leWmsSearch"/>
1414+
</item>
1415+
</layout>
1416+
</item>
12581417
</layout>
12591418
</widget>
12601419
</widget>
@@ -1269,148 +1428,6 @@
12691428
</property>
12701429
</widget>
12711430
</item>
1272-
<item row="0" column="0">
1273-
<widget class="QListWidget" name="listWidget">
1274-
<property name="minimumSize">
1275-
<size>
1276-
<width>110</width>
1277-
<height>0</height>
1278-
</size>
1279-
</property>
1280-
<property name="maximumSize">
1281-
<size>
1282-
<width>110</width>
1283-
<height>16777215</height>
1284-
</size>
1285-
</property>
1286-
<property name="frameShape">
1287-
<enum>QFrame::NoFrame</enum>
1288-
</property>
1289-
<property name="frameShadow">
1290-
<enum>QFrame::Plain</enum>
1291-
</property>
1292-
<property name="horizontalScrollBarPolicy">
1293-
<enum>Qt::ScrollBarAlwaysOff</enum>
1294-
</property>
1295-
<property name="editTriggers">
1296-
<set>QAbstractItemView::NoEditTriggers</set>
1297-
</property>
1298-
<property name="showDropIndicator" stdset="0">
1299-
<bool>false</bool>
1300-
</property>
1301-
<property name="alternatingRowColors">
1302-
<bool>false</bool>
1303-
</property>
1304-
<property name="iconSize">
1305-
<size>
1306-
<width>64</width>
1307-
<height>64</height>
1308-
</size>
1309-
</property>
1310-
<property name="textElideMode">
1311-
<enum>Qt::ElideNone</enum>
1312-
</property>
1313-
<property name="flow">
1314-
<enum>QListView::TopToBottom</enum>
1315-
</property>
1316-
<property name="isWrapping" stdset="0">
1317-
<bool>false</bool>
1318-
</property>
1319-
<property name="resizeMode">
1320-
<enum>QListView::Adjust</enum>
1321-
</property>
1322-
<property name="spacing">
1323-
<number>9</number>
1324-
</property>
1325-
<property name="viewMode">
1326-
<enum>QListView::IconMode</enum>
1327-
</property>
1328-
<property name="uniformItemSizes">
1329-
<bool>false</bool>
1330-
</property>
1331-
<property name="wordWrap">
1332-
<bool>true</bool>
1333-
</property>
1334-
<item>
1335-
<property name="text">
1336-
<string>General</string>
1337-
</property>
1338-
<property name="textAlignment">
1339-
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
1340-
</property>
1341-
<property name="icon">
1342-
<iconset resource="../../images/images.qrc">
1343-
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
1344-
</property>
1345-
</item>
1346-
<item>
1347-
<property name="text">
1348-
<string>Rendering &amp; SVG</string>
1349-
</property>
1350-
<property name="textAlignment">
1351-
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
1352-
</property>
1353-
<property name="icon">
1354-
<iconset resource="../../images/images.qrc">
1355-
<normaloff>:/images/themes/default/propertyicons/rendering.png</normaloff>:/images/themes/default/propertyicons/rendering.png</iconset>
1356-
</property>
1357-
</item>
1358-
<item>
1359-
<property name="text">
1360-
<string>Map tools</string>
1361-
</property>
1362-
<property name="icon">
1363-
<iconset resource="../../images/images.qrc">
1364-
<normaloff>:/images/themes/default/propertyicons/map_tools.png</normaloff>:/images/themes/default/propertyicons/map_tools.png</iconset>
1365-
</property>
1366-
</item>
1367-
<item>
1368-
<property name="text">
1369-
<string>Overlay</string>
1370-
</property>
1371-
<property name="icon">
1372-
<iconset resource="../../images/images.qrc">
1373-
<normaloff>:/images/themes/default/propertyicons/overlay.png</normaloff>:/images/themes/default/propertyicons/overlay.png</iconset>
1374-
</property>
1375-
</item>
1376-
<item>
1377-
<property name="text">
1378-
<string>Digitising</string>
1379-
</property>
1380-
<property name="icon">
1381-
<iconset resource="../../images/images.qrc">
1382-
<normaloff>:/images/themes/default/propertyicons/digitising.png</normaloff>:/images/themes/default/propertyicons/digitising.png</iconset>
1383-
</property>
1384-
</item>
1385-
<item>
1386-
<property name="text">
1387-
<string>CRS</string>
1388-
</property>
1389-
<property name="icon">
1390-
<iconset resource="../../images/images.qrc">
1391-
<normaloff>:/images/themes/default/propertyicons/CRS.png</normaloff>:/images/themes/default/propertyicons/CRS.png</iconset>
1392-
</property>
1393-
</item>
1394-
<item>
1395-
<property name="text">
1396-
<string>Locale</string>
1397-
</property>
1398-
<property name="icon">
1399-
<iconset resource="../../images/images.qrc">
1400-
<normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
1401-
</property>
1402-
</item>
1403-
<item>
1404-
<property name="text">
1405-
<string>Network &amp; Proxy</string>
1406-
</property>
1407-
<property name="icon">
1408-
<iconset resource="../../images/images.qrc">
1409-
<normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</iconset>
1410-
</property>
1411-
</item>
1412-
</widget>
1413-
</item>
14141431
</layout>
14151432
</widget>
14161433
<layoutdefault spacing="6" margin="11"/>

0 commit comments

Comments
 (0)
Please sign in to comment.