2.5

Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
  can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
  reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
  shows the last operator, if appropriate.
  Nkey properties moved to the other side.

A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;

- Buttons now all have a complete set of colors, based on button classifications
  (See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types. 
  Currently colors are defined for Window, Header, List/Channels and
  for Button/Tool views. 
  The screen manager handles this btw, so a TH_BACK will always pick the
  right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
  the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
  Only Panel font, widget font and widget-label work now. The 'group label'
  will be for templates mostly.
  Style settings will be expanded with spacing defaults, label conventions, 
  etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
  Same goes for Panel title color.

Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.

2 files changed, 47 insertions, 22 deletions

diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 77b0d6e2d49..7a6e48f2ca9 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -217,6 +217,7 @@ typedef struct ARegion {
 #define RGN_TYPE_CHANNELS	2
 #define RGN_TYPE_TEMPORARY	3
 #define RGN_TYPE_UI			4
+#define RGN_TYPE_TOOLS		5
 
 /* region alignment */
 #define RGN_ALIGN_NONE		0
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index c1a0e72256f..91c81023c8c 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -98,41 +98,62 @@ typedef struct uiStyle {
 	
 } uiStyle;
 
-
-/* global, button colors */
-typedef struct ThemeUI {
+typedef struct uiWidgetColors {
 	char outline[4];
-	char neutral[4];
-	char action[4];
-	char setting[4];
-	char setting1[4];
-	char setting2[4];
-	char num[4];
-	char textfield[4];
-	char textfield_hi[4];
-	char popup[4];
+	char inner[4];
+	char inner_sel[4];
+	char item[4];
 	char text[4];
-	char text_hi[4];
-	char menu_back[4];
-	char menu_item[4];
-	char menu_hilite[4];
-	char menu_text[4];
-	char menu_text_hi[4];
+	char text_sel[4];
+	short shaded;
+	short shadetop, shadedown;
+	short pad;
+} uiWidgetColors;
+
+typedef struct ThemeUI {
+	
+	/* Interface Elements (buttons, menus, icons) */
+	uiWidgetColors wcol_regular, wcol_tool, wcol_radio, wcol_text, wcol_option;
+	uiWidgetColors wcol_num, wcol_numslider;
+	uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item;
 	
-	char but_drawtype;
-	char pad[3];
 	char iconfile[80];	// FILE_MAXFILE length
+	
 } ThemeUI;
 
 /* try to put them all in one, if needed a special struct can be created as well
  * for example later on, when we introduce wire colors for ob types or so...
  */
 typedef struct ThemeSpace {
+	/* main window colors */
 	char back[4];
+	char title[4];
 	char text[4];	
 	char text_hi[4];
+	
+	/* header colors */
 	char header[4];
+	char header_title[4];
+	char header_text[4];	
+	char header_text_hi[4];
+
+	/* button/tool regions */
+	char button[4];
+	char button_title[4];
+	char button_text[4];	
+	char button_text_hi[4];
+	
+	/* listview regions */
+	char list[4];
+	char list_title[4];
+	char list_text[4];	
+	char list_text_hi[4];
+	
+	/* float panel */
 	char panel[4];
+	char panel_title[4];	
+	char panel_text[4];	
+	char panel_text_hi[4];
 	
 	char shade1[4];
 	char shade2[4];
@@ -166,8 +187,12 @@ typedef struct ThemeSpace {
 
 	char handle_vertex[4];
 	char handle_vertex_select[4];
+	
 	char handle_vertex_size;
 	char hpad[3];
+	
+	char pad[4];
+	
 } ThemeSpace;
 
 
@@ -190,7 +215,6 @@ typedef struct bTheme {
 	struct bTheme *next, *prev;
 	char name[32];
 	
-	/* Interface Elements (buttons, menus, icons) */
 	ThemeUI tui;
 	
 	/* Individual Spacetypes */
@@ -213,7 +237,7 @@ typedef struct bTheme {
 	/* 20 sets of bone colors for this theme */
 	ThemeWireColor tarm[20];
 	/*ThemeWireColor tobj[20];*/
-
+	
 } bTheme;
 
 typedef struct SolidLight {