Skip to content

Commit 7e52f06

Browse files
3nids3nids
committedMay 31, 2017
sipify gui auth classes
·
ltr-3_40final-3_0_0
1 parent 77cd7af commit 7e52f06

18 files changed

+853
-113
lines changed
 

‎python/auto_sip.blacklist

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,6 @@ gui/attributetable/qgsfeatureselectionmodel.sip
187187
gui/attributetable/qgsfieldconditionalformatwidget.sip
188188
gui/attributetable/qgsifeatureselectionmanager.sip
189189
gui/attributetable/qgsorganizetablecolumnsdialog.sip
190-
gui/auth/qgsauthauthoritieseditor.sip
191-
gui/auth/qgsauthcertificateinfo.sip
192-
gui/auth/qgsauthcertificatemanager.sip
193-
gui/auth/qgsauthcerttrustpolicycombobox.sip
194-
gui/auth/qgsauthconfigeditor.sip
195-
gui/auth/qgsauthconfigselect.sip
196-
gui/auth/qgsautheditorwidgets.sip
197-
gui/auth/qgsauthidentitieseditor.sip
198-
gui/auth/qgsauthimportcertdialog.sip
199-
gui/auth/qgsauthimportidentitydialog.sip
200-
gui/auth/qgsauthmethodedit.sip
201-
gui/auth/qgsauthserverseditor.sip
202-
gui/auth/qgsauthsslconfigwidget.sip
203-
gui/auth/qgsauthsslerrorsdialog.sip
204-
gui/auth/qgsauthsslimportdialog.sip
205-
gui/auth/qgsauthtrustedcasdialog.sip
206190
gui/layertree/qgscustomlayerorderwidget.sip
207191
gui/layertree/qgslayertreeembeddedconfigwidget.sip
208192
gui/layertree/qgslayertreeembeddedwidgetregistry.sip

‎python/gui/auth/qgsauthauthoritieseditor.sip

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,45 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthauthoritieseditor.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthAuthoritiesEditor : QWidget
214
{
15+
%Docstring
16+
Widget for viewing and editing authentication identities database
17+
%End
18+
319
%TypeHeaderCode
4-
#include <qgsauthauthoritieseditor.h>
20+
#include "qgsauthauthoritieseditor.h"
521
%End
622
public:
23+
724
explicit QgsAuthAuthoritiesEditor( QWidget *parent /TransferThis/ = 0 );
8-
~QgsAuthAuthoritiesEditor();
25+
%Docstring
26+
Widget for viewing and editing certificate authorities directly in database
27+
\param parent Parent widget
28+
%End
29+
30+
protected:
31+
virtual void showEvent( QShowEvent *e );
32+
33+
%Docstring
34+
Overridden show event of base widget
35+
%End
36+
937
};
38+
39+
/************************************************************************
40+
* This file has been generated automatically from *
41+
* *
42+
* src/gui/auth/qgsauthauthoritieseditor.h *
43+
* *
44+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
45+
************************************************************************/

‎python/gui/auth/qgsauthcertificateinfo.sip

