[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20279] branches/blender2.5/blender: UI
Brecht Van Lommel
brecht at blender.org
Tue May 19 19:13:34 CEST 2009
Revision: 20279
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20279
Author: blendix
Date: 2009-05-19 19:13:33 +0200 (Tue, 19 May 2009)
Log Message:
-----------
UI
* Fix buttons jumping around when resizing and zoom. Part of this was
adding a tiny a 0.001f offset in UI_view2d_view_ortho, otherwise the
rounding is unpredictable (used to be 0.375f, but that was disabled).
* Fix various issues with zooming, panning panels. V2D_LOCKOFS_X/Y is
now taken into account in more places in the view2d code, to avoid
zooming into the center or panning out of the view.
* Remove "Free" align mode in buttons window (it's not really useful).
* View3D/Graph/Image editors now use the same PanelType system as the
buttons window, means some deprecated panel code could be removed.
* Some small visual tweaks for panels.
* View 2D Reset operator (Home key), to reset zoom and panning for panels.
* Added argument to set number buttons as sliders (slider=True for itemR).
* Ignore labels for button alignment (doesn't look right).
* Fix some use of context.main in py scripts, should get data from active
object instead.
* Fix autotexspace -> auto_texspace in py script.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_camera.py
branches/blender2.5/blender/release/ui/buttons_data_curve.py
branches/blender2.5/blender/release/ui/buttons_data_lamp.py
branches/blender2.5/blender/release/ui/buttons_data_lattice.py
branches/blender2.5/blender/release/ui/buttons_data_text.py
branches/blender2.5/blender/release/ui/buttons_material.py
branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/interface/interface_api.c
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_intern.h
branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_toolbar.c
branches/blender2.5/blender/source/blender/makesdna/DNA_screen_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ui.c
branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/space_image/image_panels.c
Modified: branches/blender2.5/blender/release/ui/buttons_data_camera.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_camera.py 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/release/ui/buttons_data_camera.py 2009-05-19 17:13:33 UTC (rev 20279)
@@ -15,7 +15,7 @@
__label__ = "Lens"
def draw(self, context):
- cam = context.main.cameras[0]
+ cam = context.active_object.data
layout = self.layout
if not cam:
@@ -55,7 +55,7 @@
__label__ = "Display"
def draw(self, context):
- cam = context.main.cameras[0]
+ cam = context.active_object.data
layout = self.layout
if not cam:
Modified: branches/blender2.5/blender/release/ui/buttons_data_curve.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_curve.py 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/release/ui/buttons_data_curve.py 2009-05-19 17:13:33 UTC (rev 20279)
@@ -33,7 +33,7 @@
sub.itemL(text="Textures:")
sub.itemR(curve, "uv_orco")
- sub.itemR(curve, "autotexspace")
+ sub.itemR(curve, "auto_texspace")
sub = split.column()
sub.itemL(text="Resolution:")
Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-05-19 17:13:33 UTC (rev 20279)
@@ -15,7 +15,7 @@
__label__ = "Lamp"
def draw(self, context):
- lamp = context.main.lamps[0]
+ lamp = context.active_object.data
layout = self.layout
if not lamp:
@@ -61,11 +61,10 @@
def poll(self, context):
ob = context.active_object
- lamp = context.main.lamps[0]
- return (ob.type == 'LAMP' and lamp.type == 'SUN')
+ return (ob.type == 'LAMP' and ob.data.type == 'SUN')
def draw(self, context):
- lamp = context.main.lamps[0].sky
+ lamp = context.active_object.data
layout = self.layout
if not lamp:
@@ -107,11 +106,10 @@
def poll(self, context):
ob = context.active_object
- lamp = context.main.lamps[0]
- return (ob.type == 'LAMP' and lamp.type in ('POINT','SUN', 'SPOT', 'AREA'))
+ return (ob.type == 'LAMP' and ob.data.type in ('POINT','SUN', 'SPOT', 'AREA'))
def draw(self, context):
- lamp = context.main.lamps[0]
+ lamp = context.active_object.data
layout = self.layout
if not lamp:
@@ -190,11 +188,10 @@
def poll(self, context):
ob = context.active_object
- lamp = context.main.lamps[0]
- return (ob.type == 'LAMP' and lamp.type == 'SPOT')
+ return (ob.type == 'LAMP' and ob.data.type == 'SPOT')
def draw(self, context):
- lamp = context.main.lamps[0]
+ lamp = context.active_object.data
layout = self.layout
if not lamp:
Modified: branches/blender2.5/blender/release/ui/buttons_data_lattice.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lattice.py 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/release/ui/buttons_data_lattice.py 2009-05-19 17:13:33 UTC (rev 20279)
@@ -15,7 +15,7 @@
__label__ = "Lattice"
def draw(self, context):
- lat = context.main.lattices[0]
+ lat = context.active_object.data
layout = self.layout
if not lat:
Modified: branches/blender2.5/blender/release/ui/buttons_data_text.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_text.py 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/release/ui/buttons_data_text.py 2009-05-19 17:13:33 UTC (rev 20279)
@@ -32,7 +32,7 @@
sub.itemL(text="Textures:")
sub.itemR(curve, "uv_orco")
- sub.itemR(curve, "autotexspace")
+ sub.itemR(curve, "auto_texspace")
sub = split.column()
sub.itemL(text="Resolution:")
Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-19 17:13:33 UTC (rev 20279)
@@ -64,18 +64,20 @@
__idname__= "MATERIAL_PT_raymir"
__label__ = "Ray Mirror"
+ def poll(self, context):
+ ob = context.active_object
+ return (ob and ob.active_material)
+
+ def draw_header(self, context):
+ raym = context.active_object.active_material.raytrace_mirror
+
+ layout = self.layout
+ layout.itemR(raym, "enabled", text=self.__label__)
+
def draw(self, context):
layout = self.layout
- try:
- raym = context.active_object.active_material.raytrace_mirror
- except:
- raym = None
-
- if not raym:
- return
-
- layout.itemR(raym, "enabled", text="Enable")
-
+ raym = context.active_object.active_material.raytrace_mirror
+
split = layout.split()
sub = split.column()
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h 2009-05-19 17:13:33 UTC (rev 20279)
@@ -159,6 +159,8 @@
/* verify if the panel should draw or not */
int (*poll)(const struct bContext *, struct PanelType *);
+ /* draw header (optional) */
+ void (*draw_header)(const struct bContext *, struct Panel *);
/* draw entirely, view changes should be handled here */
void (*draw)(const struct bContext *, struct Panel *);
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-05-19 17:13:33 UTC (rev 20279)
@@ -5650,7 +5650,6 @@
{
SpaceButs *sbuts= (SpaceButs *)sl;
memcpy(&ar->v2d, &sbuts->v2d, sizeof(View2D));
- ar->v2d.keepzoom |= V2D_KEEPASPECT;
break;
}
case SPACE_FILE:
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_screen.h 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_screen.h 2009-05-19 17:13:33 UTC (rev 20279)
@@ -53,7 +53,9 @@
void ED_region_init(struct bContext *C, struct ARegion *ar);
void ED_region_tag_redraw(struct ARegion *ar);
void ED_region_tag_redraw_partial(struct ARegion *ar, struct rcti *rct);
+void ED_region_panels_init(struct wmWindowManager *wm, struct ARegion *ar);
void ED_region_panels(const struct bContext *C, struct ARegion *ar, int vertical, char *context);
+void ED_region_header_init(struct ARegion *ar);
void ED_region_header(const struct bContext *C, struct ARegion *ar);
/* spaces */
Modified: branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2009-05-19 16:23:18 UTC (rev 20278)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2009-05-19 17:13:33 UTC (rev 20279)
@@ -400,7 +400,7 @@
void uiBlockPickerButtons(struct uiBlock *block, float *col, float *hsv, float *old, char *hexcol, char mode, short retval);
uiBut *uiDefAutoButR(uiBlock *block, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, char *name, int icon, int x1, int y1, int x2, int y2);
-int uiDefAutoButsRNA(const struct bContext *C, uiBlock *block, struct PointerRNA *ptr);
+void uiDefAutoButsRNA(const struct bContext *C, uiLayout *layout, struct PointerRNA *ptr);
/* Links
*
@@ -462,16 +462,9 @@
void uiBeginPanels(const struct bContext *C, struct ARegion *ar);
void uiEndPanels(const struct bContext *C, struct ARegion *ar);
-struct Panel *uiBeginPanel(struct ARegion *ar, uiBlock *block, struct PanelType *pt);
+struct Panel *uiBeginPanel(struct ARegion *ar, uiBlock *block, struct PanelType *pt, int *open);
void uiEndPanel(uiBlock *block, int width, int height);
-void uiPanelsHome(struct ARegion *ar);
-
-/* deprecated */
-extern int uiNewPanel(const struct bContext *C, struct ARegion *ar, uiBlock *block, char *panelname, char *tabname, int ofsx, int ofsy, int sizex, int sizey);
-extern void uiNewPanelHeight(struct uiBlock *block, int sizey);
-extern void uiNewPanelTitle(struct uiBlock *block, char *str);
-
/* Handlers
*
* Handlers that can be registered in regions, areas and windows for
@@ -558,6 +551,8 @@
uiLayout *uiLayoutFree(uiLayout *layout, int align);
uiLayout *uiLayoutSplit(uiLayout *layout);
+uiBlock *uiLayoutFreeBlock(uiLayout *layout);
+
/* templates */
void uiTemplateHeader(uiLayout *layout, struct bContext *C);
void uiTemplateHeaderID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
@@ -573,8 +568,8 @@
void uiItemStringO(uiLayout *layout, char *name, int icon, char *opname, char *propname, char *value);
void uiItemFullO(uiLayout *layout, char *name, int icon, char *idname, struct IDProperty *properties, int context);
-void uiItemR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int expand);
-void uiItemFullR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int expand);
+void uiItemR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int expand, int slider);
+void uiItemFullR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, int value, int expand, int slider);
void uiItemEnumR(uiLayout *layout, char *name, int icon, struct PointerRNA *ptr, char *propname, int value);
void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname);
Modified: branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list