[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26904] trunk/blender: Console:

[Thomas Dinges]

Revision: 26904
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26904
Author:   dingto
Date:     2010-02-15 03:39:40 +0100 (Mon, 15 Feb 2010)

Log Message:
-----------
Console:
* Added own theme support for the cursor, was depending on the line_error color before.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/include/UI_resources.h
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/space_console/console_draw.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-15 01:42:51 UTC (rev 26903)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-02-15 02:39:40 UTC (rev 26904)
@@ -958,6 +958,7 @@
             col.prop(prefs, "line_input")
             col.prop(prefs, "line_info")
             col.prop(prefs, "line_error")
+            col.prop(prefs, "cursor")
 
 
 class USERPREF_PT_file(bpy.types.Panel):

Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h	2010-02-15 01:42:51 UTC (rev 26903)
+++ trunk/blender/source/blender/editors/include/UI_resources.h	2010-02-15 02:39:40 UTC (rev 26904)
@@ -189,6 +189,7 @@
 	TH_CONSOLE_INPUT,
 	TH_CONSOLE_INFO,
 	TH_CONSOLE_ERROR,
+	TH_CONSOLE_CURSOR,
 	
 	TH_SEQ_MOVIE,
 	TH_SEQ_IMAGE,

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2010-02-15 01:42:51 UTC (rev 26903)
+++ trunk/blender/source/blender/editors/interface/resources.c	2010-02-15 02:39:40 UTC (rev 26904)
@@ -353,6 +353,8 @@
 				cp= ts->console_info; break;
 			case TH_CONSOLE_ERROR:
 				cp= ts->console_error; break;
+			case TH_CONSOLE_CURSOR:
+				cp= ts->console_cursor; break;
 
 			case TH_HANDLE_VERTEX:
 				cp= ts->handle_vertex;
@@ -622,6 +624,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_cursor, 220, 96, 96, 255);
 	
 
 	/* space sound */

Modified: trunk/blender/source/blender/editors/space_console/console_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_draw.c	2010-02-15 01:42:51 UTC (rev 26903)
+++ trunk/blender/source/blender/editors/space_console/console_draw.c	2010-02-15 02:39:40 UTC (rev 26904)
@@ -331,7 +331,7 @@
 			BLF_draw(cl->line);
 
 			/* cursor */
-			console_line_color(fg, CONSOLE_LINE_ERROR); /* lazy */
+			UI_GetThemeColor3ubv(TH_CONSOLE_CURSOR, (char *)fg);
 			glColor3ub(fg[0], fg[1], fg[2]);
 			glRecti(xy[0]+(cwidth*cl->cursor) -1, xy[1]-2, xy[0]+(cwidth*cl->cursor) +1, xy[1]+sc->lheight-2);
 

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-02-15 01:42:51 UTC (rev 26903)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-02-15 02:39:40 UTC (rev 26904)
@@ -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];
+	char console_output[4], console_input[4], console_info[4], console_error[4], console_cursor[4];
 	
 	char vertex_size, facedot_size;
 	char bpad[6];

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-15 01:42:51 UTC (rev 26903)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-15 02:39:40 UTC (rev 26904)
@@ -1003,6 +1003,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, "cursor", PROP_FLOAT, PROP_COLOR);
+	RNA_def_property_float_sdna(prop, NULL, "console_cursor");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Cursor", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_info(BlenderRNA *brna)