- fixed newly introduced issues with SysTray and Splash
This commit is contained in:
parent
ac1dd33ae4
commit
b699f67855
|
@ -21,6 +21,7 @@ CHANGELOG for FlatCAM beta
|
||||||
- fixed some of the Tcl Commands that depended on the methods refactored above
|
- fixed some of the Tcl Commands that depended on the methods refactored above
|
||||||
- reverted the preprocessors with no toolchange commands to the original but removed the M6 toolchange command
|
- reverted the preprocessors with no toolchange commands to the original but removed the M6 toolchange command
|
||||||
- fixed newly introduced issue when doing File -> Print(PDF)
|
- fixed newly introduced issue when doing File -> Print(PDF)
|
||||||
|
- fixed newly introduced issues with SysTray and Splash
|
||||||
|
|
||||||
23.10.2020
|
23.10.2020
|
||||||
|
|
||||||
|
|
|
@ -3848,10 +3848,10 @@ class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):
|
||||||
|
|
||||||
self.menu_open.addSeparator()
|
self.menu_open.addSeparator()
|
||||||
|
|
||||||
menu_openproject.triggered.connect(self.app.on_file_openproject)
|
menu_openproject.triggered.connect(self.app.f_handlers.on_file_openproject)
|
||||||
menu_opengerber.triggered.connect(self.app.on_fileopengerber)
|
menu_opengerber.triggered.connect(self.app.f_handlers.on_fileopengerber)
|
||||||
menu_openexcellon.triggered.connect(self.app.on_fileopenexcellon)
|
menu_openexcellon.triggered.connect(self.app.f_handlers.on_fileopenexcellon)
|
||||||
menu_opengcode.triggered.connect(self.app.on_fileopengcode)
|
menu_opengcode.triggered.connect(self.app.f_handlers.on_fileopengcode)
|
||||||
|
|
||||||
exitAction = menu.addAction(_("Exit"))
|
exitAction = menu.addAction(_("Exit"))
|
||||||
exitAction.setIcon(QtGui.QIcon(self.app.resource_location + '/power16.png'))
|
exitAction.setIcon(QtGui.QIcon(self.app.resource_location + '/power16.png'))
|
||||||
|
|
37
app_Main.py
37
app_Main.py
|
@ -489,6 +489,7 @@ class App(QtCore.QObject):
|
||||||
alignment=Qt.AlignBottom | Qt.AlignLeft,
|
alignment=Qt.AlignBottom | Qt.AlignLeft,
|
||||||
color=QtGui.QColor("gray"))
|
color=QtGui.QColor("gray"))
|
||||||
else:
|
else:
|
||||||
|
self.splash = None
|
||||||
show_splash = 0
|
show_splash = 0
|
||||||
|
|
||||||
# ###########################################################################################################
|
# ###########################################################################################################
|
||||||
|
@ -744,24 +745,6 @@ class App(QtCore.QObject):
|
||||||
color=QtGui.QColor("gray"))
|
color=QtGui.QColor("gray"))
|
||||||
self.ui.splitter.setStretchFactor(1, 2)
|
self.ui.splitter.setStretchFactor(1, 2)
|
||||||
|
|
||||||
# ###########################################################################################################
|
|
||||||
# ############################################### SYS TRAY ##################################################
|
|
||||||
# ###########################################################################################################
|
|
||||||
if self.defaults["global_systray_icon"]:
|
|
||||||
self.parent_w = QtWidgets.QWidget()
|
|
||||||
|
|
||||||
if self.cmd_line_headless == 1:
|
|
||||||
self.trayIcon = FlatCAMSystemTray(app=self,
|
|
||||||
icon=QtGui.QIcon(self.resource_location +
|
|
||||||
'/flatcam_icon32_green.png'),
|
|
||||||
headless=True,
|
|
||||||
parent=self.parent_w)
|
|
||||||
else:
|
|
||||||
self.trayIcon = FlatCAMSystemTray(app=self,
|
|
||||||
icon=QtGui.QIcon(self.resource_location +
|
|
||||||
'/flatcam_icon32_green.png'),
|
|
||||||
parent=self.parent_w)
|
|
||||||
|
|
||||||
# ###########################################################################################################
|
# ###########################################################################################################
|
||||||
# ############################################### Worker SETUP ##############################################
|
# ############################################### Worker SETUP ##############################################
|
||||||
# ###########################################################################################################
|
# ###########################################################################################################
|
||||||
|
@ -1315,6 +1298,24 @@ class App(QtCore.QObject):
|
||||||
# this is calculated in the class above (somehow?)
|
# this is calculated in the class above (somehow?)
|
||||||
self.defaults["root_folder_path"] = self.app_home
|
self.defaults["root_folder_path"] = self.app_home
|
||||||
|
|
||||||
|
# ###########################################################################################################
|
||||||
|
# ############################################### SYS TRAY ##################################################
|
||||||
|
# ###########################################################################################################
|
||||||
|
if self.defaults["global_systray_icon"]:
|
||||||
|
self.parent_w = QtWidgets.QWidget()
|
||||||
|
|
||||||
|
if self.cmd_line_headless == 1:
|
||||||
|
self.trayIcon = FlatCAMSystemTray(app=self,
|
||||||
|
icon=QtGui.QIcon(self.resource_location +
|
||||||
|
'/flatcam_icon32_green.png'),
|
||||||
|
headless=True,
|
||||||
|
parent=self.parent_w)
|
||||||
|
else:
|
||||||
|
self.trayIcon = FlatCAMSystemTray(app=self,
|
||||||
|
icon=QtGui.QIcon(self.resource_location +
|
||||||
|
'/flatcam_icon32_green.png'),
|
||||||
|
parent=self.parent_w)
|
||||||
|
|
||||||
# ###########################################################################################################
|
# ###########################################################################################################
|
||||||
# ############################################ SETUP RECENT ITEMS ###########################################
|
# ############################################ SETUP RECENT ITEMS ###########################################
|
||||||
# ###########################################################################################################
|
# ###########################################################################################################
|
||||||
|
|
Loading…
Reference in New Issue