Lines changed: 57 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,83 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthcertificateinfo.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
114
class QgsAuthCertInfo : QWidget
215
{
16+
%Docstring
17+
Widget for viewing detailed info on a certificate and its hierarchical trust chain
18+
%End
19+
320
%TypeHeaderCode
4-
#include <qgsauthcertificateinfo.h>
21+
#include "qgsauthcertificateinfo.h"
522
%End
623
public:
7-
explicit QgsAuthCertInfo( const QSslCertificate& cert,
24+
explicit QgsAuthCertInfo( const QSslCertificate &cert,
825
bool manageCertTrust = false,
926
QWidget *parent /TransferThis/ = 0,
1027
const QList<QSslCertificate> &connectionCAs = QList<QSslCertificate>() );
11-
~QgsAuthCertInfo();
1228

1329
bool trustCacheRebuilt();
30+
%Docstring
31+
:rtype: bool
32+
%End
33+
1434
};
1535

16-
//////////////// Embed in dialog ///////////////////
1736

1837
class QgsAuthCertInfoDialog : QDialog
1938
{
20-
%TypeHeaderCode
21-
#include <qgsauthcertificateinfo.h>
39+
%Docstring
40+
Dialog wrapper for widget displaying detailed info on a certificate and its hierarchical trust chain
2241
%End
2342

43+
%TypeHeaderCode
44+
#include "qgsauthcertificateinfo.h"
45+
%End
2446
public:
25-
explicit QgsAuthCertInfoDialog( const QSslCertificate& cert,
47+
48+
explicit QgsAuthCertInfoDialog( const QSslCertificate &cert,
2649
bool manageCertTrust,
2750
QWidget *parent /TransferThis/ = 0,
2851
const QList<QSslCertificate> &connectionCAs = QList<QSslCertificate>() );
29-
~QgsAuthCertInfoDialog();
52+
%Docstring
53+
Construct a dialog displaying detailed info on a certificate and its hierarchical trust chain
54+
\param cert Certificate object
55+
\param manageCertTrust Whether to show widgets to manage the trust policy of certs in hierarchy
56+
\param parent Parent widget
57+
\param connectionCAs List of hierarchical certificates in a connection
58+
%End
3059

3160
QgsAuthCertInfo *certInfoWidget();
61+
%Docstring
62+
Get access to embedded info widget
63+
:rtype: QgsAuthCertInfo
64+
%End
3265

3366
bool trustCacheRebuilt();
67+
%Docstring
68+
Whether the trust cache has been rebuilt
69+
.. note::
70+
71+
This happens when a trust policy has been adjusted for any cert in the hierarchy
72+
:rtype: bool
73+
%End
74+
3475
};
76+
77+
/************************************************************************
78+
* This file has been generated automatically from *
79+
* *
80+
* src/gui/auth/qgsauthcertificateinfo.h *
81+
* *
82+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
83+
************************************************************************/

‎python/gui/auth/qgsauthcertificatemanager.sip

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,65 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthcertificatemanager.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthCertEditors : QWidget
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthcertificatemanager.h>
15+
%Docstring
16+
Wrapper widget to manage available certificate editors
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthcertificatemanager.h"
21+
%End
722
public:
23+
824
explicit QgsAuthCertEditors( QWidget *parent /TransferThis/ = 0 );
25+
%Docstring
26+
Construct a widget to contain various certificate editors
27+
\param parent Parent widget
28+
%End
929

10-
~QgsAuthCertEditors();
1130
};
1231

32+
33+
1334
class QgsAuthCertManager : QDialog
1435
{
15-
%TypeHeaderCode
16-
#include <qgsauthcertificatemanager.h>
36+
%Docstring
37+
Dialog wrapper for widget to manage available certificate editors
1738
%End
1839

40+
%TypeHeaderCode
41+
#include "qgsauthcertificatemanager.h"
42+
%End
1943
public:
20-
explicit QgsAuthCertManager( QWidget *parent /TransferThis/ = 0 );
2144

22-
~QgsAuthCertManager();
45+
explicit QgsAuthCertManager( QWidget *parent /TransferThis/ = 0 );
46+
%Docstring
47+
Construct a dialog wrapper for widget to manage available certificate editors
48+
\param parent Parent widget
49+
%End
2350

2451
QgsAuthCertEditors *certEditorsWidget();
52+
%Docstring
53+
Get access to embedded editors widget
54+
:rtype: QgsAuthCertEditors
55+
%End
56+
2557
};
58+
59+
/************************************************************************
60+
* This file has been generated automatically from *
61+
* *
62+
* src/gui/auth/qgsauthcertificatemanager.h *
63+
* *
64+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
65+
************************************************************************/

‎python/gui/auth/qgsauthcerttrustpolicycombobox.sip

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,64 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthcerttrustpolicycombobox.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
111
class QgsAuthCertTrustPolicyComboBox : QComboBox
212
{
3-
%TypeHeaderCode
4-
#include <qgsauthcerttrustpolicycombobox.h>
13+
%Docstring
14+
Widget for editing the trust policy associated with a Certificate (Intermediate) Authority
515
%End
616

17+
%TypeHeaderCode
18+
#include "qgsauthcerttrustpolicycombobox.h"
19+
%End
720
public:
21+
822
explicit QgsAuthCertTrustPolicyComboBox(
9-
QWidget *parent /TransferThis/ = 0,
10-
QgsAuthCertUtils::CertTrustPolicy policy = QgsAuthCertUtils::DefaultTrust,
11-
QgsAuthCertUtils::CertTrustPolicy defaultpolicy = QgsAuthCertUtils::DefaultTrust );
12-
~QgsAuthCertTrustPolicyComboBox();
23+
QWidget *parent /TransferThis/ = 0,
24+
QgsAuthCertUtils::CertTrustPolicy policy = QgsAuthCertUtils::DefaultTrust,
25+
QgsAuthCertUtils::CertTrustPolicy defaultpolicy = QgsAuthCertUtils::DefaultTrust );
26+
%Docstring
27+
Construct a combo box for defining certificate trust policy
28+
\param parent Parent widget
29+
\param policy Defined trust policy
30+
\param defaultpolicy Default trust policy
31+
%End
1332

1433
QgsAuthCertUtils::CertTrustPolicy trustPolicy();
34+
%Docstring
35+
Get currently set trust policy
36+
:rtype: QgsAuthCertUtils.CertTrustPolicy
37+
%End
38+
1539
QgsAuthCertUtils::CertTrustPolicy trustPolicyForIndex( int indx );
40+
%Docstring
41+
Get trust policy for a given index of combobox
42+
:rtype: QgsAuthCertUtils.CertTrustPolicy
43+
%End
1644

1745
public slots:
1846
void setTrustPolicy( QgsAuthCertUtils::CertTrustPolicy policy );
47+
%Docstring
48+
Set current trust policy
49+
%End
1950

2051
void setDefaultTrustPolicy( QgsAuthCertUtils::CertTrustPolicy defaultpolicy );
52+
%Docstring
53+
Set default trust policy
54+
%End
55+
2156
};
57+
58+
/************************************************************************
59+
* This file has been generated automatically from *
60+
* *
61+
* src/gui/auth/qgsauthcerttrustpolicycombobox.h *
62+
* *
63+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
64+
************************************************************************/

