revpi/revpicommander
1
0
Fork 0
mirror of https://github.com/naruxde/revpicommander.git synced 2025-11-09 00:53:53 +01:00
Code Issues Packages Releases Wiki Activity

Bugfix: could not open debugcontrol, because of new layout names

Browse Source
This commit is contained in:
Sven Sager
2023-01-03 13:24:13 +01:00
parent 0eb28f442e
commit 9ec1f1b622
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/ui/revpicommander_ui.py
View File

@@ -21,8 +21,8 @@ class Ui_win_revpicommander(object):
win_revpicommander.setWindowIcon(icon) win_revpicommander.setWindowIcon(icon)
self.centralwidget = QtWidgets.QWidget(win_revpicommander) self.centralwidget = QtWidgets.QWidget(win_revpicommander)
self.centralwidget.setObjectName("centralwidget") self.centralwidget.setObjectName("centralwidget")
self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) self.gl = QtWidgets.QVBoxLayout(self.centralwidget)
self.verticalLayout.setObjectName("verticalLayout") self.gl.setObjectName("gl")
self.hzl_connection = QtWidgets.QHBoxLayout() self.hzl_connection = QtWidgets.QHBoxLayout()
self.hzl_connection.setObjectName("hzl_connection") self.hzl_connection.setObjectName("hzl_connection")
self.txt_host = QtWidgets.QLineEdit(self.centralwidget) self.txt_host = QtWidgets.QLineEdit(self.centralwidget)
@@ -37,19 +37,19 @@ class Ui_win_revpicommander(object):
self.txt_connection.setReadOnly(True) self.txt_connection.setReadOnly(True)
self.txt_connection.setObjectName("txt_connection") self.txt_connection.setObjectName("txt_connection")
self.hzl_connection.addWidget(self.txt_connection) self.hzl_connection.addWidget(self.txt_connection)
self.verticalLayout.addLayout(self.hzl_connection) self.gl.addLayout(self.hzl_connection)
self.btn_plc_start = QtWidgets.QPushButton(self.centralwidget) self.btn_plc_start = QtWidgets.QPushButton(self.centralwidget)
self.btn_plc_start.setObjectName("btn_plc_start") self.btn_plc_start.setObjectName("btn_plc_start")
self.verticalLayout.addWidget(self.btn_plc_start) self.gl.addWidget(self.btn_plc_start)
self.btn_plc_stop = QtWidgets.QPushButton(self.centralwidget) self.btn_plc_stop = QtWidgets.QPushButton(self.centralwidget)
self.btn_plc_stop.setObjectName("btn_plc_stop") self.btn_plc_stop.setObjectName("btn_plc_stop")
self.verticalLayout.addWidget(self.btn_plc_stop) self.gl.addWidget(self.btn_plc_stop)
self.btn_plc_restart = QtWidgets.QPushButton(self.centralwidget) self.btn_plc_restart = QtWidgets.QPushButton(self.centralwidget)
self.btn_plc_restart.setObjectName("btn_plc_restart") self.btn_plc_restart.setObjectName("btn_plc_restart")
self.verticalLayout.addWidget(self.btn_plc_restart) self.gl.addWidget(self.btn_plc_restart)
self.btn_plc_logs = QtWidgets.QPushButton(self.centralwidget) self.btn_plc_logs = QtWidgets.QPushButton(self.centralwidget)
self.btn_plc_logs.setObjectName("btn_plc_logs") self.btn_plc_logs.setObjectName("btn_plc_logs")
self.verticalLayout.addWidget(self.btn_plc_logs) self.gl.addWidget(self.btn_plc_logs)
self.hzl_status = QtWidgets.QHBoxLayout() self.hzl_status = QtWidgets.QHBoxLayout()
self.hzl_status.setObjectName("hzl_status") self.hzl_status.setObjectName("hzl_status")
self.lbl_status = QtWidgets.QLabel(self.centralwidget) self.lbl_status = QtWidgets.QLabel(self.centralwidget)
@@ -62,12 +62,12 @@ class Ui_win_revpicommander(object):
self.txt_status.setReadOnly(True) self.txt_status.setReadOnly(True)
self.txt_status.setObjectName("txt_status") self.txt_status.setObjectName("txt_status")
self.hzl_status.addWidget(self.txt_status) self.hzl_status.addWidget(self.txt_status)
self.verticalLayout.addLayout(self.hzl_status) self.gl.addLayout(self.hzl_status)
self.btn_plc_debug = QtWidgets.QPushButton(self.centralwidget) self.btn_plc_debug = QtWidgets.QPushButton(self.centralwidget)
self.btn_plc_debug.setMinimumSize(QtCore.QSize(300, 0)) self.btn_plc_debug.setMinimumSize(QtCore.QSize(300, 0))
self.btn_plc_debug.setCheckable(True) self.btn_plc_debug.setCheckable(True)
self.btn_plc_debug.setObjectName("btn_plc_debug") self.btn_plc_debug.setObjectName("btn_plc_debug")
self.verticalLayout.addWidget(self.btn_plc_debug) self.gl.addWidget(self.btn_plc_debug)
win_revpicommander.setCentralWidget(self.centralwidget) win_revpicommander.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(win_revpicommander) self.menubar = QtWidgets.QMenuBar(win_revpicommander)
self.menubar.setGeometry(QtCore.QRect(0, 0, 353, 24)) self.menubar.setGeometry(QtCore.QRect(0, 0, 353, 24))

2
include/ui_dev/revpicommander.ui
View File

@@ -19,7 +19,7 @@
<normaloff>:/main/ico/revpipycontrol.ico</normaloff>:/main/ico/revpipycontrol.ico</iconset> <normaloff>:/main/ico/revpipycontrol.ico</normaloff>:/main/ico/revpipycontrol.ico</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="gl">
<item> <item>
<layout class="QHBoxLayout" name="hzl_connection"> <layout class="QHBoxLayout" name="hzl_connection">
<item> <item>

2
revpicommander/revpicommander.py
View File

@@ -457,7 +457,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
debugcontrol = DebugControl(self.centralwidget) debugcontrol = DebugControl(self.centralwidget)
if debugcontrol.reload_devices(): if debugcontrol.reload_devices():
self.wid_debugcontrol = debugcontrol self.wid_debugcontrol = debugcontrol
self.gl.addWidget(self.wid_debugcontrol, 7, 0) self.gl.addWidget(self.wid_debugcontrol)
else: else:
debugcontrol.deleteLater() debugcontrol.deleteLater()
QtWidgets.QMessageBox.critical( QtWidgets.QMessageBox.critical(