Skip to content

Commit

Permalink
WMS Ignore layer extent settings for default value
Browse files Browse the repository at this point in the history
  • Loading branch information
domi4484 authored and Damiano committed Dec 9, 2024
1 parent c67ca63 commit bcd4606
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 0 deletions.
5 changes: 5 additions & 0 deletions python/PyQt6/gui/auto_generated/qgsnewhttpconnection.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions python/gui/auto_generated/qgsnewhttpconnection.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions src/gui/qgsnewhttpconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include <QRegularExpressionValidator>
#include <QUrlQuery>

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 )
Expand Down Expand Up @@ -154,6 +156,8 @@ QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, ConnectionTypes typ
}
}

cbxWmsIgnoreReportedLayerExtents->setChecked( settingsIgnoreReportedLayerExtentsDefault->value() );

if ( !( flags & FlagShowTestConnection ) )
{
mTestConnectionButton->hide();
Expand Down
12 changes: 12 additions & 0 deletions src/gui/qgsnewhttpconnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
#include "ui_qgsnewhttpconnectionbase.h"
#include "qgsguiutils.h"
#include "qgis_gui.h"
#include "qgssettingstree.h"

class QgsAuthSettingsWidget;
class QgsSettingsEntryBool;

/**
* \ingroup gui
Expand All @@ -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.
*/
Expand Down

0 comments on commit bcd4606

Please sign in to comment.