diff --git a/src/providers/virtual/qgsvirtuallayersourceselectbase.ui b/src/providers/virtual/qgsvirtuallayersourceselectbase.ui
index 64315eda9f7a..c51c16f7f52f 100644
--- a/src/providers/virtual/qgsvirtuallayersourceselectbase.ui
+++ b/src/providers/virtual/qgsvirtuallayersourceselectbase.ui
@@ -15,286 +15,326 @@
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- Layer name
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
- true
-
-
-
-
-
- -
-
-
- Build a layer by referring to the current project's vector layer names and/or any configured embedded layer names as tables in the custom SQL query.
-
-
- true
-
-
-
- -
-
-
- Embedded layers
-
-
- false
+
+
+ QFrame::NoFrame
-
-
-
-
-
- Embedded layers can be added to have SQL queries with layers that are independent from layers loaded by the current QGIS project.
-In particular, saving a virtual layer with embedded layers to a QLR file can be done to reuse its definition in another project.
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- false
-
-
-
- -
-
-
-
-
-
- Add a new embedded layer
-
-
- Add
-
-
-
- -
-
-
- true
-
-
- Import layer definition from loaded layers of the current project
-
-
- Import
-
-
-
- -
-
-
- false
-
-
- Remove the selected embedded layer
-
-
- Remove
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
- -
-
-
- Query
-
-
- false
-
-
- false
+
+ true
-
-
-
-
-
- <html><head/><body><p>This is the SQL query editor. You can edit here an SQL query referring to any existing vector layers or embedded layers.</p><p>Virtual layers rely on SQLite and SpatiaLite. Any functions from SQLite or SpatiaLite can then be used in the query. To add or access geometries of a table, you can use "tablename.geometry", regardless of original geometry column's name.</p><p><span style=" font-weight:600;">Special comments:</span></p><p>Because it is not always possible to autodetect the data type of each column in a query, special comments can be used in the query to force a specific type.</p><p>Special comments must be placed on the right of a column name and have the form <tt>/*:type*/</tt> where type can be any of <span style=" font-style:italic;">int</span>, <span style=" font-style:italic;">real</span> or <span style=" font-style:italic;">text</span>. They can also be used to specify the type and SRID of the geometry column with the following syntax: <tt>/*:gtype:srid*/</tt> where <span style=" font-style:italic;">gtype</span> can be <span style=" font-style:italic;">point</span>, <span style=" font-style:italic;">linestring</span> or <span style=" font-style:italic;">polygon</span> (with an optional <span style=" font-style:italic;">multi</span> prefix) and <span style=" font-style:italic;">srid</span> is an integer identifier.</p><p>Example:</p><p><tt>SELECT id + 1 as id /*:int*/, ST_Centroid(geometry) as geom /*:point:4326*/ FROM tab</tt></p></body></html>
-
-
-
-
-
-
- -
-
-
-
-
-
- Unique identifier column
+
+
+
+ 0
+ 0
+ 873
+ 656
+
+
+
+
+ 0
-
-
- -
-
-
- false
+
+ 0
-
-
+
+ 0
-
-
-
-
- -
-
-
- Geometry
-
-
- true
-
-
-
-
-
-
- No geometry
-
-
-
- -
-
-
- Autodetect
-
-
- true
-
-
-
- -
-
-
- Manually defined
-
+
+ 0
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Layer name
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+
+
+
+ -
+
+
+ Build a layer by referring to the current project's vector layer names and/or any configured embedded layer names as tables in the custom SQL query.
+
+
+ true
+
-
- -
-
-
+
+ -
+
+
+ Embedded layers
+
+
false
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
-
-
- Geometry column
-
-
-
- -
-
-
- geometry
+
+
+
-
+
+
+ Embedded layers can be added to have SQL queries with layers that are independent from layers loaded by the current QGIS project.
+In particular, saving a virtual layer with embedded layers to a QLR file can be done to reuse its definition in another project.
-
-
- -
-
-
- Type
+
+ QAbstractItemView::SingleSelection
-
-
- -
-
-
- -
-
-
- CRS
+
+ QAbstractItemView::SelectRows
-
+
+ false
+
+
- -
-
+
-
+
-
-
-
- true
+
+
+ Add a new embedded layer
-
+
+ Add
+
+
+
+ -
+
+
+ true
+
+
+ Import layer definition from loaded layers of the current project
+
+
+ Import
+
+
-
-
+
+
+ false
+
+
+ Remove the selected embedded layer
+
- …
+ Remove
-
+
-
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+ -
+
+
+ Query
+
+
+ false
+
+
+ false
+
+
+
-
+
+
+ <html><head/><body><p>This is the SQL query editor. You can edit here an SQL query referring to any existing vector layers or embedded layers.</p><p>Virtual layers rely on SQLite and SpatiaLite. Any functions from SQLite or SpatiaLite can then be used in the query. To add or access geometries of a table, you can use "tablename.geometry", regardless of original geometry column's name.</p><p><span style=" font-weight:600;">Special comments:</span></p><p>Because it is not always possible to autodetect the data type of each column in a query, special comments can be used in the query to force a specific type.</p><p>Special comments must be placed on the right of a column name and have the form <tt>/*:type*/</tt> where type can be any of <span style=" font-style:italic;">int</span>, <span style=" font-style:italic;">real</span> or <span style=" font-style:italic;">text</span>. They can also be used to specify the type and SRID of the geometry column with the following syntax: <tt>/*:gtype:srid*/</tt> where <span style=" font-style:italic;">gtype</span> can be <span style=" font-style:italic;">point</span>, <span style=" font-style:italic;">linestring</span> or <span style=" font-style:italic;">polygon</span> (with an optional <span style=" font-style:italic;">multi</span> prefix) and <span style=" font-style:italic;">srid</span> is an integer identifier.</p><p>Example:</p><p><tt>SELECT id + 1 as id /*:int*/, ST_Centroid(geometry) as geom /*:point:4326*/ FROM tab</tt></p></body></html>
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Unique identifier column
+
+
+
+ -
+
+
+ false
+
+
+
+
+
+
+
+ -
+
+
+ Geometry
+
+
+ true
+
+
+
-
+
+
+ No geometry
+
+
+
+ -
+
+
+ Autodetect
+
+
+ true
+
+
+
+ -
+
+
+ Manually defined
+
+
+
+ -
+
+
+ false
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Geometry column
+
+
+
+ -
+
+
+ geometry
+
+
+
+ -
+
+
+ Type
+
+
+
+ -
+
+
+ -
+
+
+ CRS
+
+
+
+ -
+
+
-
+
+
+ true
+
+
+
+ -
+
+
+ …
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
+
Qt::Horizontal
-
-
+
+
QDialogButtonBox::NoButton
-
+
+
+ QgsScrollArea
+ QScrollArea
+
+ 1
+
QgsCollapsibleGroupBox
- QGroupBox
+ QWidget
1
@@ -306,8 +346,16 @@ In particular, saving a virtual layer with embedded layers to a QLR file can be
- mGeometryGroup
- buttonBox
+ scrollArea
+ mLayerNameCombo
+ mLayersTable
+ mAddLayerBtn
+ mImportLayerBtn
+ mRemoveLayerBtn
+ mUIDColumnNameChck
+ mUIDField
+ mNoGeometryRadio
+ mAutodetectGeometryRadio
mGeometryRadio
mGeometryField
mGeometryType
diff --git a/src/ui/qgswmssourceselectbase.ui b/src/ui/qgswmssourceselectbase.ui
index 90a137a4ef1b..4591e4ebe542 100644
--- a/src/ui/qgswmssourceselectbase.ui
+++ b/src/ui/qgswmssourceselectbase.ui
@@ -7,7 +7,7 @@
0
0
744
- 611
+ 679
@@ -24,497 +24,553 @@
true
- -
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
QDialogButtonBox::Help
- -
-
-
-
-
-
- Layer name
-
-
- leLayerName
-
-
-
- -
-
-
-
-
-
-
-
- true
+
+
+ QFrame::NoFrame
-
- 0
+
+ true
-
-
- Layers
-
-
-
-
-
+
+
+
+ 0
+ 0
+ 744
+ 639
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
-
-
+
- false
-
-
- Connect to selected service
+ true
-
- C&onnect
+
+ 0
+
+
+ Layers
+
+
+
-
+
+
-
+
+
+ false
+
+
+ Connect to selected service
+
+
+ C&onnect
+
+
+
+ -
+
+
+ Create a new service connection
+
+
+ &New
+
+
+
+ -
+
+
+ false
+
+
+ Edit selected service connection
+
+
+ Edit
+
+
+
+ -
+
+
+ false
+
+
+ Remove connection to selected service
+
+
+ Remove
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 8
+ 20
+
+
+
+
+ -
+
+
+ Load connections from file
+
+
+ Load
+
+
+
+ -
+
+
+ Save connections to file
+
+
+ Save
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16
+ 64
+
+
+
+ Image Encoding
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
+ Tile size
+
+
+ mTileWidth
+
+
+
+ -
+
+
+ Use contextual WMS Legend
+
+
+
+ -
+
+
+ Maximum number of GetFeatureInfo results
+
+
+ mFeatureCount
+
+
+
+ -
+
+
+ Tile width
+
+
+
+ -
+
+
+
+
+
+ 10
+
+
+
+ -
+
+
+ Tile height
+
+
+
+ -
+
+
+ Request step size
+
+
+ mTileWidth
+
+
+
+ -
+
+
+ Step width
+
+
+
+ -
+
+
+ Step height
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Coordinate Reference System
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ true
+
+
+
+ ID
+
+
+
+
+ Name
+
+
+
+
+ Title
+
+
+
+
+ Abstract
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ Layer Order
+
+
+ -
+
+
+ Move selected layer UP
+
+
+ Up
+
+
+
+ -
+
+
+ Move selected layer DOWN
+
+
+ Down
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 391
+ 30
+
+
+
+
+ -
+
+
+ 3
+
+
+
+ Layer
+
+
+
+
+ Style
+
+
+
+
+ Title
+
+
+
+
+
+
+
+
+ Tilesets
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+
+
+
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Interpretation
+
+
+
+ -
+
+
+
+
+ -
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ false
+
+
+ false
+
+
+
+ Layer
+
+
+
+
+ Format
+
+
+
+
+ Title
+
+
+
+
+ Style
+
+
+
+
+ Tileset
+
+
+
+
+ CRS
+
+
+
+
+
+
-
-
-
- Create a new service connection
-
-
- &New
-
-
+
+
-
+
+
+ Layer name
+
+
+ leLayerName
+
+
+
+ -
+
+
+
-
-
-
- false
-
+
- Edit selected service connection
+ Load each selected layer as an individual layer
- Edit
+ Load as separate layers
-
-
- -
-
-
+
false
-
- Remove connection to selected service
-
-
- Remove
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 8
- 20
-
-
-
-
- -
-
-
- Load connections from file
-
-
- Load
-
-
-
-
- Save connections to file
-
-
- Save
-
-
-
-
-
- -
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16
- 64
-
-
-
- Image Encoding
-
-
-
- -
-
-
- Options
-
-
-
-
-
-
- Tile size
-
-
- mTileWidth
-
-
-
- -
-
-
- Use contextual WMS Legend
-
-
-
- -
-
-
- Maximum number of GetFeatureInfo results
-
-
- mFeatureCount
-
-
-
- -
-
-
- Tile width
-
-
-
- -
-
-
-
-
-
- 10
-
-
-
- -
-
-
- Tile height
-
-
-
- -
-
-
- Request step size
-
-
- mTileWidth
-
-
-
- -
-
-
- Step width
-
-
-
- -
-
-
- Step height
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
- Coordinate Reference System
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QAbstractItemView::ExtendedSelection
-
-
- true
-
-
-
- ID
-
-
-
-
- Name
-
-
-
-
- Title
-
-
-
-
- Abstract
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
- Layer Order
-
-
- -
-
-
- Move selected layer UP
-
-
- Up
-
-
-
- -
-
-
- Move selected layer DOWN
-
-
- Down
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 391
- 30
-
-
-
-
- -
-
-
- 3
-
-
-
- Layer
-
-
-
-
- Style
-
-
-
-
- Title
-
-
-
-
-
-
-
-
- Tilesets
-
-
- -
-
-
-
-
+
-
+
0
0
-
- true
-
-
-
-
-
-
-
-
- -
-
-
- 0
-
-
-
-
- Interpretation
+ Ready
+
+
+ false
- -
-
-
- -
-
-
- true
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- false
-
-
- false
-
-
-
- Layer
-
-
-
-
- Format
-
-
-
-
- Title
-
-
-
-
- Style
-
-
-
-
- Tileset
-
-
-
-
- CRS
-
-
-
-
- -
-
-
- Load each selected layer as an individual layer
-
-
- Load as separate layers
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Ready
-
-
- false
-
-
-
+
+ QgsScrollArea
+ QScrollArea
+
+ 1
+
QgsFilterLineEdit
QLineEdit
@@ -526,9 +582,14 @@
qgsprojectionselectionwidget.h
1
+
+ QgsCollapsibleGroupBox
+ QWidget
+
+ 1
+
- tabServers
cmbConnections
btnConnect
btnNew