Move models around again

- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI

cura/CuraApplication.py

@@ -48,7 +48,7 @@ from cura.Arranging.Arrange import Arrange
 from cura.Arranging.ArrangeObjectsJob import ArrangeObjectsJob
 from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob
 from cura.Arranging.ShapeArray import ShapeArray
-from cura.UI.GlobalStacksModel import GlobalStacksModel
+from cura.Machines.Models.GlobalStacksModel import GlobalStacksModel
 from cura.Scene.ConvexHullDecorator import ConvexHullDecorator
 from cura.Operations.SetParentOperation import SetParentOperation
 from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator
@@ -66,19 +66,18 @@ from UM.Settings.SettingFunction import SettingFunction
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from cura.Settings.MachineNameValidator import MachineNameValidator
 
-from cura.UI.MachineModels.BuildPlateModel import BuildPlateModel
-from cura.UI.MachineModels.NozzleModel import NozzleModel
-from cura.UI.MachineModels.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
-from cura.UI.MachineModels.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel
-from cura.UI.MachineModels.MultiBuildPlateModel import MultiBuildPlateModel
-from cura.UI.MachineModels.FavoriteMaterialsModel import FavoriteMaterialsModel
-from cura.UI.MachineModels.GenericMaterialsModel import GenericMaterialsModel
-from cura.UI.MachineModels.MaterialBrandsModel import MaterialBrandsModel
-from cura.UI.MachineModels.QualityManagementModel import QualityManagementModel
-from cura.UI.MachineModels.QualitySettingsModel import QualitySettingsModel
-from cura.UI.MachineModels.MachineManagementModel import MachineManagementModel
-
-from cura.UI.MachineModels.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
+from cura.Machines.Models.BuildPlateModel import BuildPlateModel
+from cura.Machines.Models.NozzleModel import NozzleModel
+from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
+from cura.Machines.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel
+from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
+from cura.Machines.Models.FavoriteMaterialsModel import FavoriteMaterialsModel
+from cura.Machines.Models.GenericMaterialsModel import GenericMaterialsModel
+from cura.Machines.Models.MaterialBrandsModel import MaterialBrandsModel
+from cura.Machines.Models.QualityManagementModel import QualityManagementModel
+from cura.Machines.Models.QualitySettingsModel import QualitySettingsModel
+from cura.Machines.Models.MachineManagementModel import MachineManagementModel
+from cura.Machines.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
 
 from cura.Machines.MachineErrorChecker import MachineErrorChecker
 
@@ -101,8 +100,8 @@ from cura.TaskManagement.OnExitCallbackManager import OnExitCallbackManager
 
 from cura.Settings.MachineManager import MachineManager
 from cura.Settings.ExtruderManager import ExtruderManager
-from cura.UI.UserChangesModel import UserChangesModel
-from cura.UI.ExtrudersModel import ExtrudersModel
+from cura.Machines.Models.UserChangesModel import UserChangesModel
+from cura.Machines.Models.ExtrudersModel import ExtrudersModel
 from cura.Settings.MaterialSettingsVisibilityHandler import MaterialSettingsVisibilityHandler
 from cura.Settings.ContainerManager import ContainerManager
 from cura.Settings.SidebarCustomMenuItemsModel import SidebarCustomMenuItemsModel
@@ -111,7 +110,7 @@ from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions
 
 from cura.UI.ObjectsModel import ObjectsModel
 
-from cura.UI.MachineModels.DiscoveredPrintersModel import DiscoveredPrintersModel
+from cura.Machines.Models.DiscoveredPrintersModel import DiscoveredPrintersModel
 
 from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage

cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py

@@ -3,7 +3,7 @@
 
 from UM.Logger import Logger
 
-from cura.UI.MachineModels.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
+from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
 
 
 #

