Sat, 19 Oct 2024 16:04:24 +0200
Fixed a backward compatibility issue with eric-ide < 24.11.
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
139
b7ca79939cc7
Updated copyright for 2024.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
131
diff
changeset
|
3 | # Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> |
11
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
4 | # |
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
5 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a dialog to enter MQTT connection options. |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
10 | import copy |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
11 | |
129
9d54bf366323
Adapted some import statements to eric 23.1 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
127
diff
changeset
|
12 | from PyQt6.QtCore import QUuid, pyqtSlot |
9d54bf366323
Adapted some import statements to eric 23.1 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
127
diff
changeset
|
13 | from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
127
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
15 | try: |
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
16 | from eric7.EricGui import EricPixmapCache |
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
17 | except ImportError: |
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
18 | from UI import PixmapCache as EricPixmapCache |
129
9d54bf366323
Adapted some import statements to eric 23.1 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
127
diff
changeset
|
19 | |
127
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
20 | from eric7.EricWidgets import EricMessageBox |
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
21 | from eric7.EricWidgets.EricPathPicker import EricPathPickerModes |
151
f9830d91be9a
Fixed a backward compatibility issue with eric-ide < 24.11.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
143
diff
changeset
|
22 | |
f9830d91be9a
Fixed a backward compatibility issue with eric-ide < 24.11.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
143
diff
changeset
|
23 | try: |
f9830d91be9a
Fixed a backward compatibility issue with eric-ide < 24.11.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
143
diff
changeset
|
24 | from eric7.EricUtilities.crypto import pwConvert |
f9830d91be9a
Fixed a backward compatibility issue with eric-ide < 24.11.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
143
diff
changeset
|
25 | except ImportError: |
f9830d91be9a
Fixed a backward compatibility issue with eric-ide < 24.11.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
143
diff
changeset
|
26 | # backward compatibility for eric-ide < 24.11 |
f9830d91be9a
Fixed a backward compatibility issue with eric-ide < 24.11.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
143
diff
changeset
|
27 | from eric7.Utilities.crypto import pwConvert |
20
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
28 | |
105
36ec7431ad04
Made the default MQTT protocol a configuration item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
104
diff
changeset
|
29 | from .MqttClient import MqttClient |
36ec7431ad04
Made the default MQTT protocol a configuration item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
104
diff
changeset
|
30 | from .MqttProtocols import MqttProtocols |
129
9d54bf366323
Adapted some import statements to eric 23.1 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
127
diff
changeset
|
31 | from .Ui_MqttConnectionOptionsDialog import Ui_MqttConnectionOptionsDialog |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
32 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | class MqttConnectionOptionsDialog(QDialog, Ui_MqttConnectionOptionsDialog): |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | Class implementing a dialog to enter MQTT connection options. |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | """ |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
38 | |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
39 | def __init__(self, options=None, parent=None): |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | Constructor |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
42 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | @param options dictionary containing the connection options to |
11
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
44 | populate the dialog with. It must have the keys "ClientId", |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
45 | "Protocol", "ConnectionTimeout", "Keepalive", "CleanSession", |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
46 | "Username", "Password", "WillTopic", "WillMessage", "WillQos", |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
47 | "WillRetain", "WillProperties", "TlsEnable", "TlsCaCert", |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
48 | "UserProperties". |
18
bbfe5866b6aa
MqttConnectionProfilesDialog: continued implementing the connections profile dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11
diff
changeset
|
49 | @type dict |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | @param parent reference to the parent widget |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | @type QWidget |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | """ |
86
620022b14cb4
Implemented some code simplifications.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
84
diff
changeset
|
53 | super().__init__(parent) |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | self.setupUi(self) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
55 | |
92
2fb5c08019fd
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
86
diff
changeset
|
56 | self.tlsCertsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) |
25
01d44a4decf5
MqttConnectionOptionsDialog: added support for TLS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
22
diff
changeset
|
57 | self.tlsCertsFilePicker.setFilters( |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
58 | self.tr("Certificate Files (*.crt *.pem);;All Files (*)") |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
59 | ) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
60 | |
127
8982ef7b7d67
Adapted the import statements to the new structure.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
123
diff
changeset
|
61 | self.willPropertiesButton.setIcon(EricPixmapCache.getIcon("listSelection")) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
62 | |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
63 | self.optionsWidget.setCurrentIndex(0) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
64 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
65 | # initialize MQTTv5 related stuff |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
66 | self.on_mqttv5Button_toggled(False) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
67 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | self.__populateDefaults(options=options) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
69 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
70 | self.connectPropertiesButton.clicked[bool].connect( |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
71 | self.__propertiesTypeSelected |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
72 | ) |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
73 | self.disconnectPropertiesButton.clicked[bool].connect( |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
74 | self.__propertiesTypeSelected |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
75 | ) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
76 | |
20
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
77 | self.__updateOkButton() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
78 | |
20
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
79 | def __updateOkButton(self): |
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
80 | """ |
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
81 | Private method to update the enabled state of the OK button. |
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
82 | """ |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
83 | if self.clientIdEdit.text() == "" and not self.cleanSessionCheckBox.isChecked(): |
20
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
84 | enable = False |
92
2fb5c08019fd
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
86
diff
changeset
|
85 | EricMessageBox.critical( |
20
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
86 | self, |
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
87 | self.tr("Invalid Connection Parameters"), |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
88 | self.tr("""An empty Client ID requires a clean session."""), |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
89 | ) |
20
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
90 | else: |
3737a78bb6c5
MqttConnectionOptionsDialog: added some validity checks and added the default value for 'keepalive' setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
18
diff
changeset
|
91 | enable = True |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
92 | |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
93 | self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enable) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
94 | |
11
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
95 | @pyqtSlot() |
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
96 | def on_generateIdButton_clicked(self): |
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
97 | """ |
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
98 | Private slot to generate a client ID. |
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
99 | """ |
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
100 | uuid = QUuid.createUuid() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
101 | self.clientIdEdit.setText(uuid.toString(QUuid.StringFormat.WithoutBraces)) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
102 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
103 | @pyqtSlot(str) |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
104 | def on_clientIdEdit_textChanged(self, clientId): |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
105 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
106 | Private slot handling a change of the client ID string. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
107 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
108 | @param clientId client ID |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
109 | @type str |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
110 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
111 | self.__updateOkButton() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
112 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
113 | @pyqtSlot(bool) |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
114 | def on_cleanSessionCheckBox_clicked(self, checked): |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
115 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
116 | Private slot to handle a change of the clean session selection. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
117 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
118 | @param checked current state of the clean session selection |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
119 | @type bool |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
120 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
121 | self.__updateOkButton() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
122 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
123 | @pyqtSlot(bool) |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
124 | def on_mqttv5Button_toggled(self, checked): |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
125 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
126 | Private slot to handle the selection of the MQTT protocol. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
127 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
128 | @param checked state of the button |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
129 | @type bool |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
130 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
131 | self.optionsWidget.setTabEnabled( |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
132 | self.optionsWidget.indexOf(self.propertiesTab), checked |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
133 | ) |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
134 | self.willPropertiesButton.setEnabled(checked) |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
135 | self.willPropertiesButton.setVisible(checked) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
136 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | @pyqtSlot(QAbstractButton) |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | def on_buttonBox_clicked(self, button): |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | Private slot to handle the press of a button box button. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
141 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | @param button button that has been pressed |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | @type QAbstractButton |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | """ |
92
2fb5c08019fd
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
86
diff
changeset
|
145 | if button == self.buttonBox.button( |
2fb5c08019fd
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
86
diff
changeset
|
146 | QDialogButtonBox.StandardButton.RestoreDefaults |
2fb5c08019fd
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
86
diff
changeset
|
147 | ): |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | self.__populateDefaults(options=None) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
149 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
150 | @pyqtSlot(bool) |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
151 | def on_samePropertiesCheckBox_toggled(self, checked): |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
152 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
153 | Private slot to handle a change of the properties usage. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
154 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
155 | @param checked flag indicating to use the same user properties for |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
156 | CONNECT and DISCONNECT |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
157 | @type bool |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
158 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
159 | if checked and not self.connectPropertiesButton.isChecked(): |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
160 | self.connectPropertiesButton.click() |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
161 | self.disconnectPropertiesButton.setEnabled(not checked) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
162 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
163 | @pyqtSlot(bool) |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
164 | def __propertiesTypeSelected(self, checked): |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
165 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
166 | Private slot to handle the switching of the user properties type. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
167 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
168 | @param checked state of the buttons |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
169 | @type bool |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
170 | """ |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
171 | if checked: |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
172 | # handle the selection only |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
173 | if self.connectPropertiesButton.isChecked(): |
143
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
174 | self.__userProperties["disconnect"] = ( |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
175 | self.propertiesWidget.getProperties() |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
176 | ) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
177 | self.propertiesWidget.setProperties(self.__userProperties["connect"]) |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
178 | else: |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
179 | self.__userProperties["connect"] = self.propertiesWidget.getProperties() |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
180 | self.propertiesWidget.setProperties(self.__userProperties["disconnect"]) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
181 | |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
182 | @pyqtSlot() |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
183 | def on_willPropertiesButton_clicked(self): |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
184 | """ |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
185 | Private slot to edit the last will user properties. |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
186 | """ |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
187 | from .MqttUserPropertiesEditor import MqttUserPropertiesEditorDialog |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
188 | |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
189 | dlg = MqttUserPropertiesEditorDialog( |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
190 | self.tr("Last Will User Properties"), self.__willProperties, self |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
191 | ) |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
192 | if dlg.exec() == QDialog.DialogCode.Accepted: |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
193 | self.__willProperties = dlg.getProperties() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
194 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | def __populateDefaults(self, options=None): |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | Private method to populate the dialog. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
198 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | If no options dictionary is given, the dialog will be populated with |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | default values. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
201 | |
11
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
202 | @param options dictionary containing the connection options to populate |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
203 | the dialog with. It must have the keys "ClientId", "Protocol", |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
204 | "ConnectionTimeout", "Keepalive", "CleanSession", "Username", |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
205 | "Password", "WillTopic", "WillMessage", "WillQos", "WillRetain", |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
206 | "WillProperties", "TlsEnable", "TlsCaCert", "UserProperties". |
11
90d3ebed4cc0
Finished implementing the connection options dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10
diff
changeset
|
207 | @type dict |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | if options is None: |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
210 | options = MqttClient.defaultConnectionOptions() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
211 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | # general |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | self.clientIdEdit.setText(options["ClientId"]) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
214 | self.mqttv31Button.setChecked(options["Protocol"] == MqttProtocols.MQTTv31) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
215 | self.mqttv311Button.setChecked(options["Protocol"] == MqttProtocols.MQTTv311) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
216 | self.mqttv5Button.setChecked(options["Protocol"] == MqttProtocols.MQTTv5) |
31
40582e448c4b
Added a connect timeout function with a settable timeout value.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
30
diff
changeset
|
217 | self.connectionTimeoutSpinBox.setValue(options["ConnectionTimeout"]) |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | self.keepaliveSpinBox.setValue(options["Keepalive"]) |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | self.cleanSessionCheckBox.setChecked(options["CleanSession"]) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
220 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | # user credentials |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | self.usernameEdit.setText(options["Username"]) |
22
545979c7dcd4
MqttClient, MqttConnectionOptionsDialog: added support for encrypted passwords.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
20
diff
changeset
|
223 | self.passwordEdit.setText(pwConvert(options["Password"], encode=False)) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
224 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | # last will and testament |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | self.willQosSpinBox.setValue(options["WillQos"]) |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | self.willRetainCheckBox.setChecked(options["WillRetain"]) |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | self.willTopicEdit.setText(options["WillTopic"]) |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | self.willMessageEdit.setPlainText(options["WillMessage"]) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
230 | self.__willProperties = copy.deepcopy(options.get("WillProperties", [])) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
231 | |
25
01d44a4decf5
MqttConnectionOptionsDialog: added support for TLS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
22
diff
changeset
|
232 | # TLS parameters |
01d44a4decf5
MqttConnectionOptionsDialog: added support for TLS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
22
diff
changeset
|
233 | self.tlsEnableCheckBox.setChecked(options["TlsEnable"]) |
01d44a4decf5
MqttConnectionOptionsDialog: added support for TLS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
22
diff
changeset
|
234 | self.tlsCertsFilePicker.setText(options["TlsCaCert"]) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
235 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
236 | # user properties |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
237 | self.__userProperties = copy.deepcopy(options.get("UserProperties", {})) |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
238 | if not self.__userProperties: |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
239 | self.__userProperties = { |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
240 | "connect": [], |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
241 | "disconnect": [], |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
242 | "use_connect": True, |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
243 | } |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
244 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
245 | if options["Protocol"] == MqttProtocols.MQTTv5: |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
246 | self.connectPropertiesButton.setChecked(True) |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
247 | self.propertiesWidget.setProperties(self.__userProperties["connect"]) |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
248 | self.samePropertiesCheckBox.setChecked(self.__userProperties["use_connect"]) |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
249 | self.disconnectPropertiesButton.setEnabled( |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
250 | not self.__userProperties["use_connect"] |
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
251 | ) |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
252 | else: |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
253 | self.propertiesWidget.clear() |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
254 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | def getConnectionOptions(self): |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | """ |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | Public method get the entered connection options. |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
258 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | @return dictionary containing the connection options. It has the keys |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
260 | "ClientId", "Protocol", "ConnectionTimeout", "Keepalive", |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
261 | "CleanSession", "Username", "Password", "WillTopic", "WillMessage", |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
262 | "WillQos", "WillRetain", "WillProperties", "TlsEnable", |
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
263 | "TlsCaCert", "UserProperties". |
92
2fb5c08019fd
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
86
diff
changeset
|
264 | @rtype dict |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | """ |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
266 | if self.mqttv31Button.isChecked(): |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
267 | protocol = MqttProtocols.MQTTv31 |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
268 | elif self.mqttv311Button.isChecked(): |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
269 | protocol = MqttProtocols.MQTTv311 |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
270 | elif self.mqttv5Button.isChecked(): |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
271 | protocol = MqttProtocols.MQTTv5 |
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
272 | else: |
105
36ec7431ad04
Made the default MQTT protocol a configuration item.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
104
diff
changeset
|
273 | # should never happen |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
274 | protocol = MqttProtocols.MQTTv311 |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
275 | |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
276 | if protocol == MqttProtocols.MQTTv5: |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
277 | if self.connectPropertiesButton.isChecked(): |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
278 | self.__userProperties["connect"] = self.propertiesWidget.getProperties() |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
279 | else: |
143
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
280 | self.__userProperties["disconnect"] = ( |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
281 | self.propertiesWidget.getProperties() |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
282 | ) |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
283 | self.__userProperties["use_connect"] = ( |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
284 | self.samePropertiesCheckBox.isChecked() |
51bc5bcc672a
Modified the plugin for 'paho-mqtt' >=2.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
139
diff
changeset
|
285 | ) |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
286 | else: |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
287 | self.__userProperties = {} |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
288 | self.__willProperties = [] |
123
3d7e63ed4fd1
Performed some code refactoring and reformatted the source code with 'Black'
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
114
diff
changeset
|
289 | |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | return { |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | "ClientId": self.clientIdEdit.text(), |
97
21f9c010dc42
Added the MQTT protocol version to the list of connection parameters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
92
diff
changeset
|
292 | "Protocol": protocol, |
31
40582e448c4b
Added a connect timeout function with a settable timeout value.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
30
diff
changeset
|
293 | "ConnectionTimeout": self.connectionTimeoutSpinBox.value(), |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | "Keepalive": self.keepaliveSpinBox.value(), |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | "CleanSession": self.cleanSessionCheckBox.isChecked(), |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | "Username": self.usernameEdit.text(), |
22
545979c7dcd4
MqttClient, MqttConnectionOptionsDialog: added support for encrypted passwords.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
20
diff
changeset
|
297 | "Password": pwConvert(self.passwordEdit.text(), encode=True), |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
298 | "WillTopic": self.willTopicEdit.text(), |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | "WillMessage": self.willMessageEdit.toPlainText(), |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | "WillQos": self.willQosSpinBox.value(), |
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | "WillRetain": self.willRetainCheckBox.isChecked(), |
104
9a4c9b7f078c
Added support for 'Last Will' user properties and a button to clear the last will.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
302 | "WillProperties": copy.deepcopy(self.__willProperties), |
25
01d44a4decf5
MqttConnectionOptionsDialog: added support for TLS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
22
diff
changeset
|
303 | "TlsEnable": self.tlsEnableCheckBox.isChecked(), |
103
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
304 | "TlsCaCert": self.tlsCertsFilePicker.text(), |
5fe4f179975f
Continued implementing support for MQTT v5 user properties.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
97
diff
changeset
|
305 | "UserProperties": copy.deepcopy(self.__userProperties), |
10
7e0e921dc7ea
Started to implement the connection options dialog and methods to specify these connection options connecting to the server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | } |