From 2c10e9445b8b24cfe91889cbde106cae886eb9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Fri, 15 May 2020 13:56:02 +0200 Subject: [PATCH] fixed actor log level --- actors/src/UDSActorConfig.py | 4 ++-- actors/src/UDSActor_rc.py | 3 +-- actors/src/about_dialog_ui.py | 17 ++++++++--------- actors/src/message_dialog_ui.py | 3 +-- actors/src/setup-dialog.ui | 9 +++++++-- actors/src/setup_dialog_ui.py | 13 +++++++------ 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/actors/src/UDSActorConfig.py b/actors/src/UDSActorConfig.py index 489566e8..67d0f663 100644 --- a/actors/src/UDSActorConfig.py +++ b/actors/src/UDSActorConfig.py @@ -55,14 +55,14 @@ class UDSConfigDialog(QtGui.QDialog): self.ui.host.setText(data.get('host', '')) self.ui.masterKey.setText(data.get('masterKey', '')) self.ui.useSSl.setCurrentIndex(1 if data.get('ssl', False) is True else 0) - self.ui.logLevelComboBox.setCurrentIndex(int(data.get('logLevel', '10000')) / 10000 - 2) + self.ui.logLevelComboBox.setCurrentIndex(int(data.get('logLevel', '10000')) / 10000 - 1) def _getCfg(self): return { 'host': six.text_type(self.ui.host.text()), 'masterKey': six.text_type(self.ui.masterKey.text()), 'ssl': self.ui.useSSl.currentIndex() == 1, - 'logLevel': (self.ui.logLevelComboBox.currentIndex() + 2) * 10000 + 'logLevel': (self.ui.logLevelComboBox.currentIndex() + 1) * 10000 } def textChanged(self): diff --git a/actors/src/UDSActor_rc.py b/actors/src/UDSActor_rc.py index 9286384d..955fd5d7 100644 --- a/actors/src/UDSActor_rc.py +++ b/actors/src/UDSActor_rc.py @@ -2,8 +2,7 @@ # Resource object code # -# Created: Mon Apr 27 22:05:02 2015 -# by: The Resource Compiler for PyQt (Qt v4.8.6) +# Created by: The Resource Compiler for PyQt4 (Qt v4.8.7) # # WARNING! All changes made in this file will be lost! diff --git a/actors/src/about_dialog_ui.py b/actors/src/about_dialog_ui.py index 9734a1e7..45b33be4 100644 --- a/actors/src/about_dialog_ui.py +++ b/actors/src/about_dialog_ui.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'about-dialog.ui' # -# Created: Mon Apr 27 22:05:02 2015 -# by: PyQt4 UI code generator 4.11.2 +# Created by: PyQt4 UI code generator 4.12.1 # # WARNING! All changes made in this file will be lost! @@ -34,8 +33,8 @@ class Ui_UDSAboutDialog(object): UDSAboutDialog.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) UDSAboutDialog.setModal(True) self.vboxlayout = QtGui.QVBoxLayout(UDSAboutDialog) - self.vboxlayout.setSpacing(9) self.vboxlayout.setMargin(9) + self.vboxlayout.setSpacing(9) self.vboxlayout.setObjectName(_fromUtf8("vboxlayout")) self.LogoLabel = QtGui.QLabel(UDSAboutDialog) self.LogoLabel.setObjectName(_fromUtf8("LogoLabel")) @@ -55,8 +54,8 @@ class Ui_UDSAboutDialog(object): self.aboutTab = QtGui.QWidget() self.aboutTab.setObjectName(_fromUtf8("aboutTab")) self.vboxlayout1 = QtGui.QVBoxLayout(self.aboutTab) - self.vboxlayout1.setSpacing(6) self.vboxlayout1.setMargin(9) + self.vboxlayout1.setSpacing(6) self.vboxlayout1.setObjectName(_fromUtf8("vboxlayout1")) self.aboutBrowser = QtGui.QTextBrowser(self.aboutTab) self.aboutBrowser.setOpenExternalLinks(True) @@ -66,8 +65,8 @@ class Ui_UDSAboutDialog(object): self.authorsTab = QtGui.QWidget() self.authorsTab.setObjectName(_fromUtf8("authorsTab")) self.vboxlayout2 = QtGui.QVBoxLayout(self.authorsTab) - self.vboxlayout2.setSpacing(6) self.vboxlayout2.setMargin(9) + self.vboxlayout2.setSpacing(6) self.vboxlayout2.setObjectName(_fromUtf8("vboxlayout2")) self.authorsBrowser = QtGui.QTextBrowser(self.authorsTab) self.authorsBrowser.setOpenExternalLinks(True) @@ -77,8 +76,8 @@ class Ui_UDSAboutDialog(object): self.licenseTab = QtGui.QWidget() self.licenseTab.setObjectName(_fromUtf8("licenseTab")) self.vboxlayout3 = QtGui.QVBoxLayout(self.licenseTab) - self.vboxlayout3.setSpacing(6) self.vboxlayout3.setMargin(9) + self.vboxlayout3.setSpacing(6) self.vboxlayout3.setObjectName(_fromUtf8("vboxlayout3")) self.licenseBrowser = QtGui.QTextBrowser(self.licenseTab) self.licenseBrowser.setObjectName(_fromUtf8("licenseBrowser")) @@ -92,7 +91,7 @@ class Ui_UDSAboutDialog(object): self.vboxlayout.addWidget(self.buttonBox) self.retranslateUi(UDSAboutDialog) - self.tabWidget.setCurrentIndex(0) + self.tabWidget.setCurrentIndex(2) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("clicked(QAbstractButton*)")), UDSAboutDialog.closeDialog) QtCore.QMetaObject.connectSlotsByName(UDSAboutDialog) @@ -106,7 +105,7 @@ class Ui_UDSAboutDialog(object): "p, li { white-space: pre-wrap; }\n" "\n" "