cura/Machines/Models/FavoriteMaterialsModel.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from cura.UI.MachineModels.BaseMaterialsModel import BaseMaterialsModel
+from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel
 
 ##  Model that shows the list of favorite materials.
 class FavoriteMaterialsModel(BaseMaterialsModel):

cura/Machines/Models/GenericMaterialsModel.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from cura.UI.MachineModels.BaseMaterialsModel import BaseMaterialsModel
+from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel
 
 class GenericMaterialsModel(BaseMaterialsModel):
 

cura/Machines/Models/MaterialBrandsModel.py

@@ -3,7 +3,7 @@
 
 from PyQt5.QtCore import Qt, pyqtSignal
 from UM.Qt.ListModel import ListModel
-from cura.UI.MachineModels.BaseMaterialsModel import BaseMaterialsModel
+from cura.Machines.Models.BaseMaterialsModel import BaseMaterialsModel
 
 class MaterialTypesModel(ListModel):
 

cura/PrinterOutput/GenericOutputController.py

@@ -5,13 +5,13 @@ from typing import TYPE_CHECKING, Set, Union, Optional
 
 from PyQt5.QtCore import QTimer
 
-from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
+from .PrinterOutputController import PrinterOutputController
 
 if TYPE_CHECKING:
-    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
-    from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
-    from cura.UI.ExtruderOutputModel import ExtruderOutputModel
+    from .Models.PrintJobOutputModel import PrintJobOutputModel
+    from .Models.PrinterOutputModel import PrinterOutputModel
+    from .PrinterOutputDevice import PrinterOutputDevice
+    from .Models.ExtruderOutputModel import ExtruderOutputModel
 
 
 class GenericOutputController(PrinterOutputController):

cura/PrinterOutput/Models/ExtruderOutputModel.py

@@ -2,12 +2,12 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot
-from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
 
 from typing import Optional, TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from cura.UI.PrinterOutputModel import PrinterOutputModel
+    from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
     from cura.UI.MaterialOutputModel import MaterialOutputModel
 
 

cura/PrinterOutput/Models/PrintJobOutputModel.py

@@ -8,8 +8,8 @@ from PyQt5.QtGui import QImage
 
 if TYPE_CHECKING:
     from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
-    from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
+    from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
+    from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
 
 
 class PrintJobOutputModel(QObject):

cura/PrinterOutput/Models/PrinterConfigurationModel.py

@@ -6,7 +6,7 @@ from typing import List
 
 MYPY = False
 if MYPY:
-    from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
+    from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
 
 
 class PrinterConfigurationModel(QObject):

cura/PrinterOutput/Models/PrinterOutputModel.py

@@ -4,12 +4,12 @@
 from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl
 from typing import List, Dict, Optional
 from UM.Math.Vector import Vector
-from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
-from cura.UI.ExtruderOutputModel import ExtruderOutputModel
+from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.PrinterOutput.Models.ExtruderOutputModel import ExtruderOutputModel
 
 MYPY = False
 if MYPY:
-    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+    from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
     from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 
 

cura/PrinterOutput/PrinterOutputController.py

@@ -6,10 +6,10 @@ from UM.Signal import Signal
 
 MYPY = False
 if MYPY:
-    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
-    from cura.UI.ExtruderOutputModel import ExtruderOutputModel
-    from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
+    from .Models.PrintJobOutputModel import PrintJobOutputModel
+    from .Models.ExtruderOutputModel import ExtruderOutputModel
+    from .Models.PrinterOutputModel import PrinterOutputModel
+    from .PrinterOutputDevice import PrinterOutputDevice
 
 
 class PrinterOutputController:

cura/PrinterOutput/PrinterOutputDevice.py

@@ -3,9 +3,6 @@
 from enum import IntEnum
 from typing import Callable, List, Optional, Union
 
-from UM.Decorators import deprecated
-from UM.i18n import i18nCatalog
-from UM.OutputDevice.OutputDevice import OutputDevice
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject, QTimer, QUrl
 from PyQt5.QtWidgets import QMessageBox
 
@@ -13,14 +10,17 @@ from UM.Logger import Logger
 from UM.Signal import signalemitter
 from UM.Qt.QtApplication import QtApplication
 from UM.FlameProfiler import pyqtSlot
+from UM.Decorators import deprecated
+from UM.i18n import i18nCatalog
+from UM.OutputDevice.OutputDevice import OutputDevice
 
 MYPY = False
 if MYPY:
-    from cura.UI.PrinterOutputModel import PrinterOutputModel
-    from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
-    from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater
     from UM.FileHandler.FileHandler import FileHandler
     from UM.Scene.SceneNode import SceneNode
+    from .Models.PrinterOutputModel import PrinterOutputModel
+    from .Models.PrinterConfigurationModel import PrinterConfigurationModel
+    from .FirmwareUpdater import FirmwareUpdater
 
 i18n_catalog = i18nCatalog("cura")
 

cura/Scene/CuraSceneController.py

@@ -5,7 +5,7 @@ from PyQt5.QtWidgets import QApplication
 
 from UM.Scene.Camera import Camera
 from cura.UI.ObjectsModel import ObjectsModel
-from cura.UI.MachineModels.MultiBuildPlateModel import MultiBuildPlateModel
+from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
 
 from UM.Application import Application
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator

cura/Settings/MachineManager.py

@@ -23,8 +23,8 @@ from UM.Signal import postponeSignals, CompressTechnique
 
 from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
 from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
-from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
-from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.UI.MaterialOutputModel import MaterialOutputModel
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from cura.Settings.ExtruderManager import ExtruderManager

plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -30,7 +30,7 @@ from .StartSliceJob import StartSliceJob, StartJobResult
 import Arcus
 
 if TYPE_CHECKING:
-    from cura.UI.MachineModels.MultiBuildPlateModel import MultiBuildPlateModel
+    from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
     from cura.Machines.MachineErrorChecker import MachineErrorChecker
     from UM.Scene.Scene import Scene
     from UM.Settings.ContainerStack import ContainerStack

plugins/CuraEngineBackend/ProcessSlicedLayersJob.py

@@ -24,7 +24,7 @@ from cura import LayerPolygon
 
 import numpy
 from time import time
-from cura.UI.ExtrudersModel import ExtrudersModel
+from cura.Machines.Models.ExtrudersModel import ExtrudersModel
 catalog = i18nCatalog("cura")
 
 

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -18,7 +18,7 @@ from UM.Scene.SceneNode import SceneNode
 
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
-from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 
 from .CloudOutputController import CloudOutputController

plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py

@@ -2,8 +2,8 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 from typing import Union, Dict, Optional, Any
 
-from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
-from cura.UI.ExtruderOutputModel import ExtruderOutputModel
+from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.PrinterOutput.Models.ExtruderOutputModel import ExtruderOutputModel
 from .CloudClusterPrinterConfigurationMaterial import CloudClusterPrinterConfigurationMaterial
 from .BaseCloudModel import BaseCloudModel
 

plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py

@@ -2,7 +2,7 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 from typing import List, Optional, Union, Dict, Any
 
-from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
 from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel
 from ...ConfigurationChangeModel import ConfigurationChangeModel
 from ..CloudOutputController import CloudOutputController

plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py

@@ -3,7 +3,7 @@
 from typing import List, Union, Dict, Optional, Any
 
 from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
-from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 from .CloudClusterBuildPlate import CloudClusterBuildPlate
 from .CloudClusterPrintCoreConfiguration import CloudClusterPrintCoreConfiguration
 from .BaseCloudModel import BaseCloudModel

plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py

@@ -19,10 +19,10 @@ from UM.Scene.SceneNode import SceneNode  # For typing.
 from UM.Settings.ContainerRegistry import ContainerRegistry
 
 from cura.CuraApplication import CuraApplication
