- added key shortcuts for Open Manual = F1 and for Open Online VideoHelp = F2

This commit is contained in:
Marius Stanciu 2019-01-28 03:24:06 +02:00 committed by Marius S
parent c7a22e7ce5
commit e19af486b3
4 changed files with 26 additions and 6 deletions

View File

@ -3757,6 +3757,14 @@ class App(QtCore.QObject):
return
else:
if event.key == 'F1':
webbrowser.open(self.manual_url)
return
if event.key == 'F2':
webbrowser.open(self.video_url)
return
if event.key == self.defaults['fit_key']: # 1
self.on_zoom_fit(None)
return
@ -3896,8 +3904,11 @@ class App(QtCore.QObject):
<b>ALT+P:</b> Paint Area Tool<br>
<b>ALT+R:</b> Transformation Tool<br>
<b>ALT+U:</b> Cutout PCB Tool<br>
<b>ALT+Z:</b> Panelize PCB Tool<br>
<b>Del:</b> Delete Obj'''
<br>
<b>F1:</b> Open Online Manual<br>
<b>F2:</b> Open Online Tutorials<br>
<b>Del:</b> Delete Obj
'''
helpbox = QtWidgets.QMessageBox()
helpbox.setText(msg)

View File

@ -336,10 +336,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.menuhelp = self.menu.addMenu('&Help')
self.menuhelp_about = self.menuhelp.addAction(QtGui.QIcon('share/tv16.png'), 'About FlatCAM')
self.menuhelp_home = self.menuhelp.addAction(QtGui.QIcon('share/home16.png'), 'Home')
self.menuhelp_manual = self.menuhelp.addAction(QtGui.QIcon('share/globe16.png'), 'Manual')
self.menuhelp_manual = self.menuhelp.addAction(QtGui.QIcon('share/globe16.png'), 'Manual\tF1')
self.menuhelp.addSeparator()
self.menuhelp_shortcut_list = self.menuhelp.addAction(QtGui.QIcon('share/shortcuts24.png'), 'Shortcuts List')
self.menuhelp_videohelp = self.menuhelp.addAction(QtGui.QIcon('share/videohelp24.png'), 'See on YouTube')
self.menuhelp_shortcut_list = self.menuhelp.addAction(QtGui.QIcon('share/shortcuts24.png'), 'Shortcuts List\t`')
self.menuhelp_videohelp = self.menuhelp.addAction(QtGui.QIcon('share/videohelp24.png'), 'See on YouTube\tF2')
################################
### Project Tab Context menu ###

View File

@ -12,6 +12,7 @@ import inspect # TODO: Remove
import FlatCAMApp
from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt
import webbrowser
class KeySensitiveListView(QtWidgets.QTreeView):
@ -345,6 +346,14 @@ class ObjectCollection(QtCore.QAbstractItemModel):
return
else:
# Open Manual
if key == QtCore.Qt.Key_F1:
webbrowser.open(self.app.manual_url)
# Open Video Help
if key == QtCore.Qt.Key_F2:
webbrowser.open(self.app.video_url)
# Zoom Fit
if key == QtCore.Qt.Key_1:
self.app.on_zoom_fit(None)

View File

@ -14,7 +14,7 @@ CAD program, and create G-Code for Isolation routing.
- fixed the FlatCAMGerber.merge() function
- added a new menu entry for the Gerber Join function: Edit -> Conversions -> "Join Gerber(s) to Gerber" allowing joining Gerber objects into a final Gerber object
- moved Paint Tool defaults from Geometry section to the Tools section in Edit -> Preferences
- added key shortcuts for Open Manual = F1 and for Open Online VideoHelp = F2
27.01.2018