[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25222] trunk/blender/release/scripts/ui/ space_userpref.py: 2.5 User Preferences:

Thomas Dinges dingto at gmx.de
Tue Dec 8 20:08:35 CET 2009


Revision: 25222
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25222
Author:   dingto
Date:     2009-12-08 20:08:35 +0100 (Tue, 08 Dec 2009)

Log Message:
-----------
2.5 User Preferences:
* Massive Code Cleanup, still not "Layout Code Guidelines" conform, but much better.

* Commented out buttons that don't work yet, like translation buttons.
* Some minor shuffling around of buttons in "System" Tab. William: Feel free to modify that, still some room for improvements. :)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2009-12-08 18:28:09 UTC (rev 25221)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2009-12-08 19:08:35 UTC (rev 25222)
@@ -37,13 +37,6 @@
             layout.operator("wm.keyconfig_export", "Export Key Configuration...").path = "keymap.py"
 
 
-class USERPREF_MT_view(bpy.types.Menu):
-    bl_label = "View"
-
-    def draw(self, context):
-        pass # layout = self.layout
-
-
 class USERPREF_PT_tabs(bpy.types.Panel):
     bl_label = ""
     bl_space_type = 'USER_PREFERENCES'
@@ -76,74 +69,77 @@
 
         split = layout.split()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="Display:")
-        sub1.prop(view, "tooltips")
-        sub1.prop(view, "display_object_info", text="Object Info")
-        sub1.prop(view, "use_large_cursors")
-        sub1.prop(view, "show_view_name", text="View Name")
-        sub1.prop(view, "show_playback_fps", text="Playback FPS")
-        sub1.prop(view, "global_scene")
-        sub1.prop(view, "pin_floating_panels")
-        sub1.prop(view, "object_origin_size")
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-        sub1.prop(view, "show_mini_axis", text="Display Mini Axis")
-        sub2 = sub1.column()
-        sub2.enabled = view.show_mini_axis
-        sub2.prop(view, "mini_axis_size", text="Size")
-        sub2.prop(view, "mini_axis_brightness", text="Brightness")
+        col = colsplit.column()
+        col.label(text="Display:")
+        col.prop(view, "tooltips")
+        col.prop(view, "display_object_info", text="Object Info")
+        col.prop(view, "use_large_cursors")
+        col.prop(view, "show_view_name", text="View Name")
+        col.prop(view, "show_playback_fps", text="Playback FPS")
+        col.prop(view, "global_scene")
+        col.prop(view, "pin_floating_panels")
+        col.prop(view, "object_origin_size")
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        col.separator()
+        col.separator()
+        col.separator()
 
-        sub1 = sub.column()
-        sub1.label(text="View Manipulation:")
-        sub1.prop(view, "auto_depth")
-        sub1.prop(view, "global_pivot")
-        sub1.prop(view, "zoom_to_mouse")
-        sub1.prop(view, "rotate_around_selection")
-        sub1.separator()
+        col.prop(view, "show_mini_axis", text="Display Mini Axis")
+        sub = col.column()
+        sub.enabled = view.show_mini_axis
+        sub.prop(view, "mini_axis_size", text="Size")
+        sub.prop(view, "mini_axis_brightness", text="Brightness")
 
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1.prop(view, "auto_perspective")
-        sub1.prop(view, "smooth_view")
-        sub1.prop(view, "rotation_angle")
+        col = colsplit.column()
+        col.label(text="View Manipulation:")
+        col.prop(view, "auto_depth")
+        col.prop(view, "global_pivot")
+        col.prop(view, "zoom_to_mouse")
+        col.prop(view, "rotate_around_selection")
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
-        sub1 = sub.column()
+        col.separator()
 
-#Toolbox doesn't exist yet
-#       sub1.label(text="Toolbox:")
-#       sub1.prop(view, "use_column_layout")
-#       sub1.label(text="Open Toolbox Delay:")
-#       sub1.prop(view, "open_left_mouse_delay", text="Hold LMB")
-#       sub1.prop(view, "open_right_mouse_delay", text="Hold RMB")
+        col.prop(view, "auto_perspective")
+        col.prop(view, "smooth_view")
+        col.prop(view, "rotation_angle")
 
-        #manipulator
-        sub1.prop(view, "use_manipulator")
-        sub2 = sub1.column()
-        sub2.enabled = view.use_manipulator
-        sub2.prop(view, "manipulator_size", text="Size")
-        sub2.prop(view, "manipulator_handle_size", text="Handle Size")
-        sub2.prop(view, "manipulator_hotspot", text="Hotspot")
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
+        
+        col = colsplit.column()
+        
+        #Toolbox doesn't exist yet
+        #col.label(text="Toolbox:")
+        #col.prop(view, "use_column_layout")
+        #col.label(text="Open Toolbox Delay:")
+        #col.prop(view, "open_left_mouse_delay", text="Hold LMB")
+        #col.prop(view, "open_right_mouse_delay", text="Hold RMB")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        #Manipulator
+        col.prop(view, "use_manipulator")
+        sub = col.column()
+        sub.enabled = view.use_manipulator
+        sub.prop(view, "manipulator_size", text="Size")
+        sub.prop(view, "manipulator_handle_size", text="Handle Size")
+        sub.prop(view, "manipulator_hotspot", text="Hotspot")
 
