From 0fc6f41177ff4392f93b911730d3def75b5c6634 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 15 Jul 2020 21:11:47 +0300 Subject: [PATCH] - added some icons to more push buttons inside the app - a change of layout in Tools Database --- CHANGELOG.md | 8 +++--- appDatabase.py | 24 ++++++++++-------- appGUI/ObjectUI.py | 7 +++++ appTools/ToolAlignObjects.py | 3 ++- appTools/ToolCalculators.py | 3 ++- appTools/ToolCalibration.py | 1 + appTools/ToolCopperThieving.py | 3 ++- appTools/ToolCorners.py | 3 ++- appTools/ToolCutOut.py | 1 + appTools/ToolDblSided.py | 3 ++- appTools/ToolDrilling.py | 3 +++ appTools/ToolEtchCompensation.py | 3 ++- appTools/ToolExtractDrills.py | 3 ++- appTools/ToolFiducials.py | 3 ++- appTools/ToolFilm.py | 3 ++- appTools/ToolInvertGerber.py | 3 ++- appTools/ToolIsolation.py | 2 ++ appTools/ToolMilling.py | 3 +++ appTools/ToolNCC.py | 2 ++ appTools/ToolOptimal.py | 1 + appTools/ToolPaint.py | 2 ++ appTools/ToolPanelize.py | 1 + appTools/ToolPunchGerber.py | 3 ++- appTools/ToolQRCode.py | 1 + appTools/ToolRulesCheck.py | 3 ++- appTools/ToolSolderPaste.py | 1 + appTools/ToolSub.py | 3 ++- appTools/ToolTransform.py | 1 + .../resources/dark_resources/param_all32.png | Bin 0 -> 1551 bytes assets/resources/dark_resources/reset32.png | Bin 0 -> 1527 bytes assets/resources/param_all32.png | Bin 0 -> 933 bytes assets/resources/reset32.png | Bin 0 -> 993 bytes 32 files changed, 70 insertions(+), 27 deletions(-) create mode 100644 assets/resources/dark_resources/param_all32.png create mode 100644 assets/resources/dark_resources/reset32.png create mode 100644 assets/resources/param_all32.png create mode 100644 assets/resources/reset32.png diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ccdb4e..ae760f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,11 @@ CHANGELOG for FlatCAM beta - added Editor Push buttons in Geometry and CNCJob UI's - Tool Drilling - brushing through code and solved the report on estimation of execution time - Tool Drilling - more optimizations regarding of using Toolchange as opposed to not using it -- modfied the preprocessors to work with the new properties for Excellon objects +- modified the preprocessors to work with the new properties for Excellon objects - added to preprocessors information regarding the X,Y position at the end of the job - Tool Drilling made sure that on Toolchange event after toolchange event the tool feedrate is set +- added some icons to more push buttons inside the app +- a change of layout in Tools Database 14.07.2020 @@ -37,7 +39,7 @@ CHANGELOG for FlatCAM beta - Drilling Tool - now slots are converted to drills if the checkbox is ON for the tool investigated - Drilling Tool - fixes due of changes in properties (preferences) - fixed the Drillcncjob TCL command -- Multiple Tools fix - fixed issue with converting slots to drills selection being cleared when togglinh all rows by clicking on the header +- Multiple Tools fix - fixed issue with converting slots to drills selection being cleared when toggling all rows by clicking on the header - Multiple Tools fix - fixes for when having multiple tools selected which created issues in tool tables for many tools 12.07.2020 @@ -48,7 +50,7 @@ CHANGELOG for FlatCAM beta 11.07.2020 -- moved all Excellon Advanced Prefeences to Drilling Tool Preferences +- moved all Excellon Advanced Preferences to Drilling Tool Preferences - updated Drilling Tool to use the new settings - updated the Excellon Editor: the default_data dict is populated now on Editor entry - Excellon Editor: added a new functionality: conversion of slots to drills diff --git a/appDatabase.py b/appDatabase.py index 483339fc..79d2e8a9 100644 --- a/appDatabase.py +++ b/appDatabase.py @@ -1068,27 +1068,29 @@ class ToolsDB2UI: self.iso_box.setLayout(self.iso_vlay) self.drill_box.setLayout(self.drill_vlay) + + tools_vlay = QtWidgets.QVBoxLayout() + tools_vlay.addWidget(self.iso_box) + tools_vlay.addWidget(self.paint_box) + tools_vlay.addWidget(self.ncc_box) + tools_vlay.addStretch() + descript_vlay = QtWidgets.QVBoxLayout() descript_vlay.addWidget(self.tool_description_box) + descript_vlay.addLayout(tools_vlay) descript_vlay.addStretch() milling_vlay = QtWidgets.QVBoxLayout() milling_vlay.addWidget(self.milling_box) milling_vlay.addStretch() - tools1_vlay = QtWidgets.QVBoxLayout() - tools1_vlay.addWidget(self.drill_box) - tools1_vlay.addWidget(self.iso_box) - tools1_vlay.addStretch() - - tools2_vlay = QtWidgets.QVBoxLayout() - tools2_vlay.addWidget(self.paint_box) - tools2_vlay.addWidget(self.ncc_box) - tools2_vlay.addStretch() + drilling_vlay = QtWidgets.QVBoxLayout() + drilling_vlay.addWidget(self.drill_box) param_hlay.addLayout(descript_vlay) - param_hlay.addLayout(tools1_vlay) - param_hlay.addLayout(tools2_vlay) + param_hlay.addLayout(milling_vlay) + param_hlay.addLayout(drilling_vlay) + param_hlay.addLayout(tools_vlay) # always visible, always to be included last param_hlay.addLayout(milling_vlay) diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py index e38f6d45..bb0ff722 100644 --- a/appGUI/ObjectUI.py +++ b/appGUI/ObjectUI.py @@ -984,6 +984,7 @@ class GeometryObjectUI(ObjectUI): bhlay = QtWidgets.QHBoxLayout() self.addtool_btn = QtWidgets.QPushButton(_('Add')) + self.addtool_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/plus16.png')) self.addtool_btn.setToolTip( _("Add a new tool to the Tool Table\n" "with the diameter specified above.") @@ -1010,12 +1011,14 @@ class GeometryObjectUI(ObjectUI): self.geo_table_box.addLayout(grid2) self.copytool_btn = QtWidgets.QPushButton(_('Copy')) + self.copytool_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/copy16.png')) self.copytool_btn.setToolTip( _("Copy a selection of tools in the Tool Table\n" "by first selecting a row in the Tool Table.") ) self.deltool_btn = QtWidgets.QPushButton(_('Delete')) + self.deltool_btn.setIcon(QtGui.QIcon(self.app.resource_location + '/trash16.png')) self.deltool_btn.setToolTip( _("Delete a selection of tools in the Tool Table\n" "by first selecting a row in the Tool Table.") @@ -1317,6 +1320,7 @@ class GeometryObjectUI(ObjectUI): grid4.addWidget(separator_line2, 0, 0, 1, 2) self.apply_param_to_all = FCButton(_("Apply parameters to all tools")) + self.apply_param_to_all.setIcon(QtGui.QIcon(self.app.resource_location + '/param_all32.png')) self.apply_param_to_all.setToolTip( _("The parameters in the current form will be applied\n" "on all the tools from the Tool Table.") @@ -1620,6 +1624,7 @@ class GeometryObjectUI(ObjectUI): # Button self.generate_cnc_button = QtWidgets.QPushButton(_('Generate CNCJob object')) + self.generate_cnc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/cnc16.png')) self.generate_cnc_button.setToolTip('%s\n%s' % ( _("Generate CNCJob object."), _( @@ -1648,6 +1653,7 @@ class GeometryObjectUI(ObjectUI): # Paint Button self.paint_tool_button = QtWidgets.QPushButton(_('Paint Tool')) + self.paint_tool_button.setIcon(QtGui.QIcon(self.app.resource_location + '/paint20_1.png')) self.paint_tool_button.setToolTip( _( "Creates tool paths to cover the\n" @@ -1666,6 +1672,7 @@ class GeometryObjectUI(ObjectUI): # NCC Tool self.generate_ncc_button = QtWidgets.QPushButton(_('NCC Tool')) + self.generate_ncc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/eraser26.png')) self.generate_ncc_button.setToolTip( _("Create the Geometry Object\n" "for non-copper routing.") diff --git a/appTools/ToolAlignObjects.py b/appTools/ToolAlignObjects.py index d3226bb9..1125acd0 100644 --- a/appTools/ToolAlignObjects.py +++ b/appTools/ToolAlignObjects.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import FCComboBox, RadioSet @@ -171,6 +171,7 @@ class AlignObjects(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolCalculators.py b/appTools/ToolCalculators.py index 39018e20..6cf62f06 100644 --- a/appTools/ToolCalculators.py +++ b/appTools/ToolCalculators.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets +from PyQt5 import QtWidgets, QtGui from appTool import AppTool from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, NumericalEvalEntry import math @@ -244,6 +244,7 @@ class ToolCalculator(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolCalibration.py b/appTools/ToolCalibration.py index 7a9d4ef0..3bece057 100644 --- a/appTools/ToolCalibration.py +++ b/appTools/ToolCalibration.py @@ -681,6 +681,7 @@ class ToolCalibration(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolCopperThieving.py b/appTools/ToolCopperThieving.py index e082ba82..7c9dafe6 100644 --- a/appTools/ToolCopperThieving.py +++ b/appTools/ToolCopperThieving.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from camlib import grace from appTool import AppTool @@ -486,6 +486,7 @@ class ToolCopperThieving(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolCorners.py b/appTools/ToolCorners.py index 0a735940..7887fc31 100644 --- a/appTools/ToolCorners.py +++ b/appTools/ToolCorners.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, FCButton @@ -180,6 +180,7 @@ class ToolCorners(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolCutOut.py b/appTools/ToolCutOut.py index 460da05a..622af6c8 100644 --- a/appTools/ToolCutOut.py +++ b/appTools/ToolCutOut.py @@ -1543,6 +1543,7 @@ class CutoutUI: # ## Reset Tool self.reset_button = FCButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolDblSided.py b/appTools/ToolDblSided.py index 1812346d..1e68cefa 100644 --- a/appTools/ToolDblSided.py +++ b/appTools/ToolDblSided.py @@ -1,5 +1,5 @@ -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import RadioSet, FCDoubleSpinner, EvalEntry, FCEntry, FCButton, FCComboBox @@ -898,6 +898,7 @@ class DsidedUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolDrilling.py b/appTools/ToolDrilling.py index 2f65b485..79289e92 100644 --- a/appTools/ToolDrilling.py +++ b/appTools/ToolDrilling.py @@ -2248,6 +2248,7 @@ class DrillingUI: self.grid3.addWidget(separator_line2, 0, 0, 1, 2) self.apply_param_to_all = FCButton(_("Apply parameters to all tools")) + self.apply_param_to_all.setIcon(QtGui.QIcon(self.app.resource_location + '/param_all32.png')) self.apply_param_to_all.setToolTip( _("The parameters in the current form will be applied\n" "on all the tools from the Tool Table.") @@ -2497,6 +2498,7 @@ class DrillingUI: self.tools_box.addLayout(self.grid4) self.generate_cnc_button = QtWidgets.QPushButton(_('Generate CNCJob object')) + self.generate_cnc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/cnc16.png')) self.generate_cnc_button.setToolTip( _("Generate the CNC Job.\n" "If milling then an additional Geometry object will be created.\n" @@ -2516,6 +2518,7 @@ class DrillingUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolEtchCompensation.py b/appTools/ToolEtchCompensation.py index 2a9250f0..e28f4866 100644 --- a/appTools/ToolEtchCompensation.py +++ b/appTools/ToolEtchCompensation.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import FCButton, FCDoubleSpinner, RadioSet, FCComboBox, NumericalEvalEntry, FCEntry @@ -456,6 +456,7 @@ class EtchUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolExtractDrills.py b/appTools/ToolExtractDrills.py index 580dbd12..1705f5d2 100644 --- a/appTools/ToolExtractDrills.py +++ b/appTools/ToolExtractDrills.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox @@ -700,6 +700,7 @@ class ExtractDrillsUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolFiducials.py b/appTools/ToolFiducials.py index 1a8fa8fd..86c99181 100644 --- a/appTools/ToolFiducials.py +++ b/appTools/ToolFiducials.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import FCDoubleSpinner, RadioSet, EvalEntry, FCTable, FCComboBox @@ -319,6 +319,7 @@ class ToolFiducials(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolFilm.py b/appTools/ToolFilm.py index 96f11a3b..0121e07e 100644 --- a/appTools/ToolFilm.py +++ b/appTools/ToolFilm.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtCore, QtWidgets +from PyQt5 import QtCore, QtWidgets, QtGui from appTool import AppTool from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, \ @@ -506,6 +506,7 @@ class Film(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolInvertGerber.py b/appTools/ToolInvertGerber.py index cf57cc5f..985da1f8 100644 --- a/appTools/ToolInvertGerber.py +++ b/appTools/ToolInvertGerber.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import FCButton, FCDoubleSpinner, RadioSet, FCComboBox @@ -141,6 +141,7 @@ class ToolInvertGerber(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py index bd54e850..591f07bf 100644 --- a/appTools/ToolIsolation.py +++ b/appTools/ToolIsolation.py @@ -3096,6 +3096,7 @@ class IsoUI: self.grid3.addWidget(separator_line, 18, 0, 1, 2) self.apply_param_to_all = FCButton(_("Apply parameters to all tools")) + self.apply_param_to_all.setIcon(QtGui.QIcon(self.app.resource_location + '/param_all32.png')) self.apply_param_to_all.setToolTip( _("The parameters in the current form will be applied\n" "on all the tools from the Tool Table.") @@ -3296,6 +3297,7 @@ class IsoUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolMilling.py b/appTools/ToolMilling.py index 8f97de91..15cc3f8d 100644 --- a/appTools/ToolMilling.py +++ b/appTools/ToolMilling.py @@ -2040,6 +2040,7 @@ class MillingUI: self.grid3.addWidget(separator_line2, 0, 0, 1, 2) self.apply_param_to_all = FCButton(_("Apply parameters to all tools")) + self.apply_param_to_all.setIcon(QtGui.QIcon(self.app.resource_location + '/param_all32.png')) self.apply_param_to_all.setToolTip( _("The parameters in the current form will be applied\n" "on all the tools from the Tool Table.") @@ -2301,6 +2302,7 @@ class MillingUI: self.tools_box.addLayout(self.grid4) self.generate_cnc_button = QtWidgets.QPushButton(_('Generate CNCJob object')) + self.generate_cnc_button.setIcon(QtGui.QIcon(self.app.resource_location + '/cnc16.png')) self.generate_cnc_button.setToolTip( _("Generate the CNC Job.\n" "If milling then an additional Geometry object will be created.\n" @@ -2320,6 +2322,7 @@ class MillingUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolNCC.py b/appTools/ToolNCC.py index 69d5dbba..abe1748a 100644 --- a/appTools/ToolNCC.py +++ b/appTools/ToolNCC.py @@ -4053,6 +4053,7 @@ class NccUI: self.grid3.addWidget(separator_line, 21, 0, 1, 2) self.apply_param_to_all = FCButton(_("Apply parameters to all tools")) + self.apply_param_to_all.setIcon(QtGui.QIcon(self.app.resource_location + '/param_all32.png')) self.apply_param_to_all.setToolTip( _("The parameters in the current form will be applied\n" "on all the tools from the Tool Table.") @@ -4228,6 +4229,7 @@ class NccUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolOptimal.py b/appTools/ToolOptimal.py index 3c16e797..b6582210 100644 --- a/appTools/ToolOptimal.py +++ b/appTools/ToolOptimal.py @@ -241,6 +241,7 @@ class ToolOptimal(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolPaint.py b/appTools/ToolPaint.py index dfb56257..a3c5d991 100644 --- a/appTools/ToolPaint.py +++ b/appTools/ToolPaint.py @@ -3112,6 +3112,7 @@ class PaintUI: grid4.addWidget(separator_line, 11, 0, 1, 2) self.apply_param_to_all = FCButton(_("Apply parameters to all tools")) + self.apply_param_to_all.setIcon(QtGui.QIcon(self.app.resource_location + '/param_all32.png')) self.apply_param_to_all.setToolTip( _("The parameters in the current form will be applied\n" "on all the tools from the Tool Table.") @@ -3255,6 +3256,7 @@ class PaintUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolPanelize.py b/appTools/ToolPanelize.py index 9feaf603..67b14242 100644 --- a/appTools/ToolPanelize.py +++ b/appTools/ToolPanelize.py @@ -887,6 +887,7 @@ class PanelizeUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolPunchGerber.py b/appTools/ToolPunchGerber.py index 10865b04..a7e2c9ec 100644 --- a/appTools/ToolPunchGerber.py +++ b/appTools/ToolPunchGerber.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtCore, QtWidgets +from PyQt5 import QtCore, QtWidgets, QtGui from appTool import AppTool from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox @@ -991,6 +991,7 @@ class PunchUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolQRCode.py b/appTools/ToolQRCode.py index 133b0912..ed24d221 100644 --- a/appTools/ToolQRCode.py +++ b/appTools/ToolQRCode.py @@ -899,6 +899,7 @@ class QRcodeUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolRulesCheck.py b/appTools/ToolRulesCheck.py index aa7d95a4..c43eb033 100644 --- a/appTools/ToolRulesCheck.py +++ b/appTools/ToolRulesCheck.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets +from PyQt5 import QtWidgets, QtGui from appTool import AppTool from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCComboBox @@ -514,6 +514,7 @@ class RulesCheck(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolSolderPaste.py b/appTools/ToolSolderPaste.py index 6a4739a4..f226205c 100644 --- a/appTools/ToolSolderPaste.py +++ b/appTools/ToolSolderPaste.py @@ -1555,6 +1555,7 @@ class SolderUI: # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolSub.py b/appTools/ToolSub.py index 5a178173..5101b12e 100644 --- a/appTools/ToolSub.py +++ b/appTools/ToolSub.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from PyQt5 import QtWidgets, QtCore +from PyQt5 import QtWidgets, QtCore, QtGui from appTool import AppTool from appGUI.GUIElements import FCCheckBox, FCButton, FCComboBox @@ -179,6 +179,7 @@ class ToolSub(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/appTools/ToolTransform.py b/appTools/ToolTransform.py index 9019f942..ec61e416 100644 --- a/appTools/ToolTransform.py +++ b/appTools/ToolTransform.py @@ -431,6 +431,7 @@ class ToolTransform(AppTool): # ## Reset Tool self.reset_button = QtWidgets.QPushButton(_("Reset Tool")) + self.reset_button.setIcon(QtGui.QIcon(self.app.resource_location + '/reset32.png')) self.reset_button.setToolTip( _("Will reset the tool parameters.") ) diff --git a/assets/resources/dark_resources/param_all32.png b/assets/resources/dark_resources/param_all32.png new file mode 100644 index 0000000000000000000000000000000000000000..4d4fb51a7b4cc8b0414ee538d34c79e0eabc093b GIT binary patch literal 1551 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 literal 0 HcmV?d00001 diff --git a/assets/resources/reset32.png b/assets/resources/reset32.png new file mode 100644 index 0000000000000000000000000000000000000000..083bd07e02e8eef8679bf785f158b548e830724a GIT binary patch literal 993 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z;^_M8K-LVNdpDhOFVsD*`KiU3o(l8Y5aKw)U@8y#WBR=_|mKK8CO#!*gu@N z%)9k0i*I&Ll-YBI#Xd?#&Rmij6SemQ^k^oP1ShzNN0v?OlI?8y=MZ52cj4+oY^;A} z)tt=CNO_w!=BT`Xg1d*SPA%N2lJuAsiB1R=)R0j%m9EqAgN%iH^)ggDLe%f+#y@rtF_pSF< zZ<96=m?e39&s47+!58_ry}Fb))x6hw!mJrjwXXfiF6+qQIW)KK9Av065R$lez`749M25BMZ~*IA@Dx=qz;Xg+sB z`r@=ZmmJbgN^Vz9`?2V&sn(45lJl)z8C#$AZ{K8Be(lwfx}yQF)DDQ%|GMZsZ^QKo z+-4_kO7`=^L*s zIGDG;jlp}0O_8YfZP_x%C3j!%TXXQ%OM!+tPIm(R4W4HAoYJ^4EozUyiqOm}lHY2t z>D`twT=`}}^ufh#g_a5uvr1lH%T3(1;;dRv)!E!#JQA0?+W+(jzCPn&b*6JGTdH>9 z?yj9|Z)Zz7Xt4f0p>-=|wczJhs@JNo)o*f|9VTCWt=;d}idR$TxXtUC+2``^^23%y z=}BVgCr*f5-+m%t-JH+Ip1w9W-fOb!_^n<0U)E3E&uH;%%PiZCySag>S+&G9q9i4; zB-JXpC>2OC7#SED=o*;o8k&X}T38tvS{WH@8yHv_7(9sEuZf}|H$NpatrE9}iOlR% yff^)1HU#IVm6RtIr81P4m+NKbWfvzW7NqLs7p2dBXCnnv#Ng@b=d#Wzp$Py*s