[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21574] branches/blender2.5/blender: 2. 5 Buttons:
Thomas Dinges
dingto at gmx.de
Tue Jul 14 14:32:19 CEST 2009
Revision: 21574
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21574
Author: dingto
Date: 2009-07-14 14:32:19 +0200 (Tue, 14 Jul 2009)
Log Message:
-----------
2.5 Buttons:
* Some Updates for n-key Areas in View3D and Image Editor and some tweaks in bone panels. Patch by William Reynish. Thanks!
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_bone.py
branches/blender2.5/blender/release/ui/space_view3d.py
branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
Modified: branches/blender2.5/blender/release/ui/buttons_data_bone.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_bone.py 2009-07-14 12:23:08 UTC (rev 21573)
+++ branches/blender2.5/blender/release/ui/buttons_data_bone.py 2009-07-14 12:32:19 UTC (rev 21574)
@@ -23,6 +23,23 @@
split.itemL(text="", icon="ICON_BONE_DATA")
split.itemR(bone, "name", text="")
+class BONE_PT_transform_bone(BoneButtonsPanel):
+ __idname__ = "BONE_PT_transform_bone"
+ __label__ = "Transform"
+
+ def draw(self, context):
+ layout = self.layout
+ bone = context.bone
+ if not bone:
+ bone = context.edit_bone
+
+#Seems to be missing from RNA?
+ row = layout.row()
+ row.column().itemR(bone, "location")
+ row.column().itemR(bone, "rotation")
+ row.column().itemR(bone, "scale")
+
+
class BONE_PT_bone(BoneButtonsPanel):
__idname__ = "BONE_PT_bone"
__label__ = "Bone"
@@ -93,5 +110,6 @@
bpy.types.register(BONE_PT_context_bone)
+bpy.types.register(BONE_PT_transform_bone)
bpy.types.register(BONE_PT_bone)
bpy.types.register(BONE_PT_deform)
Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py 2009-07-14 12:23:08 UTC (rev 21573)
+++ branches/blender2.5/blender/release/ui/space_view3d.py 2009-07-14 12:32:19 UTC (rev 21574)
@@ -90,17 +90,92 @@
layout.template_header_3D()
-class VIEW3D_PT_random_panel(bpy.types.Panel):
+class VIEW3D_PT_3dview_properties(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "UI"
- __label__ = "Random Panel"
+ __label__ = "View"
+ def poll(self, context):
+ view = context.space_data
+ return (view)
+
def draw(self, context):
+ view = context.space_data
layout = self.layout
- layout.itemL(text="panel contents")
+
+ split = layout.split()
+ col = split.column()
+ col.itemR(view, "camera")
+ col.itemR(view, "lens")
+ col.itemL(text="Clip:")
+ col.itemR(view, "clip_start", text="Start")
+ col.itemR(view, "clip_end", text="End")
+ col.itemL(text="Grid:")
+ col.itemR(view, "grid_spacing", text="Spacing")
+ col.itemR(view, "grid_subdivisions", text="Subdivisions")
+
+class VIEW3D_PT_3dview_display(bpy.types.Panel):
+ __space_type__ = "VIEW_3D"
+ __region_type__ = "UI"
+ __label__ = "Display"
+ def poll(self, context):
+ view = context.space_data
+ return (view)
+
+ def draw(self, context):
+ view = context.space_data
+ layout = self.layout
+
+ split = layout.split()
+ col = split.column()
+ col.itemR(view, "display_floor", text="Grid Floor")
+ col.itemR(view, "display_x_axis", text="X Axis")
+ col.itemR(view, "display_y_axis", text="Y Axis")
+ col.itemR(view, "display_z_axis", text="Z Axis")
+ col.itemR(view, "outline_selected")
+ col.itemR(view, "all_object_centers")
+ col.itemR(view, "relationship_lines")
+ col.itemR(view, "textured_solid")
+
+class VIEW3D_PT_background_image(bpy.types.Panel):
+ __space_type__ = "VIEW_3D"
+ __region_type__ = "UI"
+ __label__ = "Background Image"
+
+ def poll(self, context):
+ view = context.space_data
+ bg = context.space_data.background_image
+ return (view)
+
+ def draw_header(self, context):
+ layout = self.layout
+ view = context.space_data
+
+ layout.itemR(view, "display_background_image", text="")
+
+ def draw(self, context):
+ view = context.space_data
+ bg = context.space_data.background_image
+ layout = self.layout
+
+ layout.active = view.display_background_image
+ split = layout.split()
+ col = split.column()
+ col.itemR(bg, "image")
+# col.itemR(bg, "image_user")
+ col.itemR(bg, "size")
+ col.itemR(bg, "transparency", slider=True)
+ col.itemL(text="Offset:")
+ col.itemR(bg, "x_offset", text="X")
+ col.itemR(bg, "y_offset", text="Y")
+
+
bpy.types.register(VIEW3D_MT_view_navigation)
bpy.types.register(VIEW3D_MT_view)
bpy.types.register(VIEW3D_HT_header)
-bpy.types.register(VIEW3D_PT_random_panel)
+bpy.types.register(VIEW3D_PT_3dview_properties)
+bpy.types.register(VIEW3D_PT_3dview_display)
+bpy.types.register(VIEW3D_PT_background_image)
+
Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c 2009-07-14 12:23:08 UTC (rev 21573)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c 2009-07-14 12:32:19 UTC (rev 21574)
@@ -1243,20 +1243,20 @@
// XXX uiSetButLock(ima->id.lib!=NULL, ERROR_LIBDATA_MESSAGE);
uiBlockBeginAlign(block);
uiBlockSetFunc(block, image_src_change_cb, ima, iuser);
- uiDefButS(block, ROW, imagechanged, "Still", 10, 180, 60, 20, &ima->source, 0.0, IMA_SRC_FILE, 0, 0, "Single Image file");
- uiDefButS(block, ROW, imagechanged, "Movie", 70, 180, 60, 20, &ima->source, 0.0, IMA_SRC_MOVIE, 0, 0, "Movie file");
- uiDefButS(block, ROW, imagechanged, "Sequence", 130, 180, 90, 20, &ima->source, 0.0, IMA_SRC_SEQUENCE, 0, 0, "Multiple Image files, as a sequence");
- uiDefButS(block, ROW, imagechanged, "Generated", 220, 180, 90, 20, &ima->source, 0.0, IMA_SRC_GENERATED, 0, 0, "Generated Image");
+ uiDefButS(block, ROW, imagechanged, "Still", 0, 180, 105, 20, &ima->source, 0.0, IMA_SRC_FILE, 0, 0, "Single Image file");
+ uiDefButS(block, ROW, imagechanged, "Movie", 105, 180, 105, 20, &ima->source, 0.0, IMA_SRC_MOVIE, 0, 0, "Movie file");
+ uiDefButS(block, ROW, imagechanged, "Sequence", 210, 180, 105, 20, &ima->source, 0.0, IMA_SRC_SEQUENCE, 0, 0, "Multiple Image files, as a sequence");
+ uiDefButS(block, ROW, imagechanged, "Generated", 315, 180, 105, 20, &ima->source, 0.0, IMA_SRC_GENERATED, 0, 0, "Generated Image");
uiBlockSetFunc(block, NULL, NULL, NULL);
}
else
- uiDefBut(block, LABEL, 0, " ", 10, 180, 300, 20, 0, 0, 0, 0, 0, ""); /* for align in panel */
+ uiDefBut(block, LABEL, 0, " ", 0, 180, 440, 20, 0, 0, 0, 0, 0, ""); /* for align in panel */
/* Browse */
IMAnames_to_pupstring(&strp, NULL, NULL, &(CTX_data_main(C)->image), NULL, &iuser->menunr);
uiBlockBeginAlign(block);
- but= uiDefButS(block, MENU, imagechanged, strp, 10,155,23,20, &iuser->menunr, 0, 0, 0, 0, "Selects an existing Image or Movie");
+ but= uiDefButS(block, MENU, imagechanged, strp, 0,155,40,20, &iuser->menunr, 0, 0, 0, 0, "Selects an existing Image or Movie");
uiButSetFunc(but, image_browse_cb, ima_pp, iuser);
MEM_freeN(strp);
@@ -1265,31 +1265,34 @@
if(ima) {
int drawpack= (ima->source!=IMA_SRC_SEQUENCE && ima->source!=IMA_SRC_MOVIE && ima->ok);
- but= uiDefBut(block, TEX, B_IDNAME, "IM:", 33, 155, 177, 20, ima->id.name+2, 0.0, 21.0, 0, 0, "Current Image Datablock name.");
+ but= uiDefBut(block, TEX, B_IDNAME, "IM:", 40, 155, 220, 20, ima->id.name+2, 0.0, 21.0, 0, 0, "Current Image Datablock name.");
uiButSetFunc(but, test_idbutton_cb, ima->id.name, NULL);
- but= uiDefBut(block, BUT, imagechanged, "Reload", 210, 155, 60, 20, NULL, 0, 0, 0, 0, "Reloads Image or Movie");
+ but= uiDefBut(block, BUT, imagechanged, "Reload", 260, 155, 70, 20, NULL, 0, 0, 0, 0, "Reloads Image or Movie");
uiButSetFunc(but, image_reload_cb, ima, iuser);
- but= uiDefIconBut(block, BUT, imagechanged, ICON_X, 270,155,20,20, 0, 0, 0, 0, 0, "Unlink Image block");
+ but= uiDefIconBut(block, BUT, imagechanged, ICON_X, 330, 155, 40, 20, 0, 0, 0, 0, 0, "Unlink Image block");
uiButSetFunc(but, image_unlink_cb, ima_pp, NULL);
sprintf(str, "%d", ima->id.us);
- uiDefBut(block, BUT, B_NOP, str, 290,155,20,20, 0, 0, 0, 0, 0, "Only displays number of users of Image block");
+ uiDefBut(block, BUT, B_NOP, str, 370, 155, 40, 20, 0, 0, 0, 0, 0, "Only displays number of users of Image block");
+ uiBlockEndAlign(block);
- but= uiDefIconBut(block, BUT, imagechanged, ICON_FILESEL, 10, 135, 23, 20, 0, 0, 0, 0, 0, "Open Fileselect to load new Image");
+ uiBlockBeginAlign(block);
+ but= uiDefIconBut(block, BUT, imagechanged, ICON_FILESEL, 0, 130, 40, 20, 0, 0, 0, 0, 0, "Open Fileselect to load new Image");
uiButSetFunc(but, image_load_fs_cb, ima_pp, iuser);
- but= uiDefBut(block, TEX, imagechanged, "", 33,135,257+(drawpack?0:20),20, ima->name, 0.0, 239.0, 0, 0, "Image/Movie file name, change to load new");
+ but= uiDefBut(block, TEX, imagechanged, "", 40,130, 340+(drawpack?0:20),20, ima->name, 0.0, 239.0, 0, 0, "Image/Movie file name, change to load new");
uiButSetFunc(but, image_load_cb, ima_pp, iuser);
+ uiBlockEndAlign(block);
if(drawpack) {
if (ima->packedfile) packdummy = 1;
else packdummy = 0;
- but= uiDefIconButBitI(block, TOG, 1, redraw, ICON_PACKAGE, 290,135,20,20, &packdummy, 0, 0, 0, 0, "Toggles Packed status of this Image");
+ but= uiDefIconButBitI(block, TOG, 1, redraw, ICON_PACKAGE, 380, 130, 40, 20, &packdummy, 0, 0, 0, 0, "Toggles Packed status of this Image");
uiButSetFunc(but, image_pack_cb, ima, iuser);
}
}
else {
- but= uiDefBut(block, BUT, imagechanged, "Load", 33, 155, 100,20, NULL, 0, 0, 0, 0, "Load new Image of Movie");
+ but= uiDefBut(block, BUT, imagechanged, "Load", 33, 155, 200,20, NULL, 0, 0, 0, 0, "Load new Image of Movie");
uiButSetFunc(but, image_load_fs_cb, ima_pp, iuser);
}
uiBlockEndAlign(block);
@@ -1320,46 +1323,54 @@
/* left side default per-image options, right half the additional options */
/* fields */
- uiBlockBeginAlign(block);
- but= uiDefButBitS(block, TOGBUT, IMA_FIELDS, imagechanged, "Fields", 10, 70, 65, 20, &ima->flag, 0, 0, 0, 0, "Click to enable use of fields in Image");
+
+ but= uiDefButBitS(block, TOGBUT, IMA_FIELDS, imagechanged, "Fields", 0, 80, 200, 20, &ima->flag, 0, 0, 0, 0, "Click to enable use of fields in Image");
uiButSetFunc(but, image_field_test, ima, iuser);
- uiDefButBitS(block, TOGBUT, IMA_STD_FIELD, B_NOP, "Odd", 75, 70, 45, 20, &ima->flag, 0, 0, 0, 0, "Standard Field Toggle");
+ uiDefButBitS(block, TOGBUT, IMA_STD_FIELD, B_NOP, "Odd", 0, 55, 200, 20, &ima->flag, 0, 0, 0, 0, "Standard Field Toggle");
+
uiBlockSetFunc(block, image_reload_cb, ima, iuser);
- uiDefButBitS(block, TOGBUT, IMA_ANTIALI, B_NOP, "Anti", 10, 50, 45, 20, &ima->flag, 0, 0, 0, 0, "Toggles Image anti-aliasing, only works with solid colors");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list