From e0507d99d2829fd6296878899468146f92b5de0d Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Thu, 6 Feb 2025 22:20:27 +0800 Subject: [PATCH 1/4] add substance designer into the template --- server/settings/tools.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/server/settings/tools.py b/server/settings/tools.py index 96851be1da..0aaa88a8b0 100644 --- a/server/settings/tools.py +++ b/server/settings/tools.py @@ -484,6 +484,17 @@ DEFAULT_TOOLS_VALUES = { "task_types": [], "tasks": [], "template": "{folder[name]}_{variant}" + }, + { + "product_types": [ + "textureSet" + ], + "hosts": [ + "substancedesigner" + ], + "task_types": [], + "tasks": [], + "template": "T_{folder[name]}{variant}" } ], "filter_creator_profiles": [] @@ -548,10 +559,13 @@ DEFAULT_TOOLS_VALUES = { }, { "product_types": [ - "simpleUnrealTexture" + "simpleUnrealTexture", + "image", + "textures" ], "hosts": [ - "standalonepublisher" + "standalonepublisher", + "substancedesigner" ], "task_types": [], "task_names": [], @@ -595,10 +609,13 @@ DEFAULT_TOOLS_VALUES = { "hero_template_name_profiles": [ { "product_types": [ - "simpleUnrealTexture" + "simpleUnrealTexture", + "image", + "textures" ], "hosts": [ - "standalonepublisher" + "standalonepublisher", + "substancedesigner" ], "task_types": [], "task_names": [], From a409d55b5904525797f0520c4a872a7776ad1123 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Fri, 7 Feb 2025 16:53:57 +0800 Subject: [PATCH 2/4] big roy's comment - separate template for substancedesigner from standalonepublisher --- server/settings/tools.py | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/server/settings/tools.py b/server/settings/tools.py index 0aaa88a8b0..32c72e7a98 100644 --- a/server/settings/tools.py +++ b/server/settings/tools.py @@ -559,12 +559,21 @@ DEFAULT_TOOLS_VALUES = { }, { "product_types": [ - "simpleUnrealTexture", - "image", - "textures" + "simpleUnrealTexture" + ], + "hosts": [ + "standalonepublisher" + ], + "task_types": [], + "task_names": [], + "template_name": "simpleUnrealTexture" + }, + { + "product_types": [ + "image", + "textures", ], "hosts": [ - "standalonepublisher", "substancedesigner" ], "task_types": [], @@ -609,12 +618,21 @@ DEFAULT_TOOLS_VALUES = { "hero_template_name_profiles": [ { "product_types": [ - "simpleUnrealTexture", + "simpleUnrealTexture" + ], + "hosts": [ + "standalonepublisher" + ], + "task_types": [], + "task_names": [], + "template_name": "simpleUnrealTextureHero" + }, + { + "product_types": [ "image", "textures" ], "hosts": [ - "standalonepublisher", "substancedesigner" ], "task_types": [], From 6a57b4c4504bb19987a3e10bcf8f167e4ae121b0 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 11 Feb 2025 17:13:16 +0100 Subject: [PATCH 3/4] use odd numbers for frame size --- client/ayon_core/tools/utils/nice_checkbox.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/client/ayon_core/tools/utils/nice_checkbox.py b/client/ayon_core/tools/utils/nice_checkbox.py index 06845c397a..b47e3e62e6 100644 --- a/client/ayon_core/tools/utils/nice_checkbox.py +++ b/client/ayon_core/tools/utils/nice_checkbox.py @@ -328,6 +328,9 @@ class NiceCheckbox(QtWidgets.QFrame): if frame_rect.width() < 0 or frame_rect.height() < 0: return + frame_rect.setLeft(frame_rect.x() + (frame_rect.width() % 2)) + frame_rect.setTop(frame_rect.y() + (frame_rect.height() % 2)) + painter = QtGui.QPainter(self) painter.setRenderHint(QtGui.QPainter.Antialiasing) @@ -364,11 +367,16 @@ class NiceCheckbox(QtWidgets.QFrame): margin_size_c = 0 checkbox_rect = QtCore.QRect( - frame_rect.x() + margin_size_c, - frame_rect.y() + margin_size_c, - frame_rect.width() - (margin_size_c * 2), - frame_rect.height() - (margin_size_c * 2) + frame_rect.x(), + frame_rect.y(), + frame_rect.width(), + frame_rect.height() ) + if margin_size_c: + checkbox_rect.adjust( + margin_size_c, margin_size_c, + -margin_size_c, -margin_size_c + ) if checkbox_rect.width() > checkbox_rect.height(): radius = floor(checkbox_rect.height() * 0.5) From 21187bb28cdc76655e562f474b65d6245de449c7 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Tue, 11 Feb 2025 17:13:25 +0100 Subject: [PATCH 4/4] use NoPen instead of transparent --- client/ayon_core/tools/utils/nice_checkbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/tools/utils/nice_checkbox.py b/client/ayon_core/tools/utils/nice_checkbox.py index b47e3e62e6..3d9d63b6bc 100644 --- a/client/ayon_core/tools/utils/nice_checkbox.py +++ b/client/ayon_core/tools/utils/nice_checkbox.py @@ -383,7 +383,7 @@ class NiceCheckbox(QtWidgets.QFrame): else: radius = floor(checkbox_rect.width() * 0.5) - painter.setPen(QtCore.Qt.transparent) + painter.setPen(QtCore.Qt.NoPen) painter.setBrush(bg_color) painter.drawRoundedRect(checkbox_rect, radius, radius)