refactoring of settings for more explicitly communicated attributes

2025-12-26 13:52:15 +01:00 · 2023-04-12 17:25:41 +02:00 · 2023-04-12 17:25:41 +02:00 · ae0d6dd1b5
commit ae0d6dd1b5
parent 7c54d42735
38 changed files with 139 additions and 133 deletions
--- a/openpype/settings/defaults/project_settings/aftereffects.json
+++ b/openpype/settings/defaults/project_settings/aftereffects.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/blender.json
+++ b/openpype/settings/defaults/project_settings/blender.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/celaction.json
+++ b/openpype/settings/defaults/project_settings/celaction.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/flame.json
+++ b/openpype/settings/defaults/project_settings/flame.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": true,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        },
        "project": {
--- a/openpype/settings/defaults/project_settings/fusion.json
+++ b/openpype/settings/defaults/project_settings/fusion.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        },
        "ocio": {
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@ -7,7 +7,6 @@
            ]
        },
        "file_rules": {
-            "enabled": false,
            "rules": {
                "example": {
                    "pattern": ".*(beauty).*",
--- a/openpype/settings/defaults/project_settings/harmony.json
+++ b/openpype/settings/defaults/project_settings/harmony.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/hiero.json
+++ b/openpype/settings/defaults/project_settings/hiero.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        },
        "workfile": {
--- a/openpype/settings/defaults/project_settings/houdini.json
+++ b/openpype/settings/defaults/project_settings/houdini.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/max.json
+++ b/openpype/settings/defaults/project_settings/max.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@ -1,13 +1,13 @@
 {
    "open_workfile_post_initialization": false,
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        },
        "colorManagementPreference_v2": {
--- a/openpype/settings/defaults/project_settings/nuke.json
+++ b/openpype/settings/defaults/project_settings/nuke.json
@ -9,13 +9,13 @@
        }
    },
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        },
        "viewer": {
@ -27,11 +27,6 @@
        "workfile": {
            "colorManagement": "Nuke",
            "OCIO_config": "nuke-default",
-            "customOCIOConfigPath": {
-                "windows": [],
-                "darwin": [],
-                "linux": []
-            },
            "workingSpaceLUT": "linear",
            "monitorLut": "sRGB",
            "int8Lut": "sRGB",
--- a/openpype/settings/defaults/project_settings/photoshop.json
+++ b/openpype/settings/defaults/project_settings/photoshop.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/resolve.json
+++ b/openpype/settings/defaults/project_settings/resolve.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/tvpaint.json
+++ b/openpype/settings/defaults/project_settings/tvpaint.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/unreal.json
+++ b/openpype/settings/defaults/project_settings/unreal.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/defaults/project_settings/webpublisher.json
+++ b/openpype/settings/defaults/project_settings/webpublisher.json
@ -1,12 +1,12 @@
 {
    "imageio": {
-        "enabled": false,
+        "activate_host_color_management": true,
        "ocio_config": {
-            "enabled": false,
+            "override_global_config": false,
            "filepath": []
        },
        "file_rules": {
-            "enabled": false,
+            "override_global_rules": false,
            "rules": {}
        }
    },
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_flame.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_flame.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_fusion.json
@ -10,12 +10,12 @@
            "type": "dict",
            "label": "Color Management (ImageIO)",
            "collapsible": true,
-            "checkbox_key": "enabled",
+            "is_group": true,
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_global.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_global.json
@ -27,8 +27,39 @@
                    ]
                },
                {
-                    "type": "schema",
-                    "name": "schema_imageio_file_rules"
+                    "key": "file_rules",
+                    "type": "dict",
+                    "label": "File Rules",
+                    "collapsible": true,
+                    "children": [
+                        {
+                            "key": "rules",
+                            "label": "Rules",
+                            "type": "dict-modifiable",
+                            "highlight_content": true,
+                            "collapsible": false,
+                            "object_type": {
+                                "type": "dict",
+                                "children": [
+                                    {
+                                        "key": "pattern",
+                                        "label": "Regex pattern",
+                                        "type": "text"
+                                    },
+                                    {
+                                        "key": "colorspace",
+                                        "label": "Colorspace name",
+                                        "type": "text"
+                                    },
+                                    {
+                                        "key": "ext",
+                                        "label": "File extension",
+                                        "type": "text"
+                                    }
+                                ]
+                            }
+                        }
+                    ]
                }

            ]
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_harmony.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_harmony.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
@ -9,14 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
-            "is_group": true,
            "collapsible": true,
-            "checkbox_key": "enabled",
+            "is_group": true,
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_houdini.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_houdini.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@ -16,12 +16,11 @@
            "label": "Color Management (ImageIO)",
            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_photoshop.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_resolve.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_resolve.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_unreal.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_unreal.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_webpublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_webpublisher.json
@ -9,13 +9,13 @@
            "key": "imageio",
            "type": "dict",
            "label": "Color Management (ImageIO)",
+            "collapsible": true,
            "is_group": true,
-            "checkbox_key": "enabled",
            "children": [
                {
                    "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
+                    "key": "activate_host_color_management",
+                    "label": "Enable Color Management in host"
                },
                {
                    "type": "schema",
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_imageio_config.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_imageio_config.json
@ -3,12 +3,11 @@
    "type": "dict",
    "label": "OCIO config",
    "collapsible": true,
-    "checkbox_key": "enabled",
    "children": [
        {
            "type": "boolean",
-            "key": "enabled",
-            "label": "Enabled"
+            "key": "override_global_config",
+            "label": "Override global OCIO config"
        },
        {
            "type": "path",
@ -18,4 +17,4 @@
            "multipath": true
        }
    ]
-}
+}
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_imageio_file_rules.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_imageio_file_rules.json
@ -3,12 +3,11 @@
    "type": "dict",
    "label": "File Rules",
    "collapsible": true,
-    "checkbox_key": "enabled",
    "children": [
        {
            "type": "boolean",
-            "key": "enabled",
-            "label": "Enabled"
+            "key": "override_global_rules",
+            "label": "Override global file rules"
        },
        {
            "key": "rules",
@ -38,4 +37,4 @@
            }
        }
    ]
-}
+}
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json
@ -4,16 +4,11 @@
    "label": "Color Management (ImageIO)",
    "collapsible": true,
    "is_group": true,
-    "checkbox_key": "enabled",
    "children": [
        {
            "type": "boolean",
-            "key": "enabled",
-            "label": "Enabled"
-        },
-        {
-            "type": "label",
-            "label": "<b style='color:red'>'Custom OCIO config path'</b> has deprecated. <br> If you need to set custom config, just enable and add path into 'OCIO config'. <br>Anatomy keys are supported.</i>."
+            "key": "activate_host_color_management",
+            "label": "Enable Color Management in host"
        },
        {
            "type": "schema",
@ -108,19 +103,9 @@
                                },
                                {
                                    "cg-config-v1.0.0_aces-v1.3_ocio-v2.1": "cg-config-v1.0.0_aces-v1.3_ocio-v2.1 (14)"
-                                },
-                                {
-                                    "custom": "custom"
                                }
                            ]
                        },
-                        {
-                            "type": "path",
-                            "key": "customOCIOConfigPath",
-                            "label": "Custom OCIO config path",
-                            "multiplatform": true,
-                            "multipath": true
-                        },
                        {
                            "type": "text",
                            "key": "workingSpaceLUT",