From bcd4606acf7429023095acd55ca1c2509511afcd Mon Sep 17 00:00:00 2001 From: Damiano Lombardi Date: Thu, 28 Nov 2024 17:36:42 +0100 Subject: [PATCH] WMS Ignore layer extent settings for default value --- .../gui/auto_generated/qgsnewhttpconnection.sip.in | 5 +++++ .../gui/auto_generated/qgsnewhttpconnection.sip.in | 5 +++++ src/gui/qgsnewhttpconnection.cpp | 4 ++++ src/gui/qgsnewhttpconnection.h | 12 ++++++++++++ 4 files changed, 26 insertions(+) diff --git a/python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in b/python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in index 70539ebd4f549..870792b781a27 100644 --- a/python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in +++ b/python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in @@ -21,6 +21,11 @@ information for an HTTP Server for WMS, etc. #include "qgsnewhttpconnection.h" %End public: +<<<<<<< HEAD +======= + + +>>>>>>> 702be5c1fa9 (WMS Ignore layer extent settings for default value) enum ConnectionType /BaseType=IntEnum/ { ConnectionWfs, diff --git a/python/gui/auto_generated/qgsnewhttpconnection.sip.in b/python/gui/auto_generated/qgsnewhttpconnection.sip.in index 1d6df227db8c7..898fc611ffb80 100644 --- a/python/gui/auto_generated/qgsnewhttpconnection.sip.in +++ b/python/gui/auto_generated/qgsnewhttpconnection.sip.in @@ -21,6 +21,11 @@ information for an HTTP Server for WMS, etc. #include "qgsnewhttpconnection.h" %End public: +<<<<<<< HEAD +======= + + +>>>>>>> 702be5c1fa9 (WMS Ignore layer extent settings for default value) enum ConnectionType { ConnectionWfs, diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp index c1b969bbb2e2c..200ef72a6fd43 100644 --- a/src/gui/qgsnewhttpconnection.cpp +++ b/src/gui/qgsnewhttpconnection.cpp @@ -32,6 +32,8 @@ #include #include +const QgsSettingsEntryBool *QgsNewHttpConnection::settingsIgnoreReportedLayerExtentsDefault = new QgsSettingsEntryBool( QStringLiteral( "ignore-reported-layer-extents-default" ), sTreeHttpConnectionDialog, false ) ; + QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, ConnectionTypes types, const QString &serviceName, const QString &connectionName, QgsNewHttpConnection::Flags flags, Qt::WindowFlags fl ) : QDialog( parent, fl ) , mTypes( types ) @@ -154,6 +156,8 @@ QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, ConnectionTypes typ } } + cbxWmsIgnoreReportedLayerExtents->setChecked( settingsIgnoreReportedLayerExtentsDefault->value() ); + if ( !( flags & FlagShowTestConnection ) ) { mTestConnectionButton->hide(); diff --git a/src/gui/qgsnewhttpconnection.h b/src/gui/qgsnewhttpconnection.h index 8be2cf1ba25c8..36e7fa43aa30d 100644 --- a/src/gui/qgsnewhttpconnection.h +++ b/src/gui/qgsnewhttpconnection.h @@ -22,8 +22,10 @@ #include "ui_qgsnewhttpconnectionbase.h" #include "qgsguiutils.h" #include "qgis_gui.h" +#include "qgssettingstree.h" class QgsAuthSettingsWidget; +class QgsSettingsEntryBool; /** * \ingroup gui @@ -35,6 +37,16 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo Q_OBJECT public: +<<<<<<< HEAD +======= + +#ifndef SIP_RUN + static inline QgsSettingsTreeNode *sTreeHttpConnectionDialog = QgsSettingsTree::sTreeConnections->createChildNode( QStringLiteral( "http-connection-dialog" ) ); + + static const QgsSettingsEntryBool *settingsIgnoreReportedLayerExtentsDefault; +#endif + +>>>>>>> 702be5c1fa9 (WMS Ignore layer extent settings for default value) /** * Available connection types for configuring in the dialog. */