‎python/gui/auth/qgsauthconfigeditor.sip

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,56 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthconfigeditor.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthConfigEditor : QWidget
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthconfigeditor.h>
15+
%Docstring
16+
Widget for editing authentication configuration database
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthconfigeditor.h"
21+
%End
722
public:
23+
824
explicit QgsAuthConfigEditor( QWidget *parent /TransferThis/ = 0, bool showUtilities = true, bool relayMessages = true );
9-
~QgsAuthConfigEditor();
25+
%Docstring
26+
Widget for editing authentication configurations directly in database
27+
\param parent Parent widget
28+
\param showUtilities Whether to show the widget's utilities button
29+
\param relayMessages Whether to relay auth manager messages to internal message bar
30+
%End
1031

1132
void toggleTitleVisibility( bool visible );
33+
%Docstring
34+
Hide the widget's title, e.g. when embedding
35+
%End
1236

1337
public slots:
14-
1538
void setShowUtilitiesButton( bool show = true );
39+
%Docstring
40+
Set whether to show the widget's utilities button, e.g. when embedding
41+
%End
1642

1743
void setRelayMessages( bool relay = true );
44+
%Docstring
45+
Set whether to relay auth manager messages to internal message bar, e.g. when embedding
46+
%End
47+
1848
};
49+
50+
/************************************************************************
51+
* This file has been generated automatically from *
52+
* *
53+
* src/gui/auth/qgsauthconfigeditor.h *
54+
* *
55+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
56+
************************************************************************/

‎python/gui/auth/qgsauthconfigselect.sip

Lines changed: 84 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,122 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthconfigselect.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthConfigSelect : QWidget
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthconfigselect.h>
15+
%Docstring
16+
Selector widget for authentication configs
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthconfigselect.h"
21+
%End
722
public:
23+
824
explicit QgsAuthConfigSelect( QWidget *parent /TransferThis/ = 0, const QString &dataprovider = QString() );
9-
~QgsAuthConfigSelect();
25+
%Docstring
26+
Create a dialog for setting an associated authentication config, either
27+
from existing configs, or creating/removing them from auth database
28+
\param parent Parent widget
29+
\param dataprovider The key of the calling layer provider, if applicable
30+
%End
1031

1132
void setConfigId( const QString &authcfg );
33+
%Docstring
34+
Set the authentication config id for the resource
35+
%End
1236

1337
const QString configId() const;
38+
%Docstring
39+
Get the authentication config id for the resource
40+
:rtype: str
41+
%End
1442

1543
void setDataProviderKey( const QString &key );
44+
%Docstring
45+
Set key of layer provider, if applicable
46+
%End
1647

1748
signals:
18-
void selectedConfigIdChanged( const QString &authcfg );
49+
void selectedConfigIdChanged( const QString &authcfg );
50+
%Docstring
51+
Emitted when authentication config is changed or missing
52+
%End
1953

20-
void selectedConfigIdRemoved( const QString &authcfg );
54+
void selectedConfigIdRemoved( const QString &authcfg );
55+
%Docstring
56+
Emitted when authentication config is removed
57+
%End
2158

2259
public slots:
2360
void showMessage( const QString &msg );
61+
%Docstring
62+
Show a small message bar with a close button
63+
%End
2464

2565
void clearMessage();
66+
%Docstring
67+
Clear and hide small message bar
68+
%End
69+
2670
};
2771

2872

