Grouped the preferences UI files by tab (except for tools1/2 which I put together)

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

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

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

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

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

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

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

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

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

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