\n" -"

(c) 2014, Virtual Cable S.L.U.

\n" +"

(c) 2012-2016, Virtual Cable S.L.U.

\n" "


\n" "

http://www.udsenterprise.com

\n" "

http://www.openuds.org

\n" @@ -122,7 +121,7 @@ class Ui_UDSAboutDialog(object): "\n" -"

Copyright (c) 2014 Virtual Cable S.L.

\n" +"

Copyright (c) 2012-2016 Virtual Cable S.L.

\n" "


\n" "

All rights reserved.

\n" "


\n" diff --git a/actors/src/message_dialog_ui.py b/actors/src/message_dialog_ui.py index cba126cb..3d23defa 100644 --- a/actors/src/message_dialog_ui.py +++ b/actors/src/message_dialog_ui.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'message-dialog.ui' # -# Created: Mon Apr 27 22:05:02 2015 -# by: PyQt4 UI code generator 4.11.2 +# Created by: PyQt4 UI code generator 4.12.1 # # WARNING! All changes made in this file will be lost! diff --git a/actors/src/setup-dialog.ui b/actors/src/setup-dialog.ui index 03ee9741..46127e56 100644 --- a/actors/src/setup-dialog.ui +++ b/actors/src/setup-dialog.ui @@ -121,7 +121,7 @@ 20 20 361 - 131 + 166 @@ -205,7 +205,7 @@ - 1 + 3 true @@ -220,6 +220,11 @@ INFO + + + WARN + + ERROR diff --git a/actors/src/setup_dialog_ui.py b/actors/src/setup_dialog_ui.py index 9887046f..651b0b23 100644 --- a/actors/src/setup_dialog_ui.py +++ b/actors/src/setup_dialog_ui.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'setup-dialog.ui' # -# Created: Mon Apr 27 22:05:03 2015 -# by: PyQt4 UI code generator 4.11.2 +# Created by: PyQt4 UI code generator 4.12.1 # # WARNING! All changes made in this file will be lost! @@ -63,7 +62,7 @@ class Ui_UdsActorSetupDialog(object): self.cancelButton.setSizePolicy(sizePolicy) self.cancelButton.setObjectName(_fromUtf8("cancelButton")) self.layoutWidget = QtGui.QWidget(UdsActorSetupDialog) - self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 361, 131)) + self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 361, 166)) self.layoutWidget.setObjectName(_fromUtf8("layoutWidget")) self.formLayout = QtGui.QFormLayout(self.layoutWidget) self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow) @@ -102,13 +101,14 @@ class Ui_UdsActorSetupDialog(object): self.logLevelComboBox.addItem(_fromUtf8("")) self.logLevelComboBox.setItemText(1, _fromUtf8("INFO")) self.logLevelComboBox.addItem(_fromUtf8("")) - self.logLevelComboBox.setItemText(2, _fromUtf8("ERROR")) self.logLevelComboBox.addItem(_fromUtf8("")) - self.logLevelComboBox.setItemText(3, _fromUtf8("FATAL")) + self.logLevelComboBox.setItemText(3, _fromUtf8("ERROR")) + self.logLevelComboBox.addItem(_fromUtf8("")) + self.logLevelComboBox.setItemText(4, _fromUtf8("FATAL")) self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.logLevelComboBox) self.retranslateUi(UdsActorSetupDialog) - self.logLevelComboBox.setCurrentIndex(1) + self.logLevelComboBox.setCurrentIndex(3) QtCore.QObject.connect(self.host, QtCore.SIGNAL(_fromUtf8("textChanged(QString)")), UdsActorSetupDialog.textChanged) QtCore.QObject.connect(self.masterKey, QtCore.SIGNAL(_fromUtf8("textChanged(QString)")), UdsActorSetupDialog.textChanged) QtCore.QObject.connect(self.cancelButton, QtCore.SIGNAL(_fromUtf8("pressed()")), UdsActorSetupDialog.cancelAndDiscard) @@ -139,6 +139,7 @@ class Ui_UdsActorSetupDialog(object): self.useSSl.setItemText(0, _translate("UdsActorSetupDialog", "Do not use SSL", None)) self.useSSl.setItemText(1, _translate("UdsActorSetupDialog", "Use SSL", None)) self.logLevelLabel.setText(_translate("UdsActorSetupDialog", "Log Level", None)) + self.logLevelComboBox.setItemText(2, _translate("UdsActorSetupDialog", "WARN", None)) if __name__ == "__main__":