From 9be866531100187c7b3fda68f9bcd5fb1a8ea147 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Thu, 30 Apr 2020 00:11:45 +0100 Subject: [PATCH] Grouped the preferences UI files by tab (except for tools1/2 which I put together) --- flatcamGUI/FlatCAMGUI.py | 19 ++++++++---------- flatcamGUI/preferences/__init__.py | 1 - .../{ => cncjob}/CNCJobAdvOptPrefGroupUI.py | 0 .../{ => cncjob}/CNCJobGenPrefGroupUI.py | 0 .../{ => cncjob}/CNCJobOptPrefGroupUI.py | 0 .../{ => cncjob}/CNCJobPreferencesUI.py | 6 +++--- flatcamGUI/preferences/cncjob/__init__.py | 0 .../ExcellonAdvOptPrefGroupUI.py | 0 .../ExcellonEditorPrefGroupUI.py | 0 .../{ => excellon}/ExcellonExpPrefGroupUI.py | 0 .../{ => excellon}/ExcellonGenPrefGroupUI.py | 0 .../{ => excellon}/ExcellonOptPrefGroupUI.py | 0 .../{ => excellon}/ExcellonPreferencesUI.py | 10 +++++----- flatcamGUI/preferences/excellon/__init__.py | 0 .../{ => general}/GeneralAPPSetGroupUI.py | 0 .../{ => general}/GeneralAppPrefGroupUI.py | 0 .../{ => general}/GeneralGUIPrefGroupUI.py | 0 .../{ => general}/GeneralPreferencesUI.py | 6 +++--- flatcamGUI/preferences/general/__init__.py | 0 .../GeometryAdvOptPrefGroupUI.py | 0 .../GeometryEditorPrefGroupUI.py | 0 .../{ => geometry}/GeometryGenPrefGroupUI.py | 0 .../{ => geometry}/GeometryOptPrefGroupUI.py | 0 .../{ => geometry}/GeometryPreferencesUI.py | 8 ++++---- flatcamGUI/preferences/geometry/__init__.py | 0 .../{ => gerber}/GerberAdvOptPrefGroupUI.py | 0 .../{ => gerber}/GerberEditorPrefGroupUI.py | 0 .../{ => gerber}/GerberExpPrefGroupUI.py | 0 .../{ => gerber}/GerberGenPrefGroupUI.py | 0 .../{ => gerber}/GerberOptPrefGroupUI.py | 0 .../{ => gerber}/GerberPreferencesUI.py | 10 +++++----- flatcamGUI/preferences/gerber/__init__.py | 0 .../{ => tools}/Tools2CThievingPrefGroupUI.py | 0 .../{ => tools}/Tools2CalPrefGroupUI.py | 0 .../{ => tools}/Tools2EDrillsPrefGroupUI.py | 0 .../{ => tools}/Tools2FiducialsPrefGroupUI.py | 0 .../{ => tools}/Tools2InvertPrefGroupUI.py | 0 .../{ => tools}/Tools2OptimalPrefGroupUI.py | 0 .../{ => tools}/Tools2PreferencesUI.py | 18 ++++++++--------- .../Tools2PunchGerberPrefGroupUI.py | 0 .../{ => tools}/Tools2QRCodePrefGroupUI.py | 0 .../Tools2RulesCheckPrefGroupUI.py | 0 .../{ => tools}/Tools2sidedPrefGroupUI.py | 0 .../ToolsCalculatorsPrefGroupUI.py | 0 .../{ => tools}/ToolsCutoutPrefGroupUI.py | 0 .../{ => tools}/ToolsFilmPrefGroupUI.py | 0 .../{ => tools}/ToolsNCCPrefGroupUI.py | 0 .../{ => tools}/ToolsPaintPrefGroupUI.py | 0 .../{ => tools}/ToolsPanelizePrefGroupUI.py | 0 .../{ => tools}/ToolsPreferencesUI.py | 20 +++++++++---------- .../ToolsSolderpastePrefGroupUI.py | 0 .../{ => tools}/ToolsSubPrefGroupUI.py | 0 .../{ => tools}/ToolsTransformPrefGroupUI.py | 0 flatcamGUI/preferences/tools/__init__.py | 0 .../AutoCompletePrefGroupUI.py | 0 .../{ => utilities}/FAExcPrefGroupUI.py | 0 .../{ => utilities}/FAGcoPrefGroupUI.py | 0 .../{ => utilities}/FAGrbPrefGroupUI.py | 0 .../{ => utilities}/UtilPreferencesUI.py | 8 ++++---- flatcamGUI/preferences/utilities/__init__.py | 0 60 files changed, 51 insertions(+), 55 deletions(-) rename flatcamGUI/preferences/{ => cncjob}/CNCJobAdvOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => cncjob}/CNCJobGenPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => cncjob}/CNCJobOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => cncjob}/CNCJobPreferencesUI.py (74%) create mode 100644 flatcamGUI/preferences/cncjob/__init__.py rename flatcamGUI/preferences/{ => excellon}/ExcellonAdvOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => excellon}/ExcellonEditorPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => excellon}/ExcellonExpPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => excellon}/ExcellonGenPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => excellon}/ExcellonOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => excellon}/ExcellonPreferencesUI.py (73%) create mode 100644 flatcamGUI/preferences/excellon/__init__.py rename flatcamGUI/preferences/{ => general}/GeneralAPPSetGroupUI.py (100%) rename flatcamGUI/preferences/{ => general}/GeneralAppPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => general}/GeneralGUIPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => general}/GeneralPreferencesUI.py (74%) create mode 100644 flatcamGUI/preferences/general/__init__.py rename flatcamGUI/preferences/{ => geometry}/GeometryAdvOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => geometry}/GeometryEditorPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => geometry}/GeometryGenPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => geometry}/GeometryOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => geometry}/GeometryPreferencesUI.py (72%) create mode 100644 flatcamGUI/preferences/geometry/__init__.py rename flatcamGUI/preferences/{ => gerber}/GerberAdvOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => gerber}/GerberEditorPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => gerber}/GerberExpPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => gerber}/GerberGenPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => gerber}/GerberOptPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => gerber}/GerberPreferencesUI.py (73%) create mode 100644 flatcamGUI/preferences/gerber/__init__.py rename flatcamGUI/preferences/{ => tools}/Tools2CThievingPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2CalPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2EDrillsPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2FiducialsPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2InvertPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2OptimalPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2PreferencesUI.py (74%) rename flatcamGUI/preferences/{ => tools}/Tools2PunchGerberPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2QRCodePrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2RulesCheckPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/Tools2sidedPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsCalculatorsPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsCutoutPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsFilmPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsNCCPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsPaintPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsPanelizePrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsPreferencesUI.py (74%) rename flatcamGUI/preferences/{ => tools}/ToolsSolderpastePrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsSubPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => tools}/ToolsTransformPrefGroupUI.py (100%) create mode 100644 flatcamGUI/preferences/tools/__init__.py rename flatcamGUI/preferences/{ => utilities}/AutoCompletePrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => utilities}/FAExcPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => utilities}/FAGcoPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => utilities}/FAGrbPrefGroupUI.py (100%) rename flatcamGUI/preferences/{ => utilities}/UtilPreferencesUI.py (74%) create mode 100644 flatcamGUI/preferences/utilities/__init__.py diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index d1c62023..9196bec8 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -12,24 +12,21 @@ # ########################################################## import platform -from PyQt5 import QtWidgets, QtCore, QtGui -from PyQt5.QtCore import QSettings, Qt - from flatcamGUI.GUIElements import * from flatcamGUI.preferences import settings -from flatcamGUI.preferences.CNCJobPreferencesUI import CNCJobPreferencesUI -from flatcamGUI.preferences.ExcellonPreferencesUI import ExcellonPreferencesUI -from flatcamGUI.preferences.GeneralPreferencesUI import GeneralPreferencesUI -from flatcamGUI.preferences.GeometryPreferencesUI import GeometryPreferencesUI -from flatcamGUI.preferences.GerberPreferencesUI import GerberPreferencesUI +from flatcamGUI.preferences.cncjob.CNCJobPreferencesUI import CNCJobPreferencesUI +from flatcamGUI.preferences.excellon.ExcellonPreferencesUI import ExcellonPreferencesUI +from flatcamGUI.preferences.general.GeneralPreferencesUI import GeneralPreferencesUI +from flatcamGUI.preferences.geometry.GeometryPreferencesUI import GeometryPreferencesUI +from flatcamGUI.preferences.gerber.GerberPreferencesUI import GerberPreferencesUI from flatcamEditors.FlatCAMGeoEditor import FCShapeTool from matplotlib.backend_bases import KeyEvent as mpl_key_event import webbrowser -from flatcamGUI.preferences.Tools2PreferencesUI import Tools2PreferencesUI -from flatcamGUI.preferences.ToolsPreferencesUI import ToolsPreferencesUI -from flatcamGUI.preferences.UtilPreferencesUI import UtilPreferencesUI +from flatcamGUI.preferences.tools.Tools2PreferencesUI import Tools2PreferencesUI +from flatcamGUI.preferences.tools.ToolsPreferencesUI import ToolsPreferencesUI +from flatcamGUI.preferences.utilities.UtilPreferencesUI import UtilPreferencesUI from flatcamObjects.ObjectCollection import KeySensitiveListView import subprocess diff --git a/flatcamGUI/preferences/__init__.py b/flatcamGUI/preferences/__init__.py index 6b54692b..37897d42 100644 --- a/flatcamGUI/preferences/__init__.py +++ b/flatcamGUI/preferences/__init__.py @@ -4,7 +4,6 @@ import FlatCAMTranslation as fcTranslate import builtins - fcTranslate.apply_language('strings') if '_' not in builtins.__dict__: _ = gettext.gettext diff --git a/flatcamGUI/preferences/CNCJobAdvOptPrefGroupUI.py b/flatcamGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/CNCJobAdvOptPrefGroupUI.py rename to flatcamGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/CNCJobGenPrefGroupUI.py b/flatcamGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/CNCJobGenPrefGroupUI.py rename to flatcamGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py diff --git a/flatcamGUI/preferences/CNCJobOptPrefGroupUI.py b/flatcamGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/CNCJobOptPrefGroupUI.py rename to flatcamGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/CNCJobPreferencesUI.py b/flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py similarity index 74% rename from flatcamGUI/preferences/CNCJobPreferencesUI.py rename to flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py index 9a240f50..ae6f4986 100644 --- a/flatcamGUI/preferences/CNCJobPreferencesUI.py +++ b/flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py @@ -1,8 +1,8 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI -from flatcamGUI.preferences.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI -from flatcamGUI.preferences.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI +from flatcamGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI +from flatcamGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI +from flatcamGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI class CNCJobPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/cncjob/__init__.py b/flatcamGUI/preferences/cncjob/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/flatcamGUI/preferences/ExcellonAdvOptPrefGroupUI.py b/flatcamGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ExcellonAdvOptPrefGroupUI.py rename to flatcamGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/ExcellonEditorPrefGroupUI.py b/flatcamGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ExcellonEditorPrefGroupUI.py rename to flatcamGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py diff --git a/flatcamGUI/preferences/ExcellonExpPrefGroupUI.py b/flatcamGUI/preferences/excellon/ExcellonExpPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ExcellonExpPrefGroupUI.py rename to flatcamGUI/preferences/excellon/ExcellonExpPrefGroupUI.py diff --git a/flatcamGUI/preferences/ExcellonGenPrefGroupUI.py b/flatcamGUI/preferences/excellon/ExcellonGenPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ExcellonGenPrefGroupUI.py rename to flatcamGUI/preferences/excellon/ExcellonGenPrefGroupUI.py diff --git a/flatcamGUI/preferences/ExcellonOptPrefGroupUI.py b/flatcamGUI/preferences/excellon/ExcellonOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ExcellonOptPrefGroupUI.py rename to flatcamGUI/preferences/excellon/ExcellonOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/ExcellonPreferencesUI.py b/flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py similarity index 73% rename from flatcamGUI/preferences/ExcellonPreferencesUI.py rename to flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py index c230dcc1..3b595783 100644 --- a/flatcamGUI/preferences/ExcellonPreferencesUI.py +++ b/flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py @@ -1,10 +1,10 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI -from flatcamGUI.preferences.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI -from flatcamGUI.preferences.ExcellonAdvOptPrefGroupUI import ExcellonAdvOptPrefGroupUI -from flatcamGUI.preferences.ExcellonOptPrefGroupUI import ExcellonOptPrefGroupUI -from flatcamGUI.preferences.ExcellonGenPrefGroupUI import ExcellonGenPrefGroupUI +from flatcamGUI.preferences.excellon.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI +from flatcamGUI.preferences.excellon.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI +from flatcamGUI.preferences.excellon.ExcellonAdvOptPrefGroupUI import ExcellonAdvOptPrefGroupUI +from flatcamGUI.preferences.excellon.ExcellonOptPrefGroupUI import ExcellonOptPrefGroupUI +from flatcamGUI.preferences.excellon.ExcellonGenPrefGroupUI import ExcellonGenPrefGroupUI class ExcellonPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/excellon/__init__.py b/flatcamGUI/preferences/excellon/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/flatcamGUI/preferences/GeneralAPPSetGroupUI.py b/flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeneralAPPSetGroupUI.py rename to flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py diff --git a/flatcamGUI/preferences/GeneralAppPrefGroupUI.py b/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeneralAppPrefGroupUI.py rename to flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py diff --git a/flatcamGUI/preferences/GeneralGUIPrefGroupUI.py b/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeneralGUIPrefGroupUI.py rename to flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py diff --git a/flatcamGUI/preferences/GeneralPreferencesUI.py b/flatcamGUI/preferences/general/GeneralPreferencesUI.py similarity index 74% rename from flatcamGUI/preferences/GeneralPreferencesUI.py rename to flatcamGUI/preferences/general/GeneralPreferencesUI.py index 2870de18..f01cb071 100644 --- a/flatcamGUI/preferences/GeneralPreferencesUI.py +++ b/flatcamGUI/preferences/general/GeneralPreferencesUI.py @@ -1,8 +1,8 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI -from flatcamGUI.preferences.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI -from flatcamGUI.preferences.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI +from flatcamGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI +from flatcamGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI +from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI class GeneralPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/general/__init__.py b/flatcamGUI/preferences/general/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/flatcamGUI/preferences/GeometryAdvOptPrefGroupUI.py b/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeometryAdvOptPrefGroupUI.py rename to flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/GeometryEditorPrefGroupUI.py b/flatcamGUI/preferences/geometry/GeometryEditorPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeometryEditorPrefGroupUI.py rename to flatcamGUI/preferences/geometry/GeometryEditorPrefGroupUI.py diff --git a/flatcamGUI/preferences/GeometryGenPrefGroupUI.py b/flatcamGUI/preferences/geometry/GeometryGenPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeometryGenPrefGroupUI.py rename to flatcamGUI/preferences/geometry/GeometryGenPrefGroupUI.py diff --git a/flatcamGUI/preferences/GeometryOptPrefGroupUI.py b/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GeometryOptPrefGroupUI.py rename to flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/GeometryPreferencesUI.py b/flatcamGUI/preferences/geometry/GeometryPreferencesUI.py similarity index 72% rename from flatcamGUI/preferences/GeometryPreferencesUI.py rename to flatcamGUI/preferences/geometry/GeometryPreferencesUI.py index 9a7d21ba..3b1e0181 100644 --- a/flatcamGUI/preferences/GeometryPreferencesUI.py +++ b/flatcamGUI/preferences/geometry/GeometryPreferencesUI.py @@ -1,9 +1,9 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI -from flatcamGUI.preferences.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI -from flatcamGUI.preferences.GeometryOptPrefGroupUI import GeometryOptPrefGroupUI -from flatcamGUI.preferences.GeometryGenPrefGroupUI import GeometryGenPrefGroupUI +from flatcamGUI.preferences.geometry.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI +from flatcamGUI.preferences.geometry.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI +from flatcamGUI.preferences.geometry.GeometryOptPrefGroupUI import GeometryOptPrefGroupUI +from flatcamGUI.preferences.geometry.GeometryGenPrefGroupUI import GeometryGenPrefGroupUI class GeometryPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/geometry/__init__.py b/flatcamGUI/preferences/geometry/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/flatcamGUI/preferences/GerberAdvOptPrefGroupUI.py b/flatcamGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GerberAdvOptPrefGroupUI.py rename to flatcamGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/GerberEditorPrefGroupUI.py b/flatcamGUI/preferences/gerber/GerberEditorPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GerberEditorPrefGroupUI.py rename to flatcamGUI/preferences/gerber/GerberEditorPrefGroupUI.py diff --git a/flatcamGUI/preferences/GerberExpPrefGroupUI.py b/flatcamGUI/preferences/gerber/GerberExpPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GerberExpPrefGroupUI.py rename to flatcamGUI/preferences/gerber/GerberExpPrefGroupUI.py diff --git a/flatcamGUI/preferences/GerberGenPrefGroupUI.py b/flatcamGUI/preferences/gerber/GerberGenPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GerberGenPrefGroupUI.py rename to flatcamGUI/preferences/gerber/GerberGenPrefGroupUI.py diff --git a/flatcamGUI/preferences/GerberOptPrefGroupUI.py b/flatcamGUI/preferences/gerber/GerberOptPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/GerberOptPrefGroupUI.py rename to flatcamGUI/preferences/gerber/GerberOptPrefGroupUI.py diff --git a/flatcamGUI/preferences/GerberPreferencesUI.py b/flatcamGUI/preferences/gerber/GerberPreferencesUI.py similarity index 73% rename from flatcamGUI/preferences/GerberPreferencesUI.py rename to flatcamGUI/preferences/gerber/GerberPreferencesUI.py index 41eb9be9..d7bd370d 100644 --- a/flatcamGUI/preferences/GerberPreferencesUI.py +++ b/flatcamGUI/preferences/gerber/GerberPreferencesUI.py @@ -1,10 +1,10 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI -from flatcamGUI.preferences.GerberExpPrefGroupUI import GerberExpPrefGroupUI -from flatcamGUI.preferences.GerberAdvOptPrefGroupUI import GerberAdvOptPrefGroupUI -from flatcamGUI.preferences.GerberOptPrefGroupUI import GerberOptPrefGroupUI -from flatcamGUI.preferences.GerberGenPrefGroupUI import GerberGenPrefGroupUI +from flatcamGUI.preferences.gerber.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI +from flatcamGUI.preferences.gerber.GerberExpPrefGroupUI import GerberExpPrefGroupUI +from flatcamGUI.preferences.gerber.GerberAdvOptPrefGroupUI import GerberAdvOptPrefGroupUI +from flatcamGUI.preferences.gerber.GerberOptPrefGroupUI import GerberOptPrefGroupUI +from flatcamGUI.preferences.gerber.GerberGenPrefGroupUI import GerberGenPrefGroupUI class GerberPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/gerber/__init__.py b/flatcamGUI/preferences/gerber/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/flatcamGUI/preferences/Tools2CThievingPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2CThievingPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2CThievingPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2CThievingPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2CalPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2CalPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2CalPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2CalPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2EDrillsPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2EDrillsPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2FiducialsPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2FiducialsPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2InvertPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2InvertPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2InvertPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2InvertPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2OptimalPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2OptimalPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2OptimalPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2OptimalPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2PreferencesUI.py b/flatcamGUI/preferences/tools/Tools2PreferencesUI.py similarity index 74% rename from flatcamGUI/preferences/Tools2PreferencesUI.py rename to flatcamGUI/preferences/tools/Tools2PreferencesUI.py index d36ac18f..3d2bdbaa 100644 --- a/flatcamGUI/preferences/Tools2PreferencesUI.py +++ b/flatcamGUI/preferences/tools/Tools2PreferencesUI.py @@ -1,14 +1,14 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI -from flatcamGUI.preferences.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI -from flatcamGUI.preferences.Tools2EDrillsPrefGroupUI import Tools2EDrillsPrefGroupUI -from flatcamGUI.preferences.Tools2CalPrefGroupUI import Tools2CalPrefGroupUI -from flatcamGUI.preferences.Tools2FiducialsPrefGroupUI import Tools2FiducialsPrefGroupUI -from flatcamGUI.preferences.Tools2CThievingPrefGroupUI import Tools2CThievingPrefGroupUI -from flatcamGUI.preferences.Tools2QRCodePrefGroupUI import Tools2QRCodePrefGroupUI -from flatcamGUI.preferences.Tools2OptimalPrefGroupUI import Tools2OptimalPrefGroupUI -from flatcamGUI.preferences.Tools2RulesCheckPrefGroupUI import Tools2RulesCheckPrefGroupUI +from flatcamGUI.preferences.tools.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI +from flatcamGUI.preferences.tools.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI +from flatcamGUI.preferences.tools.Tools2EDrillsPrefGroupUI import Tools2EDrillsPrefGroupUI +from flatcamGUI.preferences.tools.Tools2CalPrefGroupUI import Tools2CalPrefGroupUI +from flatcamGUI.preferences.tools.Tools2FiducialsPrefGroupUI import Tools2FiducialsPrefGroupUI +from flatcamGUI.preferences.tools.Tools2CThievingPrefGroupUI import Tools2CThievingPrefGroupUI +from flatcamGUI.preferences.tools.Tools2QRCodePrefGroupUI import Tools2QRCodePrefGroupUI +from flatcamGUI.preferences.tools.Tools2OptimalPrefGroupUI import Tools2OptimalPrefGroupUI +from flatcamGUI.preferences.tools.Tools2RulesCheckPrefGroupUI import Tools2RulesCheckPrefGroupUI class Tools2PreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/Tools2PunchGerberPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2PunchGerberPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2QRCodePrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2QRCodePrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2QRCodePrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2QRCodePrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2RulesCheckPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2RulesCheckPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py diff --git a/flatcamGUI/preferences/Tools2sidedPrefGroupUI.py b/flatcamGUI/preferences/tools/Tools2sidedPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/Tools2sidedPrefGroupUI.py rename to flatcamGUI/preferences/tools/Tools2sidedPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsCalculatorsPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsCalculatorsPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsCutoutPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsCutoutPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsCutoutPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsCutoutPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsFilmPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsFilmPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsFilmPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsFilmPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsNCCPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsNCCPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsNCCPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsNCCPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsPaintPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsPaintPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsPaintPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsPaintPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsPanelizePrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsPanelizePrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsPanelizePrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsPanelizePrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsPreferencesUI.py b/flatcamGUI/preferences/tools/ToolsPreferencesUI.py similarity index 74% rename from flatcamGUI/preferences/ToolsPreferencesUI.py rename to flatcamGUI/preferences/tools/ToolsPreferencesUI.py index 9f1bb1e0..1142e592 100644 --- a/flatcamGUI/preferences/ToolsPreferencesUI.py +++ b/flatcamGUI/preferences/tools/ToolsPreferencesUI.py @@ -1,15 +1,15 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI -from flatcamGUI.preferences.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI -from flatcamGUI.preferences.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI -from flatcamGUI.preferences.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI -from flatcamGUI.preferences.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI -from flatcamGUI.preferences.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI -from flatcamGUI.preferences.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI -from flatcamGUI.preferences.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI -from flatcamGUI.preferences.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI -from flatcamGUI.preferences.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI +from flatcamGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI +from flatcamGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI +from flatcamGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI +from flatcamGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI +from flatcamGUI.preferences.tools.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI +from flatcamGUI.preferences.tools.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI +from flatcamGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI +from flatcamGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI +from flatcamGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI +from flatcamGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI class ToolsPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/ToolsSolderpastePrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsSolderpastePrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsSubPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsSubPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsSubPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsSubPrefGroupUI.py diff --git a/flatcamGUI/preferences/ToolsTransformPrefGroupUI.py b/flatcamGUI/preferences/tools/ToolsTransformPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/ToolsTransformPrefGroupUI.py rename to flatcamGUI/preferences/tools/ToolsTransformPrefGroupUI.py diff --git a/flatcamGUI/preferences/tools/__init__.py b/flatcamGUI/preferences/tools/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/flatcamGUI/preferences/AutoCompletePrefGroupUI.py b/flatcamGUI/preferences/utilities/AutoCompletePrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/AutoCompletePrefGroupUI.py rename to flatcamGUI/preferences/utilities/AutoCompletePrefGroupUI.py diff --git a/flatcamGUI/preferences/FAExcPrefGroupUI.py b/flatcamGUI/preferences/utilities/FAExcPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/FAExcPrefGroupUI.py rename to flatcamGUI/preferences/utilities/FAExcPrefGroupUI.py diff --git a/flatcamGUI/preferences/FAGcoPrefGroupUI.py b/flatcamGUI/preferences/utilities/FAGcoPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/FAGcoPrefGroupUI.py rename to flatcamGUI/preferences/utilities/FAGcoPrefGroupUI.py diff --git a/flatcamGUI/preferences/FAGrbPrefGroupUI.py b/flatcamGUI/preferences/utilities/FAGrbPrefGroupUI.py similarity index 100% rename from flatcamGUI/preferences/FAGrbPrefGroupUI.py rename to flatcamGUI/preferences/utilities/FAGrbPrefGroupUI.py diff --git a/flatcamGUI/preferences/UtilPreferencesUI.py b/flatcamGUI/preferences/utilities/UtilPreferencesUI.py similarity index 74% rename from flatcamGUI/preferences/UtilPreferencesUI.py rename to flatcamGUI/preferences/utilities/UtilPreferencesUI.py index 28f576ed..82ba053d 100644 --- a/flatcamGUI/preferences/UtilPreferencesUI.py +++ b/flatcamGUI/preferences/utilities/UtilPreferencesUI.py @@ -1,9 +1,9 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI -from flatcamGUI.preferences.FAGrbPrefGroupUI import FAGrbPrefGroupUI -from flatcamGUI.preferences.FAGcoPrefGroupUI import FAGcoPrefGroupUI -from flatcamGUI.preferences.FAExcPrefGroupUI import FAExcPrefGroupUI +from flatcamGUI.preferences.utilities.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI +from flatcamGUI.preferences.utilities.FAGrbPrefGroupUI import FAGrbPrefGroupUI +from flatcamGUI.preferences.utilities.FAGcoPrefGroupUI import FAGcoPrefGroupUI +from flatcamGUI.preferences.utilities.FAExcPrefGroupUI import FAExcPrefGroupUI class UtilPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/utilities/__init__.py b/flatcamGUI/preferences/utilities/__init__.py new file mode 100644 index 00000000..e69de29b