[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57275] trunk/blender: add support for storing text styles in themes.

[Campbell Barton]

Revision: 57275
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57275
Author:   campbellbarton
Date:     2013-06-07 00:27:21 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
add support for storing text styles in themes.
also reset text styles when resetting to the default theme. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
    trunk/blender/source/blender/editors/interface/interface_intern.h
    trunk/blender/source/blender/editors/interface/interface_ops.c
    trunk/blender/source/blender/editors/interface/resources.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2013-06-06 23:58:30 UTC (rev 57274)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2013-06-07 00:27:21 UTC (rev 57275)
@@ -488,7 +488,10 @@
     preset_subdir = "interface_theme"
     preset_operator = "script.execute_preset"
     preset_type = 'XML'
-    preset_xml_map = (("user_preferences.themes[0]", "Theme"), )
+    preset_xml_map = (
+        ("user_preferences.themes[0]", "Theme"),
+        ("user_preferences.ui_styles[0]", "ThemeStyle"),
+        )
     draw = Menu.draw_preset
 
 

Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h	2013-06-06 23:58:30 UTC (rev 57274)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h	2013-06-07 00:27:21 UTC (rev 57275)
@@ -560,6 +560,7 @@
 /* resources.c */
 void init_userdef_do_versions(void);
 void ui_theme_init_default(void);
+void ui_style_init_default(void);
 void ui_resources_init(void);
 void ui_resources_free(void);
 

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2013-06-06 23:58:30 UTC (rev 57274)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2013-06-07 00:27:21 UTC (rev 57275)
@@ -351,6 +351,7 @@
 static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	ui_theme_init_default();
+	ui_style_init_default();
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 	
 	return OPERATOR_FINISHED;

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2013-06-06 23:58:30 UTC (rev 57274)
+++ trunk/blender/source/blender/editors/interface/resources.c	2013-06-07 00:27:21 UTC (rev 57275)
@@ -1001,7 +1001,14 @@
 	btheme->tclip.handle_vertex_size = 4;
 }
 
+void ui_style_init_default(void)
+{
+	BLI_freelistN(&U.uistyles);
+	/* gets automatically re-allocated */
+	uiStyleInit();
+}
 
+
 void UI_SetTheme(int spacetype, int regionid)
 {
 	if (spacetype == 0) {  /* called for safety, when delete themes */