diff --git a/actor/src/UDSActorConfig.py b/actor/src/UDSActorConfig.py
new file mode 100644
index 000000000..92e7bd190
--- /dev/null
+++ b/actor/src/UDSActorConfig.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2019 Virtual Cable S.L.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+# * Neither the name of Virtual Cable S.L. nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+'''
+@author: Adolfo Gómez, dkmaster at dkmon dot com
+'''
+import sys
+import os
+import logging
+
+
+from PyQt5.QtWidgets import QApplication, QDialog
+
+from ui.setup_dialog_ui import Ui_UdsActorSetupDialog
+
+
+logger = logging.getLogger('actor')
+
+
+class UDSConfigDialog(QDialog):
+
+ def __init__(self, data=None, parent=None):
+ QDialog.__init__(self, parent)
+ self.ui = Ui_UdsActorSetupDialog()
+ self.ui.setupUi(self)
+ if data is not None:
+ pass
+
+ def _getCfg(self):
+ return {
+ 'host': self.ui.host.text(),
+ 'username': self.ui.username.text(),
+ 'password': self.ui.password.text(),
+ 'validateCertificate': self.ui.useSSl.currentIndex() == 1,
+ 'logLevel': (self.ui.logLevelComboBox.currentIndex() + 1) * 10000
+ }
+
+ def textChanged(self):
+ enableButtons = self.ui.host.text() != '' and self.ui.username.text() != '' and self.ui.password.text() != ''
+ self.ui.testButton.setEnabled(enableButtons)
+ self.ui.saveButton.setEnabled(enableButtons)
+
+ def cancelAndDiscard(self):
+ logger.debug('Cancelling changes')
+ self.close()
+
+ def testParameters(self):
+ pass
+
+ def acceptAndSave(self):
+ pass
+
+
+if __name__ == "__main__":
+ # If to be run as "sudo" on linux, we will need this to avoid problems
+ if 'linux' in sys.platform:
+ os.environ['QT_X11_NO_MITSHM'] = '1'
+
+ app = QApplication(sys.argv)
+
+ # if store.checkPermissions() is False:
+ # QtGui.QMessageBox.critical(None, 'Notice', 'This Program must be executed as administrator', QtGui.QMessageBox.Ok)
+ # sys.exit(1)
+
+ myapp = UDSConfigDialog()
+ myapp.show()
+ sys.exit(app.exec_())
diff --git a/actor/src/designer/setup-dialog.ui b/actor/src/designer/setup-dialog.ui
new file mode 100644
index 000000000..0a002feb6
--- /dev/null
+++ b/actor/src/designer/setup-dialog.ui
@@ -0,0 +1,370 @@
+
+
+ Adolfo Gómez
+ UdsActorSetupDialog
+
+
+ Qt::WindowModal
+
+
+
+ 0
+ 0
+ 400
+ 293
+
+
+
+
+ 0
+ 0
+
+
+
+
+ Verdana
+ 9
+
+
+
+ UDS Actor Setup
+
+
+
+ :/img/img/uds-icon.png:/img/img/uds-icon.png
+
+
+ false
+
+
+
+
+
+ false
+
+
+ true
+
+
+
+ false
+
+
+
+ 20
+ 220
+ 361
+ 23
+
+
+
+ Click to test the selecter parameters
+
+
+ <html><head/><body><p>Click on this button to test the server host and master key parameters.</p><p>A window will be displayed with results after the test is executed.</p><p><br/></p><p>This button will only be active if all parameters are filled.</p></body></html>
+
+
+ Test parameters
+
+
+
+
+ false
+
+
+
+ 20
+ 250
+ 101
+ 23
+
+
+
+
+ 0
+ 0
+
+
+
+ Accepts changes and saves them
+
+
+ Clicking on this button will accept all changes and save them, closing the configuration window
+
+
+ Accept && Save
+
+
+
+
+
+ 260
+ 250
+ 121
+ 23
+
+
+
+
+ 0
+ 0
+
+
+
+ Cancel all changes and discard them
+
+
+ Discards all changes and closes the configuration window
+
+
+ Cancel && Discard
+
+
+
+
+
+ 20
+ 20
+ 361
+ 191
+
+
+
+
+ QFormLayout::AllNonFixedFieldsGrow
+
+
+ 16
+
+ -
+
+
+ UDS Server
+
+
+
+ -
+
+
+ false
+
+
+ Uds Broker Server Addres. Use IP or FQDN
+
+
+ Enter here the UDS Broker Addres using either its IP address or its FQDN address
+
+
+
+ -
+
+
+ Username
+
+
+
+ -
+
+
+ UDS user with administration rights (Will not be stored on template)
+
+
+ <html><head/><body><p>Administrator user on UDS Server.</p><p>Note: This credential will not be stored on client. Will be used to obtain an unique key for this image.</p></body></html>
+
+
+
+ -
+
+
+ Password for user (Will not be stored on template)
+
+
+ <html><head/><body><p>Administrator password for the user on UDS Server.</p><p>Note: This credential will not be stored on client. Will be used to obtain an unique key for this image.</p></body></html>
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Password
+
+
+
+ -
+
+
+ Security
+
+
+
+ -
+
+
+ Select communication security with broker
+
+
+ <html><head/><body><p>Select the security for communications with UDS Broker.</p><p>The recommended method of communication is <span style=" font-weight:600;">Use SSL</span>, but selection needs to be acording to your broker configuration.</p></body></html>
+
+
-
+
+ Ignore certificate
+
+
+ -
+
+ Verify certificate
+
+
+
+
+ -
+
+
+ 1
+
+
+ true
+
+
-
+
+ DEBUG
+
+
+ -
+
+ INFO
+
+
+ -
+
+ ERROR
+
+
+ -
+
+ FATAL
+
+
+
+
+ -
+
+
+ Log Level
+
+
+
+
+
+
+
+
+
+
+
+ cancelButton
+ pressed()
+ UdsActorSetupDialog
+ cancelAndDiscard()
+
+
+ 315
+ 165
+
+
+ 231
+ 161
+
+
+
+
+ testButton
+ pressed()
+ UdsActorSetupDialog
+ testParameters()
+
+
+ 239
+ 132
+
+
+ 285
+ 185
+
+
+
+
+ saveButton
+ pressed()
+ UdsActorSetupDialog
+ acceptAndSave()
+
+
+ 71
+ 165
+
+
+ 124
+ 181
+
+
+
+
+ host
+ textChanged(QString)
+ UdsActorSetupDialog
+ textChanged()
+
+
+ 237
+ 32
+
+
+ 199
+ 146
+
+
+
+
+ username
+ textChanged(QString)
+ UdsActorSetupDialog
+ textChanged()
+
+
+ 237
+ 71
+
+
+ 199
+ 146
+
+
+
+
+ password
+ textChanged(QString)
+ UdsActorSetupDialog
+ textChanged()
+
+
+ 237
+ 110
+
+
+ 199
+ 146
+
+
+
+
+
+ textChanged()
+ cancelAndDiscard()
+ testParameters()
+ acceptAndSave()
+
+
diff --git a/actor/src/designer/uds.qrc b/actor/src/designer/uds.qrc
new file mode 100644
index 000000000..024434364
--- /dev/null
+++ b/actor/src/designer/uds.qrc
@@ -0,0 +1,5 @@
+
+
+ ../img/uds-icon.png
+
+
diff --git a/actor/src/designer/update.sh b/actor/src/designer/update.sh
new file mode 100755
index 000000000..8ee15eeae
--- /dev/null
+++ b/actor/src/designer/update.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+
+function process {
+# pyuic4 about-dialog.ui -o about_dialog_ui.py -x
+# pyuic4 message-dialog.ui -o message_dialog_ui.py
+ pyuic5 setup-dialog.ui -o ../ui/setup_dialog_ui.py --import-from=ui
+}
+
+pyrcc5 uds.qrc -o ../ui/uds_rc.py
+
+
+# process current directory ui's
+process
+
diff --git a/actor/src/img/uds-icon.png b/actor/src/img/uds-icon.png
new file mode 100644
index 000000000..a52bdc7bc
Binary files /dev/null and b/actor/src/img/uds-icon.png differ
diff --git a/actor/src/ui/__init__.py b/actor/src/ui/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/actor/src/ui/setup_dialog_ui.py b/actor/src/ui/setup_dialog_ui.py
new file mode 100644
index 000000000..87cd2f91f
--- /dev/null
+++ b/actor/src/ui/setup_dialog_ui.py
@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'setup-dialog.ui'
+#
+# Created by: PyQt5 UI code generator 5.11.3
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_UdsActorSetupDialog(object):
+ def setupUi(self, UdsActorSetupDialog):
+ UdsActorSetupDialog.setObjectName("UdsActorSetupDialog")
+ UdsActorSetupDialog.setWindowModality(QtCore.Qt.WindowModal)
+ UdsActorSetupDialog.resize(400, 293)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(UdsActorSetupDialog.sizePolicy().hasHeightForWidth())
+ UdsActorSetupDialog.setSizePolicy(sizePolicy)
+ font = QtGui.QFont()
+ font.setFamily("Verdana")
+ font.setPointSize(9)
+ UdsActorSetupDialog.setFont(font)
+ icon = QtGui.QIcon()
+ icon.addPixmap(QtGui.QPixmap(":/img/img/uds-icon.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ UdsActorSetupDialog.setWindowIcon(icon)
+ UdsActorSetupDialog.setAutoFillBackground(False)
+ UdsActorSetupDialog.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
+ UdsActorSetupDialog.setSizeGripEnabled(False)
+ UdsActorSetupDialog.setModal(True)
+ self.testButton = QtWidgets.QPushButton(UdsActorSetupDialog)
+ self.testButton.setEnabled(False)
+ self.testButton.setGeometry(QtCore.QRect(20, 220, 361, 23))
+ self.testButton.setObjectName("testButton")
+ self.saveButton = QtWidgets.QPushButton(UdsActorSetupDialog)
+ self.saveButton.setEnabled(False)
+ self.saveButton.setGeometry(QtCore.QRect(20, 250, 101, 23))
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.saveButton.sizePolicy().hasHeightForWidth())
+ self.saveButton.setSizePolicy(sizePolicy)
+ self.saveButton.setObjectName("saveButton")
+ self.cancelButton = QtWidgets.QPushButton(UdsActorSetupDialog)
+ self.cancelButton.setGeometry(QtCore.QRect(260, 250, 121, 23))
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.cancelButton.sizePolicy().hasHeightForWidth())
+ self.cancelButton.setSizePolicy(sizePolicy)
+ self.cancelButton.setObjectName("cancelButton")
+ self.layoutWidget = QtWidgets.QWidget(UdsActorSetupDialog)
+ self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 361, 191))
+ self.layoutWidget.setObjectName("layoutWidget")
+ self.formLayout = QtWidgets.QFormLayout(self.layoutWidget)
+ self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
+ self.formLayout.setContentsMargins(0, 0, 0, 0)
+ self.formLayout.setVerticalSpacing(16)
+ self.formLayout.setObjectName("formLayout")
+ self.label_host = QtWidgets.QLabel(self.layoutWidget)
+ self.label_host.setObjectName("label_host")
+ self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_host)
+ self.host = QtWidgets.QLineEdit(self.layoutWidget)
+ self.host.setAcceptDrops(False)
+ self.host.setObjectName("host")
+ self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.host)
+ self.label_username = QtWidgets.QLabel(self.layoutWidget)
+ self.label_username.setObjectName("label_username")
+ self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_username)
+ self.username = QtWidgets.QLineEdit(self.layoutWidget)
+ self.username.setObjectName("username")
+ self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.username)
+ self.password = QtWidgets.QLineEdit(self.layoutWidget)
+ self.password.setEchoMode(QtWidgets.QLineEdit.Password)
+ self.password.setObjectName("password")
+ self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.password)
+ self.label_password = QtWidgets.QLabel(self.layoutWidget)
+ self.label_password.setObjectName("label_password")
+ self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_password)
+ self.label_security = QtWidgets.QLabel(self.layoutWidget)
+ self.label_security.setObjectName("label_security")
+ self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_security)
+ self.validateCertificate = QtWidgets.QComboBox(self.layoutWidget)
+ self.validateCertificate.setObjectName("validateCertificate")
+ self.validateCertificate.addItem("")
+ self.validateCertificate.addItem("")
+ self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.validateCertificate)
+ self.logLevelComboBox = QtWidgets.QComboBox(self.layoutWidget)
+ self.logLevelComboBox.setFrame(True)
+ self.logLevelComboBox.setObjectName("logLevelComboBox")
+ self.logLevelComboBox.addItem("")
+ self.logLevelComboBox.setItemText(0, "DEBUG")
+ self.logLevelComboBox.addItem("")
+ self.logLevelComboBox.setItemText(1, "INFO")
+ self.logLevelComboBox.addItem("")
+ self.logLevelComboBox.setItemText(2, "ERROR")
+ self.logLevelComboBox.addItem("")
+ self.logLevelComboBox.setItemText(3, "FATAL")
+ self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.logLevelComboBox)
+ self.label_loglevel = QtWidgets.QLabel(self.layoutWidget)
+ self.label_loglevel.setObjectName("label_loglevel")
+ self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_loglevel)
+
+ self.retranslateUi(UdsActorSetupDialog)
+ self.logLevelComboBox.setCurrentIndex(1)
+ self.cancelButton.pressed.connect(UdsActorSetupDialog.cancelAndDiscard)
+ self.testButton.pressed.connect(UdsActorSetupDialog.testParameters)
+ self.saveButton.pressed.connect(UdsActorSetupDialog.acceptAndSave)
+ self.host.textChanged['QString'].connect(UdsActorSetupDialog.textChanged)
+ self.username.textChanged['QString'].connect(UdsActorSetupDialog.textChanged)
+ self.password.textChanged['QString'].connect(UdsActorSetupDialog.textChanged)
+ QtCore.QMetaObject.connectSlotsByName(UdsActorSetupDialog)
+
+ def retranslateUi(self, UdsActorSetupDialog):
+ _translate = QtCore.QCoreApplication.translate
+ UdsActorSetupDialog.setWindowTitle(_translate("UdsActorSetupDialog", "UDS Actor Setup"))
+ self.testButton.setToolTip(_translate("UdsActorSetupDialog", "Click to test the selecter parameters"))
+ self.testButton.setWhatsThis(_translate("UdsActorSetupDialog", "