From 1f7449f3e170c3c980793ab4da6ee2eab5fdd99a Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Tue, 24 Oct 2023 20:00:09 +0200 Subject: [PATCH] Moved and cleaned --- .../ui/elements/properties/hover_alpha.json | 5 --- .../ui/elements/properties/hover_color.json | 5 --- .../ui/elements/properties/locked_alpha.json | 5 --- .../ui/elements/properties/locked_color.json | 5 --- .../ui/elements/properties/pressed_alpha.json | 5 --- .../ui/elements/properties/pressed_color.json | 5 --- .../properties/prevent_touch_input.json | 5 --- .../elements/properties/propagate_alpha.json | 5 --- .../control_header.json} | 0 .../control_type_order_priority.json} | 0 .../ignore_count.json} | 0 .../ignore_subsections.json} | 0 .../index_priority.json} | 0 .../inherit_siblings.json} | 0 .../{tts_name.json => tss/name.json} | 0 .../override_control_value.json} | 0 .../section_header.json} | 0 .../toggle_off.json} | 0 .../toggle_on.json} | 0 .../value_changed.json} | 0 .../value_order_priority.json} | 0 source/resource/ui/ui.json | 42 +++++++++---------- 22 files changed, 21 insertions(+), 61 deletions(-) delete mode 100644 source/resource/ui/elements/properties/hover_alpha.json delete mode 100644 source/resource/ui/elements/properties/hover_color.json delete mode 100644 source/resource/ui/elements/properties/locked_alpha.json delete mode 100644 source/resource/ui/elements/properties/locked_color.json delete mode 100644 source/resource/ui/elements/properties/pressed_alpha.json delete mode 100644 source/resource/ui/elements/properties/pressed_color.json delete mode 100644 source/resource/ui/elements/properties/prevent_touch_input.json delete mode 100644 source/resource/ui/elements/properties/propagate_alpha.json rename source/resource/ui/elements/properties/{tts_control_header.json => tss/control_header.json} (100%) rename source/resource/ui/elements/properties/{tts_control_type_order_priority.json => tss/control_type_order_priority.json} (100%) rename source/resource/ui/elements/properties/{tts_ignore_count.json => tss/ignore_count.json} (100%) rename source/resource/ui/elements/properties/{tts_ignore_subsections.json => tss/ignore_subsections.json} (100%) rename source/resource/ui/elements/properties/{tts_index_priority.json => tss/index_priority.json} (100%) rename source/resource/ui/elements/properties/{tts_inherit_siblings.json => tss/inherit_siblings.json} (100%) rename source/resource/ui/elements/properties/{tts_name.json => tss/name.json} (100%) rename source/resource/ui/elements/properties/{tts_override_control_value.json => tss/override_control_value.json} (100%) rename source/resource/ui/elements/properties/{tts_section_header.json => tss/section_header.json} (100%) rename source/resource/ui/elements/properties/{tts_toggle_off.json => tss/toggle_off.json} (100%) rename source/resource/ui/elements/properties/{tts_toggle_on.json => tss/toggle_on.json} (100%) rename source/resource/ui/elements/properties/{tts_value_changed.json => tss/value_changed.json} (100%) rename source/resource/ui/elements/properties/{tts_value_order_priority.json => tss/value_order_priority.json} (100%) diff --git a/source/resource/ui/elements/properties/hover_alpha.json b/source/resource/ui/elements/properties/hover_alpha.json deleted file mode 100644 index 1dfaacf9..00000000 --- a/source/resource/ui/elements/properties/hover_alpha.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Hover Alpha", - "description": "The alpha of the text when hovered.", - "$ref": "../../general/number.json" -} diff --git a/source/resource/ui/elements/properties/hover_color.json b/source/resource/ui/elements/properties/hover_color.json deleted file mode 100644 index d6f437ed..00000000 --- a/source/resource/ui/elements/properties/hover_color.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Hover Color", - "description": "The color of the text when hovered. This can be a hex color code or a color keyword.", - "$ref": "../../general/color.json" -} diff --git a/source/resource/ui/elements/properties/locked_alpha.json b/source/resource/ui/elements/properties/locked_alpha.json deleted file mode 100644 index ddf08e6b..00000000 --- a/source/resource/ui/elements/properties/locked_alpha.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Locked Alpha", - "description": "The alpha of the text when locked.", - "$ref": "../../general/number.json" -} diff --git a/source/resource/ui/elements/properties/locked_color.json b/source/resource/ui/elements/properties/locked_color.json deleted file mode 100644 index 31aa864f..00000000 --- a/source/resource/ui/elements/properties/locked_color.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Locked Color", - "description": "The color of the text when locked. This can be a hex color code or a color keyword.", - "$ref": "../../general/color.json" -} diff --git a/source/resource/ui/elements/properties/pressed_alpha.json b/source/resource/ui/elements/properties/pressed_alpha.json deleted file mode 100644 index de719df4..00000000 --- a/source/resource/ui/elements/properties/pressed_alpha.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Pressed Alpha", - "description": "The alpha of the text when pressed.", - "$ref": "../../general/number.json" -} diff --git a/source/resource/ui/elements/properties/pressed_color.json b/source/resource/ui/elements/properties/pressed_color.json deleted file mode 100644 index 2cdb6ac3..00000000 --- a/source/resource/ui/elements/properties/pressed_color.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Pressed Color", - "description": "The color of the text when pressed. This can be a hex color code or a color keyword.", - "$ref": "../../general/color.json" -} diff --git a/source/resource/ui/elements/properties/prevent_touch_input.json b/source/resource/ui/elements/properties/prevent_touch_input.json deleted file mode 100644 index 7b176dd2..00000000 --- a/source/resource/ui/elements/properties/prevent_touch_input.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Prevent Touch Input", - "description": "If true, the element will prevent touch input.", - "$ref": "../../general/boolean.json" -} diff --git a/source/resource/ui/elements/properties/propagate_alpha.json b/source/resource/ui/elements/properties/propagate_alpha.json deleted file mode 100644 index 04f4d63b..00000000 --- a/source/resource/ui/elements/properties/propagate_alpha.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Propagate Alpha", - "description": "If true, the alpha will be propagated.", - "$ref": "../../general/boolean.json" -} diff --git a/source/resource/ui/elements/properties/tts_control_header.json b/source/resource/ui/elements/properties/tss/control_header.json similarity index 100% rename from source/resource/ui/elements/properties/tts_control_header.json rename to source/resource/ui/elements/properties/tss/control_header.json diff --git a/source/resource/ui/elements/properties/tts_control_type_order_priority.json b/source/resource/ui/elements/properties/tss/control_type_order_priority.json similarity index 100% rename from source/resource/ui/elements/properties/tts_control_type_order_priority.json rename to source/resource/ui/elements/properties/tss/control_type_order_priority.json diff --git a/source/resource/ui/elements/properties/tts_ignore_count.json b/source/resource/ui/elements/properties/tss/ignore_count.json similarity index 100% rename from source/resource/ui/elements/properties/tts_ignore_count.json rename to source/resource/ui/elements/properties/tss/ignore_count.json diff --git a/source/resource/ui/elements/properties/tts_ignore_subsections.json b/source/resource/ui/elements/properties/tss/ignore_subsections.json similarity index 100% rename from source/resource/ui/elements/properties/tts_ignore_subsections.json rename to source/resource/ui/elements/properties/tss/ignore_subsections.json diff --git a/source/resource/ui/elements/properties/tts_index_priority.json b/source/resource/ui/elements/properties/tss/index_priority.json similarity index 100% rename from source/resource/ui/elements/properties/tts_index_priority.json rename to source/resource/ui/elements/properties/tss/index_priority.json diff --git a/source/resource/ui/elements/properties/tts_inherit_siblings.json b/source/resource/ui/elements/properties/tss/inherit_siblings.json similarity index 100% rename from source/resource/ui/elements/properties/tts_inherit_siblings.json rename to source/resource/ui/elements/properties/tss/inherit_siblings.json diff --git a/source/resource/ui/elements/properties/tts_name.json b/source/resource/ui/elements/properties/tss/name.json similarity index 100% rename from source/resource/ui/elements/properties/tts_name.json rename to source/resource/ui/elements/properties/tss/name.json diff --git a/source/resource/ui/elements/properties/tts_override_control_value.json b/source/resource/ui/elements/properties/tss/override_control_value.json similarity index 100% rename from source/resource/ui/elements/properties/tts_override_control_value.json rename to source/resource/ui/elements/properties/tss/override_control_value.json diff --git a/source/resource/ui/elements/properties/tts_section_header.json b/source/resource/ui/elements/properties/tss/section_header.json similarity index 100% rename from source/resource/ui/elements/properties/tts_section_header.json rename to source/resource/ui/elements/properties/tss/section_header.json diff --git a/source/resource/ui/elements/properties/tts_toggle_off.json b/source/resource/ui/elements/properties/tss/toggle_off.json similarity index 100% rename from source/resource/ui/elements/properties/tts_toggle_off.json rename to source/resource/ui/elements/properties/tss/toggle_off.json diff --git a/source/resource/ui/elements/properties/tts_toggle_on.json b/source/resource/ui/elements/properties/tss/toggle_on.json similarity index 100% rename from source/resource/ui/elements/properties/tts_toggle_on.json rename to source/resource/ui/elements/properties/tss/toggle_on.json diff --git a/source/resource/ui/elements/properties/tts_value_changed.json b/source/resource/ui/elements/properties/tss/value_changed.json similarity index 100% rename from source/resource/ui/elements/properties/tts_value_changed.json rename to source/resource/ui/elements/properties/tss/value_changed.json diff --git a/source/resource/ui/elements/properties/tts_value_order_priority.json b/source/resource/ui/elements/properties/tss/value_order_priority.json similarity index 100% rename from source/resource/ui/elements/properties/tts_value_order_priority.json rename to source/resource/ui/elements/properties/tss/value_order_priority.json diff --git a/source/resource/ui/ui.json b/source/resource/ui/ui.json index b62d1111..9de3e3f2 100644 --- a/source/resource/ui/ui.json +++ b/source/resource/ui/ui.json @@ -133,8 +133,8 @@ "handle_deselect": { "$ref": "./elements/properties/handle_deselect.json" }, "handle_select": { "$ref": "./elements/properties/handle_select.json" }, "hide_hyphen": { "$ref": "./elements/properties/hide_hyphen.json" }, - "hover_alpha": { "$ref": "./elements/properties/hover_alpha.json" }, - "hover_color": { "$ref": "./elements/properties/hover_color.json" }, + "hover_alpha": { "$ref": "./elements/properties/alpha.json" }, + "hover_color": { "$ref": "./elements/properties/color.json" }, "hover_control": { "$ref": "./elements/properties/hover_control.json" }, "hover_enabled": { "$ref": "./elements/properties/hover_enabled.json" }, "ignored": { "$ref": "./elements/properties/ignored.json" }, @@ -148,8 +148,8 @@ "keep_ratio": { "$ref": "./elements/properties/keep_ratio.json" }, "layer": { "$ref": "./elements/properties/layer.json" }, "localize": { "$ref": "./elements/properties/localize.json" }, - "locked_alpha": { "$ref": "./elements/properties/locked_alpha.json" }, - "locked_color": { "$ref": "./elements/properties/locked_color.json" }, + "locked_alpha": { "$ref": "./elements/properties/alpha.json" }, + "locked_color": { "$ref": "./elements/properties/color.json" }, "locked_control": { "$ref": "./elements/properties/locked_control.json" }, "low_frequency_rendering": { "$ref": "./elements/properties/low_frequency_rendering.json" }, "max_length": { "$ref": "./elements/properties/max_length.json" }, @@ -160,14 +160,14 @@ "offset": { "$ref": "./elements/properties/offset.json" }, "orientation": { "$ref": "./elements/properties/orientation.json" }, "place_holder_control": { "$ref": "./elements/properties/place_holder_control.json" }, - "pressed_alpha": { "$ref": "./elements/properties/pressed_alpha.json" }, - "pressed_color": { "$ref": "./elements/properties/pressed_color.json" }, + "pressed_alpha": { "$ref": "./elements/properties/alpha.json" }, + "pressed_color": { "$ref": "./elements/properties/color.json" }, "pressed_control": { "$ref": "./elements/properties/pressed_control.json" }, "prevent_touch_input": { "$ref": "./elements/properties/prevent_touch_input.json" }, - "primary_color": { "$ref": "./elements/properties/primary_color.json" }, + "primary_color": { "$ref": "./elements/properties/color.json" }, "progress_control": { "$ref": "./elements/properties/progress_control.json" }, "progress_hover_control": { "$ref": "./elements/properties/progress_hover_control.json" }, - "propagate_alpha": { "$ref": "./elements/properties/propagate_alpha.json" }, + "propagate_alpha": { "$ref": "./elements/properties/alpha.json" }, "property_bag": { "$ref": "./elements/properties/property_bag.json" }, "radio_toggle_group": { "$ref": "./elements/properties/radio_toggle_group.json" }, "render_game_behind": { "$ref": "./elements/properties/render_game_behind.json" }, @@ -222,19 +222,19 @@ "toggle_off_button": { "$ref": "./elements/properties/toggle_off_button.json" }, "toggle_on_button": { "$ref": "./elements/properties/toggle_on_button.json" }, "touch_mode": { "$ref": "./elements/properties/touch_mode.json" }, - "tts_control_header": { "$ref": "./elements/properties/tts_control_header.json" }, - "tts_control_type_order_priority": { "$ref": "./elements/properties/tts_control_type_order_priority.json" }, - "tts_ignore_count": { "$ref": "./elements/properties/tts_ignore_count.json" }, - "tts_ignore_subsections": { "$ref": "./elements/properties/tts_ignore_subsections.json" }, - "tts_index_priority": { "$ref": "./elements/properties/tts_index_priority.json" }, - "tts_inherit_siblings": { "$ref": "./elements/properties/tts_inherit_siblings.json" }, - "tts_name": { "$ref": "./elements/properties/tts_name.json" }, - "tts_override_control_value": { "$ref": "./elements/properties/tts_override_control_value.json" }, - "tts_section_header": { "$ref": "./elements/properties/tts_section_header.json" }, - "tts_toggle_off": { "$ref": "./elements/properties/tts_toggle_off.json" }, - "tts_toggle_on": { "$ref": "./elements/properties/tts_toggle_on.json" }, - "tts_value_changed": { "$ref": "./elements/properties/tts_value_changed.json" }, - "tts_value_order_priority": { "$ref": "./elements/properties/tts_value_order_priority.json" }, + "tts_control_header": { "$ref": "./elements/properties/tts/control_header.json" }, + "tts_control_type_order_priority": { "$ref": "./elements/properties/tts/control_type_order_priority.json" }, + "tts_ignore_count": { "$ref": "./elements/properties/tts/ignore_count.json" }, + "tts_ignore_subsections": { "$ref": "./elements/properties/tts/ignore_subsections.json" }, + "tts_index_priority": { "$ref": "./elements/properties/tts/index_priority.json" }, + "tts_inherit_siblings": { "$ref": "./elements/properties/tts/inherit_siblings.json" }, + "tts_name": { "$ref": "./elements/properties/tts/name.json" }, + "tts_override_control_value": { "$ref": "./elements/properties/tts/override_control_value.json" }, + "tts_section_header": { "$ref": "./elements/properties/tts/section_header.json" }, + "tts_toggle_off": { "$ref": "./elements/properties/tts/toggle_off.json" }, + "tts_toggle_on": { "$ref": "./elements/properties/tts/toggle_on.json" }, + "tts_value_changed": { "$ref": "./elements/properties/tts/value_changed.json" }, + "tts_value_order_priority": { "$ref": "./elements/properties/tts/value_order_priority.json" }, "ttsSectionContainer": { "$ref": "./elements/properties/ttsSectionContainer.json" }, "type": { "$ref": "./elements/properties/type.json" }, "unchecked_control": { "$ref": "./elements/properties/unchecked_control.json" },