giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- added some icons to more push buttons inside the app 

- a change of layout in Tools Database
This commit is contained in:
Marius Stanciu 2020-07-15 21:11:47 +03:00 committed by Marius
parent 5b80760ba7
commit 0fc6f41177
32 changed files with 70 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -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

24
appDatabase.py
View File

@ -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)

7
appGUI/ObjectUI.py
View File

@ -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.")

3
appTools/ToolAlignObjects.py
View File

@ -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.")
)

3
appTools/ToolCalculators.py
View File

@ -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.")
)

1
appTools/ToolCalibration.py
View File

@ -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.")
)

3
appTools/ToolCopperThieving.py
View File

@ -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.")
)

3
appTools/ToolCorners.py
View File

@ -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.")
)

1
appTools/ToolCutOut.py
View File

@ -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.")
)

3
appTools/ToolDblSided.py
View File

@ -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.")
)

3
appTools/ToolDrilling.py
View File

@ -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.")
)

3
appTools/ToolEtchCompensation.py
View File

@ -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.")
)

3
appTools/ToolExtractDrills.py
View File

@ -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.")
)

3
appTools/ToolFiducials.py
View File

@ -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.")
)

3
appTools/ToolFilm.py
View File

@ -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.")
)

3
appTools/ToolInvertGerber.py
View File

@ -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.")
)

2
appTools/ToolIsolation.py
View File

@ -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.")
)

3
appTools/ToolMilling.py
View File

@ -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.")
)

2
appTools/ToolNCC.py
View File

@ -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.")
)

1
appTools/ToolOptimal.py
View File

@ -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.")
)

2
appTools/ToolPaint.py
View File

@ -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.")
)

1
appTools/ToolPanelize.py
View File

@ -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.")
)

3
appTools/ToolPunchGerber.py
View File

@ -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.")
)

1
appTools/ToolQRCode.py
View File

@ -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.")
)

3
appTools/ToolRulesCheck.py
View File

@ -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.")
)

1
appTools/ToolSolderPaste.py
View File

@ -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.")
)

3
appTools/ToolSub.py
View File

@ -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.")
)

1
appTools/ToolTransform.py
View File

@ -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.")
)

BIN
assets/resources/dark_resources/param_all32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/resources/dark_resources/reset32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/resources/param_all32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 933 B

BIN
assets/resources/reset32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 993 B