334 changes: 176 additions & 158 deletions src/ui/qgsowssourceselectbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>694</width>
<height>616</height>
<height>600</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -24,6 +24,29 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="0">
<widget class="QDialogButtonBox" name="mDialogButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mStatusLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Ready</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QTabWidget" name="mTabWidget">
<property name="enabled">
Expand All @@ -41,93 +64,91 @@
<widget class="QComboBox" name="mConnectionsComboBox"/>
</item>
<item>
<widget class="QWidget" name="widget_3" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="mConnectButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>C&amp;onnect</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mNewButton">
<property name="text">
<string>&amp;New</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mEditButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mDeleteButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>82</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="mLoadButton">
<property name="toolTip">
<string>Load connections from file</string>
</property>
<property name="text">
<string>Load</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mSaveButton">
<property name="toolTip">
<string>Save connections to file</string>
</property>
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mAddDefaultButton">
<property name="statusTip">
<string>Adds a few example WMS servers</string>
</property>
<property name="whatsThis">
<string comment="Adds several example WMS servers to the list"/>
</property>
<property name="text">
<string>Add default servers</string>
</property>
</widget>
</item>
</layout>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="mConnectButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>C&amp;onnect</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mNewButton">
<property name="text">
<string>&amp;New</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mEditButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mDeleteButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_1">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>82</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="mLoadButton">
<property name="toolTip">
<string>Load connections from file</string>
</property>
<property name="text">
<string>Load</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mSaveButton">
<property name="toolTip">
<string>Save connections to file</string>
</property>
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mAddDefaultButton">
<property name="statusTip">
<string>Adds a few example WMS servers</string>
</property>
<property name="whatsThis">
<string comment="Adds several example WMS servers to the list"/>
</property>
<property name="text">
<string>Add default servers</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeWidget" name="mLayersTreeWidget">
Expand Down Expand Up @@ -166,31 +187,52 @@
</widget>
</item>
<item>
<widget class="QWidget" name="widget_2" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="mTimeLabel">
<property name="text">
<string>Time</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mTimeComboBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="mCRSGroupBox">
<property name="title">
<string>Coordinate Reference System</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="mSelectedCRSLabel">
<property name="text">
<string>Time</string>
<string>Coordinate Reference System</string>
</property>
<property name="buddy">
<cstring>mChangeCRSButton</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mTimeComboBox">
<widget class="QPushButton" name="mChangeCRSButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="text">
<string>Change ...</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -268,33 +310,37 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="mCRSGroupBox">
<property name="title">
<string>Coordinate Reference System</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="mSelectedCRSLabel">
<property name="text">
<string>Coordinate Reference System</string>
</property>
<property name="buddy">
<cstring>mChangeCRSButton</cstring>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mChangeCRSButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Change ...</string>
</property>
</widget>
</item>
</layout>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="mCacheLabel">
<property name="text">
<string>Cache</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mCacheComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Cache preference

Always cache: load from cache, even if it expired

Prefer cache: load from cache if available, otherwise load from network. Note that this can return possibly stale (but not expired) items from cache

Prefer network: default value; load from the network if the cached entry is older than the network entry

Always network: always load from network and do not check if the cache has a valid entry (similar to the &quot;Reload&quot; feature in browsers)
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -472,40 +518,12 @@
</widget>
</widget>
</item>
<item row="3" column="0">
<widget class="QDialogButtonBox" name="mDialogButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mStatusLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Ready</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mTabWidget</tabstop>
<tabstop>mConnectionsComboBox</tabstop>
<tabstop>mConnectButton</tabstop>
<tabstop>mNewButton</tabstop>
<tabstop>mEditButton</tabstop>
<tabstop>mDeleteButton</tabstop>
<tabstop>mAddDefaultButton</tabstop>
<tabstop>mLayersTreeWidget</tabstop>
<tabstop>mLayerNameLineEdit</tabstop>
<tabstop>mLayerUpButton</tabstop>
Expand Down
1 change: 1 addition & 0 deletions tests/src/providers/testqgswcsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ void TestQgsWcsProvider::read( )
uri.setParam( "identifier", identifier );
uri.setParam( "crs", "epsg:4326" );
uri.setParam( "version", version );
uri.setParam( "cache", "AlwaysNetwork" );

if ( !read( identifier, uri.encodedUri(), QDir::tempPath() + "/" + identifier + ".tif", mReport ) )
{
Expand Down
1 change: 1 addition & 0 deletions tests/src/providers/testqgswcspublicservers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ void TestQgsWcsPublicServers::test( )
{
myServerUri.setParam( "version", version );
}
myServerUri.setParam( "cache", "AlwaysNetwork" );

foreach ( QString key, myServer.params.keys() )
{
Expand Down