From b446ded9ab06462b3a33f8b636975b133a524a9e Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 8 Apr 2023 12:10:02 +0300 Subject: [PATCH] - fixed some really long strings in the Geometry Editor toolbar actions - modified the paint and buffer icons - optimized the editor menu/toolbar action names --- CHANGELOG.md | 6 + appGUI/MainGUI.py | 154 ++++++++++--------- appMain.py | 2 +- assets/resources/buffer32.png | Bin 0 -> 841 bytes assets/resources/dark_resources/buffer32.png | Bin 0 -> 873 bytes assets/resources/dark_resources/paint32.png | Bin 880 -> 1091 bytes assets/resources/paint32.png | Bin 443 -> 725 bytes 7 files changed, 85 insertions(+), 77 deletions(-) create mode 100644 assets/resources/buffer32.png create mode 100644 assets/resources/dark_resources/buffer32.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 79309118..cf4e5a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ CHANGELOG for FlatCAM Evo beta ================================================= +08.04.2023 + +- fixed some really long strings in the Geometry Editor toolbar actions +- modified the paint and buffer icons +- optimized the editor menu/toolbar action names + 22.03.2023 - in the toolbars now there is text under the icons (which can be turned off from the toolbar context menu) diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 7cbb171c..3b758200 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -703,37 +703,37 @@ class MainGUI(QtWidgets.QMainWindow): self.geo_add_circle_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/circle32.png'), - '%s\t%s' % (_('Add Circle'), _('O')) + '%s\t%s' % (_('Circle'), _('O')) ) self.geo_add_arc_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/arc16.png'), - '%s\t%s' % (_('Add Arc'), _('A'))) + '%s\t%s' % (_('Arc'), _('A'))) self.geo_editor_menu.addSeparator() self.geo_add_rectangle_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), - '%s\t%s' % (_('Add Rectangle'), _('R')) + '%s\t%s' % (_('Rectangle'), _('R')) ) self.geo_add_polygon_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/polygon32.png'), - '%s\t%s' % (_('Add Polygon'), _('N')) + '%s\t%s' % (_('Polygon'), _('N')) ) self.geo_add_path_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/path32.png'), - '%s\t%s' % (_('Add Path'), _('P'))) + '%s\t%s' % (_('Path'), _('P'))) self.geo_editor_menu.addSeparator() self.geo_add_text_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/text32.png'), - '%s\t%s' % (_('Add Text'), _('T'))) + '%s\t%s' % (_('Text'), _('T'))) self.geo_editor_menu.addSeparator() self.geo_union_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/union16.png'), - '%s\t%s' % (_('Polygon Union'), _('U'))) + '%s\t%s' % (_('Union'), _('U'))) self.geo_intersection_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/intersection16.png'), - '%s\t%s' % (_('Polygon Intersection'), _('E'))) + '%s\t%s' % (_('Intersection'), _('E'))) self.geo_subtract_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/subtract16.png'), - '%s\t%s' % (_('Polygon Subtraction'), _('S')) + '%s\t%s' % (_('Subtraction'), _('S')) ) self.geo_subtract_alt_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/subtract16.png'), @@ -747,7 +747,7 @@ class MainGUI(QtWidgets.QMainWindow): # QtGui.QIcon(self.app.resource_location + '/move16.png'), "Move Objects 'm'") self.geo_copy_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/copy16.png'), - '%s\t%s' % (_("Copy Geom"), _('C'))) + '%s\t%s' % (_("Copy"), _('C'))) self.geo_delete_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/deleteshape16.png'), '%s\t%s' % (_("Delete"), _('DEL')) @@ -757,7 +757,7 @@ class MainGUI(QtWidgets.QMainWindow): QtGui.QIcon(self.app.resource_location + '/move32.png'), '%s\t%s' % (_("Move"), _('M'))) self.geo_buffer_menuitem = self.geo_editor_menu.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16.png'), + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), '%s\t%s' % (_("Buffer"), _('B')) ) self.geo_simplification_menuitem = self.geo_editor_menu.addAction( @@ -770,7 +770,7 @@ class MainGUI(QtWidgets.QMainWindow): ) self.geo_transform_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/transform.png'), - '%s\t%s' % (_("Transformation"), _('Alt+R')) + '%s\t%s' % (_("Transform"), _('Alt+R')) ) self.geo_editor_menu.addSeparator() self.geo_cornersnap_menuitem = self.geo_editor_menu.addAction( @@ -786,18 +786,18 @@ class MainGUI(QtWidgets.QMainWindow): self.exc_add_array_drill_menuitem = self.exc_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), - '%s\t%s' % (_('Add Drill Array'), _('A'))) + '%s\t%s' % (_('Drill Array'), _('A'))) self.exc_add_drill_menuitem = self.exc_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/plus16.png'), - '%s\t%s' % (_('Add Drill'), _('D'))) + '%s\t%s' % (_('Drill'), _('D'))) self.exc_editor_menu.addSeparator() self.exc_add_array_slot_menuitem = self.exc_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/slot_array26.png'), - '%s\t%s' % (_('Add Slot Array'), _('Q'))) + '%s\t%s' % (_('Slot Array'), _('Q'))) self.exc_add_slot_menuitem = self.exc_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/slot26.png'), - '%s\t%s' % (_('Add Slot'), _('W'))) + '%s\t%s' % (_('Slot'), _('W'))) self.exc_editor_menu.addSeparator() self.exc_resize_drill_menuitem = self.exc_editor_menu.addAction( @@ -825,16 +825,16 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_add_pad_menuitem = self.grb_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/aperture16.png'), - '%s\t%s' % (_('Add Pad'), _('P'))) + '%s\t%s' % (_('Pad'), _('P'))) self.grb_add_pad_array_menuitem = self.grb_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/padarray32.png'), - '%s\t%s' % (_('Add Pad Array'), _('A'))) + '%s\t%s' % (_('Pad Array'), _('A'))) self.grb_add_track_menuitem = self.grb_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/track32.png'), - '%s\t%s' % (_('Add Track'), _('T'))) + '%s\t%s' % (_('Track'), _('T'))) self.grb_add_region_menuitem = self.grb_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), - '%s\t%s' % (_('Add Region'), _('N'))) + '%s\t%s' % (_('Region'), _('N'))) self.grb_editor_menu.addSeparator() self.grb_convert_poly_menuitem = self.grb_editor_menu.addAction( @@ -842,12 +842,12 @@ class MainGUI(QtWidgets.QMainWindow): '%s\t%s' % (_("Poligonize"), _('Alt+N'))) self.grb_add_semidisc_menuitem = self.grb_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/semidisc32.png'), - '%s\t%s' % (_("Add SemiDisc"), _('E'))) + '%s\t%s' % (_("SemiDisc"), _('E'))) self.grb_add_disc_menuitem = self.grb_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/disc32.png'), - '%s\t%s' % (_("Add Disc"), _('D'))) + '%s\t%s' % (_("Disc"), _('D'))) self.grb_add_buffer_menuitem = self.grb_editor_menu.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), '%s\t%s' % (_('Buffer'), _('B'))) self.grb_simplification_menuitem = self.geo_editor_menu.addAction( QtGui.QIcon(self.app.resource_location + '/simplify32.png'), @@ -1266,44 +1266,46 @@ class MainGUI(QtWidgets.QMainWindow): self.geo_select_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/pointer32.png'), _("Select")) self.geo_add_circle_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/circle32.png'), _('Add Circle')) + QtGui.QIcon(self.app.resource_location + '/circle32.png'), _('Circle')) self.geo_add_arc_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/arc32.png'), _('Add Arc')) + QtGui.QIcon(self.app.resource_location + '/arc32.png'), _('Arc')) self.geo_add_rectangle_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), _('Add Rectangle')) + QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), _('Rectangle')) self.geo_edit_toolbar.addSeparator() self.geo_add_path_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/path32.png'), _('Add Path')) + QtGui.QIcon(self.app.resource_location + '/path32.png'), _('Path')) self.geo_add_polygon_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _('Add Polygon')) + QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _('Polygon')) self.geo_edit_toolbar.addSeparator() self.geo_add_text_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/text32.png'), _('Add Text')) + QtGui.QIcon(self.app.resource_location + '/text32.png'), _('Text')) self.geo_add_simplification_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/simplify32.png'), _('Simplify')) self.geo_add_buffer_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _('Add Buffer')) + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), _('Buffer')) self.geo_add_paint_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/paint32.png'), _('Paint Shape')) + QtGui.QIcon(self.app.resource_location + '/paint32.png'), _('Paint')) self.geo_eraser_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/eraser26.png'), _('Eraser')) self.geo_edit_toolbar.addSeparator() self.geo_union_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/union32.png'), _('Polygon Union')) + QtGui.QIcon(self.app.resource_location + '/union32.png'), _('Union')) self.geo_explode_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/explode32.png'), _('Polygon Explode')) + QtGui.QIcon(self.app.resource_location + '/explode32.png'), _('Explode')) self.geo_intersection_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Polygon Intersection')) + QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Intersection')) self.geo_subtract_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/subtract32.png'), + QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Subtraction')) + self.geo_subtract_btn.setToolTip( _('Polygon Subtraction. First selected is the target.\n' 'The rest of the selected is subtracted from the first.\n' 'First selected is replaced by the result.')) self.geo_alt_subtract_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/subtract_alt32.png'), + QtGui.QIcon(self.app.resource_location + '/subtract_alt32.png'), _('Alt Subtraction')) + self.geo_alt_subtract_btn.setToolTip( _('Alt Subtraction. First selected is the target.\n' 'The rest of the selected is subtracted from the first.\n' 'First selected is kept besides the result.')) @@ -1312,15 +1314,15 @@ class MainGUI(QtWidgets.QMainWindow): self.geo_cutpath_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _('Cut Path')) self.geo_copy_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/copy32.png'), _("Copy Shape(s)")) + QtGui.QIcon(self.app.resource_location + '/copy32.png'), _("Copy")) self.geo_delete_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete")) self.geo_transform_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) + QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform")) self.geo_edit_toolbar.addSeparator() self.geo_move_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move Objects")) + QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move")) # ######################################################################## # ########################## Gerber Editor Toolbar# ###################### @@ -1328,13 +1330,13 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_select_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/pointer32.png'), _("Select")) self.grb_add_pad_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/aperture32.png'), _("Add Pad")) + QtGui.QIcon(self.app.resource_location + '/aperture32.png'), _("Pad")) self.add_pad_ar_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/padarray32.png'), _('Add Pad Array')) + QtGui.QIcon(self.app.resource_location + '/padarray32.png'), _('Pad Array')) self.grb_add_track_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/track32.png'), _("Add Track")) + QtGui.QIcon(self.app.resource_location + '/track32.png'), _("Track")) self.grb_add_region_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _("Add Region")) + QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _("Region")) self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/poligonize32.png'), _("Poligonize")) @@ -1345,7 +1347,7 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_edit_toolbar.addSeparator() self.aperture_buffer_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _('Buffer')) + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), _('Buffer')) self.aperture_simplify_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/simplify32.png'), _('Simplification')) self.aperture_scale_btn = self.grb_edit_toolbar.addAction( @@ -1353,7 +1355,7 @@ class MainGUI(QtWidgets.QMainWindow): self.aperture_markarea_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/markarea32.png'), _('Mark Area')) self.grb_import_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/import.png'), _('Import Shape')) + QtGui.QIcon(self.app.resource_location + '/import.png'), _('Import')) self.aperture_eraser_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/eraser26.png'), _('Eraser')) @@ -1364,7 +1366,7 @@ class MainGUI(QtWidgets.QMainWindow): self.aperture_delete_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete")) self.grb_transform_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) + QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform")) self.grb_edit_toolbar.addSeparator() self.aperture_move_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move")) @@ -1864,7 +1866,7 @@ class MainGUI(QtWidgets.QMainWindow): self.draw_simplification = self.g_editor_cmenu.addAction( QtGui.QIcon(self.app.resource_location + '/simplify32.png'), _("Simplification")) self.draw_buffer = self.g_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _("Buffer")) + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), _("Buffer")) self.draw_paint = self.g_editor_cmenu.addAction( QtGui.QIcon(self.app.resource_location + '/paint32.png'), _("Paint")) self.draw_eraser = self.g_editor_cmenu.addAction( @@ -1882,7 +1884,7 @@ class MainGUI(QtWidgets.QMainWindow): self.draw_cut = self.g_editor_cmenu.addAction( QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _("Cut")) self.draw_transform = self.g_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) + QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform")) self.g_editor_cmenu.addSeparator() self.draw_move = self.g_editor_cmenu.addAction( @@ -1909,7 +1911,7 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_editor_cmenu.addSeparator() self.grb_draw_buffer = self.grb_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _("Buffer")) + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), _("Buffer")) self.grb_draw_scale = self.grb_editor_cmenu.addAction( QtGui.QIcon(self.app.resource_location + '/scale32.png'), _("Scale")) self.grb_draw_markarea = self.grb_editor_cmenu.addAction( @@ -1919,19 +1921,19 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_editor_cmenu.addSeparator() self.grb_draw_transformations = self.grb_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) + QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform")) self.e_editor_cmenu = self.popMenu.addMenu( QtGui.QIcon(self.app.resource_location + '/drill32.png'), _("Exc Editor")) self.drill = self.e_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Add Drill")) + QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Drill")) self.drill_array = self.e_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/addarray32.png'), _("Add Drill Array")) + QtGui.QIcon(self.app.resource_location + '/addarray32.png'), _("Drill Array")) self.e_editor_cmenu.addSeparator() self.slot = self.e_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/slot26.png'), _("Add Slot")) + QtGui.QIcon(self.app.resource_location + '/slot26.png'), _("Slot")) self.slot_array = self.e_editor_cmenu.addAction( - QtGui.QIcon(self.app.resource_location + '/slot_array26.png'), _("Add Slot Array")) + QtGui.QIcon(self.app.resource_location + '/slot_array26.png'), _("Slot Array")) self.e_editor_cmenu.addSeparator() self.drill_resize = self.e_editor_cmenu.addAction( QtGui.QIcon(self.app.resource_location + '/resize16.png'), _("Resize Drill")) @@ -2584,37 +2586,37 @@ class MainGUI(QtWidgets.QMainWindow): self.geo_select_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/pointer32.png'), _("Select")) self.geo_add_circle_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/circle32.png'), _('Add Circle')) + QtGui.QIcon(self.app.resource_location + '/circle32.png'), _('Circle')) self.geo_add_arc_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/arc32.png'), _('Add Arc')) + QtGui.QIcon(self.app.resource_location + '/arc32.png'), _('Arc')) self.geo_add_rectangle_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), _('Add Rectangle')) + QtGui.QIcon(self.app.resource_location + '/rectangle32.png'), _('Rectangle')) self.geo_edit_toolbar.addSeparator() self.geo_add_path_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/path32.png'), _('Add Path')) + QtGui.QIcon(self.app.resource_location + '/path32.png'), _('Path')) self.geo_add_polygon_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _('Add Polygon')) + QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _('Polygon')) self.geo_edit_toolbar.addSeparator() self.geo_add_text_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/text32.png'), _('Add Text')) + QtGui.QIcon(self.app.resource_location + '/text32.png'), _('Text')) self.geo_add_buffer_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _('Add Buffer')) + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), _('Buffer')) self.geo_add_paint_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/paint32.png'), _('Paint Shape')) + QtGui.QIcon(self.app.resource_location + '/paint32.png'), _('Paint')) self.geo_eraser_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/eraser26.png'), _('Eraser')) self.geo_edit_toolbar.addSeparator() self.geo_union_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/union32.png'), _('Polygon Union')) + QtGui.QIcon(self.app.resource_location + '/union32.png'), _('Union')) self.geo_explode_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/explode32.png'), _('Polygon Explode')) + QtGui.QIcon(self.app.resource_location + '/explode32.png'), _('Explode')) self.geo_intersection_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Polygon Intersection')) + QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Intersection')) self.geo_subtract_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Polygon Subtraction')) + QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Subtraction')) self.geo_alt_subtract_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/subtract_alt32.png'), _('Alt Subtraction')) @@ -2622,15 +2624,15 @@ class MainGUI(QtWidgets.QMainWindow): self.geo_cutpath_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _('Cut Path')) self.geo_copy_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/copy32.png'), _("Copy Objects")) + QtGui.QIcon(self.app.resource_location + '/copy32.png'), _("Copy")) self.geo_delete_btn = self.geo_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete")) self.geo_transform_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) + QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform")) self.geo_edit_toolbar.addSeparator() self.geo_move_btn = self.geo_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move Objects")) + QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move")) # ######################################################################## # ################### Gerber Editor Toolbar ############################## @@ -2638,13 +2640,13 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_select_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/pointer32.png'), _("Select")) self.grb_add_pad_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/aperture32.png'), _("Add Pad")) + QtGui.QIcon(self.app.resource_location + '/aperture32.png'), _("Pad")) self.add_pad_ar_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/padarray32.png'), _('Add Pad Array')) + QtGui.QIcon(self.app.resource_location + '/padarray32.png'), _('Pad Array')) self.grb_add_track_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/track32.png'), _("Add Track")) + QtGui.QIcon(self.app.resource_location + '/track32.png'), _("Track")) self.grb_add_region_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _("Add Region")) + QtGui.QIcon(self.app.resource_location + '/polygon32.png'), _("Region")) self.grb_convert_poly_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/poligonize32.png'), _("Poligonize")) @@ -2655,7 +2657,7 @@ class MainGUI(QtWidgets.QMainWindow): self.grb_edit_toolbar.addSeparator() self.aperture_buffer_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/buffer16-2.png'), _('Buffer')) + QtGui.QIcon(self.app.resource_location + '/buffer32.png'), _('Buffer')) self.aperture_simplify_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/simplify32.png'), _('Simplification')) self.aperture_scale_btn = self.grb_edit_toolbar.addAction( @@ -2674,7 +2676,7 @@ class MainGUI(QtWidgets.QMainWindow): self.aperture_delete_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete")) self.grb_transform_btn = self.grb_edit_toolbar.addAction( - QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) + QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform")) self.grb_edit_toolbar.addSeparator() self.aperture_move_btn = self.grb_edit_toolbar.addAction( QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move")) @@ -4991,7 +4993,7 @@ class ShortcutsTab(QtWidgets.QWidget): _('Alt+Q'), _("QRCode"), _('Alt+R'), _("Rules Check"), _('Alt+S'), _("View File Source"), - _('Alt+T'), _("Transformations"), + _('Alt+T'), _("Transform"), _('Alt+W'), _("Subtract"), _('Alt+X'), _("Cutout PCB"), _('Alt+Z'), _("Panelize PCB"), diff --git a/appMain.py b/appMain.py index 27a6da86..a3435e00 100644 --- a/appMain.py +++ b/appMain.py @@ -2034,7 +2034,7 @@ class App(QtCore.QObject): self.ui.align_btn.triggered.connect(lambda: self.align_objects_tool.run(toggle=True)) # self.ui.sub_btn.triggered.connect(lambda: self.sub_tool.run(toggle=True)) - self.ui.extract_btn.triggered.connect(lambda: self.extract_tool.run(toggle=True)) + # self.ui.extract_btn.triggered.connect(lambda: self.extract_tool.run(toggle=True)) self.ui.copperfill_btn.triggered.connect(lambda: self.copper_thieving_tool.run(toggle=True)) self.ui.markers_tool_btn.triggered.connect(lambda: self.markers_tool.run(toggle=True)) self.ui.punch_btn.triggered.connect(lambda: self.punch_tool.run(toggle=True)) diff --git a/assets/resources/buffer32.png b/assets/resources/buffer32.png new file mode 100644 index 0000000000000000000000000000000000000000..9c049559d7ae8ebc71f72ae685b675975d964cc1 GIT binary patch literal 841 zcmV-P1GfB$P)(*1K~z|UwbxIGRaG1Z@Xym3wHQz%b)20Uh2WqQg}6{?mr$Y5 zB1EFGO&kB9Bxup1f4C4_lrjscMQDgLITIuixQUP!#iZb1kuDtnFbq1w5aOsk7v~If z=e~RId-wU~3zy%0-}8RweBbZ=&hK{)`FIci;D1yLo+*sr7wo~a1#{M*lEZ(5PviS_ zJSdoB0hUJ#6ZjlQqQKHviTfDGx(0nJcm-cZ-zxg?R5Jp$#0kD`#u+bSIL>iWew4wy z3~phx6HN-Zf=#%J?Rcl?%WWklUWV7vp5pJ}5{44oSX}&qkW1eQ$=VRM3gJ7N;=fV6 z8&2Zsl+QpM+mg3fnFuUN2pLWA?RZo8#dokPF?J@7y@qp*E|eF6A0od#!{-?x>{IAS z@ZHg8FmJJ}By0wEgv@WpiUfZ*A#hFwti#K~&bgl8mqk0C=U65OrqPGV#OH-V5n6-; zW@r1xXfL)xz_n;MWQOF60jIcGoGxjcV5VWHk>fiuInPN5PhP!6#p50(-@57?`JJm zCIa2j4&#s1a|1m>wcMZbn?Bg=Xmp`wN-?~F|AgJJCc#&PWLy2>*HV z*H-Zt=3~`d3V>guU7g}@N4p}$w_Lz;(T=6~#nIOEgjNdZ#K-Y{AT{zBTSs?L>NA~2w^BNA~bREA!^x|(JyNkMDRXCDe# Tmd>CX00000NkvXXu0mjfL)eKc literal 0 HcmV?d00001 diff --git a/assets/resources/dark_resources/buffer32.png b/assets/resources/dark_resources/buffer32.png new file mode 100644 index 0000000000000000000000000000000000000000..28a7563d4d20beea244bfb1cc99ef4fda7e1c19b GIT binary patch literal 873 zcmV-v1D5=WP)7A*=}MG%=#kdmPbzfjb=hJhb(TFmqEPIG78 zcjkKUf#L9+Gyik`bLPx>=AlM{6s!n#2j_wqaGeVd1>XcKgRAOdHc4tA@H*D!WzVLz7P=|T5TZ5ue4i-$0!;`$rA62F&7oCu!84_Fs`k~rHo z(WAM1n=AH@hkOm&g3BwI9ohF_Q@+*}&=39rj+gA0VyU9sr|?3__Zc3+1NgdCmH`#m zp6z$kU`C=S`#(_->e+A0m@k|1)iq&fNyU@zQG9mSlw5yiJ!?`4`-u`kcMu>rdfco}ck*w3e8 zzxba7k7EILC%(UE0*MQX>DE@B%lfN9H%&+rHpm9W^m{G1e?kc4owDv4v+E_kRrJ6V zYzZ!Fo1|$FZ5%R+e+urciPsy)&)4PaQh|9{@4>Fh^#|r-XHBB@SubmqWjv!e`yUR@ z^lUztf(tJ0akDtu?`PbnP3kE!2mAh;DTDz@*wJB3JK=(*Cfu{F7QIO^4Gpcr!1D9Zo4m>_};S0BaJT zw&XvCKnk7;evaYC^9V+R--3^V$D)5y9xDF<`xZ_m+m8wy00000NkvXXu0mjfc1)6m literal 0 HcmV?d00001 diff --git a/assets/resources/dark_resources/paint32.png b/assets/resources/dark_resources/paint32.png index 2374b5e878fde1ce2f2424c2afae100f7e807d7b..4ce7ab2c002196f6c5c400b974d69a0db3b59aaf 100644 GIT binary patch delta 983 zcmeysc9>&=%0!dM`sXYh9G3j)o#)gT7?}AyT^vI)?!BGqt5Fgtb8Pt@4CCH)|%a%VZo+J zRpsA}cU(B@dv)L3=GP1X(cTN%+kYJB?^|*6=BmH9focvsUbt`1jHcHN1%(G+@3Fc1 zPqyj%mw@~CA6GyA{+-9cvoq^IU;ROMw-pyNY91^U*t*JVYkm8J$&)`aa@W>AmCnxz zd3#@N!!p5y!i!QnB!uMpv-oB|IC(N;|9z<)5$AvZ3Mr0Yzs{&&I+dZZ!L(rE^F@S!2bpW?j_mC(D+H{@%_J749x8v7l-%%lT8kRxD?BsJ5QJfA3MY__(mM$$V>= z>mBm+c;CPK_eZVS@!I=WlbFqHbgoB7FIH1s`OKKVfsw)5`r5G~3!UZLl7hbctgu&g zHJxs`gO9=2_nVsW!p4TIzKYZ4^OM}$H>drdf9CAhr+sV;YuBEe#mgp~8o;9(*U7SS z^W>;7w_cYO&!1metNZF0n}5%uz|Vb4zS_u?nX%NTr3o>|#p}Okvj6`1hevHy*WW*1 zOx{hIC3^bw+{X8BH_rW1lK$ZC-A~;Dr(gcD*}6hwTYcfAC!bI57uWpuVuk1N+}vvo z`S~k@gZ=uKJ^9yKxN%QdcyyjWdqWr3w&L2qf+yZ@yIOPMwl;HD&$;){KQC0w^7UPG zt$15-lve$vg%j#yKir66Wj(aLbK(}0!fR^tkI2Y$_@7y+xO4v;nO8R@O@##GofiGt zC}}vo+bt|C>HX#B&+L{TxOU)Z;rEXl@BBN`V)S7?Z}r|Qt5@qY8Zso*&b@WtKR0ih z`qF7)uim_w9vRKv(8_vsP9fW&x62+LJlMZ5F?*}PdYn_Ts_5-s1_lPz64!{5l*E!$tK_0o zAjM#0U}UUoV4`ba5n^CrWom9^XsT^sU}a$NqgAK?MMG|WN@iLmh6Z1_j?Npa&H#02 jz^y3B%uOvWNz5(4&;-|W?`*d)P!EHrtDnm{r-UW|VcN^& delta 755 zcmV-K}|sb0I`n?{9y%=AzXjv1q2r>EEbAxX8-^KUr9tkRA}Dq zn7c{?K@^7njiO*>qZUF6@d9GJpoL;%Ku9h42v&lm2)5!IXl*5kogjjRRu&dEqNGVD z0SiT4!CN%(GGp;O!bX$q&PEQ%p625u3wyq^v$Hb;L=i<4{~@#n0LRe^0A^>IudXuh z?UjG7?~lbtM=5%G%3NzNS5~C!tg~<|M&ZRp=B3i_;)XLb(skEKytS3w+p8{YczkSL z4e9zrig$I9xtu@oVv!sfk*+_acz-{6ap6zgFq4t4-(Fk+z}Of?TsN5b{=S(bq&K*G01OS;J@J3nS8{Sv+QU+OaFD#Y2_|khKQHZJDLybj zf$M8K@y$(X5Bmma09aloKR$wqo9}u{i?oM-VFdu)-DE1|{XLbU(EWXNaq}7M?3DKL zFaA|9na_KL*4Np9=4R&OG~^+X#nW!Be%B5yF2pnk-`TDKi+wdXn6x% z*Nhx#zsllfiK+nL>B--$trWSi@V$-I0C0Hdo&2Vzr2Q(3dxmB#$GdeUgIy5vZFfckWFuyn?L;wH)C3HntbYx+4WjbwdWNBu305UK#GA%GQ lEig1xGBY|fGdeUhD=;uRFfh(#ocI6$002ovPDHLkV1g~_T=4(^ diff --git a/assets/resources/paint32.png b/assets/resources/paint32.png index 8db9f3c62cd9d308d144708c2240a1e9aa0be9e9..2d9ad061f4f6d7d12425e917c07fbb14acf17c8c 100644 GIT binary patch delta 668 zcmdnZe3ezPGr-TCmrII^fq{Y7)59eQNGpIa2MdtAS-h!!qM>O$!>V3oBOsr%z$3C4 zNGE{this?wKn8n>r>`sfa~2K`bCKeFEf)p`#wDIEjv*e$k6y9O5OEY?c%VN|MevA% zm{PdL30G;?g8~QbH+-@Y369VZThy^=D#tC(Kmo@VlUp2_xhe@8M34AQXt3Ala9q2n zb-KV;i%mQ0ds=rEzh~bxSuI#M|Jm*B`S;#zxTHM2@~PEznXebuKUFpG0jQ^k%TACDauH)UCKM9w&u_oVqxxe4$o=~qv>FR?Mr)BIsd}_`l;cc_O z-!%5W`p^HXN0ir&tH-|26k)lX#(J>*%fovY55-5`KIHEia(An!NRP*vok8>UmVKBq zJ9m0m;G!J=;GE_8tG>$r=~<9gf5nwq)@uLREi=XVX7gT=zb+x}qfv5W7q8vS@R(iV z{H&toUrdjFzQ?&PJ^RIk^-W#s=PZ{z*l;_I_4}s67o`VXg6)@0+sD1@mQwVa>+7Q* zZGB#setv(@WBmgTdrtnV68->;Mb#45h?11Vl2ohYqEsNoU}RuqtZQJRYhV!~WME-s zYHDR7R6jcvfe{mL2 O4}+(xpUXO@geCwW1s1me delta 401 zcmcc0x|`XsGr-TCmrII^fq{Y7)59eQNQ(fmAO{POEcbOW1yU^Oj=qiz3>*8o|0J?b zR5Y#s-`;;_KTv|Rz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0Sm!Ealo zalZH5elABwiMEf=U;HrcFw#!lDCy%i`{IHE##4Sqnj58a#LORviF8j$nR++n(#C)) zUG>{P`||&N-828NefT1&zL;Y%CtEh!RM*>dC9XNy%x@~KIz!pze43>nhvDYPR%<7n z&WJTbP0 Hl+XkK=6r_y