73+
74+
75+
2976
class QgsAuthConfigUriEdit : QDialog
3077
{
31-
%TypeHeaderCode
32-
#include <qgsauthconfigselect.h>
78+
%Docstring
79+
Dialog wrapper of select widget to edit an authcfg in a data source URI
3380
%End
3481

82+
%TypeHeaderCode
83+
#include "qgsauthconfigselect.h"
84+
%End
3585
public:
86+
3687
explicit QgsAuthConfigUriEdit( QWidget *parent /TransferThis/ = 0,
3788
const QString &datauri = QString(),
3889
const QString &dataprovider = QString() );
39-
~QgsAuthConfigUriEdit();
90+
%Docstring
91+
Construct wrapper dialog for select widget to edit an authcfg in a data source URI
92+
\param parent Parent widget
93+
\param datauri URI QString with of without an authcfg=ID string
94+
\param dataprovider The key of the calling layer provider, if applicable
95+
%End
4096

4197
void setDataSourceUri( const QString &datauri );
98+
%Docstring
99+
Set the data source URI to parse
100+
%End
42101

43102
QString dataSourceUri();
103+
%Docstring
104+
The returned, possibly edited data source URI
105+
:rtype: str
106+
%End
44107

45108
static bool hasConfigId( const QString &txt );
109+
%Docstring
110+
Whether a string contains an authcfg ID
111+
:rtype: bool
112+
%End
113+
46114
};
115+
116+
/************************************************************************
117+
* This file has been generated automatically from *
118+
* *
119+
* src/gui/auth/qgsauthconfigselect.h *
120+
* *
121+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
122+
************************************************************************/

‎python/gui/auth/qgsautheditorwidgets.sip

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,56 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsautheditorwidgets.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
111
class QgsAuthMethodPlugins : QDialog
212
{
3-
%TypeHeaderCode
4-
#include <qgsautheditorwidgets.h>
13+
%Docstring
14+
Dialog for viewing available authentication method plugins
515
%End
616

17+
%TypeHeaderCode
18+
#include "qgsautheditorwidgets.h"
19+
%End
720
public:
21+
822
explicit QgsAuthMethodPlugins( QWidget *parent /TransferThis/ = 0 );
23+
%Docstring
24+
Construct a dialog for viewing available authentication method plugins
25+
\param parent Parent widget
26+
%End
927

10-
~QgsAuthMethodPlugins();
1128
};
1229

1330

1431
class QgsAuthEditorWidgets : QWidget
1532
{
16-
%TypeHeaderCode
17-
#include <qgsautheditorwidgets.h>
33+
%Docstring
34+
Wrapper widget for available authentication editors
1835
%End
1936

37+
%TypeHeaderCode
38+
#include "qgsautheditorwidgets.h"
39+
%End
2040
public:
41+
2142
explicit QgsAuthEditorWidgets( QWidget *parent /TransferThis/ = 0 );
43+
%Docstring
44+
Construct a widget to contain various authentication editors
45+
\param parent Parent widget
46+
%End
2247

23-
~QgsAuthEditorWidgets();
2448
};
49+
50+
/************************************************************************
51+
* This file has been generated automatically from *
52+
* *
53+
* src/gui/auth/qgsautheditorwidgets.h *
54+
* *
55+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
56+
************************************************************************/

‎python/gui/auth/qgsauthidentitieseditor.sip

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,45 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthidentitieseditor.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthIdentitiesEditor : QWidget
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthidentitieseditor.h>
15+
%Docstring
16+
Widget for viewing and editing authentication identities database
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthidentitieseditor.h"
21+
%End
722
public:
23+
824
explicit QgsAuthIdentitiesEditor( QWidget *parent /TransferThis/ = 0 );
9-
~QgsAuthIdentitiesEditor();
25+
%Docstring
26+
Widget for editing authentication configurations directly in database
27+
\param parent Parent widget
28+
%End
29+
30+
protected:
31+
virtual void showEvent( QShowEvent *e );
32+
33+
%Docstring
34+
Overridden show event of base widget
35+
%End
36+
1037
};
38+
39+
/************************************************************************
40+
* This file has been generated automatically from *
41+
* *
42+
* src/gui/auth/qgsauthidentitieseditor.h *
43+
* *
44+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
45+
************************************************************************/

‎python/gui/auth/qgsauthimportcertdialog.sip

Lines changed: 57 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,84 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthimportcertdialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthImportCertDialog : QDialog
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthimportcertdialog.h>
15+
%Docstring
16+
Widget for importing a certificate into the authentication database
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthimportcertdialog.h"
21+
%End
722
public:
823
enum CertFilter
924
{
10-
NoFilter = 1,
11-
CaFilter = 2,
25+
NoFilter,
26+
CaFilter,
1227
};
1328

1429
enum CertInput
1530
{
16-
AllInputs = 1,
17-
FileInput = 2,
18-
TextInput = 3,
31+
AllInputs,
32+
FileInput,
33+
TextInput,
1934
};
2035

2136
explicit QgsAuthImportCertDialog( QWidget *parent /TransferThis/ = 0,
2237
QgsAuthImportCertDialog::CertFilter filter = NoFilter,
2338
QgsAuthImportCertDialog::CertInput input = AllInputs );
24-
~QgsAuthImportCertDialog();
39+
%Docstring
40+
Construct a dialog for importing certificates
41+
\param parent Parent widget
42+
\param filter Certificate type filter to apply to dialog
43+
\param input Type of input(s) for certificates
44+
%End
2545

