From 8d160a6d8c3d2fda3a5d44f02508c03caeb32b77 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 29 May 2020 05:43:21 +0300 Subject: [PATCH] - clicking on the activity icon will replot all objects --- AppGUI/GUIElements.py | 4 +++- AppGUI/MainGUI.py | 2 -- App_Main.py | 1 - CHANGELOG.md | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AppGUI/GUIElements.py b/AppGUI/GUIElements.py index 0a17690c..f8993d71 100644 --- a/AppGUI/GUIElements.py +++ b/AppGUI/GUIElements.py @@ -3003,7 +3003,7 @@ class FlatCAMActivityView(QtWidgets.QWidget): self.movie_path = movie self.icon_path = icon - self.icon = QtWidgets.QLabel(self) + self.icon = FCLabel(self) self.icon.setGeometry(0, 0, 16, 12) self.movie = QtGui.QMovie(self.movie_path) @@ -3022,6 +3022,8 @@ class FlatCAMActivityView(QtWidgets.QWidget): layout.addWidget(self.text) + self.icon.clicked.connect(self.app.on_toolbar_replot) + def set_idle(self): self.movie.stop() self.text.setText(_("Idle.")) diff --git a/AppGUI/MainGUI.py b/AppGUI/MainGUI.py index 574eb836..59b83893 100644 --- a/AppGUI/MainGUI.py +++ b/AppGUI/MainGUI.py @@ -3644,7 +3644,6 @@ class MainGUI(QtWidgets.QMainWindow): self.shell_dock.hide() self.app.plotcanvas.native.setFocus() self.shell_status_label.setStyleSheet("") - self.app.inform.emit(_("Shell disabled.")) else: self.shell_dock.show() self.shell_status_label.setStyleSheet(""" @@ -3654,7 +3653,6 @@ class MainGUI(QtWidgets.QMainWindow): background-color: lightcoral; } """) - self.app.inform.emit(_("Shell enabled.")) # I want to take the focus and give it to the Tcl Shell when the Tcl Shell is run # self.shell._edit.setFocus() diff --git a/App_Main.py b/App_Main.py index a03fd5d1..ab0021c3 100644 --- a/App_Main.py +++ b/App_Main.py @@ -5659,7 +5659,6 @@ class App(QtCore.QObject): :return: None """ - self.defaults.report_usage("on_toolbar_replot") self.log.debug("on_toolbar_replot()") try: diff --git a/CHANGELOG.md b/CHANGELOG.md index 84351064..7bb6e7c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta - fixed the Tool Isolation when using the 'follow' parameter - in Isolation Tool when the Rest machining is checked the combine parameter is set True automatically because the rest machining concept make sense only when all tools are used together - some changes in the UI; added in the status bar an icon to control the Shell Dock +- clicking on the activity icon will replot all objects 28.05.2020