From 7a31417f504cecba5bf38c5334a5974e0dd988a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Aug 2010 13:14:41 +0000 Subject: apply UserPrefs and Theme rna naming changes. --- release/scripts/modules/add_object_utils.py | 2 +- release/scripts/modules/bpy/utils.py | 4 +- release/scripts/modules/rigify/__init__.py | 6 +- release/scripts/op/presets.py | 18 ++-- release/scripts/presets/interaction/blender.py | 18 ++-- release/scripts/presets/interaction/maya.py | 16 +-- release/scripts/ui/properties_scene.py | 6 +- release/scripts/ui/space_text.py | 2 +- release/scripts/ui/space_userpref.py | 136 ++++++++++++------------- 9 files changed, 104 insertions(+), 104 deletions(-) (limited to 'release') diff --git a/release/scripts/modules/add_object_utils.py b/release/scripts/modules/add_object_utils.py index 41c05ce9d8a..eaa97512f89 100644 --- a/release/scripts/modules/add_object_utils.py +++ b/release/scripts/modules/add_object_utils.py @@ -77,7 +77,7 @@ def add_object_data(context, obdata, operator=None): bpy.ops.object.mode_set(mode='EDIT') else: scene.objects.active = obj_new - if context.user_preferences.edit.enter_edit_mode: + if context.user_preferences.edit.use_enter_edit_mode: bpy.ops.object.mode_set(mode='EDIT') return base diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 6c1c669d1f2..7cfe476c2e7 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -224,7 +224,7 @@ _scripts = (_os.path.normpath(_scripts), ) def user_script_path(): - path = _bpy.context.user_preferences.filepaths.python_scripts_directory + path = _bpy.context.user_preferences.filepaths.script_directory if path: path = _os.path.normpath(path) @@ -243,7 +243,7 @@ def script_paths(subdir=None, user=True): # add user scripts dir if user: - user_script_path = _bpy.context.user_preferences.filepaths.python_scripts_directory + user_script_path = _bpy.context.user_preferences.filepaths.script_directory else: user_script_path = None diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py index f495406e8d8..dafcc381832 100644 --- a/release/scripts/modules/rigify/__init__.py +++ b/release/scripts/modules/rigify/__init__.py @@ -159,8 +159,8 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): # Not needed but catches any errors before duplicating validate_rig(context, obj_orig) - global_undo = context.user_preferences.edit.global_undo - context.user_preferences.edit.global_undo = False + use_global_undo = context.user_preferences.edit.use_global_undo + context.user_preferences.edit.use_global_undo = False mode_orig = context.mode rest_backup = obj_orig.data.pose_position obj_orig.data.pose_position = 'REST' @@ -471,7 +471,7 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): obj_orig.data.pose_position = rest_backup obj.data.pose_position = 'POSE' obj_orig.data.pose_position = 'POSE' - context.user_preferences.edit.global_undo = global_undo + context.user_preferences.edit.use_global_undo = use_global_undo print("Done.\n") diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index 2012ba913fb..529e51f6cce 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -189,16 +189,16 @@ class AddPresetInteraction(AddPresetBase, bpy.types.Operator): save_keyconfig = True preset_values = [ - "bpy.context.user_preferences.edit.drag_immediately", - "bpy.context.user_preferences.edit.insertkey_xyz_to_rgb", + "bpy.context.user_preferences.edit.use_drag_immediately", + "bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb", "bpy.context.user_preferences.inputs.select_mouse", - "bpy.context.user_preferences.inputs.zoom_style", - "bpy.context.user_preferences.inputs.zoom_axis", - "bpy.context.user_preferences.inputs.view_rotation", - "bpy.context.user_preferences.inputs.invert_zoom_direction", - "bpy.context.user_preferences.inputs.emulate_numpad", - "bpy.context.user_preferences.inputs.emulate_3_button_mouse", - "bpy.context.user_preferences.inputs.continuous_mouse", + "bpy.context.user_preferences.inputs.view_zoom_method", + "bpy.context.user_preferences.inputs.view_zoom_axis", + "bpy.context.user_preferences.inputs.view_rotate_method", + "bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom", + "bpy.context.user_preferences.inputs.use_emulate_numpad", + "bpy.context.user_preferences.inputs.use_mouse_emulate_3_button", + "bpy.context.user_preferences.inputs.use_mouse_continuous", ] preset_subdir = "interaction" diff --git a/release/scripts/presets/interaction/blender.py b/release/scripts/presets/interaction/blender.py index 63006b2008d..229aa657b2f 100644 --- a/release/scripts/presets/interaction/blender.py +++ b/release/scripts/presets/interaction/blender.py @@ -4,13 +4,13 @@ import bpy wm = bpy.context.manager wm.active_keyconfig = wm.keyconfigs['Blender'] -bpy.context.user_preferences.view.auto_depth = False -bpy.context.user_preferences.view.zoom_to_mouse = False -bpy.context.user_preferences.view.rotate_around_selection = False -bpy.context.user_preferences.edit.drag_immediately = False -bpy.context.user_preferences.edit.insertkey_xyz_to_rgb = False +bpy.context.user_preferences.view.use_mouse_auto_depth = False +bpy.context.user_preferences.view.use_zoom_to_mouse = False +bpy.context.user_preferences.view.use_rotate_around_active = False +bpy.context.user_preferences.edit.use_drag_immediately = False +bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False bpy.context.user_preferences.inputs.select_mouse = 'RIGHT' -bpy.context.user_preferences.inputs.zoom_style = 'DOLLY' -bpy.context.user_preferences.inputs.zoom_axis = 'VERTICAL' -bpy.context.user_preferences.inputs.view_rotation = 'TRACKBALL' -bpy.context.user_preferences.inputs.invert_zoom_direction = False +bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY' +bpy.context.user_preferences.inputs.view_zoom_axis = 'VERTICAL' +bpy.context.user_preferences.inputs.view_rotate_method = 'TRACKBALL' +bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom = False diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py index 5758e5d841a..9052d082cad 100644 --- a/release/scripts/presets/interaction/maya.py +++ b/release/scripts/presets/interaction/maya.py @@ -7,7 +7,7 @@ kc = wm.add_keyconfig('Maya') # Map 3D View km = kc.add_keymap('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False) -kmi = km.items.add('view3d.use_manipulator', 'LEFTMOUSE', 'PRESS', any=True) +kmi = km.items.add('view3d.show_manipulator', 'LEFTMOUSE', 'PRESS', any=True) kmi.properties.release_confirm = True kmi = km.items.add('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS') kmi = km.items.add('view3d.rotate', 'LEFTMOUSE', 'PRESS', alt=True) @@ -175,7 +175,7 @@ kmi.properties.value = 'MEDIAN_POINT' kmi = km.items.add('wm.context_toggle', 'COMMA', 'PRESS', alt=True) kmi.properties.data_path = 'space_data.use_pivot_point_align' kmi = km.items.add('wm.context_toggle', 'Q', 'PRESS') -kmi.properties.data_path = 'space_data.use_manipulator' +kmi.properties.data_path = 'space_data.show_manipulator' kmi = km.items.add('wm.context_set_enum', 'PERIOD', 'PRESS') kmi.properties.data_path = 'space_data.pivot_point' kmi.properties.value = 'CURSOR' @@ -377,10 +377,10 @@ kmi.properties.action = 'DESELECT' wm.active_keyconfig = kc -bpy.context.user_preferences.edit.drag_immediately = True -bpy.context.user_preferences.edit.insertkey_xyz_to_rgb = False +bpy.context.user_preferences.edit.use_drag_immediately = True +bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False bpy.context.user_preferences.inputs.select_mouse = 'LEFT' -bpy.context.user_preferences.inputs.zoom_style = 'DOLLY' -bpy.context.user_preferences.inputs.zoom_axis = 'HORIZONTAL' -bpy.context.user_preferences.inputs.view_rotation = 'TURNTABLE' -bpy.context.user_preferences.inputs.invert_zoom_direction = True +bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY' +bpy.context.user_preferences.inputs.view_zoom_axis = 'HORIZONTAL' +bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE' +bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom = True diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index 3afa5d2f53f..d5b2fd6e3ec 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -98,7 +98,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, bpy.types.Panel): col.label(text="Keyframing Settings:") col.prop(ks, "insertkey_needed", text="Needed") col.prop(ks, "insertkey_visual", text="Visual") - col.prop(ks, "insertkey_xyz_to_rgb", text="XYZ to RGB") + col.prop(ks, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") class SCENE_PT_keying_set_paths(SceneButtonsPanel, bpy.types.Panel): @@ -151,7 +151,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, bpy.types.Panel): col.label(text="Keyframing Settings:") col.prop(ksp, "insertkey_needed", text="Needed") col.prop(ksp, "insertkey_visual", text="Visual") - col.prop(ksp, "insertkey_xyz_to_rgb", text="XYZ to RGB") + col.prop(ksp, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") class SCENE_PT_physics(SceneButtonsPanel, bpy.types.Panel): @@ -245,7 +245,7 @@ class ANIM_OT_keying_set_export(bpy.types.Operator): f.write("ks.insertkey_needed = %s\n" % ks.insertkey_needed) f.write("ks.insertkey_visual = %s\n" % ks.insertkey_visual) - f.write("ks.insertkey_xyz_to_rgb = %s\n" % ks.insertkey_xyz_to_rgb) + f.write("ks.use_insertkey_xyz_to_rgb = %s\n" % ks.use_insertkey_xyz_to_rgb) f.write("\n") diff --git a/release/scripts/ui/space_text.py b/release/scripts/ui/space_text.py index 59acb66a2d3..b156b18cbbb 100644 --- a/release/scripts/ui/space_text.py +++ b/release/scripts/ui/space_text.py @@ -93,7 +93,7 @@ class TEXT_PT_properties(bpy.types.Panel): text = st.text if text: - flow.prop(text, "tabs_as_spaces") + flow.prop(text, "use_tabs_as_spaces") class TEXT_PT_find(bpy.types.Panel): diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 5f9514c5885..7e2e5bd58b3 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -45,9 +45,9 @@ def ui_items_general(col, context): colsub = padding.column() colsub.row().prop(context, "text") colsub.row().prop(context, "text_sel") - colsub.prop(context, "shaded") + colsub.prop(context, "show_shaded") subsub = colsub.column(align=True) - subsub.active = context.shaded + subsub.active = context.show_shaded subsub.prop(context, "shadetop") subsub.prop(context, "shadedown") @@ -154,12 +154,12 @@ class USERPREF_PT_interface(bpy.types.Panel): col = row.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_tooltips") + col.prop(view, "show_object_info", text="Object Info") + col.prop(view, "show_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, "use_global_scene") col.prop(view, "object_origin_size") col.separator() @@ -178,14 +178,14 @@ class USERPREF_PT_interface(bpy.types.Panel): col = row.column() col.label(text="View Manipulation:") - col.prop(view, "auto_depth") - col.prop(view, "zoom_to_mouse") - col.prop(view, "rotate_around_selection") - col.prop(view, "global_pivot") + col.prop(view, "use_mouse_auto_depth") + col.prop(view, "use_zoom_to_mouse") + col.prop(view, "use_rotate_around_active") + col.prop(view, "use_global_pivot") col.separator() - col.prop(view, "auto_perspective") + col.prop(view, "use_auto_perspective") col.prop(view, "smooth_view") col.prop(view, "rotation_angle") @@ -193,7 +193,7 @@ class USERPREF_PT_interface(bpy.types.Panel): col.separator() col.label(text="2D Viewports:") - col.prop(view, "view2d_grid_minimum_spacing", text="Minimum Grid Spacing") + col.prop(view, "view2d_grid_spacing_min", text="Minimum Grid Spacing") col.prop(view, "timecode_style") row.separator() @@ -202,13 +202,13 @@ class USERPREF_PT_interface(bpy.types.Panel): col = row.column() #Toolbox doesn't exist yet #col.label(text="Toolbox:") - #col.prop(view, "use_column_layout") + #col.prop(view, "show_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") - col.prop(view, "use_manipulator") + col.prop(view, "show_manipulator") sub = col.column() - sub.active = view.use_manipulator + sub.active = view.show_manipulator sub.prop(view, "manipulator_size", text="Size") sub.prop(view, "manipulator_handle_size", text="Handle Size") sub.prop(view, "manipulator_hotspot", text="Hotspot") @@ -218,7 +218,7 @@ class USERPREF_PT_interface(bpy.types.Panel): col.separator() col.label(text="Menus:") - col.prop(view, "open_mouse_over") + col.prop(view, "use_mouse_over_open") col.label(text="Menu Open Delay:") col.prop(view, "open_toplevel_delay", text="Top Level") col.prop(view, "open_sublevel_delay", text="Sub Level") @@ -256,7 +256,7 @@ class USERPREF_PT_edit(bpy.types.Panel): col.separator() col.label(text="New Objects:") - col.prop(edit, "enter_edit_mode") + col.prop(edit, "use_enter_edit_mode") col.label(text="Align To:") col.prop(edit, "object_align", text="") @@ -265,7 +265,7 @@ class USERPREF_PT_edit(bpy.types.Panel): col.separator() col.label(text="Undo:") - col.prop(edit, "global_undo") + col.prop(edit, "use_global_undo") col.prop(edit, "undo_steps", text="Steps") col.prop(edit, "undo_memory_limit", text="Memory Limit") @@ -276,9 +276,9 @@ class USERPREF_PT_edit(bpy.types.Panel): 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, "use_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") + col.prop(edit, "use_grease_pencil_smooth_stroke", text="Smooth Stroke") col.separator() col.separator() col.separator() @@ -291,7 +291,7 @@ class USERPREF_PT_edit(bpy.types.Panel): col = row.column() col.label(text="Keyframing:") col.prop(edit, "use_visual_keying") - col.prop(edit, "keyframe_insert_needed", text="Only Insert Needed") + col.prop(edit, "use_keyframe_insert_needed", text="Only Insert Needed") col.separator() @@ -300,47 +300,47 @@ class USERPREF_PT_edit(bpy.types.Panel): sub = col.column() # sub.active = edit.use_auto_keying # incorrect, timeline can enable - sub.prop(edit, "auto_keyframe_insert_keyingset", text="Only Insert for Keying Set") - sub.prop(edit, "auto_keyframe_insert_available", text="Only Insert Available") + sub.prop(edit, "use_keyframe_insert_keyingset", text="Only Insert for Keying Set") + sub.prop(edit, "use_keyframe_insert_available", text="Only Insert Available") col.separator() col.label(text="New F-Curve Defaults:") col.prop(edit, "keyframe_new_interpolation_type", text="Interpolation") col.prop(edit, "keyframe_new_handle_type", text="Handles") - col.prop(edit, "insertkey_xyz_to_rgb", text="XYZ to RGB") + col.prop(edit, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") col.separator() col.separator() col.separator() col.label(text="Transform:") - col.prop(edit, "drag_immediately") + col.prop(edit, "use_drag_immediately") row.separator() row.separator() col = row.column() row = col.row(align=True) - row.prop(edit, "sculpt_paint_overlay_col", text="Sculpt Overlay Color") + row.prop(edit, "sculpt_paint_overlay_color", text="Sculpt Overlay Color") col.separator() col.separator() col.separator() col.label(text="Duplicate Data:") - col.prop(edit, "duplicate_mesh", text="Mesh") - col.prop(edit, "duplicate_surface", text="Surface") - col.prop(edit, "duplicate_curve", text="Curve") - col.prop(edit, "duplicate_text", text="Text") - col.prop(edit, "duplicate_metaball", text="Metaball") - col.prop(edit, "duplicate_armature", text="Armature") - col.prop(edit, "duplicate_lamp", text="Lamp") - col.prop(edit, "duplicate_material", text="Material") - col.prop(edit, "duplicate_texture", text="Texture") - #col.prop(edit, "duplicate_fcurve", text="F-Curve") - col.prop(edit, "duplicate_action", text="Action") - col.prop(edit, "duplicate_particle", text="Particle") + col.prop(edit, "use_duplicate_mesh", text="Mesh") + col.prop(edit, "use_duplicate_surface", text="Surface") + col.prop(edit, "use_duplicate_curve", text="Curve") + col.prop(edit, "use_duplicate_text", text="Text") + col.prop(edit, "use_duplicate_metaball", text="Metaball") + col.prop(edit, "use_duplicate_armature", text="Armature") + col.prop(edit, "use_duplicate_lamp", text="Lamp") + col.prop(edit, "use_duplicate_material", text="Material") + col.prop(edit, "use_duplicate_texture", text="Texture") + #col.prop(edit, "use_duplicate_fcurve", text="F-Curve") + col.prop(edit, "use_duplicate_action", text="Action") + col.prop(edit, "use_duplicate_particle", text="Particle") class USERPREF_PT_system(bpy.types.Panel): @@ -372,8 +372,8 @@ class USERPREF_PT_system(bpy.types.Panel): col.prop(system, "dpi") col.prop(system, "frame_server_port") col.prop(system, "scrollback", text="Console Scrollback") - col.prop(system, "auto_execute_scripts") - col.prop(system, "tabs_as_spaces") + col.prop(system, "use_scripts_auto_execute") + col.prop(system, "use_tabs_as_spaces") col.separator() col.separator() @@ -383,7 +383,7 @@ class USERPREF_PT_system(bpy.types.Panel): col.row().prop(system, "audio_device", expand=True) sub = col.column() sub.active = system.audio_device != 'NONE' - #sub.prop(system, "enable_all_codecs") + #sub.prop(system, "use_preview_images") sub.prop(system, "audio_channels", text="Channels") sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer") sub.prop(system, "audio_sample_rate", text="Sample Rate") @@ -406,9 +406,9 @@ class USERPREF_PT_system(bpy.types.Panel): # No translation in 2.5 yet #col.prop(system, "language") #col.label(text="Translate:") - #col.prop(system, "translate_tooltips", text="Tooltips") - #col.prop(system, "translate_buttons", text="Labels") - #col.prop(system, "translate_toolbox", text="Toolbox") + #col.prop(system, "use_translate_tooltips", text="Tooltips") + #col.prop(system, "use_translate_buttons", text="Labels") + #col.prop(system, "use_translate_toolbox", text="Toolbox") #col.separator() @@ -421,9 +421,9 @@ class USERPREF_PT_system(bpy.types.Panel): col = colsplit.column() col.label(text="OpenGL:") - col.prop(system, "clip_alpha", slider=True) + col.prop(system, "gl_clip_alpha", slider=True) col.prop(system, "use_mipmaps") - col.prop(system, "use_vbos") + col.prop(system, "use_vertex_buffer_objects") #Anti-aliasing is disabled as it breaks broder/lasso select #col.prop(system, "use_antialiasing") col.label(text="Window Draw Method:") @@ -679,13 +679,13 @@ class USERPREF_PT_file(bpy.types.Panel): sub.label(text="Animation Player:") sub = col1.column() - sub.prop(paths, "fonts_directory", text="") - sub.prop(paths, "textures_directory", text="") + sub.prop(paths, "font_directory", text="") + sub.prop(paths, "texture_directory", text="") sub.prop(paths, "texture_plugin_directory", text="") sub.prop(paths, "sequence_plugin_directory", text="") sub.prop(paths, "render_output_directory", text="") - sub.prop(paths, "python_scripts_directory", text="") - sub.prop(paths, "sounds_directory", text="") + sub.prop(paths, "script_directory", text="") + sub.prop(paths, "sound_directory", text="") sub.prop(paths, "temporary_directory", text="") sub.prop(paths, "image_editor", text="") subsplit = sub.split(percentage=0.3) @@ -695,10 +695,10 @@ class USERPREF_PT_file(bpy.types.Panel): col = split.column() col.label(text="Save & Load:") col.prop(paths, "use_relative_paths") - col.prop(paths, "compress_file") - col.prop(paths, "load_ui") - col.prop(paths, "filter_file_extensions") - col.prop(paths, "hide_dot_files_datablocks") + col.prop(paths, "use_file_compression") + col.prop(paths, "use_load_ui") + col.prop(paths, "use_filter_files") + col.prop(paths, "show_hidden_files_datablocks") col.separator() col.separator() @@ -706,10 +706,10 @@ class USERPREF_PT_file(bpy.types.Panel): col.label(text="Auto Save:") col.prop(paths, "save_version") col.prop(paths, "recent_files") - col.prop(paths, "save_preview_images") - col.prop(paths, "auto_save_temporary_files") + col.prop(paths, "use_save_preview_images") + col.prop(paths, "use_auto_save_temporary_files") sub = col.column() - sub.active = paths.auto_save_temporary_files + sub.active = paths.use_auto_save_temporary_files sub.prop(paths, "auto_save_time", text="Timer (mins)") from space_userpref_keymap import InputKeyMapPanel @@ -739,38 +739,38 @@ class USERPREF_PT_input(InputKeyMapPanel): sub.label(text="Mouse:") sub1 = sub.column() sub1.active = (inputs.select_mouse == 'RIGHT') - sub1.prop(inputs, "emulate_3_button_mouse") - sub.prop(inputs, "continuous_mouse") + sub1.prop(inputs, "use_mouse_emulate_3_button") + sub.prop(inputs, "use_mouse_continuous") sub.label(text="Select With:") sub.row().prop(inputs, "select_mouse", expand=True) sub = col.column() sub.label(text="Double Click:") - sub.prop(inputs, "double_click_time", text="Speed") + sub.prop(inputs, "mouse_double_click_time", text="Speed") sub.separator() - sub.prop(inputs, "emulate_numpad") + sub.prop(inputs, "use_emulate_numpad") sub.separator() sub.label(text="Orbit Style:") - sub.row().prop(inputs, "view_rotation", expand=True) + sub.row().prop(inputs, "view_rotate_method", expand=True) sub.label(text="Zoom Style:") - sub.row().prop(inputs, "zoom_style", text="") - if inputs.zoom_style == 'DOLLY': - sub.row().prop(inputs, "zoom_axis", expand=True) - sub.prop(inputs, "invert_zoom_direction") + sub.row().prop(inputs, "view_zoom_method", text="") + if inputs.view_zoom_method == 'DOLLY': + sub.row().prop(inputs, "view_zoom_axis", expand=True) + sub.prop(inputs, "invert_mouse_wheel_zoom") - #sub.prop(inputs, "use_middle_mouse_paste") + #sub.prop(inputs, "use_mouse_mmb_paste") #col.separator() sub = col.column() sub.label(text="Mouse Wheel:") - sub.prop(inputs, "wheel_invert_zoom", text="Invert Wheel Zoom Direction") + sub.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction") #sub.prop(view, "wheel_scroll_lines", text="Scroll Lines") col.separator() -- cgit v1.2.3