2646
const QList<QSslCertificate> certificatesToImport();
47+
%Docstring
48+
Get list of certificate objects to import
49+
:rtype: list of QSslCertificate
50+
%End
2751

2852
const QString certFileToImport();
53+
%Docstring
54+
Get the file path to a certificate to import
55+
:rtype: str
56+
%End
2957

3058
const QString certTextToImport();
59+
%Docstring
60+
Get certificate text to import
61+
:rtype: str
62+
%End
3163

3264
bool allowInvalidCerts();
65+
%Docstring
66+
Whether to allow importation of invalid certificates (so trust policy can be overridden)
67+
:rtype: bool
68+
%End
3369

3470
QgsAuthCertUtils::CertTrustPolicy certTrustPolicy();
71+
%Docstring
72+
Defined trust policy for imported certificates
73+
:rtype: QgsAuthCertUtils.CertTrustPolicy
74+
%End
75+
3576
};
77+
78+
/************************************************************************
79+
* This file has been generated automatically from *
80+
* *
81+
* src/gui/auth/qgsauthimportcertdialog.h *
82+
* *
83+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
84+
************************************************************************/

‎python/gui/auth/qgsauthimportidentitydialog.sip

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,70 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthimportidentitydialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthImportIdentityDialog : QDialog
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthimportidentitydialog.h>
15+
%Docstring
16+
Widget for importing an identity certificate/key bundle into the authentication database
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthimportidentitydialog.h"
21+
%End
722
public:
8-
/** Type of identity being imported */
923
enum IdentityType
1024
{
11-
CertIdentity = 0,
25+
CertIdentity,
1226
};
1327

14-
/** Type of bundles supported */
1528
enum BundleTypes
1629
{
17-
PkiPaths = 0,
18-
PkiPkcs12 = 1,
30+
PkiPaths,
31+
PkiPkcs12,
1932
};
2033

21-
/** Type of certificate/bundle validity output */
2234
enum Validity
2335
{
2436
Valid,
2537
Invalid,
2638
Unknown
2739
};
2840

29-
/**
30-
* Construct a dialog for importing identities
31-
* @param identitytype Type of the identity to import
32-
* @param parent Parent widget
33-
*/
3441
explicit QgsAuthImportIdentityDialog( QgsAuthImportIdentityDialog::IdentityType identitytype,
3542
QWidget *parent /TransferThis/ = 0 );
36-
~QgsAuthImportIdentityDialog();
43+
%Docstring
44+
Construct a dialog for importing identities
45+
\param identitytype Type of the identity to import
46+
\param parent Parent widget
47+
%End
3748

38-
/** Get identity type */
3949
QgsAuthImportIdentityDialog::IdentityType identityType();
50+
%Docstring
51+
Get identity type
52+
:rtype: QgsAuthImportIdentityDialog.IdentityType
53+
%End
4054

41-
/** Get certificate/key bundle to be imported.
42-
* @note not available in Python bindings
43-
*/
44-
// const QPair<QSslCertificate, QSslKey> certBundleToImport();
4555

46-
/** Get certificate/key bundle to be imported as a PKI bundle object */
4756
const QgsPkiBundle pkiBundleToImport();
57+
%Docstring
58+
Get certificate/key bundle to be imported as a PKI bundle object
59+
:rtype: QgsPkiBundle
60+
%End
61+
4862
};
63+
64+
/************************************************************************
65+
* This file has been generated automatically from *
66+
* *
67+
* src/gui/auth/qgsauthimportidentitydialog.h *
68+
* *
69+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
70+
************************************************************************/

‎python/gui/auth/qgsauthmethodedit.sip

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,78 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthmethodedit.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
112
class QgsAuthMethodEdit : QWidget
213
{
3-
%TypeHeaderCode
4-
#include <qgsauthmethodedit.h>
14+
%Docstring
15+
Abstract base class for the edit widget of authentication method plugins
516
%End
617

18+
%TypeHeaderCode
19+
#include "qgsauthmethodedit.h"
20+
%End
721
public:
822
virtual bool validateConfig() = 0;
23+
%Docstring
24+
Validate the configuration of subclasses
25+
:rtype: bool
26+
%End
927

1028
virtual QgsStringMap configMap() const = 0;
29+
%Docstring
30+
The configuration key-vale map of subclasses
31+
:rtype: QgsStringMap
32+
%End
1133

1234
signals:
1335
void validityChanged( bool valid );
36+
%Docstring
37+
Emitted when the configuration validatity changes
38+
%End
1439

1540
public slots:
41+
1642
virtual void loadConfig( const QgsStringMap &configmap ) = 0;
43+
%Docstring
44+
Load an existing config map into subclassed widget
45+
\param configmap
46+
%End
1747

1848
virtual void resetConfig() = 0;
49+
%Docstring
50+
Clear GUI controls in subclassed widget, optionally reloading any previously loaded config map
51+
%End
1952

2053
virtual void clearConfig() = 0;
54+
%Docstring
55+
Clear GUI controls in subclassed widget
56+
%End
2157

2258
protected:
59+
2360
explicit QgsAuthMethodEdit( QWidget *parent = 0 );
61+
%Docstring
62+
Construct widget to edit an authentication method configuration
63+
.. note::
64+
65+
Non-public since this is an abstract base class
66+
\param parent Parent widget
67+
%End
2468

2569
virtual ~QgsAuthMethodEdit();
2670
};
71+
72+
/************************************************************************
73+
* This file has been generated automatically from *
74+
* *
75+
* src/gui/auth/qgsauthmethodedit.h *
76+
* *
77+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
78+
************************************************************************/

