From 2d9cd37e2c20ebeea4558380041177643c40c2b4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 24 Feb 2021 11:31:00 +0100 Subject: [PATCH] entities already using label wrap set their defaults --- pype/settings/entities/dict_immutable_keys_entity.py | 10 +++++----- pype/settings/entities/dict_mutable_keys_entity.py | 8 ++++++-- pype/settings/entities/list_entity.py | 11 +++++------ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pype/settings/entities/dict_immutable_keys_entity.py b/pype/settings/entities/dict_immutable_keys_entity.py index 854c904f3c..f6cd629d10 100644 --- a/pype/settings/entities/dict_immutable_keys_entity.py +++ b/pype/settings/entities/dict_immutable_keys_entity.py @@ -27,6 +27,11 @@ class DictImmutableKeysEntity(ItemEntity): are not real settings values but entities representing the value. """ schema_types = ["dict"] + _default_label_wrap = { + "use_label_wrap": True, + "collapsible": True, + "collapsed": True + } def __getitem__(self, key): """Return entity inder key.""" @@ -169,11 +174,6 @@ class DictImmutableKeysEntity(ItemEntity): "highlight_content", False ) self.show_borders = self.schema_data.get("show_borders", True) - self.collapsible = self.schema_data.get("collapsible", True) - self.collapsed = self.schema_data.get("collapsed", True) - - # Not yet implemented - self.use_label_wrap = self.schema_data.get("use_label_wrap") or True def get_child_path(self, child_obj): """Get hierarchical path of child entity. diff --git a/pype/settings/entities/dict_mutable_keys_entity.py b/pype/settings/entities/dict_mutable_keys_entity.py index 8fe71db2a3..2fd2b87311 100644 --- a/pype/settings/entities/dict_mutable_keys_entity.py +++ b/pype/settings/entities/dict_mutable_keys_entity.py @@ -29,6 +29,12 @@ class DictMutableKeysEntity(EndpointEntity): - clear callbacks """ schema_types = ["dict-modifiable"] + _default_label_wrap = { + "use_label_wrap": True, + "collapsible": True, + "collapsed": True + } + _miss_arg = object() def __getitem__(self, key): @@ -174,8 +180,6 @@ class DictMutableKeysEntity(EndpointEntity): self.hightlight_content = ( self.schema_data.get("highlight_content") or False ) - self.collapsible = self.schema_data.get("collapsible", True) - self.collapsed = self.schema_data.get("collapsed", True) object_type = self.schema_data["object_type"] if not isinstance(object_type, dict): diff --git a/pype/settings/entities/list_entity.py b/pype/settings/entities/list_entity.py index 07221929b7..752347489a 100644 --- a/pype/settings/entities/list_entity.py +++ b/pype/settings/entities/list_entity.py @@ -15,6 +15,11 @@ from .exceptions import ( class ListEntity(EndpointEntity): schema_types = ["list"] + _default_label_wrap = { + "use_label_wrap": False, + "collapsible": True, + "collapsed": False + } def __iter__(self): for item in self.children: @@ -139,12 +144,6 @@ class ListEntity(EndpointEntity): # Value that was set on set_override_state self.initial_value = [] - # GUI attributes - self.use_label_wrap = self.schema_data.get("use_label_wrap") or False - # Used only if `use_label_wrap` is set to True - self.collapsible = self.schema_data.get("collapsible") or True - self.collapsed = self.schema_data.get("collapsed") or False - def schema_validations(self): super(ListEntity, self).schema_validations()