diff --git a/CHANGELOG.md b/CHANGELOG.md index f600a126..94749132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 607c58d9..15a3872d 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -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) diff --git a/app_Main.py b/app_Main.py index a9512c3b..2158990d 100644 --- a/app_Main.py +++ b/app_Main.py @@ -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 #############################################