‎python/gui/auth/qgsauthserverseditor.sip

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,43 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthserverseditor.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthServersEditor : QWidget
214
{
3-
%TypeHeaderCode
4-
#include <qgsauthserverseditor.h>
15+
%Docstring
16+
Widget for viewing and editing servers in authentication database
517
%End
618

19+
%TypeHeaderCode
20+
#include "qgsauthserverseditor.h"
21+
%End
722
public:
23+
824
explicit QgsAuthServersEditor( QWidget *parent /TransferThis/ = 0 );
9-
~QgsAuthServersEditor();
25+
%Docstring
26+
Widget for editing authentication configurations directly in database
27+
\param parent Parent Widget
28+
%End
29+
30+
protected:
31+
32+
virtual void showEvent( QShowEvent *e );
33+
1034

1135
};
36+
37+
/************************************************************************
38+
* This file has been generated automatically from *
39+
* *
40+
* src/gui/auth/qgsauthserverseditor.h *
41+
* *
42+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
43+
************************************************************************/

‎python/gui/auth/qgsauthsslconfigwidget.sip

Lines changed: 161 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,243 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthsslconfigwidget.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
114
class QgsAuthSslConfigWidget : QWidget
215
{
3-
%TypeHeaderCode
4-
#include <qgsauthsslconfigwidget.h>
16+
%Docstring
17+
Widget for editing an SSL server configuration
518
%End
619

20+
%TypeHeaderCode
21+
#include "qgsauthsslconfigwidget.h"
22+
%End
723
public:
24+
825
explicit QgsAuthSslConfigWidget( QWidget *parent /TransferThis/ = 0,
926
const QSslCertificate &cert = QSslCertificate(),
1027
const QString &hostport = QString(),
1128
const QList<QSslCertificate> &connectionCAs = QList<QSslCertificate>() );
12-
~QgsAuthSslConfigWidget();
29+
%Docstring
30+
Construct a widget for editing an SSL server certificate configuration
31+
\param parent Parent widget
32+
\param cert SSL server certificate object
33+
\param hostport Unique host:port to associate with the server certificate
34+
\param connectionCAs List of trusted Certificate Authorities objects
35+
%End
1336

1437
QGroupBox *certificateGroupBox();
38+
%Docstring
39+
Access to the certificate's group box widget
40+
:rtype: QGroupBox
41+
%End
1542
QGroupBox *sslConfigGroupBox();
43+
%Docstring
44+
Access to the SSL configuration's group box widget
45+
:rtype: QGroupBox
46+
%End
1647

1748
const QgsAuthConfigSslServer sslCustomConfig();
49+
%Docstring
50+
Get the SSL configuration
51+
:rtype: QgsAuthConfigSslServer
52+
%End
1853

1954
const QSslCertificate sslCertificate();
55+
%Docstring
56+
Get the SSL server certificate
57+
:rtype: QSslCertificate
58+
%End
2059

2160
const QString sslHost();
61+
%Docstring
62+
Get the host:port to associate with the server certificate
63+
:rtype: str
64+
%End
2265

2366
QSsl::SslProtocol sslProtocol();
67+
%Docstring
68+
Get the SSL protocl used for connections
69+
:rtype: QSsl.SslProtocol
70+
%End
2471

2572
const QList<QSslError::SslError> sslIgnoreErrorEnums();
73+
%Docstring
74+
Get list of the SSL errors (as enums) to be ignored for connections
75+
:rtype: list of QSslError.SslError
76+
%End
2677

2778
QSslSocket::PeerVerifyMode sslPeerVerifyMode();
79+
%Docstring
80+
Get the client's peer verify mode for connections
81+
:rtype: QSslSocket.PeerVerifyMode
82+
%End
2883

2984
int sslPeerVerifyDepth();
85+
%Docstring
86+
Get the client's peer verify depth for connections
87+
.. note::
88+
89+
Value of 0 = unlimited
90+
:rtype: int
91+
%End
3092

3193
public slots:
3294
void enableSslCustomOptions( bool enable );
95+
%Docstring
96+
Enable or disable the custom options widget
97+
%End
3398

3499
void setSslCertificate( const QSslCertificate &cert, const QString &hostport = QString() );
100+
%Docstring
101+
Set SSl certificate and any associated host:port
102+
%End
35103

36104
void loadSslCustomConfig( const QgsAuthConfigSslServer &config = QgsAuthConfigSslServer() );
105+
%Docstring
106+
Load an existing SSL server configuration
107+
%End
37108

38109
void saveSslCertConfig();
110+
%Docstring
111+
Save the current SSL server configuration to the authentication database
112+
%End
39113

40114
void resetSslCertConfig();
115+
%Docstring
116+
Clear the current SSL server configuration and disabled it
117+
%End
41118

42119
void setSslProtocol( QSsl::SslProtocol protocol );
120+
%Docstring
121+
Set the SSL protocol to use in connections
122+
%End
43123

44124
void resetSslProtocol();
125+
%Docstring
126+
Reset the SSL protocol to use in connections to the default
127+
%End
45128

46129
void appendSslIgnoreErrors( const QList<QSslError> &errors );
130+
%Docstring
131+
Add to SSL errors to ignore for the connection
132+
%End
47133

48134
void setSslIgnoreErrorEnums( const QList<QSslError::SslError> &errorenums );
135+
%Docstring
136+
Set the SSL errors (as enums) to ignore for the connection
137+
%End
49138

50139
void setSslIgnoreErrors( const QList<QSslError> &errors );
140+
%Docstring
141+
Set the SSL errors to ignore for the connection
142+
%End
51143

52144
void resetSslIgnoreErrors();
145+
%Docstring
146+
Clear the SSL errors to ignore for the connection
147+
%End
53148

54149
void setSslPeerVerify( QSslSocket::PeerVerifyMode mode, int modedepth );
150+
%Docstring
151+
Set the client's peer verify mode for connections
152+
%End
55153

56154
void resetSslPeerVerify();
155+
%Docstring
156+
Reset the client's peer verify mode for connections to default
157+
%End
57158

58159
void setSslHost( const QString &host );
160+
%Docstring
161+
Set the host of the server
162+
%End
59163

60164
void setConfigCheckable( bool checkable );
165+
%Docstring
166+
Set whether the config group box is checkable
167+
%End
61168

62169
void validateHostPortText( const QString &txt );
170+
%Docstring
171+
Parse string for host:port
172+
%End
63173

64174
bool readyToSave();
175+
%Docstring
176+
Verify if the configuration if ready to save
177+
:rtype: bool
178+
%End
65179

66180
signals:
67181
void configEnabledChanged( bool enabled );
182+
%Docstring
183+
Emitted when the enabled state of the configuration changes
184+
%End
185+
68186
void certFoundInAuthDatabase( bool found );
187+
%Docstring
188+
Emitted when an certificate of same SHA hash is found in authentication database
189+
%End
190+
69191
void hostPortValidityChanged( bool valid );
192+
%Docstring
193+
Emitted when the validity of the host:port changes
194+
%End
195+
70196
void readyToSaveChanged( bool cansave );
197+
%Docstring
198+
Emitted when the configuration can be saved changes
199+
%End
200+
71201
};
72202

73-
//////////////// Embed in dialog ///////////////////
74203

75204
class QgsAuthSslConfigDialog : QDialog
76205
{
77-
%TypeHeaderCode
78-
#include <qgsauthsslconfigwidget.h>
206+
%Docstring
207+
Dialog wrapper of widget for editing an SSL server configuration
79208
%End
80209

210+
%TypeHeaderCode
211+
#include "qgsauthsslconfigwidget.h"
212+
%End
81213
public:
214+
82215
explicit QgsAuthSslConfigDialog( QWidget *parent = 0,
83-
const QSslCertificate& cert = QSslCertificate(),
216+
const QSslCertificate &cert = QSslCertificate(),
84217
const QString &hostport = QString() );
85-
~QgsAuthSslConfigDialog();
218+
%Docstring
219+
Construct wrapper dialog for the SSL config widget
220+
\param parent Parent widget
221+
\param cert SSL server certificate object
222+
\param hostport Unique host:port to associate with the server certificate
223+
%End
86224

87225
QgsAuthSslConfigWidget *sslCustomConfigWidget();
226+
%Docstring
227+
Access the embedded SSL server configuration widget
228+
:rtype: QgsAuthSslConfigWidget
229+
%End
88230

89231
public slots:
90-
void accept();
232+
virtual void accept();
233+
234+
91235
};
236+
237+
/************************************************************************
238+
* This file has been generated automatically from *
239+
* *
240+
* src/gui/auth/qgsauthsslconfigwidget.h *
241+
* *
242+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
243+
************************************************************************/