-from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
-from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
-from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 from cura.UI.MaterialOutputModel import MaterialOutputModel
 from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 

plugins/UM3NetworkPrinting/src/ClusterUM3PrinterOutputController.py

@@ -5,7 +5,7 @@ from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 
 MYPY = False
 if MYPY:
-    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+    from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
 
 class ClusterUM3PrinterOutputController(PrinterOutputController):
     def __init__(self, output_device):

plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py

@@ -2,8 +2,8 @@ from typing import List, Optional
 
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState
-from cura.UI.PrinterOutputModel import PrinterOutputModel
-from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
 from cura.UI.MaterialOutputModel import MaterialOutputModel
 from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
 

plugins/UM3NetworkPrinting/src/LegacyUM3PrinterOutputController.py

@@ -7,8 +7,8 @@ from UM.Version import Version
 
 MYPY = False
 if MYPY:
-    from cura.UI.PrintJobOutputModel import PrintJobOutputModel
-    from cura.UI.PrinterOutputModel import PrinterOutputModel
+    from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
+    from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 
 
 class LegacyUM3PrinterOutputController(PrinterOutputController):

plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py

@@ -5,7 +5,7 @@ from typing import List
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal
 
-from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
 from .ConfigurationChangeModel import ConfigurationChangeModel
 

plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py

@@ -6,7 +6,7 @@ from unittest.mock import patch, MagicMock
 
 from UM.Scene.SceneNode import SceneNode
 from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
-from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 from ...src.Cloud import CloudApiClient
 from ...src.Cloud.CloudOutputDevice import CloudOutputDevice
 from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse

plugins/USBPrinting/USBPrinterOutputDevice.py

@@ -11,8 +11,8 @@ from UM.Qt.Duration import DurationFormat
 
 from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState, ConnectionType
-from cura.UI.PrinterOutputModel import PrinterOutputModel
-from cura.UI.PrintJobOutputModel import PrintJobOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
 from cura.PrinterOutput.GenericOutputController import GenericOutputController
 
 from .AutoDetectBaudJob import AutoDetectBaudJob

tests/Machines/Models/TestDiscoveredPrintersModel.py

@@ -1,9 +1,8 @@
-
 from unittest.mock import MagicMock
 
 import pytest
 
-from cura.UI.MachineModels.DiscoveredPrintersModel import DiscoveredPrintersModel
+from cura.Machines.Models.DiscoveredPrintersModel import DiscoveredPrintersModel
 
 
 @pytest.fixture()

tests/PrinterOutput/Models/TestPrintJobOutputModel.py

@@ -2,9 +2,9 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
-from cura.UI.PrintJobOutputModel import PrintJobOutputModel
-from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 
 test_validate_data_get_set = [
     {"attribute": "compatibleMachineFamilies", "value": ["yay"]},

tests/PrinterOutput/Models/TestPrinterConfigurationModel.py

@@ -4,8 +4,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
-from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
+from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
+from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
 
 test_validate_data_get_set = [
     {"attribute": "extruderConfigurations", "value": [ExtruderConfigurationModel()]},

tests/PrinterOutput/Models/TestPrinterOutputModel.py

@@ -4,8 +4,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from cura.UI.PrintJobOutputModel import PrintJobOutputModel
-from cura.UI.PrinterOutputModel import PrinterOutputModel
+from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel
+from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel
 
 test_validate_data_get_set = [
     {"attribute": "name", "value": "YAY"},

tests/Settings/TestSettingVisibilityPresets.py

@@ -5,7 +5,7 @@ import os.path
 from UM.Preferences import Preferences
 from UM.Resources import Resources
 from cura.CuraApplication import CuraApplication
-from cura.UI.MachineModels.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
+from cura.Machines.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
 from cura.Settings.SettingVisibilityPreset import SettingVisibilityPreset
 
 setting_visibility_preset_test_settings = {"test", "zomg", "derp", "yay", "whoo"}