[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34204] branches/soc-2008-mxcurioni: Simplified the implementation of toggle buttons for folding/expanding

[Tamito Kajiyama]

Revision: 34204
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34204
Author:   kjym3
Date:     2011-01-09 18:15:00 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Simplified the implementation of toggle buttons for folding/expanding
modifier boxes in the Parameter Editor mode UI.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py	2011-01-09 17:56:26 UTC (rev 34203)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py	2011-01-09 18:15:00 UTC (rev 34204)
@@ -305,7 +305,7 @@
             icon = "TRIA_DOWN"
         else:
             icon = "TRIA_RIGHT"
-        row.operator("scene.freestyle_modifier_toggle_fold", icon=icon, text="", emboss=False)
+        row.prop(modifier, "expanded", text="", icon=icon, emboss=False)
         row.label(text=modifier.rna_type.name)
         row.prop(modifier, "name", text="")
         row.prop(modifier, "use", text="")

Modified: branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h	2011-01-09 17:56:26 UTC (rev 34203)
+++ branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h	2011-01-09 18:15:00 UTC (rev 34204)
@@ -60,7 +60,6 @@
 void SCENE_OT_freestyle_color_modifier_add(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_alpha_modifier_add(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_thickness_modifier_add(struct wmOperatorType *ot);
-void SCENE_OT_freestyle_modifier_toggle_fold(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_modifier_remove(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_modifier_move(struct wmOperatorType *ot);
 

Modified: branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c	2011-01-09 17:56:26 UTC (rev 34203)
+++ branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c	2011-01-09 18:15:00 UTC (rev 34204)
@@ -67,7 +67,6 @@
 	WM_operatortype_append(SCENE_OT_freestyle_color_modifier_add);
 	WM_operatortype_append(SCENE_OT_freestyle_alpha_modifier_add);
 	WM_operatortype_append(SCENE_OT_freestyle_thickness_modifier_add);
-	WM_operatortype_append(SCENE_OT_freestyle_modifier_toggle_fold);
 	WM_operatortype_append(SCENE_OT_freestyle_modifier_remove);
 	WM_operatortype_append(SCENE_OT_freestyle_modifier_move);
 

Modified: branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c	2011-01-09 17:56:26 UTC (rev 34203)
+++ branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c	2011-01-09 18:15:00 UTC (rev 34204)
@@ -1084,36 +1084,6 @@
 	ot->prop= RNA_def_enum(ot->srna, "type", linestyle_thickness_modifier_type_items, 0, "Type", "");
 }
 
-static int freestyle_modifier_toggle_fold_exec(bContext *C, wmOperator *UNUSED(op))
-{
-	Scene *scene= CTX_data_scene(C);
-	PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier);
-	LineStyleModifier *modifier= ptr.data;
-
-	if (modifier->flags & LS_MODIFIER_EXPANDED)
-		modifier->flags &= ~LS_MODIFIER_EXPANDED;
-	else
-		modifier->flags |= LS_MODIFIER_EXPANDED;
-
-	WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
-	
-	return OPERATOR_FINISHED;
-}
-
-void SCENE_OT_freestyle_modifier_toggle_fold(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Toggle Modifier Fold";
-	ot->idname= "SCENE_OT_freestyle_modifier_toggle_fold";
-	ot->description="Fold/expand the modifier tab.";
-	
-	/* api callbacks */
-	ot->exec= freestyle_modifier_toggle_fold_exec;
-
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-}
-
 static int freestyle_get_modifier_type(PointerRNA *ptr)
 {
 	if (RNA_struct_is_a(ptr->type, &RNA_LineStyleColorModifier))