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

- fixed issues in the Tools Database due of recent changes in how the data structure is created

Browse Source 
- made sure that the right tools go only to the intended use, in Tools Database otherwise an error status message is created and Tools DB is closed on adding a wrong tool
- fixed the usage for Tools Database in Unix-like OS's
- done some modest refactoring
- fixed the Search and Add feature in Geometry Object UI
This commit is contained in:
Marius Stanciu
2020-10-29 22:32:44 +02:00
committed by Marius
parent 46d2304b67
commit 38abfa4f31
12 changed files with 327 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
appGUI/MainGUI.py
View File

@@ -1885,6 +1885,17 @@ class MainGUI(QtWidgets.QMainWindow):
self.infobar.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.build_infobar_context_menu()
def set_ui_title(self, name):
"""
Sets the title of the main window.
:param name: String that store the project path and project name
:return: None
"""
title = 'FlatCAM %s %s - %s - [%s] %s' % (
self.app.version, ('BETA' if self.app.beta else ''), platform.architecture()[0], self.app.engine, name)
self.setWindowTitle(title)
def save_geometry(self, x, y, width, height, notebook_width):
"""
Will save the application geometry and positions in the defaults dicitionary to be restored at the next
@@ -2089,6 +2100,7 @@ class MainGUI(QtWidgets.QMainWindow):
resource_loc = self.app.resource_location
response = None
bt_yes = None
if forced_clear is False:
msgbox = QtWidgets.QMessageBox()
msgbox.setText(_("Are you sure you want to delete the GUI Settings? \n"))
@@ -4449,32 +4461,32 @@ class ShortcutsTab(QtWidgets.QWidget):
# ALT section
_('Alt+A'), _("Align Objects Tool"),
_('Alt+C'),_("Calculators Tool"),
_('Alt+D'),_("2-Sided PCB Tool"),
_('Alt+E'),_("Extract Drills Tool"),
_('Alt+F'),_("Fiducials Tool"),
_('Alt+G'),_("Invert Gerber Tool"),
_('Alt+H'),_("Punch Gerber Tool"),
_('Alt+I'),_("Isolation Tool"),
_('Alt+J'),_("Copper Thieving Tool"),
_('Alt+K'),_("Solder Paste Dispensing Tool"),
_('Alt+L'),_("Film PCB Tool"),
_('Alt+M'),_("Corner Markers Tool"),
_('Alt+N'),_("Non-Copper Clearing Tool"),
_('Alt+O'),_("Optimal Tool"),
_('Alt+P'),_("Paint Area Tool"),
_('Alt+Q'),_("QRCode Tool"),
_('Alt+R'),_("Rules Check Tool"),
_('Alt+S'),_("View File Source"),
_('Alt+T'),_("Transformations Tool"),
_('Alt+W'),_("Subtract Tool"),
_('Alt+X'),_("Cutout PCB Tool"),
_('Alt+Z'),_("Panelize PCB"),
_('Alt+1'),_("Enable all"),
_('Alt+2'),_("Disable all"),
_('Alt+3'),_("Enable Non-selected Objects"),
_('Alt+4'),_("Disable Non-selected Objects"),
_('Alt+F10'),_("Toggle Full Screen"),
_('Alt+C'), _("Calculators Tool"),
_('Alt+D'), _("2-Sided PCB Tool"),
_('Alt+E'), _("Extract Drills Tool"),
_('Alt+F'), _("Fiducials Tool"),
_('Alt+G'), _("Invert Gerber Tool"),
_('Alt+H'), _("Punch Gerber Tool"),
_('Alt+I'), _("Isolation Tool"),
_('Alt+J'), _("Copper Thieving Tool"),
_('Alt+K'), _("Solder Paste Dispensing Tool"),
_('Alt+L'), _("Film PCB Tool"),
_('Alt+M'), _("Corner Markers Tool"),
_('Alt+N'), _("Non-Copper Clearing Tool"),
_('Alt+O'), _("Optimal Tool"),
_('Alt+P'), _("Paint Area Tool"),
_('Alt+Q'), _("QRCode Tool"),
_('Alt+R'), _("Rules Check Tool"),
_('Alt+S'), _("View File Source"),
_('Alt+T'), _("Transformations Tool"),
_('Alt+W'), _("Subtract Tool"),
_('Alt+X'), _("Cutout PCB Tool"),
_('Alt+Z'), _("Panelize PCB"),
_('Alt+1'), _("Enable all"),
_('Alt+2'), _("Disable all"),
_('Alt+3'), _("Enable Non-selected Objects"),
_('Alt+4'), _("Disable Non-selected Objects"),
_('Alt+F10'), _("Toggle Full Screen"),
# CTRL + ALT section
_('Ctrl+Alt+X'), _("Abort current task (gracefully)"),

8
appGUI/ObjectUI.py
View File

@@ -1093,9 +1093,9 @@ class GeometryObjectUI(ObjectUI):
bhlay = QtWidgets.QHBoxLayout()
self.addtool_btn = QtWidgets.QPushButton(_('Search and Add'))
self.addtool_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/plus16.png'))
self.addtool_btn.setToolTip(
self.search_and_add_btn = QtWidgets.QPushButton(_('Search and Add'))
self.search_and_add_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/plus16.png'))
self.search_and_add_btn.setToolTip(
_("Add a new tool to the Tool Table\n"
"with the diameter specified above.")
)
@@ -1109,7 +1109,7 @@ class GeometryObjectUI(ObjectUI):
"Menu: Options -> Tools Database")
)
bhlay.addWidget(self.addtool_btn)
bhlay.addWidget(self.search_and_add_btn)
bhlay.addWidget(self.addtool_from_db_btn)
grid1.addLayout(bhlay, 5, 0, 1, 2)