Revision: 19852
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19852
Author: blendix
Date: 2009-04-21 17:30:54 +0200 (Tue, 21 Apr 2009)
Log Message:
-----------
2.5:
* Changed the buttons window contexts to be like the mockups:
scene, world, object, data, material, texture, particles, physics
* Removed temporary C layout code for buttons and scene.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_scene.py
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_object.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_scene.c
Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py 2009-04-21
15:24:04 UTC (rev 19851)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py 2009-04-21
15:30:54 UTC (rev 19852)
@@ -4,7 +4,7 @@
class RenderButtonsPanel(bpy.types.Panel):
__space_type__ = "BUTTONS_WINDOW"
__region_type__ = "WINDOW"
- __context__ = "render"
+ __context__ = "scene"
class RENDER_PT_shading(RenderButtonsPanel):
__label__ = "Shading"
@@ -35,7 +35,6 @@
class RENDER_PT_image(RenderButtonsPanel):
__label__ = "Image"
- __context__ = "render"
def draw(self, context):
scene = context.scene
@@ -65,7 +64,6 @@
class RENDER_PT_antialiasing(RenderButtonsPanel):
__label__ = "Anti-Aliasing"
- __context__ = "render"
def draw(self, context):
scene = context.scene
@@ -91,7 +89,6 @@
class RENDER_PT_render(RenderButtonsPanel):
__label__ = "Render"
- __context__ = "render"
def draw(self, context):
scene = context.scene
@@ -149,4 +146,4 @@
bpy.types.register(RENDER_PT_render)
bpy.types.register(RENDER_PT_antialiasing)
bpy.types.register(RENDER_PT_shading)
-bpy.types.register(RENDER_PT_image)
\ No newline at end of file
+bpy.types.register(RENDER_PT_image)
Modified:
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
2009-04-21 15:24:04 UTC (rev 19851)
+++
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
2009-04-21 15:30:54 UTC (rev 19852)
@@ -122,6 +122,7 @@
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, NULL);
break;
case B_CONTEXT_SWITCH:
+ case B_BUTSPREVIEW:
ED_area_tag_redraw(CTX_wm_area(C));
break;
}
@@ -153,53 +154,17 @@
uiBlockSetEmboss(block, UI_EMBOSS);
uiBlockBeginAlign(block);
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_GAME,
xco, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_LOGIC, 0, 0,
"Logic (F4) ");
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCRIPT,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SCRIPT, 0, 0,
"Script ");
- uiDefIconButS(block, ROW, B_BUTSPREVIEW,
ICON_MATERIAL_DATA,xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0,
(float)CONTEXT_SHADING, 0, 0, "Shading (F5) ");
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_OBJECT,
0, 0, "Object (F7) ");
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_EDIT,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_EDITING,
0, 0, "Editing (F9) ");
- uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE_DATA,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SCENE, 0, 0,
"Scene (F10) ");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE,
xco, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0,
"Scene");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_WORLD,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0,
"World");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0,
"Object");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_EDIT,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_GAME, 0, 0,
"Object Data");
+ uiDefIconButS(block, ROW, B_BUTSPREVIEW, ICON_MATERIAL,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0,
(float)BCONTEXT_MATERIAL, 0, 0, "Material");
+ uiDefIconButS(block, ROW, B_BUTSPREVIEW, ICON_TEXTURE,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0,
"Texture");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PARTICLES,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0,
"Particles");
+ uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PHYSICS,
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0,
"Physics");
xco+= XIC;
- /* select the context to be drawn, per contex/tab the actual context is
tested */
- uiBlockSetEmboss(block, UI_EMBOSS); // normal
- switch(sbuts->mainb) {
- case CONTEXT_SCENE:
- uiBlockBeginAlign(block);
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_SCENE, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SCENE]), 1.0,
(float)TAB_SCENE_RENDER, 0, 0, "Render buttons ");
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_SEQUENCE, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SCENE]), 1.0,
(float)TAB_SCENE_SEQUENCER, 0, 0, "Sequencer buttons ");
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_ANIM, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SCENE]), 1.0,
(float)TAB_SCENE_ANIM, 0, 0, "Anim/playback buttons");
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_SOUND, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SCENE]), 1.0,
(float)TAB_SCENE_SOUND, 0, 0, "Sound block buttons");
-
- break;
- case CONTEXT_OBJECT:
- uiBlockBeginAlign(block);
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_OBJECT_DATA, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]),
1.0, (float)TAB_OBJECT_OBJECT, 0, 0, "Object buttons ");
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_PHYSICS, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]), 1.0,
(float)TAB_OBJECT_PHYSICS, 0, 0, "Physics buttons");
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_PARTICLES, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]), 1.0,
(float)TAB_OBJECT_PARTICLE, 0, 0, "Particle buttons");
-
- break;
- case CONTEXT_SHADING:
- uiBlockBeginAlign(block);
- uiDefIconButC(block, ROW, B_BUTSPREVIEW,
ICON_LAMP, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SHADING]), 1.0,
(float)TAB_SHADING_LAMP, 0, 0, "Lamp buttons");
- uiDefIconButC(block, ROW, B_BUTSPREVIEW,
ICON_MATERIAL, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SHADING]), 1.0,
(float)TAB_SHADING_MAT, 0, 0, "Material buttons");
- uiDefIconButC(block, ROW, B_BUTSPREVIEW,
ICON_TEXTURE, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SHADING]), 1.0,
(float)TAB_SHADING_TEX, 0, 0, "Texture buttons(F6)");
- uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,
ICON_RADIO,xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SHADING]),
1.0, (float)TAB_SHADING_RAD, 0, 0, "Radiosity buttons");
- uiDefIconButC(block, ROW, B_BUTSPREVIEW,
ICON_WORLD, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_SHADING]), 1.0,
(float)TAB_SHADING_WORLD, 0, 0, "World buttons");
-
- break;
- case CONTEXT_EDITING:
-
- break;
- case CONTEXT_SCRIPT:
-
- break;
- case CONTEXT_LOGIC:
-
- break;
- }
-
uiBlockEndAlign(block);
xco+=XIC;
Modified:
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
2009-04-21 15:24:04 UTC (rev 19851)
+++
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
2009-04-21 15:30:54 UTC (rev 19852)
@@ -32,34 +32,18 @@
struct ARegionType;
struct bContext;
-/* warning: the values of these defines are used in sbuts->tabs[7] */
+/* warning: the values of these defines are used in sbuts->tabs[8] */
/* buts->mainb new */
-#define CONTEXT_SCENE 0
-#define CONTEXT_OBJECT 1
-#define CONTEXT_TYPES 2
-#define CONTEXT_SHADING 3
-#define CONTEXT_EDITING 4
-#define CONTEXT_SCRIPT 5
-#define CONTEXT_LOGIC 6
+#define BCONTEXT_SCENE 0
+#define BCONTEXT_WORLD 1
+#define BCONTEXT_OBJECT 2
+#define BCONTEXT_DATA 3
+#define BCONTEXT_MATERIAL 4
+#define BCONTEXT_TEXTURE 5
+#define BCONTEXT_PARTICLE 6
+#define BCONTEXT_PHYSICS 7
+#define BCONTEXT_GAME 8
-/* buts->tab new */
-#define TAB_SHADING_MAT 0
-#define TAB_SHADING_TEX 1
-#define TAB_SHADING_RAD 2
-#define TAB_SHADING_WORLD 3
-#define TAB_SHADING_LAMP 4
-
-#define TAB_OBJECT_OBJECT 0
-#define TAB_OBJECT_PHYSICS 1
-#define TAB_OBJECT_PARTICLE 2
-
-#define TAB_SCENE_RENDER 0
-#define TAB_SCENE_WORLD 1
-#define TAB_SCENE_ANIM 2
-#define TAB_SCENE_SOUND 3
-#define TAB_SCENE_SEQUENCER 4
-
-
/* buts->scaflag */
#define BUTS_SENS_SEL 1
#define BUTS_SENS_ACT 2
@@ -73,13 +57,10 @@
#define BUTS_SENS_STATE 512
#define BUTS_ACT_STATE 1024
-
/* internal exports only */
/* image_header.c */
void buttons_header_buttons(const struct bContext *C, struct ARegion *ar);
-void buttons_scene_register(struct ARegionType *art);
-void buttons_object_register(struct ARegionType *art);
#endif /* ED_BUTTONS_INTERN_H */
Deleted:
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_object.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_object.c
2009-04-21 15:24:04 UTC (rev 19851)
+++
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_object.c
2009-04-21 15:30:54 UTC (rev 19852)
@@ -1,218 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_group_types.h"
-#include "DNA_object_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_space_types.h"
-
-#include "BLI_listbase.h"
-
-#include "BKE_context.h"
-#include "BKE_group.h"
-#include "BKE_main.h"
-#include "BKE_screen.h"
-
-#include "UI_interface.h"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