-        sub1.label(text="Menus:")
-        sub1.prop(view, "open_mouse_over")
-        sub1.label(text="Menu Open Delay:")
-        sub1.prop(view, "open_toplevel_delay", text="Top Level")
-        sub1.prop(view, "open_sublevel_delay", text="Sub Level")
+        col.separator()
+        col.separator()
+        col.separator()
 
+        col.label(text="Menus:")
+        col.prop(view, "open_mouse_over")
+        col.label(text="Menu Open Delay:")
+        col.prop(view, "open_toplevel_delay", text="Top Level")
+        col.prop(view, "open_sublevel_delay", text="Sub Level")
 
+
 class USERPREF_PT_edit(bpy.types.Panel):
     bl_space_type = 'USER_PREFERENCES'
     bl_label = "Edit"
@@ -162,93 +158,102 @@
 
         split = layout.split()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="Link Materials To:")
-        sub1.row().prop(edit, "material_link", expand=True)
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-        sub1.label(text="New Objects:")
-        sub1.prop(edit, "enter_edit_mode")
-        sub1.label(text="Align To:")
-        sub1.row().prop(edit, "object_align", expand=True)
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        col = colsplit.column()
+        col.label(text="Link Materials To:")
+        col.row().prop(edit, "material_link", expand=True)
 
-        sub1.label(text="Undo:")
-        sub1.prop(edit, "global_undo")
-        sub1.prop(edit, "undo_steps", text="Steps")
-        sub1.prop(edit, "undo_memory_limit", text="Memory Limit")
+        col.separator()
+        col.separator()
+        col.separator()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        col.label(text="New Objects:")
+        col.prop(edit, "enter_edit_mode")
+        col.label(text="Align To:")
+        col.row().prop(edit, "object_align", expand=True)
+        
+        col.separator()
+        col.separator()
+        col.separator()
 
-        sub1 = sub.column()
-        sub1.label(text="Snap:")
-        sub1.prop(edit, "snap_translate", text="Translate")
-        sub1.prop(edit, "snap_rotate", text="Rotate")
-        sub1.prop(edit, "snap_scale", text="Scale")
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
-        sub1.label(text="Grease Pencil:")
-        sub1.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
-        sub1.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
-        # sub1.prop(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
-        sub1.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
-        sub1.prop(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
+        col.label(text="Undo:")
+        col.prop(edit, "global_undo")
+        col.prop(edit, "undo_steps", text="Steps")
+        col.prop(edit, "undo_memory_limit", text="Memory Limit")
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1 = sub.column()
-        sub1.label(text="Keyframing:")
-        sub1.prop(edit, "use_visual_keying")
-        sub1.prop(edit, "keyframe_insert_needed", text="Only Insert Needed")
-        sub1.separator()
-        sub1.label(text="New F-Curve Defaults:")
-        sub1.prop(edit, "new_interpolation_type", text="Interpolation")
-        sub1.separator()
-        sub1.prop(edit, "auto_keying_enable", text="Auto Keyframing:")
-        sub2 = sub1.column()
-        sub2.active = edit.auto_keying_enable
-        sub2.prop(edit, "auto_keyframe_insert_keyingset", text="Only Insert for Keying Set")
-        sub2.prop(edit, "auto_keyframe_insert_available", text="Only Insert Available")
+        col = colsplit.column()
+        col.label(text="Snap:")
+        col.prop(edit, "snap_translate", text="Translate")
+        col.prop(edit, "snap_rotate", text="Rotate")
+        col.prop(edit, "snap_scale", text="Scale")
+        col.separator()
+        col.separator()
+        col.separator()
+        col.label(text="Grease Pencil:")
+        col.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
+        col.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
+        #col.prop(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
+        col.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
+        col.prop(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        column = split.column()
+        colsplit = column.split(percentage=0.85)
 
-        sub1.label(text="Transform:")
-        sub1.prop(edit, "drag_immediately")
+        col = colsplit.column()
+        col.label(text="Keyframing:")
+        col.prop(edit, "use_visual_keying")
+        col.prop(edit, "keyframe_insert_needed", text="Only Insert Needed")
 
-        sub1.separator()
-        sub1.separator()
-        sub1.separator()
+        col.separator()
 
-        col = split.column()
-        sub = col.split(percentage=0.85)
+        col.label(text="New F-Curve Defaults:")

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list