diff -r 17ef10819773 -r 40582e448c4b MqttMonitor/MqttConnectionOptionsDialog.py --- a/MqttMonitor/MqttConnectionOptionsDialog.py Sun Sep 09 12:21:19 2018 +0200 +++ b/MqttMonitor/MqttConnectionOptionsDialog.py Sun Sep 09 17:32:54 2018 +0200 @@ -34,7 +34,8 @@ @param options dictionary containing the connection options to populate the dialog with. It must have the keys "ClientId", "Keepalive", "CleanSession", "Username", "Password", "WillTopic", - "WillMessage", "WillQos", "WillRetain", "TlsEnable", "TlsCaCert". + "WillMessage", "WillQos", "WillRetain", "TlsEnable", "TlsCaCert", + "ConnectionTimeout". @type dict @param parent reference to the parent widget @type QWidget @@ -97,7 +98,8 @@ @param options dictionary containing the connection options to populate the dialog with. It must have the keys "ClientId", "Keepalive", "CleanSession", "Username", "Password", "WillTopic", "WillMessage", - "WillQos", "WillRetain", "TlsEnable", "TlsCaCert". + "WillQos", "WillRetain", "TlsEnable", "TlsCaCert", + "ConnectionTimeout". @type dict """ if options is None: @@ -105,6 +107,7 @@ # general self.clientIdEdit.setText(options["ClientId"]) + self.connectionTimeoutSpinBox.setValue(options["ConnectionTimeout"]) self.keepaliveSpinBox.setValue(options["Keepalive"]) self.cleanSessionCheckBox.setChecked(options["CleanSession"]) @@ -129,11 +132,12 @@ @return dictionary containing the connection options. It has the keys "ClientId", "Keepalive", "CleanSession", "Username", "Password", "WillTopic", "WillMessage", "WillQos", "WillRetain", "TlsEnable", - "TlsCaCert". + "TlsCaCert", "ConnectionTimeout". @rtype tuple of (int, dict) """ return { "ClientId": self.clientIdEdit.text(), + "ConnectionTimeout": self.connectionTimeoutSpinBox.value(), "Keepalive": self.keepaliveSpinBox.value(), "CleanSession": self.cleanSessionCheckBox.isChecked(), "Username": self.usernameEdit.text(),