diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2aa1f8db3a..de5d46ba96 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -57,8 +57,8 @@ from cura.Settings.MachineNameValidator import MachineNameValidator from cura.Machines.Models.BuildPlateModel import BuildPlateModel from cura.Machines.Models.NozzleModel import NozzleModel -from cura.Machines.Models.QualityProfilesModel import QualityProfilesModel -from cura.Machines.Models.CustomQualityProfilesModel import CustomQualityProfilesModel +from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel +from cura.Machines.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel @@ -399,8 +399,8 @@ class CuraApplication(QtApplication): self.getCuraSceneController().setActiveBuildPlate(0) # Initialize - self._quality_profile_model = None - self._custom_quality_profile_model = None + self._quality_profile_drop_down_menu_model = None + self._custom_quality_profile_drop_down_menu_model = None CuraApplication.Created = True @@ -918,15 +918,15 @@ class CuraApplication(QtApplication): def getPrintInformation(self): return self._print_information - def getQualityProfileModel(self, *args, **kwargs): - if self._quality_profile_model is None: - self._quality_profile_model = QualityProfilesModel(self) - return self._quality_profile_model + def getQualityProfilesDropDownMenuModel(self, *args, **kwargs): + if self._quality_profile_drop_down_menu_model is None: + self._quality_profile_drop_down_menu_model = QualityProfilesDropDownMenuModel(self) + return self._quality_profile_drop_down_menu_model - def getCustomQualityProfilesModel(self, *args, **kwargs): - if self._custom_quality_profile_model is None: - self._custom_quality_profile_model = CustomQualityProfilesModel(self) - return self._custom_quality_profile_model + def getCustomQualityProfilesDropDownMenuModel(self, *args, **kwargs): + if self._custom_quality_profile_drop_down_menu_model is None: + self._custom_quality_profile_drop_down_menu_model = CustomQualityProfilesDropDownMenuModel(self) + return self._custom_quality_profile_drop_down_menu_model ## Registers objects for the QML engine to use. # @@ -960,8 +960,10 @@ class CuraApplication(QtApplication): qmlRegisterType(MaterialManagementModel, "Cura", 1, 0, "MaterialManagementModel") qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel") - qmlRegisterSingletonType(QualityProfilesModel, "Cura", 1, 0, "QualityProfilesModel", self.getQualityProfileModel) - qmlRegisterSingletonType(CustomQualityProfilesModel, "Cura", 1, 0, "CustomQualityProfilesModel", self.getCustomQualityProfilesModel) + qmlRegisterSingletonType(QualityProfilesDropDownMenuModel, "Cura", 1, 0, + "QualityProfilesDropDownMenuModel", self.getQualityProfilesDropDownMenuModel) + qmlRegisterSingletonType(CustomQualityProfilesDropDownMenuModel, "Cura", 1, 0, + "CustomQualityProfilesDropDownMenuModel", self.getCustomQualityProfilesDropDownMenuModel) qmlRegisterType(NozzleModel, "Cura", 1, 0, "NozzleModel") qmlRegisterType(MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler") diff --git a/cura/Machines/Models/CustomQualityProfilesModel.py b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py similarity index 87% rename from cura/Machines/Models/CustomQualityProfilesModel.py rename to cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py index 4c88d83fdc..f2b164703f 100644 --- a/cura/Machines/Models/CustomQualityProfilesModel.py +++ b/cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py @@ -4,13 +4,13 @@ from UM.Application import Application from UM.Logger import Logger -from cura.Machines.Models.QualityProfilesModel import QualityProfilesModel +from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel # # This model is used for the custom profile items in the profile drop down menu. # -class CustomQualityProfilesModel(QualityProfilesModel): +class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel): def _update(self): Logger.log("d", "Updating %s ...", self.__class__.__name__) diff --git a/cura/Machines/Models/QualityProfilesModel.py b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py similarity index 98% rename from cura/Machines/Models/QualityProfilesModel.py rename to cura/Machines/Models/QualityProfilesDropDownMenuModel.py index 6452f848ed..30b8634294 100644 --- a/cura/Machines/Models/QualityProfilesModel.py +++ b/cura/Machines/Models/QualityProfilesDropDownMenuModel.py @@ -13,7 +13,7 @@ from cura.Machines.QualityManager import QualityGroup # # QML Model for all built-in quality profiles. This model is used for the drop-down quality menu. # -class QualityProfilesModel(ListModel): +class QualityProfilesDropDownMenuModel(ListModel): NameRole = Qt.UserRole + 1 QualityTypeRole = Qt.UserRole + 2 LayerHeightRole = Qt.UserRole + 3 diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml index 5924ad5322..7a78b7a911 100644 --- a/resources/qml/Menus/ProfileMenu.qml +++ b/resources/qml/Menus/ProfileMenu.qml @@ -13,7 +13,7 @@ Menu Instantiator { - model: Cura.QualityProfilesModel + model: Cura.QualityProfilesDropDownMenuModel MenuItem { @@ -34,18 +34,18 @@ Menu MenuSeparator { id: customSeparator - visible: Cura.CustomQualityProfilesModel.rowCount > 0 + visible: Cura.CustomQualityProfilesDropDownMenuModel.rowCount > 0 } Instantiator { id: customProfileInstantiator - model: Cura.CustomQualityProfilesModel + model: Cura.CustomQualityProfilesDropDownMenuModel Connections { - target: Cura.CustomQualityProfilesModel - onModelReset: customSeparator.visible = Cura.CustomQualityProfilesModel.rowCount() > 0 + target: Cura.CustomQualityProfilesDropDownMenuModel + onModelReset: customSeparator.visible = Cura.CustomQualityProfilesDropDownMenuModel.rowCount() > 0 } MenuItem diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 507091a721..fa8f253452 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -58,7 +58,7 @@ Item running: false repeat: false onTriggered: { - var item = Cura.QualityProfilesModel.getItem(qualitySlider.value); + var item = Cura.QualityProfilesDropDownMenuModel.getItem(qualitySlider.value); Cura.MachineManager.activeQualityGroup = item.quality_group; } } @@ -105,8 +105,8 @@ Item var availableMin = -1 var availableMax = -1 - for (var i = 0; i < Cura.QualityProfilesModel.rowCount(); i++) { - var qualityItem = Cura.QualityProfilesModel.getItem(i) + for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.rowCount(); i++) { + var qualityItem = Cura.QualityProfilesDropDownMenuModel.getItem(i) // Add each quality item to the UI quality model qualityModel.append(qualityItem) @@ -168,7 +168,7 @@ Item qualityModel.existingQualityProfile = 0 // check, the ticks count cannot be less than zero - qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesModel.rowCount() - 1) + qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.rowCount() - 1) } } @@ -194,13 +194,13 @@ Item anchors.verticalCenter: parent.verticalCenter anchors.top: parent.top anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2) - color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") + color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") text: { var result = "" if(Cura.MachineManager.activeMachine != null) { - result = Cura.QualityProfilesModel.getItem(index).layer_height_without_unit + result = Cura.QualityProfilesDropDownMenuModel.getItem(index).layer_height_without_unit if(result == undefined) { @@ -265,7 +265,7 @@ Item Rectangle { anchors.verticalCenter: parent.verticalCenter - color: Cura.QualityProfilesModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") + color: Cura.QualityProfilesDropDownMenuModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") width: 1 * screenScaleFactor height: 6 * screenScaleFactor y: 0 @@ -403,9 +403,9 @@ Item // if the current profile is user-created, switch to a built-in quality if (Cura.SimpleModeSettingsManager.isProfileUserCreated) { - if (Cura.QualityProfilesModel.rowCount() > 0) + if (Cura.QualityProfilesDropDownMenuModel.rowCount() > 0) { - var item = Cura.QualityProfilesModel.getItem(0); + var item = Cura.QualityProfilesDropDownMenuModel.getItem(0); Cura.MachineManager.activeQualityGroup = item.quality_group; } }