From 098de7f030594263fe2207145be9803d8420a704 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 15 Feb 2019 00:23:29 +0200 Subject: [PATCH] - added shortcut key 'J' (jump to location) in Editors and added an icon to the dialog popup window --- FlatCAMApp.py | 4 +++- FlatCAMGUI.py | 18 +++++++++++++++++- GUIElements.py | 5 +++-- README.md | 5 +++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 899f6e76..45270735 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -3670,7 +3670,9 @@ class App(QtCore.QObject): """ self.report_usage("on_jump_to()") - dia_box = Dialog_box(title="Jump to Coordinates", label="Enter the coordinates in format X,Y:") + dia_box = Dialog_box(title="Jump to ...", + label="Enter the coordinates in format X,Y:", + icon=QtGui.QIcon('share/jump_to16.png')) if dia_box.ok is True: try: diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index 4318df77..ae46a58a 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -1047,6 +1047,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): I  Paint Tool + + J +  Jump to Location (x, y) + K  Toggle Corner Snap @@ -1068,7 +1072,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):  Draw a Path - R + R  Draw Rectangle @@ -1134,6 +1138,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): D  Add Drill + + J +  Jump to Location (x, y) + M  Move Drill(s) @@ -1940,6 +1948,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if key == QtCore.Qt.Key_I or key == 'I': self.app.geo_editor.select_tool('paint') + # Jump to coords + if key == QtCore.Qt.Key_J or key == 'J': + self.app.on_jump_to() + # Corner Snap if key == QtCore.Qt.Key_K or key == 'K': self.app.geo_editor.on_corner_snap() @@ -2162,6 +2174,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.ui.grid_snap_btn.trigger() return + # Jump to coords + if key == QtCore.Qt.Key_J or key == 'J': + self.app.on_jump_to() + # Corner Snap if key == QtCore.Qt.Key_K or key == 'K': self.app.exc_editor.launched_from_shortcuts = True diff --git a/GUIElements.py b/GUIElements.py index 261eccdf..6eaac17d 100644 --- a/GUIElements.py +++ b/GUIElements.py @@ -1212,7 +1212,7 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox): class Dialog_box(QtWidgets.QWidget): - def __init__(self, title=None, label=None): + def __init__(self, title=None, label=None, icon=None): """ :param title: string with the window title @@ -1223,7 +1223,8 @@ class Dialog_box(QtWidgets.QWidget): self.ok = False dialog_box = QtWidgets.QInputDialog() - dialog_box.setFixedWidth(270) + dialog_box.setFixedWidth(290) + self.setWindowIcon(icon) self.location, self.ok = dialog_box.getText(self, title, label) diff --git a/README.md b/README.md index 5a3a4396..66109853 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing. ================================================= +15.02.2019 + +- + 14.02.2019 - added total travel distance for CNCJob object created from Excellon Object in the CNCJob Selected tab @@ -17,6 +21,7 @@ CAD program, and create G-Code for Isolation routing. - updated the function for the project context menu 'Generate CNC' menu entry (Action) to use the modernized function FlatCAMObj.FlatCAMGeometry.on_generatecnc_button_click() - when linked, the grid snap on Y will copy the value in grid snap on X in real time - in Gerber aperture table now the values are displayed in the current units set in FlatCAM +- added shortcut key 'J' (jump to location) in Editors and added an icon to the dialog popup window 13.02.2019