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

- some names are updated

Browse Source 
- made sure that when a new project is created that the levelling grid shapes are deleted
- some code optimization and code refactoring
This commit is contained in:
Marius Stanciu
2023-11-25 14:40:51 +02:00
parent 4458249ee5
commit 6b4483044b
21 changed files with 275 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
appGUI/GUIElements.py
View File

@@ -6101,10 +6101,10 @@ class AppSystemTray(QtWidgets.QSystemTrayIcon):
self.menu_open.addSeparator()
menu_openproject.triggered.connect(lambda: self.app.f_handlers.on_file_openproject())
menu_opengerber.triggered.connect(lambda: self.app.f_handlers.on_fileopengerber())
menu_openexcellon.triggered.connect(lambda: self.app.f_handlers.on_fileopenexcellon())
menu_opengcode.triggered.connect(lambda: self.app.f_handlers.on_fileopengcode())
menu_openproject.triggered.connect(lambda: self.app.f_handlers.on_file_open_project())
menu_opengerber.triggered.connect(lambda: self.app.f_handlers.on_file_open_gerber())
menu_openexcellon.triggered.connect(lambda: self.app.f_handlers.on_file_open_excellon())
menu_opengcode.triggered.connect(lambda: self.app.f_handlers.on_file_open_gcode())
exitAction = menu.addAction(_("Exit"))
exitAction.setIcon(QtGui.QIcon(self.app.resource_location + '/power16.png'))
@@ -6112,7 +6112,7 @@ class AppSystemTray(QtWidgets.QSystemTrayIcon):
menu_toggle_gui.triggered.connect(self.app.ui.on_toggle_gui)
menu_runscript.triggered.connect(lambda: self.app.on_filerunscript(
menu_runscript.triggered.connect(lambda: self.app.on_file_run_cript(
silent=True if self.app.cmd_line_headless == 1 else False))
exitAction.triggered.connect(self.app.final_save)

12
appGUI/MainGUI.py
View File

@@ -2950,7 +2950,7 @@ class MainGUI(QtWidgets.QMainWindow):
# CTRL + SHIFT
if modifiers == QtCore.Qt.KeyboardModifier.ControlModifier | QtCore.Qt.KeyboardModifier.ShiftModifier:
if key == QtCore.Qt.Key.Key_S:
self.app.f_handlers.on_file_saveprojectas()
self.app.f_handlers.on_file_save_project_as()
return
# CTRL
elif modifiers == QtCore.Qt.KeyboardModifier.ControlModifier:
@@ -2975,7 +2975,7 @@ class MainGUI(QtWidgets.QMainWindow):
# Open Excellon file
if key == QtCore.Qt.Key.Key_E:
self.app.f_handlers.on_fileopenexcellon()
self.app.f_handlers.on_file_open_excellon()
# Open Gerber file
if key == QtCore.Qt.Key.Key_G:
@@ -2983,7 +2983,7 @@ class MainGUI(QtWidgets.QMainWindow):
if 'editor' in widget_name.lower():
self.app.goto_text_line()
else:
self.app.f_handlers.on_fileopengerber()
self.app.f_handlers.on_file_open_gerber()
# Distance Tool
if key == QtCore.Qt.Key.Key_M:
@@ -2995,7 +2995,7 @@ class MainGUI(QtWidgets.QMainWindow):
# Open Project
if key == QtCore.Qt.Key.Key_O:
self.app.f_handlers.on_file_openproject()
self.app.f_handlers.on_file_open_project()
# Open Project
if key == QtCore.Qt.Key.Key_P:
@@ -3019,7 +3019,7 @@ class MainGUI(QtWidgets.QMainWindow):
self.app.tools_db_tab.on_save_tools_db()
return
self.app.f_handlers.on_file_saveproject()
self.app.f_handlers.on_file_save_project()
# Toggle Plot Area
if key == QtCore.Qt.Key.Key_F10 or key == 'F10':
@@ -3070,7 +3070,7 @@ class MainGUI(QtWidgets.QMainWindow):
# Run a Script
if key == QtCore.Qt.Key.Key_S:
self.app.f_handlers.on_filerunscript()
self.app.f_handlers.on_file_run_cript()
return
# Toggle Workspace