diff options
Diffstat (limited to 'release/ui/space_image.py')
| -rw-r--r-- | release/ui/space_image.py | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/release/ui/space_image.py b/release/ui/space_image.py index 8dc016f55b7..0d0fd86ef8c 100644 --- a/release/ui/space_image.py +++ b/release/ui/space_image.py @@ -7,6 +7,7 @@ class IMAGE_MT_view(bpy.types.Menu): def draw(self, context): layout = self.layout + sima = context.space_data uv = sima.uv_editor settings = context.tool_settings @@ -69,6 +70,7 @@ class IMAGE_MT_image(bpy.types.Menu): def draw(self, context): layout = self.layout + sima = context.space_data ima = sima.image @@ -124,9 +126,9 @@ class IMAGE_MT_uvs_transform(bpy.types.Menu): def draw(self, context): layout = self.layout - layout.item_enumO("tfm.transform", "mode", 'TRANSLATION') - layout.item_enumO("tfm.transform", "mode", 'ROTATION') - layout.item_enumO("tfm.transform", "mode", 'RESIZE') + layout.itemO("tfm.translate") + layout.itemO("tfm.rotate") + layout.itemO("tfm.resize") class IMAGE_MT_uvs_mirror(bpy.types.Menu): __space_type__ = 'IMAGE_EDITOR' @@ -134,9 +136,13 @@ class IMAGE_MT_uvs_mirror(bpy.types.Menu): def draw(self, context): layout = self.layout + layout.operator_context = "EXEC_REGION_WIN" - layout.item_enumO("uv.mirror", "axis", 'MIRROR_X') # "X Axis", M, - layout.item_enumO("uv.mirror", "axis", 'MIRROR_Y') # "Y Axis", M, + props= layout.itemO("tfm.mirror", text="X Axis", properties=True) + props.constraint_axis[0]= True + + props= layout.itemO("tfm.mirror", text="Y Axis", properties=True) + props.constraint_axis[1]= True class IMAGE_MT_uvs_weldalign(bpy.types.Menu): __space_type__ = 'IMAGE_EDITOR' @@ -148,13 +154,13 @@ class IMAGE_MT_uvs_weldalign(bpy.types.Menu): layout.itemO("uv.weld") # W, 1 layout.items_enumO("uv.align", "axis") # W, 2/3/4 - class IMAGE_MT_uvs(bpy.types.Menu): __space_type__ = 'IMAGE_EDITOR' __label__ = "UVs" def draw(self, context): layout = self.layout + sima = context.space_data uv = sima.uv_editor settings = context.tool_settings @@ -195,10 +201,11 @@ class IMAGE_HT_header(bpy.types.Header): __space_type__ = 'IMAGE_EDITOR' def draw(self, context): + layout = self.layout + sima = context.space_data ima = sima.image iuser = sima.image_user - layout = self.layout settings = context.tool_settings show_render = sima.show_render @@ -230,14 +237,14 @@ class IMAGE_HT_header(bpy.types.Header): if show_uvedit: uvedit = sima.uv_editor - layout.itemR(uvedit, "pivot", text="") + layout.itemR(uvedit, "pivot", text="", icon_only=True) layout.itemR(settings, "uv_sync_selection", text="") if settings.uv_sync_selection: layout.itemR(settings, "mesh_selection_mode", text="", expand=True) else: layout.itemR(settings, "uv_selection_mode", text="", expand=True) - layout.itemR(uvedit, "sticky_selection_mode", text="") + layout.itemR(uvedit, "sticky_selection_mode", text="", icon_only=True) pass row = layout.row(align=True) @@ -281,38 +288,34 @@ class IMAGE_PT_game_properties(bpy.types.Panel): return (sima and sima.image) and (rd.engine == 'BLENDER_GAME') def draw(self, context): - sima = context.space_data layout = self.layout - + + sima = context.space_data ima = sima.image - if ima: - split = layout.split() - - col = split.column() - - subcol = col.column(align=True) - subcol.itemR(ima, "clamp_x") - subcol.itemR(ima, "clamp_y") + split = layout.split() - col.itemR(ima, "mapping", expand=True) - col.itemR(ima, "tiles") + col = split.column() + col.itemR(ima, "clamp_x") + col.itemR(ima, "clamp_y") + col.itemR(ima, "mapping", expand=True) + col.itemR(ima, "tiles") - col = split.column() + col = split.column() - subcol = col.column(align=True) - subcol.itemR(ima, "animated") + sub = col.column(align=True) + sub.itemR(ima, "animated") - subcol = subcol.column() - subcol.itemR(ima, "animation_start", text="Start") - subcol.itemR(ima, "animation_end", text="End") - subcol.itemR(ima, "animation_speed", text="Speed") - subcol.active = ima.animated + subsub = sub.column() + subsub.active = ima.animated + subsub.itemR(ima, "animation_start", text="Start") + subsub.itemR(ima, "animation_end", text="End") + subsub.itemR(ima, "animation_speed", text="Speed") - subrow = col.row(align=True) - subrow.itemR(ima, "tiles_x", text="X") - subrow.itemR(ima, "tiles_y", text="Y") - subrow.active = ima.tiles or ima.animated + sub = col.row(align=True) + sub.active = ima.tiles or ima.animated + sub.itemR(ima, "tiles_x", text="X") + sub.itemR(ima, "tiles_y", text="Y") class IMAGE_PT_view_properties(bpy.types.Panel): __space_type__ = 'IMAGE_EDITOR' @@ -324,9 +327,9 @@ class IMAGE_PT_view_properties(bpy.types.Panel): return (sima and (sima.image or sima.show_uvedit)) def draw(self, context): - sima = context.space_data layout = self.layout - + + sima = context.space_data ima = sima.image show_uvedit = sima.show_uvedit uvedit = sima.uv_editor @@ -376,4 +379,3 @@ bpy.types.register(IMAGE_MT_uvs) bpy.types.register(IMAGE_HT_header) bpy.types.register(IMAGE_PT_game_properties) bpy.types.register(IMAGE_PT_view_properties) - |