From 81abc6ffd7fc5dc13fffdaace238516b83d8b819 Mon Sep 17 00:00:00 2001 From: Yusarina Date: Tue, 18 Jun 2024 22:58:29 +0100 Subject: [PATCH] Some Baisc UI Improvements Nothing much, just improving the UI looks a little bit, we now have Import and Export in a popup and I made some changes to some of the buttons. That's about it. --- ui/optimization.py | 9 ++++++--- ui/panel.py | 5 ++++- ui/quick_access.py | 47 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/ui/optimization.py b/ui/optimization.py index 54e7ce2..2f6e69a 100644 --- a/ui/optimization.py +++ b/ui/optimization.py @@ -16,12 +16,15 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel): layout.label(text="Optimization Options") row = layout.row() + row.scale_y = 1.2 row.operator("avatar_toolkit.combine_materials", text="Combine Materials") - row = layout.row() + layout.separator(factor=0.5) + + row = layout.row(align=True) + row.scale_y = 1.2 row.operator("avatar_toolkit.join_all_meshes", text="Join All Meshes") - - row = layout.row() row.operator("avatar_toolkit.join_selected_meshes", text="Join Selected Meshes") # Add optimization options here + diff --git a/ui/panel.py b/ui/panel.py index 384c089..a987a28 100644 --- a/ui/panel.py +++ b/ui/panel.py @@ -11,6 +11,9 @@ class AvatarToolkitPanel(bpy.types.Panel): def draw(self, context): layout = self.layout - layout.label(text="Welcome to Avatar Toolkit!") + layout.label(text="Welcome to Avatar Toolkit, a tool for") + layout.label(text="creating and editing avatars in blender,") + layout.label(text="This is an early alpha version, so expect") + layout.label(text="bugs and issues.") #print("Avatar Toolkit Panel is being drawn") diff --git a/ui/quick_access.py b/ui/quick_access.py index 86f4bf7..80562b1 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -17,11 +17,50 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel): def draw(self, context): layout = self.layout layout.label(text="Quick Access Options") - - # Add import buttons + row = layout.row() - row.operator("avatar_toolkit.import_pmx", text="Import PMX") - row.operator("avatar_toolkit.import_pmd", text="Import PMD") + row.label(text="Import/Export", icon='IMPORT') + + layout.separator(factor=0.5) + + row = layout.row(align=True) + row.scale_y = 1.5 + row.operator("avatar_toolkit.import_menu", text="Import") + row.operator("avatar_toolkit.export_menu", text="Export") + +@register_wrap +class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): + bl_idname = "avatar_toolkit.import_menu" + bl_label = "Import Menu" + + def execute(self, context): + return {'FINISHED'} + + def invoke(self, context, event): + wm = context.window_manager + return wm.invoke_popup(self, width=200) + + def draw(self, context): + layout = self.layout + layout.label(text="Select Import Method") + layout.operator("avatar_toolkit.import_pmx", text="Import PMX") + layout.operator("avatar_toolkit.import_pmd", text="Import PMD") + +@register_wrap +class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): + bl_idname = "avatar_toolkit.export_menu" + bl_label = "Export Menu" + + def execute(self, context): + return {'FINISHED'} + + def invoke(self, context, event): + wm = context.window_manager + return wm.invoke_popup(self, width=200) + + def draw(self, context): + layout = self.layout + layout.label(text="Export options will go here") @register_wrap class AVATAR_TOOLKIT_OT_import_pmx(bpy.types.Operator):