[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20574] branches/blender2.5/blender/source /blender: Wrapped buttons window in RNA

[Matt Ebb]

Revision: 20574
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20574
Author:   broken
Date:     2009-06-02 10:08:41 +0200 (Tue, 02 Jun 2009)

Log Message:
-----------
Wrapped buttons window in RNA

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
    branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c

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-06-02 07:52:17 UTC (rev 20573)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h	2009-06-02 08:08:41 UTC (rev 20574)
@@ -32,19 +32,6 @@
 struct ARegionType;
 struct bContext;
 
-/* warning: the values of these defines are used in sbuts->tabs[8] */
-/* buts->mainb new */
-#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
-#define BCONTEXT_BONE		9
-#define BCONTEXT_MODIFIER	10
 
 /* buts->scaflag */		
 #define BUTS_SENS_SEL		1

Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h	2009-06-02 07:52:17 UTC (rev 20573)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h	2009-06-02 08:08:41 UTC (rev 20574)
@@ -463,6 +463,22 @@
 #define TAB_SCENE_SOUND		3
 #define TAB_SCENE_SEQUENCER	4
 
+
+/* warning: the values of these defines are used in sbuts->tabs[8] */
+/* buts->mainb new */
+#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
+#define BCONTEXT_BONE		9
+#define BCONTEXT_MODIFIER	10
+
+
 /* sbuts->flag */
 #define SB_PRV_OSA			1
 

Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h	2009-06-02 07:52:17 UTC (rev 20573)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h	2009-06-02 08:08:41 UTC (rev 20574)
@@ -245,6 +245,7 @@
 extern StructRNA RNA_SoundSequence;
 extern StructRNA RNA_Space;
 extern StructRNA RNA_Space3DView;
+extern StructRNA RNA_SpaceButtonsWindow;
 extern StructRNA RNA_SpaceImageEditor;
 extern StructRNA RNA_SpaceUVEditor;
 extern StructRNA RNA_SpaceTextEditor;

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c	2009-06-02 07:52:17 UTC (rev 20573)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c	2009-06-02 08:08:41 UTC (rev 20574)
@@ -74,9 +74,9 @@
 		*/
 		case SPACE_OUTLINER:
 			return &RNA_SpaceOutliner;
-		/* case SPACE_BUTS:
+		case SPACE_BUTS:
 			return &RNA_SpaceButtonsWindow;
-		case SPACE_FILE:
+		/* case SPACE_FILE:
 			return &RNA_SpaceFileBrowser;*/
 		case SPACE_IMAGE:
 			return &RNA_SpaceImageEditor;
@@ -471,6 +471,45 @@
 	
 }
 
+static void rna_def_space_buttons(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem buttons_context_items[] = {
+		{BCONTEXT_SCENE, "SCENE", "Scene", ""},
+		{BCONTEXT_WORLD, "WORLD", "World", ""},
+		{BCONTEXT_OBJECT, "OBJECT", "Object", ""},
+		{BCONTEXT_DATA, "DATA", "Data", ""},
+		{BCONTEXT_MATERIAL, "MATERIAL", "Material", ""},
+		{BCONTEXT_TEXTURE, "TEXTURE", "Texture", ""},
+		{BCONTEXT_PARTICLE, "PARTICLE", "Particle", ""},
+		{BCONTEXT_PHYSICS, "PHYSICS", "Physics", ""},
+		{BCONTEXT_GAME, "GAME", "Game", ""},
+		{BCONTEXT_BONE, "BONE", "Bone", ""},
+		{BCONTEXT_MODIFIER, "MODIFIER", "Modifier", ""},
+		{0, NULL, NULL, NULL}};
+		
+	static EnumPropertyItem panel_alignment_items[] = {
+		{1, "HORIZONTAL", "Horizontal", ""},
+		{2, "VERTICAL", "Vertical", ""},
+		{0, NULL, NULL, NULL}};
+		
+	srna= RNA_def_struct(brna, "SpaceButtonsWindow", "Space");
+	RNA_def_struct_sdna(srna, "SpaceButs");
+	RNA_def_struct_ui_text(srna, "Buttons Space", "Buttons Window space data");
+	
+	prop= RNA_def_property(srna, "buttons_context", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "mainb");
+	RNA_def_property_enum_items(prop, buttons_context_items);
+	RNA_def_property_ui_text(prop, "Buttons Context", "The type of active data to display and edit in the buttons window");
+	
+	prop= RNA_def_property(srna, "panel_alignment", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "align");
+	RNA_def_property_enum_items(prop, panel_alignment_items);
+	RNA_def_property_ui_text(prop, "Panel Alignment", "Arrangement of the panels within the buttons window");
+}
+
 static void rna_def_space_image(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -624,6 +663,7 @@
 	rna_def_space_outliner(brna);
 	rna_def_background_image(brna);
 	rna_def_space_3dview(brna);
+	rna_def_space_buttons(brna);
 }
 
 #endif