From e8f6b1a9ae959ba7fccd92aad6a1b08f7d78189f Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 24 Apr 2019 14:52:12 +0300 Subject: [PATCH] - minor UI changes/ bug fixes --- flatcamEditors/FlatCAMGrbEditor.py | 5 +++-- flatcamGUI/FlatCAMGUI.py | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/flatcamEditors/FlatCAMGrbEditor.py index 80758c4f..a27db07c 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/flatcamEditors/FlatCAMGrbEditor.py @@ -2630,14 +2630,15 @@ class FlatCAMGrbEditor(QtCore.QObject): self.edited_obj_name = self.name_entry.get_value() def on_aptype_changed(self, current_text): + # 'O' is letter O not zero. if current_text == 'R' or current_text == 'O': self.apdim_lbl.show() self.apdim_entry.show() - self.apsize_entry.setReadOnly(True) + self.apsize_entry.setDisabled(True) else: self.apdim_lbl.hide() self.apdim_entry.hide() - self.apsize_entry.setReadOnly(False) + self.apsize_entry.setDisabled(False) def activate_grb_editor(self): # adjust the status of the menu entries related to the editor diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index eff33c93..fb4b0850 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -699,7 +699,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/poligonize32.png'), _("Poligonize")) - self.grb_add_semidisc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/semidisc32.png'), _("SemiDisc")) self.grb_add_disc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/disc32.png'), _("Disc")) self.grb_edit_toolbar.addSeparator() @@ -1850,7 +1849,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): _("Calculators Tool")) self.transform_btn = self.toolbartools.addAction(QtGui.QIcon('share/transform.png'), _("Transform Tool")) - ### Drill Editor Toolbar ### + ### Excellon Editor Toolbar ### self.select_drill_btn = self.exc_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select")) self.add_drill_btn = self.exc_edit_toolbar.addAction(QtGui.QIcon('share/plus16.png'), _('Add Drill Hole')) self.add_drill_array_btn = self.exc_edit_toolbar.addAction( @@ -1906,6 +1905,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.add_pad_ar_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/padarray32.png'), _('Add Pad Array')) self.grb_add_track_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/track32.png'), _("Add Track")) self.grb_add_region_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/polygon32.png'), _("Add Region")) + self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/poligonize32.png'), + _("Poligonize")) + + self.grb_add_semidisc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/semidisc32.png'), _("SemiDisc")) + self.grb_add_disc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/disc32.png'), _("Disc")) self.grb_edit_toolbar.addSeparator() self.aperture_buffer_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/buffer16-2.png'), _('Buffer')) @@ -1974,7 +1978,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.exc_edit_toolbar.setDisabled(True) self.geo_edit_toolbar.setVisible(True) self.geo_edit_toolbar.setDisabled(True) - self.grb_edit_toolbar.setVisible(False) + self.grb_edit_toolbar.setVisible(True) self.grb_edit_toolbar.setDisabled(True) self.corner_snap_btn.setVisible(True)