- removed the shortcut for the PDF Import Plugin (Ctrl+Q) since it interfered with the MacOS usage

This commit is contained in:
Marius Stanciu
2022-05-05 23:42:28 +03:00
committed by Marius
parent b711189608
commit 5139fca50b
3 changed files with 383 additions and 357 deletions

View File

@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM Evo beta
- when exiting an Editor with a sub-tool active the cursor data display feature is removed
- updated the GCode header
- fixed the 'light' theme paint icon name
- removed the shortcut for the PDF Import Plugin (Ctrl+Q) since it interfered with the MacOS usage
4.05.2020

View File

@@ -3040,7 +3040,8 @@ class MainGUI(QtWidgets.QMainWindow):
# PDF Import
if key == QtCore.Qt.Key.Key_Q:
self.app.pdf_tool.run()
# self.app.pdf_tool.run()
pass
# Save Project
if key == QtCore.Qt.Key.Key_S:
@@ -4606,8 +4607,9 @@ class ShortcutsTab(QtWidgets.QWidget):
self.sh_tab_layout.addWidget(self.sh_title)
self.sh_tab_layout.addLayout(self.sh_hlay)
self.app_sh_msg = (
'''<b>%s</b><br>
self.app_sh_title = "<b>%s</b><br>" % _("General Shortcut list")
self.app_sh_no_mod = """
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
@@ -4630,6 +4632,10 @@ class ShortcutsTab(QtWidgets.QWidget):
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
@@ -4698,306 +4704,13 @@ class ShortcutsTab(QtWidgets.QWidget):
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>'%s'</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tbody>
</table>
''' %
(
_("General Shortcut list"),
""" % (
_('F3'), _("SHOW SHORTCUT LIST"),
_('1'), _("Switch to Project Tab"),
_('2'), _("Switch to Selected Tab"),
@@ -5020,7 +4733,62 @@ class ShortcutsTab(QtWidgets.QWidget):
_('Y'), _("Flip on Y_axis"),
_('-'), _("Zoom Out"),
_('='), _("Zoom In"),
)
self.app_sh_ctrl_mod = """
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20" width="89"><strong>%s</strong></td>
<td width="194"><span>&nbsp;%s</span></td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tbody>
</table>
""" % (
# CTRL section
_('Ctrl+A'), _("Select All"),
_('Ctrl+C'), _("Copy Obj"),
@@ -5031,10 +4799,72 @@ class ShortcutsTab(QtWidgets.QWidget):
_('Ctrl+N'), _("New Project"),
_('Ctrl+O'), _("Open Project"),
_('Ctrl+P'), _("Print (PDF)"),
_('Ctrl+Q'), _("PDF Import Tool"),
_('Ctrl+S'), _("Save Project"),
_('Ctrl+F10'), _("Toggle Plot Area"),
)
self.app_sh_shift_mod = """
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20" width="89"><strong>%s</strong></td>
<td width="194"><span>&nbsp;%s</span></td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tbody>
</table>
""" % (
# SHIFT section
_('Shift+A'), _("Toggle the axis"),
_('Shift+C'), _("Copy Obj_Name"),
@@ -5049,7 +4879,130 @@ class ShortcutsTab(QtWidgets.QWidget):
_('Shift+W'), _("Toggle the workspace"),
_('Shift+X'), _("Skew on X axis"),
_('Shift+Y'), _("Skew on Y axis"),
)
self.app_sh_alt_mod = """
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20" width="89"><strong>%s</strong></td>
<td width="194"><span>&nbsp;%s</span></td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong%s>T</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>&#39;%s&#39;</strong></td>
<td>&nbsp;%s</td>
</tr>
</tbody>
</table>
""" % (
# ALT section
_('Alt+A'), _("Align Objects"),
_('Alt+B'), _("Markers"),
@@ -5079,7 +5032,30 @@ class ShortcutsTab(QtWidgets.QWidget):
_('Alt+3'), _("Enable Non-selected Objects"),
_('Alt+4'), _("Disable Non-selected Objects"),
_('Alt+F10'), _("Toggle Full Screen"),
)
self.app_sh_combo_mod = """
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20" width="89"><strong>%s</strong></td>
<td width="194"><span>&nbsp;%s</span></td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tbody>
</table>
""" % (
# CTRL + ALT section
_('Ctrl+Alt+X'), _("Abort current task (gracefully)"),
@@ -5088,6 +5064,54 @@ class ShortcutsTab(QtWidgets.QWidget):
_('Ctrl+Shift+V'), _("Paste Special. "
"Will convert a Windows path style to the one required in Tcl Shell"),
)
self.app_sh_div = """
<table border="0" cellpadding="0" cellspacing="0" style="width:283px">
<tbody>
<tr height="20">
<td height="20">&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr height="20">
<td height="20" width="89"><strong>%s</strong></td>
<td width="194"><span>&nbsp;%s</span></td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
<tr height="20">
<td height="20"><strong>%s</strong></td>
<td>&nbsp;%s</td>
</tr>
</tbody>
</table>
""" % (
# F keys section
_('F1'), _("Open Online Manual"),
_('F2'), _("Rename Objects"),
@@ -5099,8 +5123,9 @@ class ShortcutsTab(QtWidgets.QWidget):
_('Space'), _("En(Dis)able Obj Plot"),
_('Esc'), _("Deselects all objects")
)
)
self.app_sh_msg = self.app_sh_title + self.app_sh_no_mod + self.app_sh_ctrl_mod + self.app_sh_shift_mod + \
self.app_sh_alt_mod + self.app_sh_combo_mod + self.app_sh_div
self.sh_app = QtWidgets.QTextEdit()
self.sh_app.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.NoTextInteraction)

View File

@@ -56,7 +56,7 @@ class ToolPDF(AppTool):
self.on_open_pdf_click()
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Ctrl+Q', **kwargs)
AppTool.install(self, icon, separator, shortcut='', **kwargs)
def set_tool_ui(self):
pass