mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-24 23:23:57 -06:00
Spelling fix: Overriden -> Overridden
I think some of us got the spelling of this word wrong in their heads.
This commit is contained in:
parent
932a5c8fc9
commit
bd1712cb10
5 changed files with 13 additions and 13 deletions
|
@ -34,7 +34,7 @@ class PerObjectContainerStack(CuraContainerStack):
|
||||||
if limit_to_extruder is not None:
|
if limit_to_extruder is not None:
|
||||||
limit_to_extruder = str(limit_to_extruder)
|
limit_to_extruder = str(limit_to_extruder)
|
||||||
|
|
||||||
# if this stack has the limit_to_extruder "not overriden", use the original limit_to_extruder as the current
|
# if this stack has the limit_to_extruder "not overridden", use the original limit_to_extruder as the current
|
||||||
# limit_to_extruder, so the values retrieved will be from the perspective of the original limit_to_extruder
|
# limit_to_extruder, so the values retrieved will be from the perspective of the original limit_to_extruder
|
||||||
# stack.
|
# stack.
|
||||||
if limit_to_extruder == "-1":
|
if limit_to_extruder == "-1":
|
||||||
|
@ -42,7 +42,7 @@ class PerObjectContainerStack(CuraContainerStack):
|
||||||
limit_to_extruder = context.context["original_limit_to_extruder"]
|
limit_to_extruder = context.context["original_limit_to_extruder"]
|
||||||
|
|
||||||
if limit_to_extruder is not None and limit_to_extruder != "-1" and limit_to_extruder in global_stack.extruders:
|
if limit_to_extruder is not None and limit_to_extruder != "-1" and limit_to_extruder in global_stack.extruders:
|
||||||
# set the original limit_to_extruder if this is the first stack that has a non-overriden limit_to_extruder
|
# set the original limit_to_extruder if this is the first stack that has a non-overridden limit_to_extruder
|
||||||
if "original_limit_to_extruder" not in context.context:
|
if "original_limit_to_extruder" not in context.context:
|
||||||
context.context["original_limit_to_extruder"] = limit_to_extruder
|
context.context["original_limit_to_extruder"] = limit_to_extruder
|
||||||
|
|
||||||
|
|
|
@ -259,7 +259,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
|
||||||
instance_container_files = [name for name in cura_file_names if name.endswith(self._instance_container_suffix)]
|
instance_container_files = [name for name in cura_file_names if name.endswith(self._instance_container_suffix)]
|
||||||
quality_name = ""
|
quality_name = ""
|
||||||
custom_quality_name = ""
|
custom_quality_name = ""
|
||||||
num_settings_overriden_by_quality_changes = 0 # How many settings are changed by the quality changes
|
num_settings_overridden_by_quality_changes = 0 # How many settings are changed by the quality changes
|
||||||
num_user_settings = 0
|
num_user_settings = 0
|
||||||
quality_changes_conflict = False
|
quality_changes_conflict = False
|
||||||
|
|
||||||
|
@ -297,7 +297,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
|
||||||
|
|
||||||
custom_quality_name = parser["general"]["name"]
|
custom_quality_name = parser["general"]["name"]
|
||||||
values = parser["values"] if parser.has_section("values") else dict()
|
values = parser["values"] if parser.has_section("values") else dict()
|
||||||
num_settings_overriden_by_quality_changes += len(values)
|
num_settings_overridden_by_quality_changes += len(values)
|
||||||
# Check if quality changes already exists.
|
# Check if quality changes already exists.
|
||||||
quality_changes = self._container_registry.findInstanceContainers(name = custom_quality_name,
|
quality_changes = self._container_registry.findInstanceContainers(name = custom_quality_name,
|
||||||
type = "quality_changes")
|
type = "quality_changes")
|
||||||
|
@ -515,7 +515,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
|
||||||
self._dialog.setNumVisibleSettings(num_visible_settings)
|
self._dialog.setNumVisibleSettings(num_visible_settings)
|
||||||
self._dialog.setQualityName(quality_name)
|
self._dialog.setQualityName(quality_name)
|
||||||
self._dialog.setQualityType(quality_type)
|
self._dialog.setQualityType(quality_type)
|
||||||
self._dialog.setNumSettingsOverridenByQualityChanges(num_settings_overriden_by_quality_changes)
|
self._dialog.setNumSettingsOverriddenByQualityChanges(num_settings_overridden_by_quality_changes)
|
||||||
self._dialog.setNumUserSettings(num_user_settings)
|
self._dialog.setNumUserSettings(num_user_settings)
|
||||||
self._dialog.setActiveMode(active_mode)
|
self._dialog.setActiveMode(active_mode)
|
||||||
self._dialog.setMachineName(machine_name)
|
self._dialog.setMachineName(machine_name)
|
||||||
|
|
|
@ -41,7 +41,7 @@ class WorkspaceDialog(QObject):
|
||||||
self._num_user_settings = 0
|
self._num_user_settings = 0
|
||||||
self._active_mode = ""
|
self._active_mode = ""
|
||||||
self._quality_name = ""
|
self._quality_name = ""
|
||||||
self._num_settings_overriden_by_quality_changes = 0
|
self._num_settings_overridden_by_quality_changes = 0
|
||||||
self._quality_type = ""
|
self._quality_type = ""
|
||||||
self._machine_name = ""
|
self._machine_name = ""
|
||||||
self._machine_type = ""
|
self._machine_type = ""
|
||||||
|
@ -151,11 +151,11 @@ class WorkspaceDialog(QObject):
|
||||||
|
|
||||||
@pyqtProperty(int, notify=numSettingsOverridenByQualityChangesChanged)
|
@pyqtProperty(int, notify=numSettingsOverridenByQualityChangesChanged)
|
||||||
def numSettingsOverridenByQualityChanges(self):
|
def numSettingsOverridenByQualityChanges(self):
|
||||||
return self._num_settings_overriden_by_quality_changes
|
return self._num_settings_overridden_by_quality_changes
|
||||||
|
|
||||||
def setNumSettingsOverridenByQualityChanges(self, num_settings_overriden_by_quality_changes):
|
def setNumSettingsOverriddenByQualityChanges(self, num_settings_overridden_by_quality_changes):
|
||||||
self._num_settings_overriden_by_quality_changes = num_settings_overriden_by_quality_changes
|
self._num_settings_overridden_by_quality_changes = num_settings_overridden_by_quality_changes
|
||||||
self.numSettingsOverridenByQualityChangesChanged.emit()
|
self.numSettingsOverriddenByQualityChangesChanged.emit()
|
||||||
|
|
||||||
@pyqtProperty(str, notify=qualityNameChanged)
|
@pyqtProperty(str, notify=qualityNameChanged)
|
||||||
def qualityName(self):
|
def qualityName(self):
|
||||||
|
|
|
@ -64,7 +64,7 @@ Item
|
||||||
|
|
||||||
if(!propertyProvider.isValueUsed)
|
if(!propertyProvider.isValueUsed)
|
||||||
{
|
{
|
||||||
tooltip += "<i>%1</i><br/><br/>".arg(catalog.i18nc("@label", "This setting is not used because all the settings that it influences are overriden."))
|
tooltip += "<i>%1</i><br/><br/>".arg(catalog.i18nc("@label", "This setting is not used because all the settings that it influences are overridden."))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (affects_list != "")
|
if (affects_list != "")
|
||||||
|
@ -218,7 +218,7 @@ Item
|
||||||
|
|
||||||
UM.SimpleButton
|
UM.SimpleButton
|
||||||
{
|
{
|
||||||
// This button shows when the setting has an inherited function, but is overriden by profile.
|
// This button shows when the setting has an inherited function, but is overridden by profile.
|
||||||
id: inheritButton
|
id: inheritButton
|
||||||
// Inherit button needs to be visible if;
|
// Inherit button needs to be visible if;
|
||||||
// - User made changes that override any loaded settings
|
// - User made changes that override any loaded settings
|
||||||
|
|
|
@ -45,7 +45,7 @@ SettingItem
|
||||||
{
|
{
|
||||||
if (propertyProvider.properties.value == -1)
|
if (propertyProvider.properties.value == -1)
|
||||||
{
|
{
|
||||||
control.currentIndex = model.count - 1; // we know the last item is "Not overriden"
|
control.currentIndex = model.count - 1; // we know the last item is "Not overridden"
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue