From aa7bc125f4827f6e22efeecb2560fe330bda8fcd Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 27 Jan 2020 15:27:34 +0200 Subject: [PATCH] - the Jump To popup window will now autoselect the LineEdit therefore no more need for an extra click after launching the function --- README.md | 1 + flatcamGUI/GUIElements.py | 6 ++++-- flatcamTools/ToolPunchGerber.py | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5d35f12f..555aad09 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing. - in Geometry Editor made sure that on final save, for MultiLineString geometry all the connected lines are merged into one LineString to minimize the number of vertical movements in GCode - more work in Punch Gerber Tool +- the Jump To popup window will now autoselect the LineEdit therefore no more need for an extra click after launching the function 24.02.2020 diff --git a/flatcamGUI/GUIElements.py b/flatcamGUI/GUIElements.py index 05314ffe..8127739a 100644 --- a/flatcamGUI/GUIElements.py +++ b/flatcamGUI/GUIElements.py @@ -2278,7 +2278,7 @@ class Dialog_box(QtWidgets.QWidget): class DialogBoxRadio(QtWidgets.QDialog): - def __init__(self, title=None, label=None, icon=None, initial_text=None, reference='abs'): + def __init__(self, title=None, label=None, icon=None, initial_text=None, reference='abs', parent=None): """ :param title: string with the window title @@ -2322,8 +2322,10 @@ class DialogBoxRadio(QtWidgets.QDialog): "If the reference is Relative then the Jump will be at the (x,y) distance\n" "from the current mouse location point.") ) - self.lineEdit = EvalEntry() + self.lineEdit = EvalEntry(self) self.lineEdit.setText(str(self.location).replace('(', '').replace(')', '')) + self.lineEdit.selectAll() + self.lineEdit.setFocus() self.form.addRow(self.loc_label, self.lineEdit) self.button_box = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel, diff --git a/flatcamTools/ToolPunchGerber.py b/flatcamTools/ToolPunchGerber.py index b52058ef..16aeabb8 100644 --- a/flatcamTools/ToolPunchGerber.py +++ b/flatcamTools/ToolPunchGerber.py @@ -249,7 +249,7 @@ class ToolPunchGerber(FlatCAMTool): self.grid1.addWidget(self.circular_ring_entry, 3, 1) # Oblong Annular Ring Value - self.oblong_ring_label= QtWidgets.QLabel('%s:' % _("Oblong")) + self.oblong_ring_label = QtWidgets.QLabel('%s:' % _("Oblong")) self.oblong_ring_label.setToolTip( _("The size of annular ring for oblong pads.") ) @@ -634,4 +634,3 @@ class ToolPunchGerber(FlatCAMTool): self.gerber_object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) self.exc_combo.setRootModelIndex(self.app.collection.index(1, 0, QtCore.QModelIndex())) self.ui_disconnect() -