bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- minor UI changes/ bug fixes

Browse Source
This commit is contained in:
Marius Stanciu
2019-04-24 14:52:12 +03:00
committed by Marius
parent e4faa27351
commit e8f6b1a9ae
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -2630,14 +2630,15 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.edited_obj_name = self.name_entry.get_value() self.edited_obj_name = self.name_entry.get_value()
def on_aptype_changed(self, current_text): def on_aptype_changed(self, current_text):
# 'O' is letter O not zero.
if current_text == 'R' or current_text == 'O': if current_text == 'R' or current_text == 'O':
self.apdim_lbl.show() self.apdim_lbl.show()
self.apdim_entry.show() self.apdim_entry.show()
self.apsize_entry.setReadOnly(True) self.apsize_entry.setDisabled(True)
else: else:
self.apdim_lbl.hide() self.apdim_lbl.hide()
self.apdim_entry.hide() self.apdim_entry.hide()
self.apsize_entry.setReadOnly(False) self.apsize_entry.setDisabled(False)
def activate_grb_editor(self): def activate_grb_editor(self):
# adjust the status of the menu entries related to the editor # adjust the status of the menu entries related to the editor

10
flatcamGUI/FlatCAMGUI.py
View File

@@ -699,7 +699,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/poligonize32.png'), self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/poligonize32.png'),
_("Poligonize")) _("Poligonize"))
self.grb_add_semidisc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/semidisc32.png'), _("SemiDisc")) 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_add_disc_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/disc32.png'), _("Disc"))
self.grb_edit_toolbar.addSeparator() self.grb_edit_toolbar.addSeparator()
@@ -1850,7 +1849,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
_("Calculators Tool")) _("Calculators Tool"))
self.transform_btn = self.toolbartools.addAction(QtGui.QIcon('share/transform.png'), _("Transform 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.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_btn = self.exc_edit_toolbar.addAction(QtGui.QIcon('share/plus16.png'), _('Add Drill Hole'))
self.add_drill_array_btn = self.exc_edit_toolbar.addAction( 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.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_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_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.grb_edit_toolbar.addSeparator()
self.aperture_buffer_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/buffer16-2.png'), _('Buffer')) 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.exc_edit_toolbar.setDisabled(True)
self.geo_edit_toolbar.setVisible(True) self.geo_edit_toolbar.setVisible(True)
self.geo_edit_toolbar.setDisabled(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.grb_edit_toolbar.setDisabled(True)
self.corner_snap_btn.setVisible(True) self.corner_snap_btn.setVisible(True)