diff --git a/CHANGELOG.md b/CHANGELOG.md index 37700126..ed3db16a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta - renamed the Extract Drills Tool to Extract Tool and enhanced the tool to extract a Soldermask Gerber from a given Gerber object - updated the language strings files +- changed the icon for Extract Tool 9.11.2020 diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index a7c436f5..90b37fe3 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -1040,7 +1040,7 @@ class MainGUI(QtWidgets.QMainWindow): self.align_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) self.extract_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Extract Tool")) + QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) self.cutout_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) @@ -2209,7 +2209,7 @@ class MainGUI(QtWidgets.QMainWindow): self.align_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) self.extract_btn = self.toolbartools.addAction( - QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Extract Tool")) + QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) self.cutout_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/cut16_bis.png'), _("Cutout Tool")) diff --git a/appTools/ToolExtract.py b/appTools/ToolExtract.py index 84650c06..4a09931f 100644 --- a/appTools/ToolExtract.py +++ b/appTools/ToolExtract.py @@ -813,7 +813,7 @@ class ExtractUI: # Extract solderemask from Gerber apertures flashes (pads) self.e_sm_button = QtWidgets.QPushButton(_("Extract Soldermask")) - self.e_sm_button.setIcon(QtGui.QIcon(self.app.resource_location + '/drill16.png')) + self.e_sm_button.setIcon(QtGui.QIcon(self.app.resource_location + '/extract32.png')) self.e_sm_button.setToolTip( _("Extract soldermask from a given Gerber file.") ) diff --git a/app_Main.py b/app_Main.py index 305c39c3..9cbad171 100644 --- a/app_Main.py +++ b/app_Main.py @@ -1043,7 +1043,7 @@ class App(QtCore.QObject): self.qrcode_tool = None self.copper_thieving_tool = None self.fiducial_tool = None - self.edrills_tool = None + self.extract_tool = None self.align_objects_tool = None self.punch_tool = None self.invert_tool = None @@ -1827,8 +1827,8 @@ class App(QtCore.QObject): self.align_objects_tool = AlignObjects(self) self.align_objects_tool.install(icon=QtGui.QIcon(self.resource_location + '/align16.png'), separator=False) - self.edrills_tool = ToolExtract(self) - self.edrills_tool.install(icon=QtGui.QIcon(self.resource_location + '/drill16.png'), separator=True) + self.extract_tool = ToolExtract(self) + self.extract_tool.install(icon=QtGui.QIcon(self.resource_location + '/extract32.png'), separator=True) self.panelize_tool = Panelize(self) self.panelize_tool.install(icon=QtGui.QIcon(self.resource_location + '/panelize16.png')) @@ -2149,7 +2149,7 @@ class App(QtCore.QObject): self.ui.dblsided_btn.triggered.connect(lambda: self.dblsidedtool.run(toggle=True)) self.ui.cal_btn.triggered.connect(lambda: self.cal_exc_tool.run(toggle=True)) self.ui.align_btn.triggered.connect(lambda: self.align_objects_tool.run(toggle=True)) - self.ui.extract_btn.triggered.connect(lambda: self.edrills_tool.run(toggle=True)) + self.ui.extract_btn.triggered.connect(lambda: self.extract_tool.run(toggle=True)) self.ui.cutout_btn.triggered.connect(lambda: self.cutout_tool.run(toggle=True)) self.ui.ncc_btn.triggered.connect(lambda: self.ncclear_tool.run(toggle=True)) diff --git a/assets/resources/dark_resources/extract32.png b/assets/resources/dark_resources/extract32.png new file mode 100644 index 00000000..fa026ea5 Binary files /dev/null and b/assets/resources/dark_resources/extract32.png differ diff --git a/assets/resources/extract32.png b/assets/resources/extract32.png new file mode 100644 index 00000000..adc61502 Binary files /dev/null and b/assets/resources/extract32.png differ