giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- moved the init of activity view in the MainGUI file from the APP.__init__()

This commit is contained in:
Marius Stanciu 2020-06-13 20:12:34 +03:00 committed by Marius
parent c44f395625
commit 39210fcfbf
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta
- updated the FCTable GUI element to work correctly when doing drag&drop for the rows
- updated the Geometry UI to work with the new FCTable
- made the coordinates / delta coordinates / grid toolbar / actions toolbar visibility an option, controlled from the infobar (Status bar) context menu. How it's at app shutdown it's restored at the next application start
- moved the init of activity view in the MainGUI file from the APP.__init__()
12.06.2020

4
appGUI/MainGUI.py
View File

@ -1598,6 +1598,10 @@ class MainGUI(QtWidgets.QMainWindow):
self.units_label.setMargin(2)
self.infobar.addWidget(self.units_label)
# this used to be done in the APP.__init__()
self.activity_view = FlatCAMActivityView(app=self.app)
self.infobar.addWidget(self.activity_view)
# disabled
# self.progress_bar = QtWidgets.QProgressBar()
# self.progress_bar.setMinimum(0)

6
app_Main.py
View File

@ -761,9 +761,9 @@ class App(QtCore.QObject):
# ###########################################################################################################
# ############################################# Activity Monitor ###########################################
# ###########################################################################################################
self.activity_view = FlatCAMActivityView(app=self)
self.ui.infobar.addWidget(self.activity_view)
self.proc_container = FCVisibleProcessContainer(self.activity_view)
# self.activity_view = FlatCAMActivityView(app=self)
# self.ui.infobar.addWidget(self.activity_view)
self.proc_container = FCVisibleProcessContainer(self.ui.activity_view)
# ###########################################################################################################
# ############################################# Signal handling #############################################