[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26808] trunk/blender: Theme support for console background.

[Daniel Salazar]

Revision: 26808
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26808
Author:   zanqdo
Date:     2010-02-11 17:28:31 +0100 (Thu, 11 Feb 2010)

Log Message:
-----------
Theme support for console background. Thx cam for help!

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/space_console/space_console.c
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-02-11 15:45:19 UTC (rev 26807)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-02-11 16:28:31 UTC (rev 26808)
@@ -951,6 +951,7 @@
 
             col = split.column()
             col.prop(prefs, "header")
+            col.prop(prefs, "background")
 
             col = split.column()
             col.prop(prefs, "line_output")

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2010-02-11 15:45:19 UTC (rev 26807)
+++ trunk/blender/source/blender/editors/interface/resources.c	2010-02-11 16:28:31 UTC (rev 26808)
@@ -353,6 +353,8 @@
 				cp= ts->console_info; break;
 			case TH_CONSOLE_ERROR:
 				cp= ts->console_error; break;
+			case TH_BACK:
+				cp= ts->console_back; break;
 
 			case TH_HANDLE_VERTEX:
 				cp= ts->handle_vertex;
@@ -621,6 +623,7 @@
 	SETCOL(btheme->tconsole.console_input, 255, 255, 255, 255);
 	SETCOL(btheme->tconsole.console_info, 0, 170, 0, 255);
 	SETCOL(btheme->tconsole.console_error, 220, 96, 96, 255);
+	SETCOL(btheme->tconsole.console_back, 0, 0, 0, 255);
 	
 
 	/* space sound */

Modified: trunk/blender/source/blender/editors/space_console/space_console.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/space_console.c	2010-02-11 15:45:19 UTC (rev 26807)
+++ trunk/blender/source/blender/editors/space_console/space_console.c	2010-02-11 16:28:31 UTC (rev 26808)
@@ -162,15 +162,14 @@
 	SpaceConsole *sc= CTX_wm_space_console(C);
 	View2D *v2d= &ar->v2d;
 	View2DScrollers *scrollers;
-	//float col[3];
+	float col[3];
 	
 	if((sc->type==CONSOLE_TYPE_PYTHON) && (sc->scrollback.first==NULL))
 		WM_operator_name_call((bContext *)C, "CONSOLE_OT_banner", WM_OP_EXEC_DEFAULT, NULL);
 
 	/* clear and setup matrix */
-	//UI_GetThemeColor3fv(TH_BACK, col);
-	//glClearColor(col[0], col[1], col[2], 0.0);
-	glClearColor(0, 0, 0, 1.0);
+	UI_GetThemeColor3fv(TH_BACK, col);
+	glClearColor(col[0], col[1], col[2], 1.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	console_update_rect(C, ar);

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-02-11 15:45:19 UTC (rev 26807)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-02-11 16:28:31 UTC (rev 26808)
@@ -202,7 +202,7 @@
 	char cframe[4];
 	char ds_channel[4], ds_subchannel[4]; // dopesheet
 	
-	char console_output[4], console_input[4], console_info[4], console_error[4], console_back[4]; // Console (todo - console_back)
+	char console_output[4], console_input[4], console_info[4], console_error[4], console_back[4];
 	
 	char vertex_size, facedot_size;
 	char bpad[2];

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-11 15:45:19 UTC (rev 26807)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-11 16:28:31 UTC (rev 26808)
@@ -987,6 +987,12 @@
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Line Error", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+	prop= RNA_def_property(srna, "background", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "console_back");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Background", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_info(BlenderRNA *brna)