[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25851] trunk/blender/release/scripts/ui/ space_userpref.py: User Preferences:
Thomas Dinges
dingto at gmx.de
Sat Jan 9 16:49:31 CET 2010
Revision: 25851
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25851
Author: dingto
Date: 2010-01-09 16:49:27 +0100 (Sat, 09 Jan 2010)
Log Message:
-----------
User Preferences:
*More cleanup, still this file gives me a headache.
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 2010-01-09 13:04:43 UTC (rev 25850)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-01-09 15:49:27 UTC (rev 25851)
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-# UI Color Settings, extra function to reduce code.
+# General UI Theme Settings (User Interface)
def ui_items_general(self, context):
layout = self.layout
@@ -39,7 +39,28 @@
subsub.active = context.shaded
subsub.prop(context, "shadetop")
subsub.prop(context, "shadedown")
+
+def opengl_lamp_buttons(column, lamp):
+ split = column.split(percentage=0.1)
+ if lamp.enabled == True:
+ split.prop(lamp, "enabled", text="", icon='OUTLINER_OB_LAMP')
+ else:
+ split.prop(lamp, "enabled", text="", icon='LAMP_DATA')
+
+ col = split.column()
+ col.active = lamp.enabled
+ row = col.row()
+ row.label(text="Diffuse:")
+ row.prop(lamp, "diffuse_color", text="")
+ row = col.row()
+ row.label(text="Specular:")
+ row.prop(lamp, "specular_color", text="")
+
+ col = split.column()
+ col.active = lamp.enabled
+ col.prop(lamp, "direction", text="")
+
KM_HIERARCHY = [
('Window', 'EMPTY', 'WINDOW', []), # file save, window change, exit
('Screen', 'EMPTY', 'WINDOW', [ # full screen, undo, screenshot
@@ -175,7 +196,6 @@
row = layout.row()
-
col = row.column()
col.label(text="Display:")
col.prop(view, "tooltips")
@@ -197,7 +217,6 @@
sub.prop(view, "mini_axis_size", text="Size")
sub.prop(view, "mini_axis_brightness", text="Brightness")
-
row.separator()
row.separator()
@@ -258,13 +277,11 @@
userpref = context.user_preferences
edit = userpref.edit
-
row = layout.row()
-
col = row.column()
col.label(text="Link Materials To:")
- col.row().prop(edit, "material_link", expand=True)
+ col.prop(edit, "material_link", text="")
col.separator()
col.separator()
@@ -273,7 +290,7 @@
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.prop(edit, "object_align", text="")
col.separator()
col.separator()
@@ -284,11 +301,9 @@
col.prop(edit, "undo_steps", text="Steps")
col.prop(edit, "undo_memory_limit", text="Memory Limit")
-
row.separator()
row.separator()
-
col = row.column()
col.label(text="Snap:")
col.prop(edit, "snap_translate", text="Translate")
@@ -304,11 +319,9 @@
col.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius")
col.prop(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke")
-
row.separator()
row.separator()
-
col = row.column()
col.label(text="Keyframing:")
col.prop(edit, "use_visual_keying")
@@ -337,11 +350,9 @@
col.label(text="Transform:")
col.prop(edit, "drag_immediately")
-
row.separator()
row.separator()
-
col = row.column()
col.label(text="Duplicate Data:")
col.prop(edit, "duplicate_mesh", text="Mesh")
@@ -373,12 +384,11 @@
userpref = context.user_preferences
system = userpref.system
- lamp0 = system.solid_lights[0]
- lamp1 = system.solid_lights[1]
- lamp2 = system.solid_lights[2]
split = layout.split()
+
+ # 1. Column
column = split.column()
colsplit = column.split(percentage=0.85)
@@ -408,8 +418,6 @@
col.separator()
col.separator()
-
-
#column = split.column()
#colsplit = column.split(percentage=0.85)
@@ -423,7 +431,9 @@
#col.separator()
#col.prop(system, "use_textured_fonts")
+
+ # 2. Column
column = split.column()
colsplit = column.split(percentage=0.85)
@@ -448,7 +458,9 @@
col.label(text="Sequencer:")
col.prop(system, "prefetch_frames")
col.prop(system, "memory_cache_limit")
+
+ # 3. Column
column = split.column()
column.label(text="Solid OpenGL lights:")
@@ -457,83 +469,29 @@
split.label()
split.label(text="Colors:")
split.label(text="Direction:")
+
+ lamp = system.solid_lights[0]
+ opengl_lamp_buttons(column, lamp)
+
+ lamp = system.solid_lights[1]
+ opengl_lamp_buttons(column, lamp)
+
+ lamp = system.solid_lights[2]
+ opengl_lamp_buttons(column, lamp)
-
- split = column.split(percentage=0.1)
-
- if lamp0.enabled == True:
- split.prop(lamp0, "enabled", text="", icon='OUTLINER_OB_LAMP')
- else:
- split.prop(lamp0, "enabled", text="", icon='LAMP_DATA')
-
- col = split.column()
- col.active = lamp0.enabled
- row = col.row()
- row.label(text="Diffuse:")
- row.prop(lamp0, "diffuse_color", text="")
- row = col.row()
- row.label(text="Specular:")
- row.prop(lamp0, "specular_color", text="")
-
- col = split.column()
- col.active = lamp0.enabled
- col.prop(lamp0, "direction", text="")
-
-
- split = column.split(percentage=0.1)
-
- if lamp1.enabled == True:
- split.prop(lamp1, "enabled", text="", icon='OUTLINER_OB_LAMP')
- else:
- split.prop(lamp1, "enabled", text="", icon='LAMP_DATA')
-
- col = split.column()
- col.active = lamp1.enabled
- row = col.row()
- row.label(text="Diffuse:")
- row.prop(lamp1, "diffuse_color", text="")
- row = col.row()
- row.label(text="Specular:")
- row.prop(lamp1, "specular_color", text="")
-
- col = split.column()
- col.active = lamp1.enabled
- col.prop(lamp1, "direction", text="")
-
-
- split = column.split(percentage=0.1)
-
- if lamp2.enabled == True:
- split.prop(lamp2, "enabled", text="", icon='OUTLINER_OB_LAMP')
- else:
- split.prop(lamp2, "enabled", text="", icon='LAMP_DATA')
-
- col = split.column()
- col.active = lamp2.enabled
- row = col.row()
- row.label(text="Diffuse:")
- row.prop(lamp2, "diffuse_color", text="")
- row = col.row()
- row.label(text="Specular:")
- row.prop(lamp2, "specular_color", text="")
-
- col = split.column()
- col.active = lamp2.enabled
- col.prop(lamp2, "direction", text="")
-
-
column.separator()
column.separator()
column.separator()
-
- col = column.column()
- col.prop(system, "color_picker_type")
+ column.label(text="Color Picker Type:")
+ column.row().prop(system, "color_picker_type", text="")
column.separator()
+ column.separator()
+ column.separator()
- col.prop(system, "use_weight_color_range", text="Custom Weight Paint Range")
- sub = col.column()
+ column.prop(system, "use_weight_color_range", text="Custom Weight Paint Range")
+ sub = column.column()
sub.active = system.use_weight_color_range
sub.template_color_ramp(system, "weight_color_range", expand=True)
More information about the Bf-blender-cvs
mailing list