[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22379] branches/blender2.5/blender/ release/ui/space_info.py: 2.5: User Preferences:

Thomas Dinges dingto at gmx.de
Tue Aug 11 20:19:09 CEST 2009


Revision: 22379
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22379
Author:   dingto
Date:     2009-08-11 20:19:09 +0200 (Tue, 11 Aug 2009)

Log Message:
-----------
2.5: User Preferences:

* Code cleanup. Note: This file doesn't follow the UI code guidelines due to some more complex layout structure. 
Will think about this special case.

* Added new Sound Options into the System settings. 

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_info.py

Modified: branches/blender2.5/blender/release/ui/space_info.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_info.py	2009-08-11 18:16:00 UTC (rev 22378)
+++ branches/blender2.5/blender/release/ui/space_info.py	2009-08-11 18:19:09 UTC (rev 22379)
@@ -5,9 +5,10 @@
 	__space_type__ = "USER_PREFERENCES"
 
 	def draw(self, context):
+		layout = self.layout
+		
 		st = context.space_data
 		rd = context.scene.render_data
-		layout = self.layout
 		
 		layout.template_header()
 
@@ -142,6 +143,7 @@
 
 	def draw(self, context):
 		layout = self.layout
+		
 		rd = context.scene.render_data
 
 		layout.itemO("screen.render", text="Render Image")
@@ -174,6 +176,7 @@
 
 	def draw(self, context):
 		layout = self.layout
+		
 		userpref = context.user_preferences
 
 		layout.itemR(userpref, "active_section", expand=True)
@@ -189,100 +192,98 @@
 
 	def draw(self, context):
 		layout = self.layout
+		
 		userpref = context.user_preferences
 		view = userpref.view
 
 		split = layout.split()
+		
 		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
-		colsplitcol.itemL(text="Display:")
-		colsplitcol.itemR(view, "tooltips")
-		colsplitcol.itemR(view, "display_object_info", text="Object Info")
-		colsplitcol.itemR(view, "use_large_cursors")
-		colsplitcol.itemR(view, "show_view_name", text="View Name")
-		colsplitcol.itemR(view, "show_playback_fps", text="Playback FPS")
-		colsplitcol.itemR(view, "global_scene")
-		colsplitcol.itemR(view, "pin_floating_panels")
-		colsplitcol.itemR(view, "object_center_size")
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-		colsplitcol.itemS()
+		sub = col.split(percentage=0.85)
 		
-		colsplitcol.itemR(view, "show_mini_axis")
-		colsub = colsplitcol.column()
-		colsub.enabled = view.show_mini_axis
-		colsub.itemR(view, "mini_axis_size")
-		colsub.itemR(view, "mini_axis_brightness")
+		sub1 = sub.column()
+		sub1.itemL(text="Display:")
+		sub1.itemR(view, "tooltips")
+		sub1.itemR(view, "display_object_info", text="Object Info")
+		sub1.itemR(view, "use_large_cursors")
+		sub1.itemR(view, "show_view_name", text="View Name")
+		sub1.itemR(view, "show_playback_fps", text="Playback FPS")
+		sub1.itemR(view, "global_scene")
+		sub1.itemR(view, "pin_floating_panels")
+		sub1.itemR(view, "object_center_size")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemR(view, "show_mini_axis")
+		sub2 = sub1.column()
+		sub2.enabled = view.show_mini_axis
+		sub2.itemR(view, "mini_axis_size")
+		sub2.itemR(view, "mini_axis_brightness")
 		
-
+		col = split.column()
+		sub = col.split(percentage=0.85)
 		
