diff --git a/pype/settings/entities/base_entity.py b/pype/settings/entities/base_entity.py index 839ec01554..4bbafde841 100644 --- a/pype/settings/entities/base_entity.py +++ b/pype/settings/entities/base_entity.py @@ -356,7 +356,7 @@ class BaseEntity: pass @abstractmethod - def set_studio_default(self): + def add_to_studio_default(self): """Item's implementation to set current values as studio's overrides. Mark item and it's children as they have studio overrides. @@ -638,6 +638,10 @@ class RootEntity(BaseEntity): for child_obj in self.non_gui_children.values(): child_obj.discard_changes(on_change_trigger) + def add_to_studio_default(self): + for child_obj in self.non_gui_children.values(): + child_obj.add_to_studio_default() + def _remove_overrides(self): for child_obj in self.non_gui_children.values(): child_obj.remove_overrides() @@ -650,10 +654,6 @@ class RootEntity(BaseEntity): for child_obj in self.non_gui_children.values(): child_obj.set_as_overriden() - def set_studio_default(self): - for child_obj in self.non_gui_children.values(): - child_obj.set_studio_default() - def save(self): if self.override_state is OverrideState.NOT_DEFINED: raise ValueError( diff --git a/pype/settings/entities/dict_immutable_keys_entity.py b/pype/settings/entities/dict_immutable_keys_entity.py index b6230a403f..808d9cfbea 100644 --- a/pype/settings/entities/dict_immutable_keys_entity.py +++ b/pype/settings/entities/dict_immutable_keys_entity.py @@ -412,13 +412,13 @@ class DictImmutableKeysEntity(ItemEntity): self.ignore_child_changes = False - def set_studio_default(self): + def add_to_studio_default(self): if self.override_state is not OverrideState.STUDIO: return self.ignore_child_changes = True for child_obj in self.non_gui_children.values(): - child_obj.set_studio_default() + child_obj.add_to_studio_default() self.ignore_child_changes = False self.parent.on_child_change(self) diff --git a/pype/settings/entities/dict_mutable_keys_entity.py b/pype/settings/entities/dict_mutable_keys_entity.py index 7cf260f6b2..3112133b82 100644 --- a/pype/settings/entities/dict_mutable_keys_entity.py +++ b/pype/settings/entities/dict_mutable_keys_entity.py @@ -425,7 +425,7 @@ class DictMutableKeysEntity(ItemEntity): self.set_override_state(self.override_state) on_change_trigger.append(self.on_change) - def set_studio_default(self): + def add_to_studio_default(self): if self.override_state is not OverrideState.STUDIO: return self._has_studio_override = True diff --git a/pype/settings/entities/input_entities.py b/pype/settings/entities/input_entities.py index c1ed271378..543a101368 100644 --- a/pype/settings/entities/input_entities.py +++ b/pype/settings/entities/input_entities.py @@ -252,7 +252,7 @@ class InputEntity(ItemEntity): raise NotImplementedError("BUG: Unexcpected part of code.") - def set_studio_default(self): + def add_to_studio_default(self): if self.override_state is not OverrideState.STUDIO: return self._has_studio_override = True diff --git a/pype/settings/entities/item_entities.py b/pype/settings/entities/item_entities.py index c10878931d..6ec1149e4e 100644 --- a/pype/settings/entities/item_entities.py +++ b/pype/settings/entities/item_entities.py @@ -70,7 +70,7 @@ save ## Action calls - last to implement discard_changes -set_studio_default +add_to_studio_default reset_to_pype_default remove_overrides set_as_overriden @@ -194,7 +194,7 @@ class GUIEntity(ItemEntity): _reset_to_pype_default = None _remove_overrides = None set_as_overriden = None - set_studio_default = None + add_to_studio_default = None update_default_value = None update_studio_values = None update_project_values = None @@ -372,6 +372,9 @@ class PathEntity(ItemEntity): def _discard_changes(self, *args): self.child_obj.discard_changes(*args) + def add_to_studio_default(self): + self.child_obj.add_to_studio_default() + def _remove_overrides(self, *args): self.child_obj.remove_overrides(*args) self._has_project_override = False @@ -383,9 +386,6 @@ class PathEntity(ItemEntity): def set_as_overriden(self): self.child_obj.set_as_overriden() - def set_studio_default(self): - self.child_obj.set_studio_default() - def reset_callbacks(self): super(PathEntity, self).reset_callbacks() self.child_obj.reset_callbacks() @@ -527,7 +527,7 @@ class ListStrictEntity(ItemEntity): for child_obj in self.children: child_obj.discard_changes(on_change_trigger) - def set_studio_default(self): + def add_to_studio_default(self): if self.override_state is not OverrideState.STUDIO: return self._has_studio_override = True diff --git a/pype/settings/entities/list_entity.py b/pype/settings/entities/list_entity.py index 6de0facc69..64404ac121 100644 --- a/pype/settings/entities/list_entity.py +++ b/pype/settings/entities/list_entity.py @@ -367,7 +367,7 @@ class ListEntity(ItemEntity): on_change_trigger.append(self.on_change) - def set_studio_default(self): + def add_to_studio_default(self): if self.override_state is not OverrideState.STUDIO: return self._has_studio_override = True diff --git a/pype/tools/settings/settings/widgets/base.py b/pype/tools/settings/settings/widgets/base.py index 1691c3b548..e41c31c749 100644 --- a/pype/tools/settings/settings/widgets/base.py +++ b/pype/tools/settings/settings/widgets/base.py @@ -112,7 +112,7 @@ class BaseWidget(QtWidgets.QWidget): actions_mapping[action] = reset_to_pype_default menu.addAction(action) - def _set_studio_default(self, menu, actions_mapping): + def _add_to_studio_default(self, menu, actions_mapping): """Set values as studio overrides.""" # Skip if not in studio overrides if self.entity.override_state is not OverrideState.STUDIO: @@ -128,8 +128,8 @@ class BaseWidget(QtWidgets.QWidget): return # TODO better label - action = QtWidgets.QAction("Set studio default") - actions_mapping[action] = self.entity.set_studio_default + action = QtWidgets.QAction("Add to studio default") + actions_mapping[action] = self.entity.add_to_studio_default menu.addAction(action) def _remove_project_override_action(self, menu, actions_mapping): @@ -167,9 +167,9 @@ class BaseWidget(QtWidgets.QWidget): actions_mapping = {} self._discard_changes_action(menu, actions_mapping) - self._set_project_override_action(menu, actions_mapping) + self._add_to_studio_default(menu, actions_mapping) self._reset_to_pype_default_action(menu, actions_mapping) - self._set_studio_default(menu, actions_mapping) + self._set_project_override_action(menu, actions_mapping) self._remove_project_override_action(menu, actions_mapping) if not actions_mapping: