[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27850] trunk/blender: Fix [#20115] Some theme settings are not saved

Matt Ebb matt at mke3.net
Tue Mar 30 06:27:15 CEST 2010


Revision: 27850
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27850
Author:   broken
Date:     2010-03-30 06:27:13 +0200 (Tue, 30 Mar 2010)

Log Message:
-----------
Fix [#20115] Some theme settings are not saved

Theme colours were getting overwritten on startup with defaults (as in 2.4 
system). Changed this to allow changing the default theme, and added a 
'Reset to defaults' operator in user prefs. Perhaps next step to look into the 
py presets system for themes too (nice and easy to share).

If you're using a custom B.blend you may get some strange theme colours on 
startup if they weren't saved properly before. 'Reset to default' button in theme 
preferences should fix it back to defaults.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/datafiles/B.blend.c
    trunk/blender/source/blender/editors/interface/interface.c
    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/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-03-30 02:54:49 UTC (rev 27849)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-03-30 04:27:13 UTC (rev 27850)
@@ -164,17 +164,19 @@
 
         layout.operator_context = 'EXEC_AREA'
         layout.operator("wm.save_homefile", text="Save As Default")
-
+        
+        layout.operator_context = 'INVOKE_DEFAULT'
+        
         if userpref.active_section == 'INPUT':
-            layout.operator_context = 'INVOKE_DEFAULT'
-            op = layout.operator("wm.keyconfig_export", "Export Key Configuration...")
+            op = layout.operator("wm.keyconfig_export")
             op.path = "keymap.py"
-            op = layout.operator("wm.keyconfig_import", "Import Key Configuration...")
+            op = layout.operator("wm.keyconfig_import")
             op.path = "keymap.py"
         elif userpref.active_section == 'ADDONS':
-            layout.operator_context = 'INVOKE_DEFAULT'
-            op = layout.operator("wm.addon_install", "Install Add-On...")
+            op = layout.operator("wm.addon_install")
             op.path = "*.py"
+        elif userpref.active_section == 'THEMES':           
+            op = layout.operator("ui.reset_default_theme")
 
 
 class USERPREF_PT_tabs(bpy.types.Panel):
@@ -1593,7 +1595,7 @@
 class WM_OT_addon_install(bpy.types.Operator):
     "Install an addon"
     bl_idname = "wm.addon_install"
-    bl_label = "Install Add-On"
+    bl_label = "Install Add-On..."
 
     module = StringProperty(name="Module", description="Module name of the addon to disable")
 

Modified: trunk/blender/source/blender/editors/datafiles/B.blend.c
===================================================================
--- trunk/blender/source/blender/editors/datafiles/B.blend.c	2010-03-30 02:54:49 UTC (rev 27849)
+++ trunk/blender/source/blender/editors/datafiles/B.blend.c	2010-03-30 04:27:13 UTC (rev 27850)
@@ -1,213 +1,267 @@
-/* DataToC output of file <_B25_blend> */
+/* DataToC output of file <B_blend> */
 
-int datatoc_B_blend_size= 341204;
+int datatoc_B_blend_size= 395872;
 char datatoc_B_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 95,118, 50, 53, 49, 82, 69, 78, 68, 32,  0,  0,  0,
-168, 93,199,191,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 76, 79, 66, 16,  1,  0,  0,180, 92,199,191,199,  0,  0,  0,  1,  0,  0,  0,
- 32, 32, 32, 48,  0,  0,  0,  0,250,  0,  0,  0,  1,  0,  0,  1,  8, 71,112, 10,240,212,114, 10,  0, 16,  0,  0,128,  0,  4,  0,
- 47,104,111,109,101, 47,105,100,101, 97,115,109, 97,110, 52, 50, 47, 46, 66, 50, 53, 46, 98,108,101,110,100,  0, 20, 93,199,191,
- 60, 94,199,191,192, 93,199,191, 76, 97,173,  0, 20, 93,199,191,127, 14,189,  8,232, 93,199,191, 60, 94,199,191,  0,  0,  0,  0,
-  1,128,173,251, 76,103,199,191, 41,207,126,  8, 96,166,190, 11,168, 93,199,191, 32,  0,  0,  0,255,255,255,255, 60, 94,199,191,
-255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,244,175,205,  8,136, 93,199,191,114,209,126,  8,104,160,222, 10,
-168, 93,199,191, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 32,  0,  0,  0,
-168, 93,199,191,  0,  0,  0,  0,  1,  0,  0,  0, 40,120,113, 11, 76,103,199,191,216, 93,199,191, 46,216,126,  8,104,160,222, 10,
- 82, 69, 78, 68, 32,  0,  0,  0,168, 93,199,191, 48,208,115, 10,244,175,205,  8,  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77,  0,  0,164,  0,  0,  0,176,233,110, 10,103,  1,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77, 87,105,110, 77, 97,110,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,234,110, 10,128,234,110, 10,
-128,234,110, 10,128,234,110, 10,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,110,115, 10, 24,110,115, 10, 24,110,115, 10, 32,111,115, 10,
- 32,111,115, 10, 32,111,115, 10, 68, 65, 84, 65,148,  0,  0,  0,128,234,110, 10,104,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,144,111,115, 10,  1,  0,  0,  0,  0,  0,  0,  0,  8, 71,112, 10,  0,  0,  0,  0,115, 99,114,101,101,110,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 26,  0,254,  4,214,  2,
-  0,  0,  0,  0,  1,  0,238,  3,  0,  0,  1,  0,  0,  0,  0,  0,136,189,163, 10,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0, 88,138,164, 10,144,140,184, 11,144,140,184, 11,144,101,164, 10,152,102,164, 10,160,103,164, 10,160,103,164, 10,
- 24,104,164, 10, 96,142,164, 10,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,140,  0,  0,  0, 64,235,110, 10,193,  0,  0,  0,
-  1,  0,  0,  0,176,172,111, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 65,110,105,109, 97,116,105,111,110,  0,
- 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,235,110, 10, 56,240,110, 10,
-120,240,110, 10, 88,248,110, 10,160,248,110, 10,240,156,111, 10,  0,  0,  0,  0,  0,  0,  0,  0,240,212,114, 10,  0,  0,  0,  0,
+
+ 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 50, 82, 69, 78, 68, 32,  0,  0,  0,112,231,191, 95,255,127,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 71, 76, 79, 66, 24,  1,  0,  0,128,230,191, 95,255,127,  0,  0,200,  0,  0,  0,  1,  0,  0,  0, 32, 32, 32, 50,
+  2,  0,  0,  0,250,  0,  0,  0,  1,  0,  0,  1,176,206, 83, 22,  1,  0,  0,  0, 48,218,173,  4,  1,  0,  0,  0,  0, 16,  0,  0,
+128,  0,  4,  0, 60,109,101,109,111,114,121, 50, 62,  0,  0,  0,  0,  0,  0,  0,226, 76,241,  1,  1,  0,  0,  0, 40,  0,  0,  0,
+ 48,  0,  0,  0,176,231,191, 95,255,127,  0,  0,224,230,191, 95,255,127,  0,  0,208, 38,171, 30, 32,  0,  0,  0,112,231,191, 95,
+255,127,  0,  0, 64,140, 49, 30,  1,  0,  0,  0, 45,  0,  0,  0,  0,  0,  0,  0,118,  0,  0,  0,  0,  0,  0,  0, 80,231,191, 95,
+255,127,  0,  0, 65,209, 98,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,112,231,191, 95,255,127,  0,  0, 32,  0,  0,  0,
+ 82, 69, 78, 68, 64,140, 49, 30,  1,  0,  0,  0, 82, 69, 78, 68, 32,  0,  0,  0,112,231,191, 95,255,127,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,160,231,191, 95,255,127,  0,  0,160,231,191, 95,255,127,  0,  0, 20,216, 98,  0,  1,  0,  0,  0, 48,162,172,  4,
+  1,  0,  0,  0, 64,140, 49, 30,  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,176,206, 83, 22,  1,  0,  0,  0, 87, 77,  0,  0, 16,  1,  0,  0,160,139, 82, 22,
+  1,  0,  0,  0,106,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77, 87,105,110, 77, 97,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,140, 82, 22,  1,  0,  0,  0,240,140, 82, 22,
+  1,  0,  0,  0,240,140, 82, 22,  1,  0,  0,  0,240,140, 82, 22,  1,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,240,148, 53, 30,
+  1,  0,  0,  0,240,148, 53, 30,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,108, 53, 30,
+  1,  0,  0,  0, 80,108, 53, 30,  1,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,248,235,110, 10,194,  0,  0,  0,
-  1,  0,  0,  0, 56,236,110, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,
- 56,236,110, 10,194,  0,  0,  0,  1,  0,  0,  0,120,236,110, 10,248,235,110, 10,  0,  0,  0,  0,  0,  0,214,  2,  0,  0,  0,  0,
- 68, 65, 84, 65, 20,  0,  0,  0,120,236,110, 10,194,  0,  0,  0,  1,  0,  0,  0,184,236,110, 10, 56,236,110, 10,  0,  0,  0,  0,
-254,  4,214,  2,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,184,236,110, 10,194,  0,  0,  0,  1,  0,  0,  0,248,236,110, 10,
-120,236,110, 10,  0,  0,  0,  0,254,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,248,236,110, 10,194,  0,  0,  0,
-  1,  0,  0,  0, 56,237,110, 10,184,236,110, 10,  0,  0,  0,  0,  0,  0,187,  2,  1,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,
- 56,237,110, 10,194,  0,  0,  0,  1,  0,  0,  0,120,237,110, 10,248,236,110, 10,  0,  0,  0,  0,254,  4,187,  2,  1,  0,  0,  0,
- 68, 65, 84, 65, 20,  0,  0,  0,120,237,110, 10,194,  0,  0,  0,  1,  0,  0,  0,184,237,110, 10, 56,237,110, 10,  0,  0,  0,  0,
- 32,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,184,237,110, 10,194,  0,  0,  0,  1,  0,  0,  0,248,237,110, 10,
-120,237,110, 10,  0,  0,  0,  0, 32,  4,187,  2,  1,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,248,237,110, 10,194,  0,  0,  0,
-  1,  0,  0,  0, 56,238,110, 10,184,237,110, 10,  0,  0,  0,  0, 32,  4, 52,  1,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,
- 56,238,110, 10,194,  0,  0,  0,  1,  0,  0,  0,120,238,110, 10,248,237,110, 10,  0,  0,  0,  0,254,  4, 52,  1,  0,  0,  0,  0,
- 68, 65, 84, 65, 20,  0,  0,  0,120,238,110, 10,194,  0,  0,  0,  1,  0,  0,  0,184,238,110, 10, 56,238,110, 10,  0,  0,  0,  0,
-  0,  0, 84,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,184,238,110, 10,194,  0,  0,  0,  1,  0,  0,  0,248,238,110, 10,
-120,238,110, 10,  0,  0,  0,  0, 32,  4, 84,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,248,238,110, 10,194,  0,  0,  0,
-  1,  0,  0,  0, 56,239,110, 10,184,238,110, 10,  0,  0,  0,  0,192,  1, 84,  0,  0,  0,  0,  0, 68, 65, 84, 65, 20,  0,  0,  0,

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list