From eae5b3d8e3cea60a6fb6b896775e110a983a0bd3 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 17 Jan 2020 03:42:50 +0200 Subject: [PATCH] - changes to Geometry UI --- README.md | 1 + flatcamGUI/ObjectUI.py | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 899a10e3..204ff374 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing. 17.01.2020 - more changes to Excellon UI +- changes to Geometry UI 16.01.2020 diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index 7143de33..807b9cf3 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -1503,6 +1503,14 @@ class GeometryObjectUI(ObjectUI): self.grid1.addWidget(self.tool_offset_lbl, 0, 0) self.grid1.addWidget(self.tool_offset_entry, 0, 1, 1, 2) + separator_line = QtWidgets.QFrame() + separator_line.setFrameShape(QtWidgets.QFrame.HLine) + separator_line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.grid1.addWidget(separator_line, 1, 0, 1, 3) + + self.tool_sel_label = QtWidgets.QLabel('%s' % _("New Tool")) + self.grid1.addWidget(self.tool_sel_label, 2, 0, 1, 3) + self.addtool_entry_lbl = QtWidgets.QLabel('%s:' % _('Tool Dia')) self.addtool_entry_lbl.setToolTip( _("Diameter for the new tool") @@ -1518,16 +1526,21 @@ class GeometryObjectUI(ObjectUI): "with the specified diameter.") ) - self.grid1.addWidget(self.addtool_entry_lbl, 1, 0) - self.grid1.addWidget(self.addtool_entry, 1, 1) - self.grid1.addWidget(self.addtool_btn, 1, 2) + self.grid1.addWidget(self.addtool_entry_lbl, 3, 0) + self.grid1.addWidget(self.addtool_entry, 3, 1) + self.grid1.addWidget(self.addtool_btn, 3, 2) self.addtool_from_db_btn = QtWidgets.QPushButton(_('Add from DB')) self.addtool_from_db_btn.setToolTip( _("Add a new tool to the Tool Table\n" "from the Tool DataBase.") ) - self.grid1.addWidget(self.addtool_from_db_btn, 2, 0, 1, 3) + self.grid1.addWidget(self.addtool_from_db_btn, 4, 0, 1, 3) + + separator_line = QtWidgets.QFrame() + separator_line.setFrameShape(QtWidgets.QFrame.HLine) + separator_line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.grid1.addWidget(separator_line, 5, 0, 1, 3) grid2 = QtWidgets.QGridLayout() self.geo_tools_box.addLayout(grid2)