diff options
Diffstat (limited to 'release')
29 files changed, 459 insertions, 445 deletions
diff --git a/release/io/engine_render_pov.py b/release/io/engine_render_pov.py index ba9e7377535..97337ebc853 100644 --- a/release/io/engine_render_pov.py +++ b/release/io/engine_render_pov.py @@ -791,7 +791,7 @@ for member in dir(buttons_material): del buttons_material class RenderButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "scene" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py index 681b8ba8954..9b640776a9e 100644 --- a/release/ui/buttons_data_armature.py +++ b/release/ui/buttons_data_armature.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py index e05b64e5e11..1eb09377892 100644 --- a/release/ui/buttons_data_bone.py +++ b/release/ui/buttons_data_bone.py @@ -2,7 +2,7 @@ import bpy class BoneButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "bone" diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py index 51d8c8c61e6..f2fa4207ec8 100644 --- a/release/ui/buttons_data_camera.py +++ b/release/ui/buttons_data_camera.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py index d0e1756986d..35d557afe32 100644 --- a/release/ui/buttons_data_curve.py +++ b/release/ui/buttons_data_curve.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_empty.py b/release/ui/buttons_data_empty.py index 827fe02e411..2a2f51ed292 100644 --- a/release/ui/buttons_data_empty.py +++ b/release/ui/buttons_data_empty.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index 6fb021802f0..a00bb23d5b5 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" @@ -319,4 +319,4 @@ bpy.types.register(DATA_PT_falloff_curve) bpy.types.register(DATA_PT_area) bpy.types.register(DATA_PT_spot) bpy.types.register(DATA_PT_shadow) -bpy.types.register(DATA_PT_sunsky)
\ No newline at end of file +bpy.types.register(DATA_PT_sunsky) diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py index 3766b9ff1a5..5d8a07c7d44 100644 --- a/release/ui/buttons_data_lattice.py +++ b/release/ui/buttons_data_lattice.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py index d6ca0817edc..b681218a8fe 100644 --- a/release/ui/buttons_data_mesh.py +++ b/release/ui/buttons_data_mesh.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_metaball.py b/release/ui/buttons_data_metaball.py index a3781705799..e31c3d7fcd0 100644 --- a/release/ui/buttons_data_metaball.py +++ b/release/ui/buttons_data_metaball.py @@ -1,7 +1,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_data_modifier.py b/release/ui/buttons_data_modifier.py index 6dd11457ec9..436baa540d4 100644 --- a/release/ui/buttons_data_modifier.py +++ b/release/ui/buttons_data_modifier.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "modifier" diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py index 757e61307df..754d6fcda39 100644 --- a/release/ui/buttons_data_text.py +++ b/release/ui/buttons_data_text.py @@ -2,7 +2,7 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "data" diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py index b662254f1bb..3158536585e 100644 --- a/release/ui/buttons_game.py +++ b/release/ui/buttons_game.py @@ -2,7 +2,7 @@ import bpy class PhysicsButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "physics" @@ -171,7 +171,7 @@ bpy.types.register(PHYSICS_PT_game_physics) bpy.types.register(PHYSICS_PT_game_collision_bounds) class SceneButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "scene" @@ -276,7 +276,7 @@ bpy.types.register(SCENE_PT_game_player) bpy.types.register(SCENE_PT_game_stereo) class WorldButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "world" diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py index ff587d47668..b971a678926 100644 --- a/release/ui/buttons_material.py +++ b/release/ui/buttons_material.py @@ -2,7 +2,7 @@ import bpy class MaterialButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "material" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here diff --git a/release/ui/buttons_object.py b/release/ui/buttons_object.py index 5bd4bbbd6bd..6b6d583e2ca 100644 --- a/release/ui/buttons_object.py +++ b/release/ui/buttons_object.py @@ -2,7 +2,7 @@ import bpy class ObjectButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "object" diff --git a/release/ui/buttons_object_constraint.py b/release/ui/buttons_object_constraint.py index 505fa57fa0b..c67d6e40cfb 100644 --- a/release/ui/buttons_object_constraint.py +++ b/release/ui/buttons_object_constraint.py @@ -2,7 +2,7 @@ import bpy class ConstraintButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "constraint" diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py index 07ad3b7841c..8bc84b734bf 100644 --- a/release/ui/buttons_particle.py +++ b/release/ui/buttons_particle.py @@ -11,7 +11,7 @@ def particle_panel_poll(context): return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR') class ParticleButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "particle" diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py index d18df9e5003..f34077c758a 100644 --- a/release/ui/buttons_physics_cloth.py +++ b/release/ui/buttons_physics_cloth.py @@ -2,7 +2,7 @@ import bpy class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "physics" diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py index 02802779c04..fb29dd92833 100644 --- a/release/ui/buttons_physics_field.py +++ b/release/ui/buttons_physics_field.py @@ -2,7 +2,7 @@ import bpy class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "physics" diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py index 0ad87120a7f..304d419b388 100644 --- a/release/ui/buttons_physics_fluid.py +++ b/release/ui/buttons_physics_fluid.py @@ -2,7 +2,7 @@ import bpy class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "physics" diff --git a/release/ui/buttons_physics_smoke.py b/release/ui/buttons_physics_smoke.py index a225aedbe23..7e2395216c0 100644 --- a/release/ui/buttons_physics_smoke.py +++ b/release/ui/buttons_physics_smoke.py @@ -2,7 +2,7 @@ import bpy class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "physics" @@ -156,4 +156,4 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel): bpy.types.register(PHYSICS_PT_smoke) bpy.types.register(PHYSICS_PT_smoke_highres) -bpy.types.register(PHYSICS_PT_smoke_groups)
\ No newline at end of file +bpy.types.register(PHYSICS_PT_smoke_groups) diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py index d0d3475c11b..2613f9e8032 100644 --- a/release/ui/buttons_physics_softbody.py +++ b/release/ui/buttons_physics_softbody.py @@ -2,7 +2,7 @@ import bpy class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "physics" diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index 12200eb26ca..e9ee97468e8 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -2,7 +2,7 @@ import bpy class RenderButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "scene" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py index a1b89bec0ce..18c836f9080 100644 --- a/release/ui/buttons_texture.py +++ b/release/ui/buttons_texture.py @@ -2,7 +2,7 @@ import bpy class TextureButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "texture" diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py index 7840a4946f2..599f45d160b 100644 --- a/release/ui/buttons_world.py +++ b/release/ui/buttons_world.py @@ -2,7 +2,7 @@ import bpy class WorldButtonsPanel(bpy.types.Panel): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __region_type__ = "WINDOW" __context__ = "world" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here diff --git a/release/ui/space_buttons.py b/release/ui/space_buttons.py index b444913809d..cf1c385e3dc 100644 --- a/release/ui/space_buttons.py +++ b/release/ui/space_buttons.py @@ -2,7 +2,7 @@ import bpy class Buttons_HT_header(bpy.types.Header): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" def draw(self, context): layout = self.layout @@ -21,7 +21,7 @@ class Buttons_HT_header(bpy.types.Header): row.itemR(scene, "current_frame") class Buttons_MT_view(bpy.types.Menu): - __space_type__ = "BUTTONS_WINDOW" + __space_type__ = "PROPERTIES" __label__ = "View" def draw(self, context): diff --git a/release/ui/space_info.py b/release/ui/space_info.py index af2dac02ccb..12005ea3ecb 100644 --- a/release/ui/space_info.py +++ b/release/ui/space_info.py @@ -2,7 +2,7 @@ import bpy class INFO_HT_header(bpy.types.Header): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" def draw(self, context): layout = self.layout @@ -34,7 +34,7 @@ class INFO_HT_header(bpy.types.Header): layout.template_running_jobs() class INFO_MT_file(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "File" def draw(self, context): @@ -70,14 +70,14 @@ class INFO_MT_file(bpy.types.Menu): layout.itemO("wm.exit_blender", text="Quit") class INFO_MT_file_import(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "Import" def draw(self, context): layout = self.layout class INFO_MT_file_export(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "Export" def draw(self, context): @@ -86,7 +86,7 @@ class INFO_MT_file_export(bpy.types.Menu): layout.itemO("export.ply", text="PLY") class INFO_MT_file_external_data(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "External Data" def draw(self, context): @@ -103,7 +103,7 @@ class INFO_MT_file_external_data(bpy.types.Menu): layout.itemO("file.find_missing_files") class INFO_MT_add(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "Add" def draw(self, context): @@ -129,7 +129,7 @@ class INFO_MT_add(bpy.types.Menu): layout.item_enumO("OBJECT_OT_object_add", "type", 'LAMP', icon='ICON_OUTLINER_OB_LAMP') class INFO_MT_game(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "Game" def draw(self, context): @@ -138,7 +138,7 @@ class INFO_MT_game(bpy.types.Menu): layout.itemO("view3d.game_start") class INFO_MT_render(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "Render" def draw(self, context): @@ -154,7 +154,7 @@ class INFO_MT_render(bpy.types.Menu): layout.itemO("screen.render_view_show") class INFO_MT_help(bpy.types.Menu): - __space_type__ = "USER_PREFERENCES" + __space_type__ = "INFO" __label__ = "Help" def draw(self, context): @@ -170,397 +170,6 @@ class INFO_MT_help(bpy.types.Menu): layout.itemO("help.developer_community") layout.itemO("help.user_community") -class INFO_PT_tabs(bpy.types.Panel): - __space_type__ = "USER_PREFERENCES" - __show_header__ = False - - def draw(self, context): - layout = self.layout - - userpref = context.user_preferences - - layout.itemR(userpref, "active_section", expand=True) - -class INFO_PT_view(bpy.types.Panel): - __space_type__ = "USER_PREFERENCES" - __label__ = "View" - __show_header__ = False - - def poll(self, context): - userpref = context.user_preferences - return (userpref.active_section == 'VIEW_CONTROLS') - - def draw(self, context): - layout = self.layout - - userpref = context.user_preferences - view = userpref.view - - split = layout.split() - - col = split.column() - sub = col.split(percentage=0.85) - - 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() - 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() - sub = col.split(percentage=0.85) - - sub1 = sub.column() - #manipulator - 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" - __show_header__ = False - - def poll(self, context): - userpref = context.user_preferences - return (userpref.active_section == 'EDIT_METHODS') - - def draw(self, context): - layout = self.layout - - userpref = context.user_preferences - edit = userpref.edit - view = userpref.view - - split = layout.split() - - col = split.column() - sub = col.split(percentage=0.85) - - 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") - - col = split.column() - sub = col.split(percentage=0.85) - - 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() - sub = col.split(percentage=0.85) - - sub1 = sub.column() - sub1.itemL(text="Keyframing:") - sub1.itemR(edit, "use_visual_keying") - sub1.itemR(edit, "new_interpolation_type") - sub1.itemS() - sub1.itemR(edit, "auto_keying_enable", text="Auto Keyframing") - sub2 = sub1.column() - sub2.enabled = edit.auto_keying_enable - sub2.row().itemR(edit, "auto_keying_mode", expand=True) - sub2.itemR(edit, "auto_keyframe_insert_available", text="Only Insert Available") - sub2.itemR(edit, "auto_keyframe_insert_needed", text="Only Insert Needed") - sub1.itemS() - sub1.itemS() - sub1.itemS() - sub1.itemL(text="Undo:") - sub1.itemR(edit, "global_undo") - sub1.itemR(edit, "undo_steps", text="Steps") - sub1.itemR(edit, "undo_memory_limit", text="Memory Limit") - sub1.itemS() - sub1.itemS() - sub1.itemS() - - col = split.column() - sub = col.split(percentage=0.85) - - sub1 = sub.column() - sub1.itemL(text="Duplicate:") - sub1.itemR(edit, "duplicate_mesh", text="Mesh") - sub1.itemR(edit, "duplicate_surface", text="Surface") - sub1.itemR(edit, "duplicate_curve", text="Curve") - sub1.itemR(edit, "duplicate_text", text="Text") - sub1.itemR(edit, "duplicate_metaball", text="Metaball") - sub1.itemR(edit, "duplicate_armature", text="Armature") - sub1.itemR(edit, "duplicate_lamp", text="Lamp") - sub1.itemR(edit, "duplicate_material", text="Material") - sub1.itemR(edit, "duplicate_texture", text="Texture") - sub1.itemR(edit, "duplicate_ipo", text="F-Curve") - sub1.itemR(edit, "duplicate_action", text="Action") - -class INFO_PT_system(bpy.types.Panel): - __space_type__ = "USER_PREFERENCES" - __label__ = "System" - __show_header__ = False - - def poll(self, context): - userpref = context.user_preferences - return (userpref.active_section == 'SYSTEM_OPENGL') - - def draw(self, context): - layout = self.layout - - userpref = context.user_preferences - system = userpref.system - lan = userpref.language - - split = layout.split() - - col = split.column() - sub = col.split(percentage=0.85) - - sub1 = sub.column() - sub1.itemR(system, "emulate_numpad") - sub1.itemS() - sub1.itemS() - - #Weight Colors - sub1.itemL(text="Weight Colors:") - sub1.itemR(system, "use_weight_color_range", text="Use Custom Range") - - sub2 = sub1.column() - sub2.active = system.use_weight_color_range - sub2.template_color_ramp(system.weight_color_range, expand=True) - sub1.itemS() - sub1.itemS() - - #sequencer - sub1.itemL(text="Sequencer:") - sub1.itemR(system, "prefetch_frames") - sub1.itemR(system, "memory_cache_limit") - - col = split.column() - sub = col.split(percentage=0.85) - - sub1 = sub .column() - #System - sub1.itemL(text="System:") - sub1.itemR(lan, "dpi") - sub1.itemR(system, "auto_run_python_scripts") - sub1.itemR(system, "frame_server_port") - sub1.itemR(system, "filter_file_extensions") - sub1.itemR(system, "hide_dot_files_datablocks") - sub1.itemR(lan, "scrollback", text="Console Scrollback") - sub1.itemS() - sub1.itemS() - sub1.itemL(text="Sound:") - sub1.itemR(system, "audio_device") - sub2 = sub1.column() - sub2.active = system.audio_device != 'AUDIO_DEVICE_NULL' - sub2.itemR(system, "enable_all_codecs") - sub2.itemR(system, "game_sound") - sub2.itemR(system, "audio_channels") - sub2.itemR(system, "audio_mixing_buffer") - sub2.itemR(system, "audio_sample_rate") - sub2.itemR(system, "audio_sample_format") - - col = split.column() - sub = col.split(percentage=0.85) - - sub1 = sub.column() - #OpenGL - sub1.itemL(text="OpenGL:") - sub1.itemR(system, "clip_alpha", slider=True) - sub1.itemR(system, "use_mipmaps") - sub1.itemL(text="Window Draw Method:") - sub1.row().itemR(system, "window_draw_method", expand=True) - sub1.itemL(text="Textures:") - sub1.itemR(system, "gl_texture_limit", text="Limit Size") - sub1.itemR(system, "texture_time_out", text="Time Out") - sub1.itemR(system, "texture_collection_rate", text="Collection Rate") - -class INFO_PT_filepaths(bpy.types.Panel): - __space_type__ = "USER_PREFERENCES" - __label__ = "File Paths" - __show_header__ = False - - def poll(self, context): - userpref = context.user_preferences - return (userpref.active_section == 'FILE_PATHS') - - def draw(self, context): - layout = self.layout - - userpref = context.user_preferences - paths = userpref.filepaths - - split = layout.split() - - col = split.column() - col.itemL(text="File Paths:") - sub = col.split(percentage=0.3) - - sub.itemL(text="Fonts:") - sub.itemR(paths, "fonts_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Textures:") - sub.itemR(paths, "textures_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Texture Plugins:") - sub.itemR(paths, "texture_plugin_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Sequence Plugins:") - sub.itemR(paths, "sequence_plugin_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Render Output:") - sub.itemR(paths, "render_output_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Scripts:") - sub.itemR(paths, "python_scripts_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Sounds:") - sub.itemR(paths, "sounds_directory", text="") - sub = col.split(percentage=0.3) - sub.itemL(text="Temp:") - sub.itemR(paths, "temporary_directory", text="") - - col = split.column() - sub = col.split(percentage=0.2) - sub1 = sub.column() - sub2 = sub.column() - sub2.itemL(text="Save & Load:") - sub2.itemR(paths, "use_relative_paths") - sub2.itemR(paths, "compress_file") - sub2.itemL(text="Auto Save:") - sub2.itemR(paths, "save_version") - sub2.itemR(paths, "recent_files") - sub2.itemR(paths, "save_preview_images") - sub2.itemR(paths, "auto_save_temporary_files") - sub3 = sub2.column() - sub3.enabled = paths.auto_save_temporary_files - sub3.itemR(paths, "auto_save_time") - -class INFO_PT_language(bpy.types.Panel): - __space_type__ = "USER_PREFERENCES" - __label__ = "Language" - __show_header__ = False - - def poll(self, context): - userpref = context.user_preferences - return (userpref.active_section == 'LANGUAGE_COLORS') - - def draw(self, context): - layout = self.layout - - userpref = context.user_preferences - lan = userpref.language - - split = layout.split() - col = split.column() - - col.itemR(lan, "language") - col.itemR(lan, "translate_tooltips") - col.itemR(lan, "translate_buttons") - col.itemR(lan, "translate_toolbox") - col.itemR(lan, "use_textured_fonts") - -class INFO_PT_bottombar(bpy.types.Panel): - __space_type__ = "USER_PREFERENCES" - __label__ = " " - __show_header__ = False - - def draw(self, context): - layout = self.layout - userpref = context.user_preferences - - split = layout.split(percentage=0.8) - split.itemL(text="") - layout.operator_context = "EXEC_AREA" - split.itemO("wm.save_homefile", text="Save As Default") - bpy.types.register(INFO_HT_header) bpy.types.register(INFO_MT_file) bpy.types.register(INFO_MT_file_import) @@ -570,13 +179,6 @@ bpy.types.register(INFO_MT_add) bpy.types.register(INFO_MT_game) bpy.types.register(INFO_MT_render) bpy.types.register(INFO_MT_help) -bpy.types.register(INFO_PT_tabs) -bpy.types.register(INFO_PT_view) -bpy.types.register(INFO_PT_edit) -bpy.types.register(INFO_PT_system) -bpy.types.register(INFO_PT_filepaths) -bpy.types.register(INFO_PT_language) -bpy.types.register(INFO_PT_bottombar) # Help operators @@ -631,3 +233,4 @@ bpy.ops.add(HELP_OT_blender_website) bpy.ops.add(HELP_OT_blender_eshop) bpy.ops.add(HELP_OT_developer_community) bpy.ops.add(HELP_OT_user_community) + diff --git a/release/ui/space_time.py b/release/ui/space_time.py index 45fdeb04ead..785d11a8fc5 100644 --- a/release/ui/space_time.py +++ b/release/ui/space_time.py @@ -23,8 +23,6 @@ class TIME_HT_header(bpy.types.Header): layout.itemR(scene, "use_preview_range", text="PR", toggle=True) - layout.itemS() - row = layout.row(align=True) if not scene.use_preview_range: row.itemR(scene, "start_frame", text="Start") @@ -33,10 +31,7 @@ class TIME_HT_header(bpy.types.Header): row.itemR(scene, "preview_range_start_frame", text="Start") row.itemR(scene, "preview_range_end_frame", text="End") - layout.itemS() layout.itemR(scene, "current_frame", text="") - - layout.itemS() row = layout.row(align=True) row.item_booleanO("screen.frame_jump", "end", False, text="", icon='ICON_REW') @@ -51,8 +46,6 @@ class TIME_HT_header(bpy.types.Header): row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME') row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF') - layout.itemS() - layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER') layout.itemS() diff --git a/release/ui/space_userpref.py b/release/ui/space_userpref.py new file mode 100644 index 00000000000..95054efcb25 --- /dev/null +++ b/release/ui/space_userpref.py @@ -0,0 +1,418 @@ + +import bpy + +class USERPREF_HT_header(bpy.types.Header): + __space_type__ = "USER_PREFERENCES" + + def draw(self, context): + layout = self.layout + layout.template_header(menus=False) + +class USERPREF_MT_view(bpy.types.Menu): + __space_type__ = "USER_PREFERENCES" + __label__ = "View" + + def draw(self, context): + layout = self.layout + +class USERPREF_PT_tabs(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __show_header__ = False + + def draw(self, context): + layout = self.layout + + userpref = context.user_preferences + + layout.itemR(userpref, "active_section", expand=True) + +class USERPREF_PT_view(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __label__ = "View" + __show_header__ = False + + def poll(self, context): + userpref = context.user_preferences + return (userpref.active_section == 'VIEW_CONTROLS') + + def draw(self, context): + layout = self.layout + + userpref = context.user_preferences + view = userpref.view + + split = layout.split() + + col = split.column() + sub = col.split(percentage=0.85) + + 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() + 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() + sub = col.split(percentage=0.85) + + sub1 = sub.column() + #manipulator + 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 USERPREF_PT_edit(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __label__ = "Edit" + __show_header__ = False + + def poll(self, context): + userpref = context.user_preferences + return (userpref.active_section == 'EDIT_METHODS') + + def draw(self, context): + layout = self.layout + + userpref = context.user_preferences + edit = userpref.edit + view = userpref.view + + split = layout.split() + + col = split.column() + sub = col.split(percentage=0.85) + + 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") + + col = split.column() + sub = col.split(percentage=0.85) + + 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() + sub = col.split(percentage=0.85) + + sub1 = sub.column() + sub1.itemL(text="Keyframing:") + sub1.itemR(edit, "use_visual_keying") + sub1.itemR(edit, "new_interpolation_type") + sub1.itemS() + sub1.itemR(edit, "auto_keying_enable", text="Auto Keyframing") + sub2 = sub1.column() + sub2.enabled = edit.auto_keying_enable + sub2.row().itemR(edit, "auto_keying_mode", expand=True) + sub2.itemR(edit, "auto_keyframe_insert_available", text="Only Insert Available") + sub2.itemR(edit, "auto_keyframe_insert_needed", text="Only Insert Needed") + sub1.itemS() + sub1.itemS() + sub1.itemS() + sub1.itemL(text="Undo:") + sub1.itemR(edit, "global_undo") + sub1.itemR(edit, "undo_steps", text="Steps") + sub1.itemR(edit, "undo_memory_limit", text="Memory Limit") + sub1.itemS() + sub1.itemS() + sub1.itemS() + + col = split.column() + sub = col.split(percentage=0.85) + + sub1 = sub.column() + sub1.itemL(text="Duplicate:") + sub1.itemR(edit, "duplicate_mesh", text="Mesh") + sub1.itemR(edit, "duplicate_surface", text="Surface") + sub1.itemR(edit, "duplicate_curve", text="Curve") + sub1.itemR(edit, "duplicate_text", text="Text") + sub1.itemR(edit, "duplicate_metaball", text="Metaball") + sub1.itemR(edit, "duplicate_armature", text="Armature") + sub1.itemR(edit, "duplicate_lamp", text="Lamp") + sub1.itemR(edit, "duplicate_material", text="Material") + sub1.itemR(edit, "duplicate_texture", text="Texture") + sub1.itemR(edit, "duplicate_ipo", text="F-Curve") + sub1.itemR(edit, "duplicate_action", text="Action") + +class USERPREF_PT_system(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __label__ = "System" + __show_header__ = False + + def poll(self, context): + userpref = context.user_preferences + return (userpref.active_section == 'SYSTEM_OPENGL') + + def draw(self, context): + layout = self.layout + + userpref = context.user_preferences + system = userpref.system + lan = userpref.language + + split = layout.split() + + col = split.column() + sub = col.split(percentage=0.85) + + sub1 = sub.column() + sub1.itemR(system, "emulate_numpad") + sub1.itemS() + sub1.itemS() + + #Weight Colors + sub1.itemL(text="Weight Colors:") + sub1.itemR(system, "use_weight_color_range", text="Use Custom Range") + + sub2 = sub1.column() + sub2.active = system.use_weight_color_range + sub2.template_color_ramp(system.weight_color_range, expand=True) + sub1.itemS() + sub1.itemS() + + #sequencer + sub1.itemL(text="Sequencer:") + sub1.itemR(system, "prefetch_frames") + sub1.itemR(system, "memory_cache_limit") + + col = split.column() + sub = col.split(percentage=0.85) + + sub1 = sub .column() + #System + sub1.itemL(text="System:") + sub1.itemR(lan, "dpi") + sub1.itemR(system, "auto_run_python_scripts") + sub1.itemR(system, "frame_server_port") + sub1.itemR(system, "filter_file_extensions") + sub1.itemR(system, "hide_dot_files_datablocks") + sub1.itemR(lan, "scrollback", text="Console Scrollback") + sub1.itemS() + sub1.itemS() + sub1.itemL(text="Sound:") + sub1.itemR(system, "audio_device") + sub2 = sub1.column() + sub2.active = system.audio_device != 'AUDIO_DEVICE_NULL' + sub2.itemR(system, "enable_all_codecs") + sub2.itemR(system, "game_sound") + sub2.itemR(system, "audio_channels") + sub2.itemR(system, "audio_mixing_buffer") + sub2.itemR(system, "audio_sample_rate") + sub2.itemR(system, "audio_sample_format") + + col = split.column() + sub = col.split(percentage=0.85) + + sub1 = sub.column() + #OpenGL + sub1.itemL(text="OpenGL:") + sub1.itemR(system, "clip_alpha", slider=True) + sub1.itemR(system, "use_mipmaps") + sub1.itemL(text="Window Draw Method:") + sub1.row().itemR(system, "window_draw_method", expand=True) + sub1.itemL(text="Textures:") + sub1.itemR(system, "gl_texture_limit", text="Limit Size") + sub1.itemR(system, "texture_time_out", text="Time Out") + sub1.itemR(system, "texture_collection_rate", text="Collection Rate") + +class USERPREF_PT_filepaths(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __label__ = "File Paths" + __show_header__ = False + + def poll(self, context): + userpref = context.user_preferences + return (userpref.active_section == 'FILE_PATHS') + + def draw(self, context): + layout = self.layout + + userpref = context.user_preferences + paths = userpref.filepaths + + split = layout.split() + + col = split.column() + col.itemL(text="File Paths:") + sub = col.split(percentage=0.3) + + sub.itemL(text="Fonts:") + sub.itemR(paths, "fonts_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Textures:") + sub.itemR(paths, "textures_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Texture Plugins:") + sub.itemR(paths, "texture_plugin_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Sequence Plugins:") + sub.itemR(paths, "sequence_plugin_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Render Output:") + sub.itemR(paths, "render_output_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Scripts:") + sub.itemR(paths, "python_scripts_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Sounds:") + sub.itemR(paths, "sounds_directory", text="") + sub = col.split(percentage=0.3) + sub.itemL(text="Temp:") + sub.itemR(paths, "temporary_directory", text="") + + col = split.column() + sub = col.split(percentage=0.2) + sub1 = sub.column() + sub2 = sub.column() + sub2.itemL(text="Save & Load:") + sub2.itemR(paths, "use_relative_paths") + sub2.itemR(paths, "compress_file") + sub2.itemL(text="Auto Save:") + sub2.itemR(paths, "save_version") + sub2.itemR(paths, "recent_files") + sub2.itemR(paths, "save_preview_images") + sub2.itemR(paths, "auto_save_temporary_files") + sub3 = sub2.column() + sub3.enabled = paths.auto_save_temporary_files + sub3.itemR(paths, "auto_save_time") + +class USERPREF_PT_language(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __label__ = "Language" + __show_header__ = False + + def poll(self, context): + userpref = context.user_preferences + return (userpref.active_section == 'LANGUAGE_COLORS') + + def draw(self, context): + layout = self.layout + + userpref = context.user_preferences + lan = userpref.language + + split = layout.split() + col = split.column() + + col.itemR(lan, "language") + col.itemR(lan, "translate_tooltips") + col.itemR(lan, "translate_buttons") + col.itemR(lan, "translate_toolbox") + col.itemR(lan, "use_textured_fonts") + +class USERPREF_PT_bottombar(bpy.types.Panel): + __space_type__ = "USER_PREFERENCES" + __label__ = " " + __show_header__ = False + + def draw(self, context): + layout = self.layout + userpref = context.user_preferences + + split = layout.split(percentage=0.8) + split.itemL(text="") + layout.operator_context = "EXEC_AREA" + split.itemO("wm.save_homefile", text="Save As Default") + +bpy.types.register(USERPREF_HT_header) +bpy.types.register(USERPREF_MT_view) +bpy.types.register(USERPREF_PT_tabs) +bpy.types.register(USERPREF_PT_view) +bpy.types.register(USERPREF_PT_edit) +bpy.types.register(USERPREF_PT_system) +bpy.types.register(USERPREF_PT_filepaths) +bpy.types.register(USERPREF_PT_language) +bpy.types.register(USERPREF_PT_bottombar) + |