[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48622] branches/soc-2012-bratwurst: Switch the floating controls panel over to python drawing.

[Jorge Rodriguez]

Revision: 48622
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48622
Author:   vino
Date:     2012-07-05 04:25:01 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Switch the floating controls panel over to python drawing.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py	2012-07-05 03:55:55 UTC (rev 48621)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py	2012-07-05 04:25:01 UTC (rev 48622)
@@ -2703,6 +2703,23 @@
             rna_prop_ui.draw(self.layout, context, member, object, False)
 
 
+class VIEW3D_PT_floating_controls(Panel):
+	bl_space_type = 'VIEW_3D'
+	bl_region_type = 'WINDOW'
+	bl_label = "Floating Controls"
+	bl_options = {'HIDE_HEADER'}
+
+	def draw(self, context):
+		layout = self.layout
+
+		col = layout.column(align=True)
+		col.label(text="Transform:")
+		#col.operator("transform.translate")
+		#col.operator("transform.rotate")
+		#col.operator("transform.resize", text="Scale")
+
+
+
 def register():
     bpy.utils.register_module(__name__)
 

Modified: branches/soc-2012-bratwurst/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/space_view3d/space_view3d.c	2012-07-05 03:55:55 UTC (rev 48621)
+++ branches/soc-2012-bratwurst/source/blender/editors/space_view3d/space_view3d.c	2012-07-05 04:25:01 UTC (rev 48622)
@@ -1174,8 +1174,6 @@
 	art->dont_clear = 1;
 	BLI_addhead(&st->regiontypes, art);
 
-	view3d_main_register(art);
-
 	/* regions: listview/buttons */
 	art = MEM_callocN(sizeof(ARegionType), "spacetype view3d buttons region");
 	art->regionid = RGN_TYPE_UI;

Modified: branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_intern.h	2012-07-05 03:55:55 UTC (rev 48621)
+++ branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_intern.h	2012-07-05 04:25:01 UTC (rev 48622)
@@ -186,9 +186,6 @@
 void viewzoom_modal_keymap(struct wmKeyConfig *keyconf);
 void viewdolly_modal_keymap(struct wmKeyConfig *keyconf);
 
-/* view3d_view.c */
-void view3d_main_register(struct ARegionType *art);
-
 /* view3d_buttons.c */
 void VIEW3D_OT_properties(struct wmOperatorType *ot);
 void view3d_buttons_register(struct ARegionType *art);

Modified: branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c	2012-07-05 03:55:55 UTC (rev 48621)
+++ branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c	2012-07-05 04:25:01 UTC (rev 48622)
@@ -64,11 +64,6 @@
 #include "ED_screen.h"
 #include "ED_armature.h"
 
-#ifdef TEST_CONTROLS
-#include "UI_interface.h"
-#include "UI_resources.h"
-#endif
-
 #ifdef WITH_GAMEENGINE
 #include "BL_System.h"
 #endif
@@ -1876,27 +1871,6 @@
 	        ) * rv3d->pixsize;
 }
 
-static void view3d_panel_main(const bContext *C, Panel *pa)
-{
-#ifdef TEST_CONTROLS
-	uiLayout *col;
-	col = uiLayoutColumn(pa->layout, TRUE);
-	uiItemFullO(col, "TRANSFORM_OT_transform", NULL, ICON_SIZE_ICON, NULL, WM_OP_INVOKE_REGION_WIN, 0);
-#endif
-}
-
-void view3d_main_register(ARegionType *art)
-{
-	PanelType *pt;
-
-	pt = MEM_callocN(sizeof(PanelType), "spacetype view3d panel floating");
-	strcpy(pt->idname, "VIEW3D_PT_floating_controls");
-	strcpy(pt->label, "Floating Controls");
-	pt->draw = view3d_panel_main;
-	pt->flag = PNL_NO_HEADER;
-	BLI_addtail(&art->paneltypes, pt);
-}
-
 /* view matrix properties utilities */
 
 /* unused */