From b5d3ae49e89f12ca635211f61737c18e471ac1e5 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Fri, 10 May 2024 14:51:52 +0200 Subject: [PATCH 1/4] Improve debugger texts --- addons/io_hubs_addon/debugger.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/io_hubs_addon/debugger.py b/addons/io_hubs_addon/debugger.py index df95467f..4531f6b4 100644 --- a/addons/io_hubs_addon/debugger.py +++ b/addons/io_hubs_addon/debugger.py @@ -53,7 +53,7 @@ def is_room_set(context): class HubsUpdateRoomOperator(bpy.types.Operator): bl_idname = "hubs_scene.update_room" bl_label = "View Scene" - bl_description = "Update room" + bl_description = "Updates the currently opened room scene with the Blender scene" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -122,8 +122,8 @@ def execute(self, context): class HubsCreateRoomOperator(bpy.types.Operator): bl_idname = "hubs_scene.create_room" - bl_label = "Create Room" - bl_description = "Create room" + bl_label = "Create a new room" + bl_description = "Creates a new room in the selected instance" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -153,8 +153,8 @@ def execute(self, context): class HubsOpenRoomOperator(bpy.types.Operator): bl_idname = "hubs_scene.open_room" - bl_label = "Open Room" - bl_description = "Open room" + bl_label = "Open selected room" + bl_description = "Opens the selected room" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -256,8 +256,7 @@ def draw(self, context: Context): icon='REMOVE', text="") row = box.row() - row.operator(HubsCreateRoomOperator.bl_idname, - text='Create') + row.operator(HubsCreateRoomOperator.bl_idname) class HUBS_PT_ToolsSceneDebuggerOpenPanel(bpy.types.Panel): @@ -289,8 +288,7 @@ def draw(self, context: Context): icon='REMOVE', text="") row = box.row() - row.operator(HubsOpenRoomOperator.bl_idname, - text='Open') + row.operator(HubsOpenRoomOperator.bl_idname) class HUBS_PT_ToolsSceneDebuggerUpdatePanel(bpy.types.Panel): @@ -354,10 +352,10 @@ def draw(self, context: Context): row.label( text="You need to be signed in to Hubs to update the room scene") - update_mode = "Update Scene" if context.scene.hubs_scene_debugger_room_create_prefs.debugLocalScene else "Spawn as object" + update_mode = "Update current scene" if context.scene.hubs_scene_debugger_room_create_prefs.debugLocalScene else "Spawn as object" if hubs_session.is_alive(): room_params = hubs_session.room_params - update_mode = "Update Scene" if "debugLocalScene" in room_params else "Spawn as object" + update_mode = "Update current scene" if "debugLocalScene" in room_params else "Spawn as object" row = box.row() row.operator(HubsUpdateRoomOperator.bl_idname, text=f'{update_mode}') From f8ab8e017e86e83b39bf0a51b1e36a0086c4a036 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 15 May 2024 10:54:58 +0200 Subject: [PATCH 2/4] Use description method for the update room operator --- addons/io_hubs_addon/debugger.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/io_hubs_addon/debugger.py b/addons/io_hubs_addon/debugger.py index 4531f6b4..f52d1afa 100644 --- a/addons/io_hubs_addon/debugger.py +++ b/addons/io_hubs_addon/debugger.py @@ -53,9 +53,20 @@ def is_room_set(context): class HubsUpdateRoomOperator(bpy.types.Operator): bl_idname = "hubs_scene.update_room" bl_label = "View Scene" - bl_description = "Updates the currently opened room scene with the Blender scene" bl_options = {'REGISTER', 'UNDO'} + @classmethod + def description(cls, context, properties): + is_scene_update = context.scene.hubs_scene_debugger_room_create_prefs.debugLocalScene + if hubs_session.is_alive(): + room_params = hubs_session.room_params + is_scene_update = "debugLocalScene" in room_params + + if is_scene_update: + return "Updates the currently opened room scene with the Blender scene" + else: + return "Spawns the Blender scene in the currently opened room as an object" + @classmethod def poll(cls, context: Context): return hubs_session and hubs_session.user_logged_in and hubs_session.user_in_room From 80566d1b17b8482085777586dca30868381a7bef Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 15 May 2024 10:57:38 +0200 Subject: [PATCH 3/4] Improve Open/Create comments --- addons/io_hubs_addon/debugger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/io_hubs_addon/debugger.py b/addons/io_hubs_addon/debugger.py index f52d1afa..606c4ab4 100644 --- a/addons/io_hubs_addon/debugger.py +++ b/addons/io_hubs_addon/debugger.py @@ -134,7 +134,7 @@ def execute(self, context): class HubsCreateRoomOperator(bpy.types.Operator): bl_idname = "hubs_scene.create_room" bl_label = "Create a new room" - bl_description = "Creates a new room in the selected instance" + bl_description = "Creates a new room in the selected instance and opens it in the browser selected in the add-on preferences. The specified room flags will be applied" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -165,7 +165,7 @@ def execute(self, context): class HubsOpenRoomOperator(bpy.types.Operator): bl_idname = "hubs_scene.open_room" bl_label = "Open selected room" - bl_description = "Opens the selected room" + bl_description = "Opens the selected room in the browser selected in the add-on preferences. The specified room flags will be applied" bl_options = {'REGISTER', 'UNDO'} @classmethod From 8a1b23eb52f0dbb5b526e439a65615563a2d5a17 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 15 May 2024 11:10:12 +0200 Subject: [PATCH 4/4] Updates for publish buttons texts --- addons/io_hubs_addon/debugger.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/addons/io_hubs_addon/debugger.py b/addons/io_hubs_addon/debugger.py index 606c4ab4..4a4d0c84 100644 --- a/addons/io_hubs_addon/debugger.py +++ b/addons/io_hubs_addon/debugger.py @@ -614,8 +614,8 @@ def draw_item(self, context, layout, data, item, icon, active_data, active_propn class HubsPublishSceneOperator(bpy.types.Operator): bl_idname = "hubs_scene.publish_scene" - bl_label = "Scene Manager" - bl_description = "Publish scene" + bl_label = "Publish" + bl_description = "Publish current Blender scene" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -684,7 +684,7 @@ def execute(self, context): class HubsUpdateSceneOperator(bpy.types.Operator): bl_idname = "hubs_scene.update_scene" bl_label = "Update" - bl_description = "Update selected scene" + bl_description = "Updates the selected scene with the Blender scene" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -737,8 +737,8 @@ def draw(self, context): class HubsCreateRoomWithSceneOperator(bpy.types.Operator): bl_idname = "hubs_scene.create_room_with_scene" - bl_label = "Create Room With Scene" - bl_description = "Create a room with the selected scene" + bl_label = "Create Room" + bl_description = "Creates a new room in the selected instance and opens it in the browser selected in the add-on preferences. The currently selected scene from the scenes list will be used. The specified room flags will be applied" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -799,7 +799,7 @@ def execute(self, context): class HubsGetScenesOperator(bpy.types.Operator): bl_idname = "hubs_scene.get_scenes" bl_label = "Get Scenes" - bl_description = "Get Scenes" + bl_description = "Gets the scene list from your account" bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -894,16 +894,13 @@ def draw(self, context: Context): row = box.row() col = row.column() - col.operator(HubsGetScenesOperator.bl_idname, - text='Get Scenes') + col.operator(HubsGetScenesOperator.bl_idname) col = row.column() - col.operator(HubsUpdateSceneOperator.bl_idname, - text='Update') + col.operator(HubsUpdateSceneOperator.bl_idname) row = box.row() row = row.column() - row.operator(HubsCreateRoomWithSceneOperator.bl_idname, - text='Create Room') + row.operator(HubsCreateRoomWithSceneOperator.bl_idname) box = self.layout.box() row = box.row() @@ -922,8 +919,7 @@ def draw(self, context: Context): op = col.operator("image.hubs_open_image", text='', icon='FILE_FOLDER') op.target_property = "screenshot" row = box.row() - op = row.operator(HubsPublishSceneOperator.bl_idname, - text='Publish') + op = row.operator(HubsPublishSceneOperator.bl_idname) class HubsSceneDebuggerRoomCreatePrefs(bpy.types.PropertyGroup):