‎python/gui/auth/qgsauthsslerrorsdialog.sip

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,46 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthsslerrorsdialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAuthSslErrorsDialog : QDialog
214
{
15+
%Docstring
16+
Widget for reporting SSL errors and offering an option to store an SSL server exception into the authentication database
17+
%End
18+
319
%TypeHeaderCode
4-
#include <qgsauthsslerrorsdialog.h>
20+
#include "qgsauthsslerrorsdialog.h"
521
%End
622
public:
23+
724
QgsAuthSslErrorsDialog( QNetworkReply *reply,
8-
const QList<QSslError>& sslErrors,
9-
QWidget *parent /TransferThis/ = 0 ,
25+
const QList<QSslError> &sslErrors,
26+
QWidget *parent /TransferThis/ = 0,
1027
const QString &digest = QString(),
1128
const QString &hostport = QString() );
12-
~QgsAuthSslErrorsDialog();
29+
%Docstring
30+
Construct a dialog to handle SSL errors and saving SSL server certificate exceptions
31+
\param reply Network reply that hand error(s)
32+
\param sslErrors SSL errors that occurred
33+
\param parent Parent widget
34+
\param digest SHA digest of server certificate
35+
\param hostport Unique host:port to associate with the server certificate
36+
%End
1337

1438
};
39+
40+
/************************************************************************
41+
* This file has been generated automatically from *
42+
* *
43+
* src/gui/auth/qgsauthsslerrorsdialog.h *
44+
* *
45+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
46+
************************************************************************/

‎python/gui/auth/qgsauthsslimportdialog.sip

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,44 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthsslimportdialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
14+
115
class QgsAuthSslImportDialog : QDialog
216
{
17+
%Docstring
18+
Widget for importing an SSL server certificate exception into the authentication database
19+
%End
20+
321
%TypeHeaderCode
4-
#include <qgsauthsslimportdialog.h>
22+
#include "qgsauthsslimportdialog.h"
523
%End
624
public:
25+
726
QgsAuthSslImportDialog( QWidget *parent /TransferThis/ = 0 );
8-
~QgsAuthSslImportDialog();
27+
%Docstring
28+
Construct dialog for importing certificates
29+
\param parent
30+
%End
931

1032
public slots:
11-
void accept();
33+
virtual void accept();
34+
35+
1236
};
37+
38+
/************************************************************************
39+
* This file has been generated automatically from *
40+
* *
41+
* src/gui/auth/qgsauthsslimportdialog.h *
42+
* *
43+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
44+
************************************************************************/

‎python/gui/auth/qgsauthtrustedcasdialog.sip

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,46 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/auth/qgsauthtrustedcasdialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
114
class QgsAuthTrustedCAsDialog : QDialog
215
{
3-
%TypeHeaderCode
4-
#include <qgsauthtrustedcasdialog.h>
16+
%Docstring
17+
Widget for listing trusted Certificate (Intermediate) Authorities used in secure connections
518
%End
619

20+
%TypeHeaderCode
21+
#include "qgsauthtrustedcasdialog.h"
22+
%End
723
public:
24+
825
explicit QgsAuthTrustedCAsDialog( QWidget *parent /TransferThis/ = 0,
926
const QList<QSslCertificate> &trustedCAs = QList<QSslCertificate>() );
10-
~QgsAuthTrustedCAsDialog();
27+
%Docstring
28+
Construct a dialog that will list the trusted Certificate Authorities
29+
\param parent Parent widget
30+
\param trustedCAs List of trusted Certificate Authorities objects
31+
%End
32+
33+
protected:
34+
35+
virtual void showEvent( QShowEvent *e );
36+
37+
1138
};
39+
40+
/************************************************************************
41+
* This file has been generated automatically from *
42+
* *
43+
* src/gui/auth/qgsauthtrustedcasdialog.h *
44+
* *
45+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
46+
************************************************************************/

‎src/gui/auth/qgsauthsslerrorsdialog.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <QSslError>
2323
#include "ui_qgsauthsslerrorsdialog.h"
2424
#include "qgis_gui.h"
25+
#include "qgis_sip.h"
2526

2627
class QNetworkReply;
2728
class QPushButton;
@@ -44,7 +45,7 @@ class GUI_EXPORT QgsAuthSslErrorsDialog : public QDialog, private Ui::QgsAuthSsl
4445
*/
4546
QgsAuthSslErrorsDialog( QNetworkReply *reply,
4647
const QList<QSslError> &sslErrors,
47-
QWidget *parent = nullptr,
48+
QWidget *parent SIP_TRANSFERTHIS = nullptr,
4849
const QString &digest = QString(),
4950
const QString &hostport = QString() );
5051

0 commit comments

Comments
 (0)
Please sign in to comment.