diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd44cbdf..4e27eb56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ CHANGELOG for FlatCAM beta
=================================================
+10.01.2021
+
+- renamed the Tool menu category to Plugins
+- for all the plugins optimized the plugin name
+- renamed the app to FlatCAM Evo in order to make a difference from FlatCAM app which follows its own path
+- modified the splash image to reflect the new naming of the app
+- modified some of the documents (License, Readme) in the app to reflect the actual reality in 2021
+
9.1.2021
- attempting to fix issue #492 - when checking for tools present in the database there were some errors in the NCC, ISO, MILL, PAINT and CUTOUT Tools
diff --git a/LICENSE b/LICENSE
index 8499c799..250fc31f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
The MIT License (MIT)
-Copyright (c) 2014-2019 Juan Pablo Caram
+Copyright FlatCAM Evo (c) 2018-2021 Marius Stanciu
+Copyright FlatCAM (c) 2014-2018 Juan Pablo Caram
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/README.md b/README.md
index 85322a64..a6762797 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-FlatCAM BETA (c) 2019 - by Marius Stanciu
+FlatCAM Evo (c) 2019 - by Marius Stanciu
+
Based on FlatCAM:
-2D Computer-Aided PCB Manufacturing by (c) 2014-2016 Juan Pablo Caram
+2D Computer-Aided PCB Manufacturing by (c) 2014-2018 Juan Pablo Caram
=====================================================================
FlatCAM is a program for preparing CNC jobs for making PCBs on a CNC router.
@@ -11,7 +12,7 @@ CAD program, and create G-Code for Isolation routing.
-------------------------- Installation instructions ----------------
-Works with Python version 3.5 or greater and PyQt5.
+Works with Python version 3.6 or greater and PyQt5.
More on the YouTube channel: https://www.youtube.com/playlist?list=PLVvP2SYRpx-AQgNlfoxw93tXUXon7G94_
You can contact me on my email address found in the app in:
@@ -42,8 +43,8 @@ pip -V
- look in the requirements.txt file (found in the sources folder) and install all the dependencies using the pip package.
The required wheels can be downloaded either from:
-https://www.lfd.uci.edu/~gohlke/pythonlibs/
-or
+https://www.lfd.uci.edu/~gohlke/pythonlibs/ (Recommended)
+or if the required modules cannot be found in the previous source use:
https://pypi.org/
You can download all the required wheels files into a folder (e.g D:\my_folder) and install them from Command Prompt like this:
diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py
index 5e1bb3ca..92433b56 100644
--- a/appEditors/AppGeoEditor.py
+++ b/appEditors/AppGeoEditor.py
@@ -149,7 +149,7 @@ class BufferSelectionTool(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -389,7 +389,7 @@ class TextInputTool(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -605,7 +605,7 @@ class PaintOptionsTool(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -1100,7 +1100,7 @@ class TransformEditorTool(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py
index 75cd87e9..b80d140c 100644
--- a/appEditors/AppGerberEditor.py
+++ b/appEditors/AppGerberEditor.py
@@ -7073,7 +7073,7 @@ class TransformEditorTool(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py
index 1642ed5a..57ef286a 100644
--- a/appGUI/MainGUI.py
+++ b/appGUI/MainGUI.py
@@ -584,11 +584,11 @@ class MainGUI(QtWidgets.QMainWindow):
'%s\t%s' % (_('Deselect All'), ''))
# ########################################################################
- # ########################## Tool # ######################################
+ # ########################## Plugins # ######################################
# ########################################################################
- self.menutool = QtWidgets.QMenu(_('Tool'))
- self.menutoolaction = self.menu.addMenu(self.menutool)
- self.menutoolshell = self.menutool.addAction(
+ self.menu_plugins = QtWidgets.QMenu(_('Plugins'))
+ self.menu_plugins_action = self.menu.addMenu(self.menu_plugins)
+ self.menu_plugins_shell = self.menu_plugins.addAction(
QtGui.QIcon(self.app.resource_location + '/shell16.png'),
'%s\t%s' % (_('Command Line'), _('S')))
@@ -1815,7 +1815,7 @@ class MainGUI(QtWidgets.QMainWindow):
self.setWindowIcon(self.app_icon)
self.setGeometry(100, 100, 1024, 650)
- self.setWindowTitle('FlatCAM %s %s - %s' %
+ self.setWindowTitle('FlatCAM Evo %s %s - %s' %
(self.app.version,
('BETA' if self.app.beta else ''),
platform.architecture()[0])
@@ -1960,7 +1960,7 @@ class MainGUI(QtWidgets.QMainWindow):
:param name: String that store the project path and project name
:return: None
"""
- title = 'FlatCAM %s %s - %s - [%s] %s' % (
+ title = 'FlatCAM Evo %s %s - %s - [%s] %s' % (
self.app.version, ('BETA' if self.app.beta else ''), platform.architecture()[0], self.app.engine, name)
self.setWindowTitle(title)
diff --git a/appGUI/preferences/utilities/UtilPreferencesUI.py b/appGUI/preferences/utilities/UtilPreferencesUI.py
index be0b5265..f405348d 100644
--- a/appGUI/preferences/utilities/UtilPreferencesUI.py
+++ b/appGUI/preferences/utilities/UtilPreferencesUI.py
@@ -34,4 +34,4 @@ class UtilPreferencesUI(QtWidgets.QWidget):
self.layout.addWidget(self.fa_gerber_group)
self.layout.addWidget(self.kw_group)
- self.layout.addStretch()
+ self.layout.addStretch(1)
diff --git a/appTool.py b/appTool.py
index a61a1439..cfd4c231 100644
--- a/appTool.py
+++ b/appTool.py
@@ -47,12 +47,12 @@ class AppTool(QtWidgets.QWidget):
before = None
# 'pos' is the menu where the Action has to be installed
- # if no 'pos' kwarg is provided then by default our Action will be installed in the menutool
+ # if no 'pos' kwarg is provided then by default our Action will be installed in the menu_plugins
# as it previously was
if 'pos' in kwargs:
pos = kwargs['pos']
else:
- pos = self.app.ui.menutool
+ pos = self.app.ui.menu_plugins
# 'before' is the Action in the menu stated by 'pos' kwarg, before which we want our Action to be installed
# if 'before' kwarg is not provided, by default our Action will be added in the last place.
diff --git a/appTools/ToolAlignObjects.py b/appTools/ToolAlignObjects.py
index 10b67d4f..81f3bb15 100644
--- a/appTools/ToolAlignObjects.py
+++ b/appTools/ToolAlignObjects.py
@@ -92,7 +92,7 @@ class AlignObjects(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
diff --git a/appTools/ToolCalculators.py b/appTools/ToolCalculators.py
index 92a1b4b4..fb8c9b7c 100644
--- a/appTools/ToolCalculators.py
+++ b/appTools/ToolCalculators.py
@@ -59,7 +59,7 @@ class ToolCalculator(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -87,7 +87,7 @@ class ToolCalculator(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Calc. Tool"))
+ self.app.ui.notebook.setTabText(2, _("Calculators"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+C', **kwargs)
diff --git a/appTools/ToolCalibration.py b/appTools/ToolCalibration.py
index 0418e6c7..3caa7582 100644
--- a/appTools/ToolCalibration.py
+++ b/appTools/ToolCalibration.py
@@ -102,7 +102,7 @@ class ToolCalibration(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -130,7 +130,7 @@ class ToolCalibration(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Calibration Tool"))
+ self.app.ui.notebook.setTabText(2, _("Calibration"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+E', **kwargs)
@@ -745,7 +745,7 @@ class ToolCalibration(AppTool):
class CalibrationUI:
- toolName = _("Calibration Tool")
+ toolName = _("Calibration")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolCopperThieving.py b/appTools/ToolCopperThieving.py
index d1d22161..5f503fa3 100644
--- a/appTools/ToolCopperThieving.py
+++ b/appTools/ToolCopperThieving.py
@@ -113,7 +113,7 @@ class ToolCopperThieving(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -141,7 +141,7 @@ class ToolCopperThieving(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Copper Thieving Tool"))
+ self.app.ui.notebook.setTabText(2, _("Copper Thieving"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+J', **kwargs)
@@ -1243,7 +1243,7 @@ class ToolCopperThieving(AppTool):
class ThievingUI:
- toolName = _("Copper Thieving Tool")
+ toolName = _("Copper Thieving")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolCorners.py b/appTools/ToolCorners.py
index 7dfddefd..fd2bf650 100644
--- a/appTools/ToolCorners.py
+++ b/appTools/ToolCorners.py
@@ -83,7 +83,7 @@ class ToolCorners(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -111,7 +111,7 @@ class ToolCorners(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Corners Tool"))
+ self.app.ui.notebook.setTabText(2, _("Corners"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+B', **kwargs)
@@ -635,7 +635,7 @@ class ToolCorners(AppTool):
class CornersUI:
- toolName = _("Corner Markers Tool")
+ toolName = _("Corner Markers")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolCutOut.py b/appTools/ToolCutOut.py
index cc4fbfc3..fc735188 100644
--- a/appTools/ToolCutOut.py
+++ b/appTools/ToolCutOut.py
@@ -141,7 +141,7 @@ class CutOut(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -168,7 +168,7 @@ class CutOut(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Cutout Tool"))
+ self.app.ui.notebook.setTabText(2, _("Cutout"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+X', **kwargs)
@@ -2288,7 +2288,7 @@ class CutOut(AppTool):
class CutoutUI:
- toolName = _("Cutout PCB")
+ toolName = _("Cutout")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolDblSided.py b/appTools/ToolDblSided.py
index c322bad6..c8eb38f2 100644
--- a/appTools/ToolDblSided.py
+++ b/appTools/ToolDblSided.py
@@ -74,7 +74,7 @@ class DblSidedTool(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -101,7 +101,7 @@ class DblSidedTool(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("2-Sided Tool"))
+ self.app.ui.notebook.setTabText(2, _("2-Sided"))
def connect_signals_at_init(self):
# #############################################################################
@@ -604,7 +604,7 @@ class DblSidedTool(AppTool):
class DsidedUI:
- toolName = _("2-Sided PCB")
+ toolName = _("2-Sided")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolDistance.py b/appTools/ToolDistance.py
index bae8fa38..6bd9374b 100644
--- a/appTools/ToolDistance.py
+++ b/appTools/ToolDistance.py
@@ -120,11 +120,11 @@ class Distance(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
- self.app.ui.notebook.setTabText(2, _("Distance Tool"))
+ self.app.ui.notebook.setTabText(2, _("Distance"))
# Remove anything else in the appGUI
self.app.ui.tool_scroll_area.takeWidget()
@@ -554,7 +554,7 @@ class Distance(AppTool):
class DistUI:
- toolName = _("Distance Tool")
+ toolName = _("Distance")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolDistanceMin.py b/appTools/ToolDistanceMin.py
index 11ad4dce..27a6848b 100644
--- a/appTools/ToolDistanceMin.py
+++ b/appTools/ToolDistanceMin.py
@@ -76,11 +76,11 @@ class DistanceMin(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
- self.app.ui.notebook.setTabText(2, _("Minimum Distance Tool"))
+ self.app.ui.notebook.setTabText(2, _("Minimum Distance"))
# Remove anything else in the appGUI
self.app.ui.tool_scroll_area.takeWidget()
@@ -230,7 +230,7 @@ class DistanceMin(AppTool):
class DistMinUI:
- toolName = _("Minimum Distance Tool")
+ toolName = _("Minimum Distance")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolDrilling.py b/appTools/ToolDrilling.py
index 471b39cb..9bbf031f 100644
--- a/appTools/ToolDrilling.py
+++ b/appTools/ToolDrilling.py
@@ -230,7 +230,7 @@ class ToolDrilling(AppTool, Excellon):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -263,7 +263,7 @@ class ToolDrilling(AppTool, Excellon):
# all the tools are selected by default
self.ui.tools_table.selectAll()
- self.app.ui.notebook.setTabText(2, _("Drilling Tool"))
+ self.app.ui.notebook.setTabText(2, _("Drilling"))
def connect_signals_at_init(self):
# #############################################################################
@@ -2171,7 +2171,7 @@ class ToolDrilling(AppTool, Excellon):
class DrillingUI:
- toolName = _("Drilling Tool")
+ toolName = _("Drilling")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolEtchCompensation.py b/appTools/ToolEtchCompensation.py
index cb8ac692..155ad387 100644
--- a/appTools/ToolEtchCompensation.py
+++ b/appTools/ToolEtchCompensation.py
@@ -68,7 +68,7 @@ class ToolEtchCompensation(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -95,7 +95,7 @@ class ToolEtchCompensation(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Etch Compensation Tool"))
+ self.app.ui.notebook.setTabText(2, _("Etch Compensation"))
def set_tool_ui(self):
self.ui.thick_entry.set_value(18.0)
@@ -266,7 +266,7 @@ class ToolEtchCompensation(AppTool):
class EtchUI:
- toolName = _("Etch Compensation Tool")
+ toolName = _("Etch Compensation")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolExtract.py b/appTools/ToolExtract.py
index 7cf906d0..d598d1a7 100644
--- a/appTools/ToolExtract.py
+++ b/appTools/ToolExtract.py
@@ -131,7 +131,7 @@ class ToolExtract(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -159,7 +159,7 @@ class ToolExtract(AppTool):
self.set_tool_ui()
self.build_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Extract Tool"))
+ self.app.ui.notebook.setTabText(2, _("Extract"))
def set_tool_ui(self):
self.reset_fields()
@@ -874,7 +874,7 @@ class ToolExtract(AppTool):
class ExtractUI:
- toolName = _("Extract Tool")
+ toolName = _("Extract")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolFiducials.py b/appTools/ToolFiducials.py
index e1e7b19c..b2dd1e1e 100644
--- a/appTools/ToolFiducials.py
+++ b/appTools/ToolFiducials.py
@@ -107,7 +107,7 @@ class ToolFiducials(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -135,7 +135,7 @@ class ToolFiducials(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Fiducials Tool"))
+ self.app.ui.notebook.setTabText(2, _("Fiducials"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+F', **kwargs)
@@ -744,7 +744,7 @@ class ToolFiducials(AppTool):
class FidoUI:
- toolName = _("Fiducials Tool")
+ toolName = _("Fiducials")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolFilm.py b/appTools/ToolFilm.py
index 0d4fa3cd..2336b066 100644
--- a/appTools/ToolFilm.py
+++ b/appTools/ToolFilm.py
@@ -109,7 +109,7 @@ class Film(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -137,7 +137,7 @@ class Film(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Film Tool"))
+ self.app.ui.notebook.setTabText(2, _("Film"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+L', **kwargs)
@@ -1078,7 +1078,7 @@ class Film(AppTool):
class FilmUI:
- toolName = _("Film PCB")
+ toolName = _("Film")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolFollow.py b/appTools/ToolFollow.py
index 8539d476..f9dea8b2 100644
--- a/appTools/ToolFollow.py
+++ b/appTools/ToolFollow.py
@@ -96,7 +96,7 @@ class ToolFollow(AppTool, Gerber):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -123,7 +123,7 @@ class ToolFollow(AppTool, Gerber):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Follow Tool"))
+ self.app.ui.notebook.setTabText(2, _("Follow"))
def set_tool_ui(self):
self.units = self.app.defaults['units'].upper()
@@ -643,7 +643,7 @@ class ToolFollow(AppTool, Gerber):
class FollowUI:
- toolName = _("Follow Tool")
+ toolName = _("Follow")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolImage.py b/appTools/ToolImage.py
index 836b02ba..59c13c25 100644
--- a/appTools/ToolImage.py
+++ b/appTools/ToolImage.py
@@ -55,7 +55,7 @@ class ToolImage(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -82,7 +82,7 @@ class ToolImage(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Image Tool"))
+ self.app.ui.notebook.setTabText(2, _("Image Import"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, **kwargs)
@@ -187,7 +187,7 @@ class ToolImage(AppTool):
class ImageUI:
- toolName = _("Image as Object")
+ toolName = _("Image Import")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolInvertGerber.py b/appTools/ToolInvertGerber.py
index 0bbdb296..97ad54d7 100644
--- a/appTools/ToolInvertGerber.py
+++ b/appTools/ToolInvertGerber.py
@@ -63,7 +63,7 @@ class ToolInvertGerber(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -90,7 +90,7 @@ class ToolInvertGerber(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Invert Tool"))
+ self.app.ui.notebook.setTabText(2, _("Invert Gerber"))
def set_tool_ui(self):
self.ui.margin_entry.set_value(float(self.app.defaults["tools_invert_margin"]))
@@ -187,7 +187,7 @@ class ToolInvertGerber(AppTool):
class InvertUI:
- toolName = _("Invert Gerber Tool")
+ toolName = _("Invert Gerber")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolIsolation.py b/appTools/ToolIsolation.py
index d37e6ab3..2267d4f5 100644
--- a/appTools/ToolIsolation.py
+++ b/appTools/ToolIsolation.py
@@ -169,7 +169,7 @@ class ToolIsolation(AppTool, Gerber):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -205,7 +205,7 @@ class ToolIsolation(AppTool, Gerber):
# all the tools are selected by default
self.ui.tools_table.selectAll()
- self.app.ui.notebook.setTabText(2, _("Isolation Tool"))
+ self.app.ui.notebook.setTabText(2, _("Isolation"))
def connect_signals_at_init(self):
# #############################################################################
@@ -3141,7 +3141,7 @@ class ToolIsolation(AppTool, Gerber):
class IsoUI:
- toolName = _("Isolation Tool")
+ toolName = _("Isolation")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolLevelling.py b/appTools/ToolLevelling.py
index b76e3834..b35ae64e 100644
--- a/appTools/ToolLevelling.py
+++ b/appTools/ToolLevelling.py
@@ -144,7 +144,7 @@ class ToolLevelling(AppTool, CNCjob):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -171,7 +171,7 @@ class ToolLevelling(AppTool, CNCjob):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Levelling Tool"))
+ self.app.ui.notebook.setTabText(2, _("Levelling"))
def connect_signals_at_init(self):
self.build_al_table_sig.connect(self.build_al_table)
@@ -1637,7 +1637,7 @@ class ToolLevelling(AppTool, CNCjob):
class LevelUI:
- toolName = _("Levelling Tool")
+ toolName = _("Levelling")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolMilling.py b/appTools/ToolMilling.py
index 30851b99..e85aef43 100644
--- a/appTools/ToolMilling.py
+++ b/appTools/ToolMilling.py
@@ -174,7 +174,7 @@ class ToolMilling(AppTool, Excellon):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -210,7 +210,7 @@ class ToolMilling(AppTool, Excellon):
# all the tools are selected by default
self.ui.tools_table.selectAll()
- self.app.ui.notebook.setTabText(2, _("Milling Tool"))
+ self.app.ui.notebook.setTabText(2, _("Milling"))
def connect_signals_at_init(self):
# #############################################################################
@@ -3426,7 +3426,7 @@ class ToolMilling(AppTool, Excellon):
class MillingUI:
- toolName = _("Milling Tool")
+ toolName = _("Milling")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolNCC.py b/appTools/ToolNCC.py
index 85db8785..ab9371d8 100644
--- a/appTools/ToolNCC.py
+++ b/appTools/ToolNCC.py
@@ -178,7 +178,7 @@ class NonCopperClear(AppTool, Gerber):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -217,7 +217,7 @@ class NonCopperClear(AppTool, Gerber):
# self.ui.tools_table.selectColumn(0)
self.ui.tools_table.selectAll()
- self.app.ui.notebook.setTabText(2, _("NCC Tool"))
+ self.app.ui.notebook.setTabText(2, _("NCC"))
def connect_signals_at_init(self):
# #############################################################################
@@ -4077,7 +4077,7 @@ class NonCopperClear(AppTool, Gerber):
class NccUI:
- toolName = _("Non-Copper Clearing")
+ toolName = _("NCC")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolOptimal.py b/appTools/ToolOptimal.py
index 8b9d77bc..d8f1bd37 100644
--- a/appTools/ToolOptimal.py
+++ b/appTools/ToolOptimal.py
@@ -91,7 +91,7 @@ class ToolOptimal(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -118,7 +118,7 @@ class ToolOptimal(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Optimal Tool"))
+ self.app.ui.notebook.setTabText(2, _("Find Optimal"))
def set_tool_ui(self):
self.ui.result_entry.set_value(0.0)
@@ -405,7 +405,7 @@ class ToolOptimal(AppTool):
class OptimalUI:
- toolName = _("Optimal Tool")
+ toolName = _("Find Optimal")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolPaint.py b/appTools/ToolPaint.py
index 5161ccd5..61be83b6 100644
--- a/appTools/ToolPaint.py
+++ b/appTools/ToolPaint.py
@@ -212,7 +212,7 @@ class ToolPaint(AppTool, Gerber):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -244,7 +244,7 @@ class ToolPaint(AppTool, Gerber):
# all the tools are selected by default
self.ui.tools_table.selectAll()
- self.app.ui.notebook.setTabText(2, _("Paint Tool"))
+ self.app.ui.notebook.setTabText(2, _("Paint"))
def on_toggle_all_rows(self):
"""
@@ -2879,7 +2879,7 @@ class ToolPaint(AppTool, Gerber):
class PaintUI:
- toolName = _("Paint Tool")
+ toolName = _("Paint")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolPanelize.py b/appTools/ToolPanelize.py
index e3a49f3f..819e38f7 100644
--- a/appTools/ToolPanelize.py
+++ b/appTools/ToolPanelize.py
@@ -84,7 +84,7 @@ class Panelize(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -111,7 +111,7 @@ class Panelize(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Panel. Tool"))
+ self.app.ui.notebook.setTabText(2, _("Panelization"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+Z', **kwargs)
@@ -1045,7 +1045,7 @@ class Panelize(AppTool):
class PanelizeUI:
- toolName = _("Panelize PCB")
+ toolName = _("Panelization")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolPcbWizard.py b/appTools/ToolPcbWizard.py
index 5d9c2c52..e5d63aa4 100644
--- a/appTools/ToolPcbWizard.py
+++ b/appTools/ToolPcbWizard.py
@@ -81,7 +81,7 @@ class PcbWizard(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -108,7 +108,7 @@ class PcbWizard(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("PCBWizard Tool"))
+ self.app.ui.notebook.setTabText(2, _("PCBWizard Import"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, **kwargs)
@@ -377,7 +377,7 @@ class PcbWizard(AppTool):
class WizardUI:
- toolName = _("PcbWizard Import Tool")
+ toolName = _("PcbWizard Import")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolProperties.py b/appTools/ToolProperties.py
index f4c3ae1b..e016f067 100644
--- a/appTools/ToolProperties.py
+++ b/appTools/ToolProperties.py
@@ -87,7 +87,7 @@ class Properties(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
diff --git a/appTools/ToolPunchGerber.py b/appTools/ToolPunchGerber.py
index 8c437d83..a2609ff6 100644
--- a/appTools/ToolPunchGerber.py
+++ b/appTools/ToolPunchGerber.py
@@ -162,7 +162,7 @@ class ToolPunchGerber(AppTool, Gerber):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -191,7 +191,7 @@ class ToolPunchGerber(AppTool, Gerber):
self.set_tool_ui()
self.build_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Punch Tool"))
+ self.app.ui.notebook.setTabText(2, _("Punch Geber"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+H', **kwargs)
diff --git a/appTools/ToolQRCode.py b/appTools/ToolQRCode.py
index 0e1de30a..c859958f 100644
--- a/appTools/ToolQRCode.py
+++ b/appTools/ToolQRCode.py
@@ -104,7 +104,7 @@ class QRCode(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -132,7 +132,7 @@ class QRCode(AppTool):
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("QRCode Tool"))
+ self.app.ui.notebook.setTabText(2, _("QRCode"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+Q', **kwargs)
@@ -696,7 +696,7 @@ class QRCode(AppTool):
class QRcodeUI:
- toolName = _("QRCode Tool")
+ toolName = _("QRCode")
def __init__(self, layout, app):
self.app = app
diff --git a/appTools/ToolRulesCheck.py b/appTools/ToolRulesCheck.py
index ea30ab72..b22ca19d 100644
--- a/appTools/ToolRulesCheck.py
+++ b/appTools/ToolRulesCheck.py
@@ -103,7 +103,7 @@ class RulesCheck(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -130,7 +130,7 @@ class RulesCheck(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Rules Tool"))
+ self.app.ui.notebook.setTabText(2, _("Check Rules"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+R', **kwargs)
diff --git a/appTools/ToolShell.py b/appTools/ToolShell.py
index be22b61b..4e3c5ded 100644
--- a/appTools/ToolShell.py
+++ b/appTools/ToolShell.py
@@ -318,9 +318,9 @@ class FCShell(TermWidget):
app_icon.addFile(self.app.resource_location + '/flatcam_icon32.png', QtCore.QSize(32, 32))
self.setWindowIcon(app_icon)
- self.setWindowTitle(_("FlatCAM Shell"))
+ self.setWindowTitle(_("FlatCAM Evo Shell"))
self.resize(*self.app.defaults["global_shell_shape"])
- self._append_to_browser('in', "FlatCAM %s - " % version)
+ self._append_to_browser('in', "FlatCAM Evo %s - " % version)
self.append_output('%s\n\n' % _("Type >help< to get started"))
self.app.ui.shell_dock.setWidget(self)
diff --git a/appTools/ToolSolderPaste.py b/appTools/ToolSolderPaste.py
index fddc53f0..3bb293a6 100644
--- a/appTools/ToolSolderPaste.py
+++ b/appTools/ToolSolderPaste.py
@@ -104,7 +104,7 @@ class SolderPaste(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -132,7 +132,7 @@ class SolderPaste(AppTool):
self.set_tool_ui()
self.build_ui()
- self.app.ui.notebook.setTabText(2, _("SolderPaste Tool"))
+ self.app.ui.notebook.setTabText(2, _("SP Dispenser"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+K', **kwargs)
@@ -1140,7 +1140,7 @@ class SolderPaste(AppTool):
class SolderUI:
- toolName = _("Solder Paste Tool")
+ toolName = _("SP Dispenser")
def __init__(self, layout, app, solder_class):
self.app = app
@@ -1156,6 +1156,9 @@ class SolderUI:
font-weight: bold;
}
""")
+ title_label.setToolTip(
+ _("A plugin to help dispense solder paste on the PCB pads using a CNC machine.")
+ )
self.layout.addWidget(title_label)
# ## Form Layout
diff --git a/appTools/ToolSub.py b/appTools/ToolSub.py
index c4c2670f..d7a62d69 100644
--- a/appTools/ToolSub.py
+++ b/appTools/ToolSub.py
@@ -138,7 +138,7 @@ class ToolSub(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -165,7 +165,7 @@ class ToolSub(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Sub Tool"))
+ self.app.ui.notebook.setTabText(2, _("Subtract"))
def on_object_selection_changed(self, current, previous):
try:
@@ -743,7 +743,7 @@ class ToolSub(AppTool):
class SubUI:
- toolName = _("Subtract Tool")
+ toolName = _("Subtract")
def __init__(self, layout, app):
self.app = app
@@ -762,6 +762,9 @@ class SubUI:
font-weight: bold;
}
""")
+ title_label.setToolTip(
+ _("A plugin to help subtract a Gerber/Geometry object from another of the same type.")
+ )
self.title_box.addWidget(title_label)
# App Level label
diff --git a/appTools/ToolTransform.py b/appTools/ToolTransform.py
index 037ae71e..05cbd761 100644
--- a/appTools/ToolTransform.py
+++ b/appTools/ToolTransform.py
@@ -73,7 +73,7 @@ class ToolTransform(AppTool):
break
# show the Tab
if not found_idx:
- self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Tool"))
+ self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
@@ -100,7 +100,7 @@ class ToolTransform(AppTool):
AppTool.run(self)
self.set_tool_ui()
- self.app.ui.notebook.setTabText(2, _("Transform Tool"))
+ self.app.ui.notebook.setTabText(2, _("Object Transform"))
def install(self, icon=None, separator=None, **kwargs):
AppTool.install(self, icon, separator, shortcut='Alt+T', **kwargs)
@@ -544,6 +544,9 @@ class TransformUI:
font-weight: bold;
}
""")
+ title_label.setToolTip(
+ _("A plugin that allow geometry transformation.")
+ )
self.layout.addWidget(title_label)
self.layout.addWidget(FCLabel(""))
diff --git a/app_Main.py b/app_Main.py
index 92af243d..55ec09a4 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -1420,7 +1420,7 @@ class App(QtCore.QObject):
self.connect_menuview_signals()
# Tool Signals
- self.ui.menutoolshell.triggered.connect(self.ui.toggle_shell_ui)
+ self.ui.menu_plugins_shell.triggered.connect(self.ui.toggle_shell_ui)
# the rest are auto-inserted
# Help Signals
@@ -1859,7 +1859,7 @@ class App(QtCore.QObject):
self.dblsidedtool.install(icon=QtGui.QIcon(self.resource_location + '/doubleside16.png'), separator=False)
self.cal_exc_tool = ToolCalibration(self)
- self.cal_exc_tool.install(icon=QtGui.QIcon(self.resource_location + '/calibrate_16.png'), pos=self.ui.menutool,
+ self.cal_exc_tool.install(icon=QtGui.QIcon(self.resource_location + '/calibrate_16.png'), pos=self.ui.menu_plugins,
before=self.dblsidedtool.menuAction,
separator=False)
@@ -1883,46 +1883,46 @@ class App(QtCore.QObject):
self.sub_tool = ToolSub(self)
self.sub_tool.install(icon=QtGui.QIcon(self.resource_location + '/sub32.png'),
- pos=self.ui.menutool, separator=True)
+ pos=self.ui.menu_plugins, separator=True)
self.rules_tool = RulesCheck(self)
self.rules_tool.install(icon=QtGui.QIcon(self.resource_location + '/rules32.png'),
- pos=self.ui.menutool, separator=False)
+ pos=self.ui.menu_plugins, separator=False)
self.optimal_tool = ToolOptimal(self)
self.optimal_tool.install(icon=QtGui.QIcon(self.resource_location + '/open_excellon32.png'),
- pos=self.ui.menutool, separator=True)
+ pos=self.ui.menu_plugins, separator=True)
self.move_tool = ToolMove(self)
self.move_tool.install(icon=QtGui.QIcon(self.resource_location + '/move16.png'), pos=self.ui.menuedit,
before=self.ui.menueditorigin, separator=True)
self.cutout_tool = CutOut(self)
- self.cutout_tool.install(icon=QtGui.QIcon(self.resource_location + '/cut32.png'), pos=self.ui.menutool,
+ self.cutout_tool.install(icon=QtGui.QIcon(self.resource_location + '/cut32.png'), pos=self.ui.menu_plugins,
before=self.sub_tool.menuAction)
self.ncclear_tool = NonCopperClear(self)
- self.ncclear_tool.install(icon=QtGui.QIcon(self.resource_location + '/ncc32.png'), pos=self.ui.menutool,
+ self.ncclear_tool.install(icon=QtGui.QIcon(self.resource_location + '/ncc32.png'), pos=self.ui.menu_plugins,
before=self.sub_tool.menuAction, separator=True)
self.paint_tool = ToolPaint(self)
- self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint20_1.png'), pos=self.ui.menutool,
+ self.paint_tool.install(icon=QtGui.QIcon(self.resource_location + '/paint20_1.png'), pos=self.ui.menu_plugins,
before=self.sub_tool.menuAction, separator=True)
self.isolation_tool = ToolIsolation(self)
- self.isolation_tool.install(icon=QtGui.QIcon(self.resource_location + '/iso_16.png'), pos=self.ui.menutool,
+ self.isolation_tool.install(icon=QtGui.QIcon(self.resource_location + '/iso_16.png'), pos=self.ui.menu_plugins,
before=self.sub_tool.menuAction, separator=True)
self.follow_tool = ToolFollow(self)
- self.follow_tool.install(icon=QtGui.QIcon(self.resource_location + '/follow32.png'), pos=self.ui.menutool,
+ self.follow_tool.install(icon=QtGui.QIcon(self.resource_location + '/follow32.png'), pos=self.ui.menu_plugins,
before=self.sub_tool.menuAction, separator=True)
self.drilling_tool = ToolDrilling(self)
self.drilling_tool.install(icon=QtGui.QIcon(self.resource_location + '/extract_drill32.png'),
- pos=self.ui.menutool, before=self.sub_tool.menuAction, separator=True)
+ pos=self.ui.menu_plugins, before=self.sub_tool.menuAction, separator=True)
self.milling_tool = ToolMilling(self)
self.milling_tool.install(icon=QtGui.QIcon(self.resource_location + '/milling_tool32.png'),
- pos=self.ui.menutool, before=self.sub_tool.menuAction, separator=True)
+ pos=self.ui.menu_plugins, before=self.sub_tool.menuAction, separator=True)
self.levelling_tool = ToolLevelling(self)
self.levelling_tool.install(icon=QtGui.QIcon(self.resource_location + '/level32.png'),
@@ -1930,27 +1930,27 @@ class App(QtCore.QObject):
self.copper_thieving_tool = ToolCopperThieving(self)
self.copper_thieving_tool.install(icon=QtGui.QIcon(self.resource_location + '/copperfill32.png'),
- pos=self.ui.menutool)
+ pos=self.ui.menu_plugins)
self.fiducial_tool = ToolFiducials(self)
self.fiducial_tool.install(icon=QtGui.QIcon(self.resource_location + '/fiducials_32.png'),
- pos=self.ui.menutool)
+ pos=self.ui.menu_plugins)
self.qrcode_tool = QRCode(self)
self.qrcode_tool.install(icon=QtGui.QIcon(self.resource_location + '/qrcode32.png'),
- pos=self.ui.menutool)
+ pos=self.ui.menu_plugins)
self.punch_tool = ToolPunchGerber(self)
- self.punch_tool.install(icon=QtGui.QIcon(self.resource_location + '/punch32.png'), pos=self.ui.menutool)
+ self.punch_tool.install(icon=QtGui.QIcon(self.resource_location + '/punch32.png'), pos=self.ui.menu_plugins)
self.invert_tool = ToolInvertGerber(self)
- self.invert_tool.install(icon=QtGui.QIcon(self.resource_location + '/invert32.png'), pos=self.ui.menutool)
+ self.invert_tool.install(icon=QtGui.QIcon(self.resource_location + '/invert32.png'), pos=self.ui.menu_plugins)
self.corners_tool = ToolCorners(self)
- self.corners_tool.install(icon=QtGui.QIcon(self.resource_location + '/corners_32.png'), pos=self.ui.menutool)
+ self.corners_tool.install(icon=QtGui.QIcon(self.resource_location + '/corners_32.png'), pos=self.ui.menu_plugins)
self.etch_tool = ToolEtchCompensation(self)
- self.etch_tool.install(icon=QtGui.QIcon(self.resource_location + '/etch_32.png'), pos=self.ui.menutool)
+ self.etch_tool.install(icon=QtGui.QIcon(self.resource_location + '/etch_32.png'), pos=self.ui.menu_plugins)
self.transform_tool = ToolTransform(self)
self.transform_tool.install(icon=QtGui.QIcon(self.resource_location + '/transform.png'),
@@ -1981,8 +1981,8 @@ class App(QtCore.QObject):
Will remove all the actions in the Tool menu.
:return: None
"""
- for act in self.ui.menutool.actions():
- self.ui.menutool.removeAction(act)
+ for act in self.ui.menu_plugins.actions():
+ self.ui.menu_plugins.removeAction(act)
def init_tools(self, init_tcl=True):
"""
@@ -2016,9 +2016,9 @@ class App(QtCore.QObject):
self.remove_tools()
# re-add the TCL Shell action to the Tools menu and reconnect it to ist slot function
- self.ui.menutoolshell = self.ui.menutool.addAction(QtGui.QIcon(self.resource_location + '/shell16.png'),
+ self.ui.menu_plugins_shell = self.ui.menu_plugins.addAction(QtGui.QIcon(self.resource_location + '/shell16.png'),
'&Command Line\tS')
- self.ui.menutoolshell.triggered.connect(self.ui.toggle_shell_ui)
+ self.ui.menu_plugins_shell.triggered.connect(self.ui.toggle_shell_ui)
# third install all of them
try:
@@ -2586,7 +2586,7 @@ class App(QtCore.QObject):
# disable the objects menu as it may interfere with the appEditors
self.ui.menuobjects.setDisabled(True)
# disable the tools menu as it makes sense not to be available when in the Editor
- self.ui.menutool.setDisabled(True)
+ self.ui.menu_plugins.setDisabled(True)
self.ui.plot_tab_area.setTabText(0, _("EDITOR Area"))
self.ui.plot_tab_area.protectTab(0)
@@ -2826,7 +2826,7 @@ class App(QtCore.QObject):
# re-enable the objects menu that was disabled on entry in Editor mode
self.ui.menuobjects.setDisabled(False)
# re-enable the tool menu that was disabled on entry in Editor mode
- self.ui.menutool.setDisabled(False)
+ self.ui.menu_plugins.setDisabled(False)
# restore the call_source to app
self.call_source = 'app'
@@ -3240,12 +3240,12 @@ class App(QtCore.QObject):
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % _("E-mail")), 0, 2)
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Juan Pablo Caram"), 1, 0)
- self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % _("Program Author")), 1, 1)
+ self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % _("FlatCAM Author")), 1, 1)
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % "<>"), 1, 2)
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Denis Hayrullin"), 2, 0)
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Kamil Sopko"), 3, 0)
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Marius Stanciu"), 4, 0)
- self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % _("BETA Maintainer >= 2019")), 4, 1)
+ self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % _("FlatCAM Evo Author/Maintainer")), 4, 1)
self.prog_grid_lay.addWidget(QtWidgets.QLabel('%s' % ""), 4, 2)
self.prog_grid_lay.addWidget(QtWidgets.QLabel(''), 5, 0)
diff --git a/assets/resources/dark_resources/splash.png b/assets/resources/dark_resources/splash.png
index 8acb82bd..347bcd1f 100644
Binary files a/assets/resources/dark_resources/splash.png and b/assets/resources/dark_resources/splash.png differ
diff --git a/assets/resources/splash.png b/assets/resources/splash.png
index 8acb82bd..347bcd1f 100644
Binary files a/assets/resources/splash.png and b/assets/resources/splash.png differ