+		sub1 = sub.column()
+		sub1.itemL(text="View Manipulation:")
+		sub1.itemR(view, "auto_depth")
+		sub1.itemR(view, "global_pivot")
+		sub1.itemR(view, "zoom_to_mouse")
+		sub1.itemR(view, "rotate_around_selection")
+		sub1.itemS()
+		sub1.itemL(text="Zoom Style:")
+		sub1.row().itemR(view, "viewport_zoom_style", expand=True)
+		sub1.itemL(text="Orbit Style:")
+		sub1.row().itemR(view, "view_rotation", expand=True)
+		sub1.itemR(view, "perspective_orthographic_switch")
+		sub1.itemR(view, "smooth_view")
+		sub1.itemR(view, "rotation_angle")
+		sub1.itemS()
+		sub1.itemL(text="NDOF Device:")
+		sub1.itemR(view, "ndof_pan_speed", text="Pan Speed")
+		sub1.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
 		
 		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
-		colsplitcol.itemL(text="View Manipulation:")
-		colsplitcol.itemR(view, "auto_depth")
-		colsplitcol.itemR(view, "global_pivot")
-		colsplitcol.itemR(view, "zoom_to_mouse")
-		colsplitcol.itemR(view, "rotate_around_selection")
-		colsplitcol.itemL(text="Zoom Style:")
-		row = colsplitcol.row()
-		row.itemR(view, "viewport_zoom_style", expand=True)
-		colsplitcol.itemL(text="Orbit Style:")
-		row = colsplitcol.row()
-		row.itemR(view, "view_rotation", expand=True)
-		colsplitcol.itemR(view, "perspective_orthographic_switch")
-		colsplitcol.itemR(view, "smooth_view")
-		colsplitcol.itemR(view, "rotation_angle")
-		colsplitcol.itemL(text="NDOF Device:")
-		colsplitcol.itemR(view, "ndof_pan_speed", text="Pan Speed")
-		colsplitcol.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
+		sub = col.split(percentage=0.85)
 		
+		sub1 = sub.column()
+		sub1.itemL(text="Mouse Buttons:")
+		sub1.itemR(view, "left_mouse_button_select")
+		sub1.itemR(view, "right_mouse_button_select")
+		sub1.itemR(view, "emulate_3_button_mouse")
+		sub1.itemR(view, "use_middle_mouse_paste")
+		sub1.itemR(view, "middle_mouse_rotate")
+		sub1.itemR(view, "middle_mouse_pan")
+		sub1.itemR(view, "wheel_invert_zoom")
+		sub1.itemR(view, "wheel_scroll_lines")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Menus:")
+		sub1.itemR(view, "open_mouse_over")
+		sub1.itemL(text="Menu Open Delay:")
+		sub1.itemR(view, "open_toplevel_delay", text="Top Level")
+		sub1.itemR(view, "open_sublevel_delay", text="Sub Level")
+
 		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
-		colsplitcol.itemL(text="Mouse Buttons:")
-		colsplitcol.itemR(view, "left_mouse_button_select")
-		colsplitcol.itemR(view, "right_mouse_button_select")
-		colsplitcol.itemR(view, "emulate_3_button_mouse")
-		colsplitcol.itemR(view, "use_middle_mouse_paste")
-		colsplitcol.itemR(view, "middle_mouse_rotate")
-		colsplitcol.itemR(view, "middle_mouse_pan")
-		colsplitcol.itemR(view, "wheel_invert_zoom")
-		colsplitcol.itemR(view, "wheel_scroll_lines")
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-		colsplitcol.itemS()
+		sub = col.split(percentage=0.85)
 		
-		colsplitcol.itemL(text="Menus:")
-		colsplitcol.itemR(view, "open_mouse_over")
-		colsplitcol.itemL(text="Menu Open Delay:")
-		colsplitcol.itemR(view, "open_toplevel_delay", text="Top Level")
-		colsplitcol.itemR(view, "open_sublevel_delay", text="Sub Level")
-
-		
-		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
+		sub1 = sub.column()
 		#manipulator
