diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py
index 9d09186c..ac9c85fb 100644
--- a/FlatCAMGUI.py
+++ b/FlatCAMGUI.py
@@ -753,65 +753,245 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.sh_tab_layout.addLayout(self.sh_hlay)
self.app_sh_msg = '''General Shortcut list
-
-~: Show Shortcut List
-
-1: Switch to Project Tab
-2: Switch to Selected Tab
-3: Switch to Tool Tab
-E: Edit Object (if selected)
-G: Grid On/Off
-J: Jump to Coordinates
-L: New Excellon
-M: Move Obj
-N: New Geometry
-O: Set Origin
-Q: Change Units
-P: Open Properties Tool
-R: Rotate by 90 degree CW
-S: Shell Toggle
-V: Zoom Fit
-X: Flip on X_axis
-Y: Flip on Y_axis
-=: Zoom Out
--: Zoom In
-
-Space: En(Dis)able Obj Plot
-CTRL+A: Select All
-CTRL+C: Copy Obj
-CTRL+E: Open Excellon File
-CTRL+G: Open Gerber File
-CTRL+N: New Project
-CTRL+M: Measurement Tool
-CTRL+O: Open Project
-CTRL+S: Save Project As
-CTRL+F10: Toggle Plot Area
-
-SHIFT+C: Copy Obj_Name
-SHIFT+G: Toggle the axis
-SHIFT+P: Open Preferences Window
-SHIFT+R: Rotate by 90 degree CCW
-SHIFT+S: Run a Script
-SHIFT+W: Toggle the workspace
-SHIFT+X: Skew on X axis
-SHIFT+Y: Skew on Y axis
-
-ALT+C: Calculators Tool
-ALT+D: 2-Sided PCB Tool
-ALT+L: Film PCB Tool
-ALT+N: Non-Copper Clearing Tool
-ALT+P: Paint Area Tool
-ALT+R: Transformation Tool
-ALT+U: Cutout PCB Tool
-ALT+1: Enable all Plots
-ALT+2: Disable all Plots
-ALT+3: Disable Non-selected Plots
-ALT+F10: Toggle Full Screen
-
-F1: Open Online Manual
-F2: Open Online Tutorials
-Del: Delete Obj
+
+
+
+ ~ |
+ SHOW SHORTCUT LIST |
+
+
+ |
+ |
+
+
+ 1 |
+ Switch to Project Tab |
+
+
+ 2 |
+ Switch to Selected Tab |
+
+
+ 3 |
+ Switch to Tool Tab |
+
+
+ |
+ |
+
+
+ E |
+ Edit Object (if selected) |
+
+
+ G |
+ Grid On/Off |
+
+
+ J |
+ Jump to Coordinates |
+
+
+ L |
+ New Excellon |
+
+
+ M |
+ Move Obj |
+
+
+ N |
+ New Geometry |
+
+
+ O |
+ Set Origin |
+
+
+ Q |
+ Change Units |
+
+
+ P |
+ Open Properties Tool |
+
+
+ R |
+ Rotate by 90 degree CW |
+
+
+ S |
+ Shell Toggle |
+
+
+ V |
+ Zoom Fit |
+
+
+ X |
+ Flip on X_axis |
+
+
+ Y |
+ Flip on Y_axis |
+
+
+ '=' |
+ Zoom Out |
+
+
+ '-' |
+ Zoom In |
+
+
+ |
+ |
+
+
+ CTRL+A |
+ Select All |
+
+
+ CTRL+C |
+ Copy Obj |
+
+
+ CTRL+E |
+ Open Excellon File |
+
+
+ CTRL+G |
+ Open Gerber File |
+
+
+ CTRL+N |
+ New Project |
+
+
+ CTRL+M |
+ Measurement Tool |
+
+
+ CTRL+O |
+ Open Project |
+
+
+ CTRL+S |
+ Save Project As |
+
+
+ CTRL+F10 |
+ Toggle Plot Area |
+
+
+ |
+ |
+
+
+ SHIFT+C |
+ Copy Obj_Name |
+
+
+ SHIFT+G |
+ Toggle the axis |
+
+
+ SHIFT+P |
+ Open Preferences Window |
+
+
+ SHIFT+R |
+ Rotate by 90 degree CCW |
+
+
+ SHIFT+S |
+ Run a Script |
+
+
+ SHIFT+W |
+ Toggle the workspace |
+
+
+ SHIFT+X |
+ Skew on X axis |
+
+
+ SHIFT+Y |
+ Skew on Y axis |
+
+
+ |
+ |
+
+
+ ALT+C |
+ Calculators Tool |
+
+
+ ALT+D |
+ 2-Sided PCB Tool |
+
+
+ ALT+L |
+ Film PCB Tool |
+
+
+ ALT+N |
+ Non-Copper Clearing Tool |
+
+
+ ALT+P |
+ Paint Area Tool |
+
+
+ ALT+R |
+ Transformation Tool |
+
+
+ ALT+U |
+ Cutout PCB Tool |
+
+
+ ALT+1 |
+ Enable all Plots |
+
+
+ ALT+2 |
+ Disable all Plots |
+
+
+ ALT+3 |
+ Disable Non-selected Plots |
+
+
+ ALT+F10 |
+ Toggle Full Screen |
+
+
+ |
+ |
+
+
+ F1 |
+ Open Online Manual |
+
+
+ F2 |
+ Open Online Tutorials |
+
+
+ Del |
+ Delete Obj |
+
+
+ SPACE |
+ En(Dis)able Obj Plot |
+
+
+
+
'''
+
self.sh_app = QtWidgets.QTextEdit()
self.sh_app.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
@@ -821,47 +1001,147 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.editor_sh_msg = '''Editor Shortcut list
- GEOMETRY EDITOR
-
-A: Draw an Arc
-B: Buffer Tool
-C: Copy Geo Item
-E: Polygon Intersection Tool
+GEOMETRY EDITOR
-I: Paint Tool
-K: Toggle Corner Snap
-
-M: Move Geo Item
-N: Draw a Polygon
-O: Draw a Circle
-P: Draw a Path
-R: Draw Rectangle
-S: Polygon Substraction Tool
-T: Add Text Tool
-U: Polygon Union Tool
-X: Polygon Cut Tool
-
-
-CTRL+S: Save Object and Exit Editor
-
-Space: Rotate Geometry
-ENTER: Finish drawing for certain tools
-ESC: Abort and return to Select
-Del: Delete Shape
+
+
+
+ A |
+ Draw an Arc |
+
+
+ B |
+ Buffer Tool |
+
+
+ C |
+ Copy Geo Item |
+
+
+ E |
+ Polygon Intersection Tool |
+
+
+ I |
+ Paint Tool |
+
+
+ K |
+ Toggle Corner Snap |
+
+
+ M |
+ Move Geo Item |
+
+
+ N |
+ Draw a Polygon |
+
+
+ O |
+ Draw a Circle |
+
+
+ P |
+ Draw a Path |
+
+
+ R |
+ Draw Rectangle |
+
+
+ S |
+ Polygon Substraction Tool |
+
+
+ T |
+ Add Text Tool |
+
+
+ U |
+ Polygon Union Tool |
+
+
+ X |
+ Polygon Cut Tool |
+
+
+ |
+ |
+
+
+ CTRL+S |
+ Save Object and Exit Editor |
+
+
+ |
+ |
+
+
+ Space |
+ Rotate Geometry |
+
+
+ ENTER |
+ Finish drawing for certain tools |
+
+
+ ESC |
+ Abort and return to Select |
+
+
+ Del |
+ Delete Shape |
+
+
+
- EXCELLON EDITOR
-
-A: Add Drill Array
-C: Copy Drill(s)
-D: Add Drill
-M: Move Drill(s)
-
-R: Resize Drill(s)
-
-Del: Delete Drill(s)
-ESC: Abort and return to Select
-CTRL+S: Save Object and Exit Editor
+EXCELLON EDITOR
+
+
+
+ A |
+ Add Drill Array |
+
+
+ C |
+ Copy Drill(s) |
+
+
+ D |
+ Add Drill |
+
+
+ M |
+ Move Drill(s) |
+
+
+ R |
+ Resize Drill(s) |
+
+
+ |
+ |
+
+
+ Del |
+ Delete Drill(s) |
+
+
+ |
+ |
+
+
+ ESC |
+ Abort and return to Select |
+
+
+ CTRL+S |
+ Save Object and Exit Editor |
+
+
+
'''
self.sh_editor = QtWidgets.QTextEdit()
self.sh_editor.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
diff --git a/README.md b/README.md
index 3c46f4e4..01fb656d 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ CAD program, and create G-Code for Isolation routing.
- added ability to be detached for the tabs in the Notebook section (Project, Selected and Tool)
- added ability for all detachable tabs to be restored to the same position from where they were detached.
- changed the shortcut keys for Zoom In, Zoom Out and Zoom Fit from 1, 2, 3 to '-', '=' respectively 'V'. Added new shortcut keys '1', '2', '3' for Select Project Tab, Select Selected Tab and Select Tool Tab.
+- formatted the Shortcut List Tab into a HTML table
+
3.3.2019
- updated the new shortcut list with the shortcuts added lately