Revision: 21859
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21859
Author: billrey
Date: 2009-07-24 16:30:40 +0200 (Fri, 24 Jul 2009)
Log Message:
-----------
Resized the preferences window to 800 px. This makes proper space for the
header button text. Merged File Paths and Autosave preference tabs to one
'File' item. This makes the number of items inside the tabs more even and makes
text in the tabs easier to read when the window is narrower.
Also added weight paint ramp.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_info.py
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: branches/blender2.5/blender/release/ui/space_info.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_info.py 2009-07-24
14:26:47 UTC (rev 21858)
+++ branches/blender2.5/blender/release/ui/space_info.py 2009-07-24
14:30:40 UTC (rev 21859)
@@ -195,7 +195,7 @@
split = layout.split()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Display:")
colsplitcol.itemR(view, "tooltips")
@@ -220,7 +220,7 @@
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="View Manipulation:")
colsplitcol.itemR(view, "auto_depth")
@@ -241,7 +241,7 @@
colsplitcol.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Mouse Buttons:")
colsplitcol.itemR(view, "left_mouse_button_select")
@@ -264,7 +264,7 @@
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
#manipulator
colsplitcol.itemR(view, "use_manipulator")
@@ -301,7 +301,7 @@
split = layout.split()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Materials:")
@@ -322,7 +322,7 @@
colsplitcol.itemR(edit, "drag_immediately")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Snap:")
colsplitcol.itemR(edit, "snap_translate", text="Translate")
@@ -341,7 +341,7 @@
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Keyframing:")
@@ -367,7 +367,7 @@
colsplitcol.itemS()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemL(text="Duplicate:")
colsplitcol.itemR(edit, "duplicate_mesh", text="Mesh")
@@ -399,7 +399,7 @@
split = layout.split()
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
colsplitcol.itemR(system, "emulate_numpad")
colsplitcol.itemS()
@@ -407,7 +407,10 @@
#Weight Colors
colsplitcol.itemL(text="Weight Colors:")
colsplitcol.itemR(system, "use_weight_color_range", text="Use
Custom Range")
- colsplitcol.itemR(system, "weight_color_range")
+
+ colsub = colsplitcol.column()
+ colsub.active = system.use_weight_color_range
+ colsub.template_color_ramp(system.weight_color_range,
expand=True)
colsplitcol.itemS()
colsplitcol.itemS()
@@ -417,7 +420,7 @@
colsplitcol.itemR(system, "memory_cache_limit")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
#System
colsplitcol.itemL(text="System:")
@@ -431,7 +434,7 @@
colsplitcol.itemR(system, "audio_mixing_buffer")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.85)
colsplitcol = colsplit.column()
#OpenGL
colsplitcol.itemL(text="OpenGL:")
@@ -441,7 +444,7 @@
row = colsplitcol.row()
row.itemR(system, "window_draw_method", expand=True)
colsplitcol.itemL(text="Textures:")
- colsplitcol.itemR(system, "gl_texture_limit", text="Limit")
+ colsplitcol.itemR(system, "gl_texture_limit", text="Limit Size")
colsplitcol.itemR(system, "texture_time_out", text="Time Out")
colsplitcol.itemR(system, "texture_collection_rate",
text="Collection Rate")
@@ -461,46 +464,48 @@
split = layout.split()
col = split.column()
- col.itemR(paths, "use_relative_paths")
- col.itemR(paths, "compress_file")
- col.itemR(paths, "fonts_directory")
- col.itemR(paths, "textures_directory")
- col.itemR(paths, "texture_plugin_directory")
- col.itemR(paths, "sequence_plugin_directory")
- col.itemR(paths, "render_output_directory")
- col.itemR(paths, "python_scripts_directory")
- col.itemR(paths, "sounds_directory")
- col.itemR(paths, "temporary_directory")
-
-class INFO_PT_autosave(bpy.types.Panel):
- __space_type__ = "USER_PREFERENCES"
- __label__ = "Auto Save"
- __no_header__ = True
-
- def poll(self, context):
- userpref = context.user_preferences
- return (userpref.active_section == 'AUTO_SAVE')
-
- def draw(self, context):
- layout = self.layout
- userpref = context.user_preferences
- save = userpref.autosave
+ col.itemL(text="File Paths:")
+ splitcol = col.split(percentage=0.3)
- split = layout.split()
- col = split.column()
- colsplit = col.split(percentage=0.8)
- colsplitcol = colsplit.column()
- colsplitcol.itemR(save, "save_version")
- colsplitcol.itemR(save, "recent_files")
- colsplitcol.itemR(save, "save_preview_images")
+ splitcol.itemL(text="Fonts:")
+ splitcol.itemR(paths, "fonts_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Textures:")
+ splitcol.itemR(paths, "textures_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Texture Plugins:")
+ splitcol.itemR(paths, "texture_plugin_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Sequence Plugins:")
+ splitcol.itemR(paths, "sequence_plugin_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Render Output:")
+ splitcol.itemR(paths, "render_output_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Scripts:")
+ splitcol.itemR(paths, "python_scripts_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Sounds:")
+ splitcol.itemR(paths, "sounds_directory", text="")
+ splitcol = col.split(percentage=0.3)
+ splitcol.itemL(text="Temp:")
+ splitcol.itemR(paths, "temporary_directory", text="")
col = split.column()
- colsplit = col.split(percentage=0.8)
+ colsplit = col.split(percentage=0.2)
colsplitcol = colsplit.column()
- colsplitcol.itemR(save, "auto_save_temporary_files")
+ colsplitcol = colsplit.column()
+ colsplitcol.itemL(text="Save & Load:")
+ colsplitcol.itemR(paths, "use_relative_paths")
+ colsplitcol.itemR(paths, "compress_file")
+ colsplitcol.itemL(text="Auto Save:")
+ colsplitcol.itemR(paths, "save_version")
+ colsplitcol.itemR(paths, "recent_files")
+ colsplitcol.itemR(paths, "save_preview_images")
+ colsplitcol.itemR(paths, "auto_save_temporary_files")
colsub = colsplitcol.column()
- colsub.enabled = save.auto_save_temporary_files
- colsub.itemR(save, "auto_save_time")
+ colsub.enabled = paths.auto_save_temporary_files
+ colsub.itemR(paths, "auto_save_time")
class INFO_PT_language(bpy.types.Panel):
__space_type__ = "USER_PREFERENCES"
@@ -553,7 +558,6 @@
bpy.types.register(INFO_PT_edit)
bpy.types.register(INFO_PT_system)
bpy.types.register(INFO_PT_filepaths)
-bpy.types.register(INFO_PT_autosave)
bpy.types.register(INFO_PT_language)
bpy.types.register(INFO_PT_bottombar)
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-07-24 14:26:47 UTC (rev 21858)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-07-24 14:30:40 UTC (rev 21859)
@@ -2982,7 +2982,7 @@
rcti rect;
int sizex, sizey;
- sizex= 640;
+ sizex= 800;
sizey= 480;
/* some magic to calculate postition */
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
2009-07-24 14:26:47 UTC (rev 21858)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
2009-07-24 14:30:40 UTC (rev 21859)
@@ -101,11 +101,6 @@
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesEdit,
ptr->data);
}
-static PointerRNA rna_UserDef_autosave_get(PointerRNA *ptr)
-{
- return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesAutosave,
ptr->data);
-}
-
static PointerRNA rna_UserDef_language_get(PointerRNA *ptr)
{
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesLanguage,
ptr->data);
@@ -1721,8 +1716,8 @@
StructRNA *srna;
static EnumPropertyItem auto_key_modes[] = {
- {AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add/Replace
Keys", ""},
- {AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", 0, "Replace Keys", ""},
+ {AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add/Replace", ""},
+ {AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", 0, "Replace", ""},
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem new_interpolation_types[] = {
@@ -1956,55 +1951,20 @@
RNA_def_property_update(prop, NC_WINDOW, NULL);
}
-static void rna_def_userdef_autosave(BlenderRNA *brna)
-{
- PropertyRNA *prop;
- StructRNA *srna;
-
- /* Autosave */
-
- srna= RNA_def_struct(brna, "UserPreferencesAutosave", NULL);
- RNA_def_struct_sdna(srna, "UserDef");
- RNA_def_struct_nested(brna, srna, "UserPreferences");
- RNA_def_struct_ui_text(srna, "Auto Save", "Automatic backup file
settings.");
-
- prop= RNA_def_property(srna, "save_version", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "versions");
- RNA_def_property_range(prop, 0, 32);
- RNA_def_property_ui_text(prop, "Save Versions", "The number of old
versions to maintain in the current directory, when manually saving.");
-
- prop= RNA_def_property(srna, "auto_save_temporary_files", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOSAVE);
- RNA_def_property_ui_text(prop, "Auto Save Temporary Files", "Automatic
saving of temporary files.");
-
- prop= RNA_def_property(srna, "auto_save_time", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "savetime");
- RNA_def_property_range(prop, 1, 60);
- RNA_def_property_ui_text(prop, "Auto Save Time", "The time (in minutes)
to wait between automatic temporary saves.");
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