-		colsplitcol.itemR(view, "use_manipulator")
-		colsub = colsplitcol.column()
-		colsub.enabled = view.use_manipulator
-		colsub.itemR(view, "manipulator_size", text="Size")
-		colsub.itemR(view, "manipulator_handle_size", text="Handle Size")
-		colsub.itemR(view, "manipulator_hotspot", text="Hotspot")	
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-				
-		colsplitcol.itemL(text="Toolbox:")
-		colsplitcol.itemR(view, "use_column_layout")
-		colsplitcol.itemL(text="Open Toolbox Delay:")
-		colsplitcol.itemR(view, "open_left_mouse_delay", text="Hold LMB")
-		colsplitcol.itemR(view, "open_right_mouse_delay", text="Hold RMB")
+		sub1.itemR(view, "use_manipulator")
+		sub2 = sub1.column()
+		sub2.enabled = view.use_manipulator
+		sub2.itemR(view, "manipulator_size", text="Size")
+		sub2.itemR(view, "manipulator_handle_size", text="Handle Size")
+		sub2.itemR(view, "manipulator_hotspot", text="Hotspot")	
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()			
+		sub1.itemL(text="Toolbox:")
+		sub1.itemR(view, "use_column_layout")
+		sub1.itemL(text="Open Toolbox Delay:")
+		sub1.itemR(view, "open_left_mouse_delay", text="Hold LMB")
+		sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
 
-		
 class INFO_PT_edit(bpy.types.Panel):
 	__space_type__ = "USER_PREFERENCES"
 	__label__ = "Edit"
@@ -294,93 +295,92 @@
 
 	def draw(self, context):
 		layout = self.layout
+		
 		userpref = context.user_preferences
 		edit = userpref.edit
 		view = userpref.view
 		
 		split = layout.split()
+		
 		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
-
-		colsplitcol.itemL(text="Materials:")
-		colsplitcol.itemR(edit, "material_linked_object", text="Linked to Object")
-		colsplitcol.itemR(edit, "material_linked_obdata", text="Linked to ObData")
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-		colsplitcol.itemS()
+		sub = col.split(percentage=0.85)
 		
-		colsplitcol.itemL(text="New Objects:")
-		colsplitcol.itemR(edit, "enter_edit_mode")
-		colsplitcol.itemR(edit, "align_to_view")
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-		colsplitcol.itemS()
+		sub1 = sub.column()
+		sub1.itemL(text="Materials:")
+		sub1.itemR(edit, "material_linked_object", text="Linked to Object")
+		sub1.itemR(edit, "material_linked_obdata", text="Linked to ObData")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="New Objects:")
+		sub1.itemR(edit, "enter_edit_mode")
+		sub1.itemR(edit, "align_to_view")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Transform:")
+		sub1.itemR(edit, "drag_immediately")
 		
-		colsplitcol.itemL(text="Transform:")
-		colsplitcol.itemR(edit, "drag_immediately")
-		
 		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
-		colsplitcol.itemL(text="Snap:")
-		colsplitcol.itemR(edit, "snap_translate", text="Translate")
-		colsplitcol.itemR(edit, "snap_rotate", text="Rotate")
-		colsplitcol.itemR(edit, "snap_scale", text="Scale")
-		colsplitcol.itemS()
-		colsplitcol.itemS()
-		colsplitcol.itemS()
+		sub = col.split(percentage=0.85)
 		
-		colsplitcol.itemL(text="Grease Pencil:")
-		colsplitcol.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
-		colsplitcol.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
-		colsplitcol.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
-		# colsplitcol.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
-		colsplitcol.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
+		sub1 = sub.column()
+		sub1.itemL(text="Snap:")
+		sub1.itemR(edit, "snap_translate", text="Translate")
+		sub1.itemR(edit, "snap_rotate", text="Rotate")
+		sub1.itemR(edit, "snap_scale", text="Scale")
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemS()
+		sub1.itemL(text="Grease Pencil:")
+		sub1.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
+		sub1.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")
+		sub1.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
+		# sub1.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke")
+		sub1.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
 		
-		
 		col = split.column()
-		colsplit = col.split(percentage=0.85)
-		colsplitcol = colsplit.column()
-
-		colsplitcol.itemL(text="Keyframing:")

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list