From 7285ee0b82803c06fcaaf89d2c2915a80e4a7b4b Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 19 Aug 2020 04:36:46 +0300 Subject: [PATCH] - in CNCJob UI Autolevelling - Grbl Connect tab colors will change with the connection status --- CHANGELOG.md | 1 + appGUI/ObjectUI.py | 5 +++++ appObjects/FlatCAMCNCJob.py | 11 ++++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b694d18a..d8d0951c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta 19.08.2020 - in CNCJob UI Autolevelling - sending GCode/GRBL commands is now threaded +- in CNCJob UI Autolevelling - Grbl Connect tab colors will change with the connection status 18.08.2020 diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py index 161e2240..8c8fcab4 100644 --- a/appGUI/ObjectUI.py +++ b/appGUI/ObjectUI.py @@ -2084,6 +2084,10 @@ class CNCObjectUI(ObjectUI): # self.gr_conn_tab_layout.addWidget(self.gr_conn_scroll_area) self.al_toolbar.addTab(self.gr_conn_tab, _("Connect")) + for idx in range(self.al_toolbar.count()): + if self.al_toolbar.tabText(idx) == _("Connect"): + self.al_toolbar.tabBar.setTabTextColor(idx, QtGui.QColor('red')) + # GRBL Control TAB self.gr_ctrl_tab = QtWidgets.QWidget() self.gr_ctrl_tab.setObjectName("connect_tab") @@ -2176,6 +2180,7 @@ class CNCObjectUI(ObjectUI): self.com_connect_button.setToolTip( _("Connect to the selected port with the selected baud rate.") ) + self.com_connect_button.setStyleSheet("QPushButton {background-color: red;}") ctrl_hlay.addWidget(self.com_connect_button) grbl_conn_grid.addLayout(ctrl_hlay, 10, 0, 1, 3) diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py index 4013e9c3..ea22cc55 100644 --- a/appObjects/FlatCAMCNCJob.py +++ b/appObjects/FlatCAMCNCJob.py @@ -953,8 +953,10 @@ class CNCJobObject(FlatCAMObj, CNCjob): rtscts=False) self.app.inform.emit("%s: %s" % (_("Port connected"), port_name)) - self.ui.com_connect_button.setStyleSheet("QPushButton {color: seagreen;}") - + self.ui.com_connect_button.setStyleSheet("QPushButton {background-color: seagreen;}") + for idx in range(self.ui.al_toolbar.count()): + if self.ui.al_toolbar.tabText(idx) == _("Connect"): + self.ui.al_toolbar.tabBar.setTabTextColor(idx, QtGui.QColor('seagreen')) # Toggle DTR to reset the controller loaded with GRBL (Arduino, ESP32, etc) try: self.grbl_ser_port.dtr = False @@ -971,7 +973,10 @@ class CNCJobObject(FlatCAMObj, CNCjob): self.grbl_ser_port = serial.Serial() self.grbl_ser_port.port = port_name self.grbl_ser_port.close() - self.ui.com_connect_button.setStyleSheet("") + self.ui.com_connect_button.setStyleSheet("QPushButton {background-color: red;}") + for idx in range(self.ui.al_toolbar.count()): + if self.ui.al_toolbar.tabText(idx) == _("Connect"): + self.ui.al_toolbar.tabBar.setTabTextColor(idx, QtGui.QColor('red')) self.app.inform.emit("%s: %s" % (_("Port is connected. Disconnecting"), port_name)) except Exception: self.app.inform.emit("[ERROR_NOTCL] %s: %s" % (_("Could not connect to port"), port_name))