bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- clicking on the activity icon will replot all objects

Browse Source
This commit is contained in:
Marius Stanciu
2020-05-29 05:43:21 +03:00
committed by Marius
parent 57a3c48f2f
commit 8d160a6d8c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AppGUI/GUIElements.py
View File

@@ -3003,7 +3003,7 @@ class FlatCAMActivityView(QtWidgets.QWidget):
self.movie_path = movie self.movie_path = movie
self.icon_path = icon self.icon_path = icon
self.icon = QtWidgets.QLabel(self) self.icon = FCLabel(self)
self.icon.setGeometry(0, 0, 16, 12) self.icon.setGeometry(0, 0, 16, 12)
self.movie = QtGui.QMovie(self.movie_path) self.movie = QtGui.QMovie(self.movie_path)
@@ -3022,6 +3022,8 @@ class FlatCAMActivityView(QtWidgets.QWidget):
layout.addWidget(self.text) layout.addWidget(self.text)
self.icon.clicked.connect(self.app.on_toolbar_replot)
def set_idle(self): def set_idle(self):
self.movie.stop() self.movie.stop()
self.text.setText(_("Idle.")) self.text.setText(_("Idle."))

2
AppGUI/MainGUI.py
View File

@@ -3644,7 +3644,6 @@ class MainGUI(QtWidgets.QMainWindow):
self.shell_dock.hide() self.shell_dock.hide()
self.app.plotcanvas.native.setFocus() self.app.plotcanvas.native.setFocus()
self.shell_status_label.setStyleSheet("") self.shell_status_label.setStyleSheet("")
self.app.inform.emit(_("Shell disabled."))
else: else:
self.shell_dock.show() self.shell_dock.show()
self.shell_status_label.setStyleSheet(""" self.shell_status_label.setStyleSheet("""
@@ -3654,7 +3653,6 @@ class MainGUI(QtWidgets.QMainWindow):
background-color: lightcoral; 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 # I want to take the focus and give it to the Tcl Shell when the Tcl Shell is run
# self.shell._edit.setFocus() # self.shell._edit.setFocus()

1
App_Main.py
View File

@@ -5659,7 +5659,6 @@ class App(QtCore.QObject):
:return: None :return: None
""" """
self.defaults.report_usage("on_toolbar_replot")
self.log.debug("on_toolbar_replot()") self.log.debug("on_toolbar_replot()")
try: try:

1
CHANGELOG.md
View File

@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta
- fixed the Tool Isolation when using the 'follow' parameter - 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 - 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 - 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 28.05.2020