From b9d99b9c5b03f5e4741753f07eafe5c882bfcd02 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Aug 2010 07:49:53 +0000 Subject: apply all rna naming changes for rna_space.c --- release/scripts/op/nla.py | 2 +- release/scripts/presets/interaction/maya.py | 10 ++++---- release/scripts/ui/properties_texture.py | 2 +- release/scripts/ui/space_console.py | 2 +- release/scripts/ui/space_dopesheet.py | 8 +++--- release/scripts/ui/space_graph.py | 12 ++++----- release/scripts/ui/space_image.py | 38 ++++++++++++++--------------- release/scripts/ui/space_nla.py | 6 ++--- release/scripts/ui/space_node.py | 4 +-- release/scripts/ui/space_outliner.py | 8 +++--- release/scripts/ui/space_sequencer.py | 12 ++++----- release/scripts/ui/space_text.py | 6 ++--- release/scripts/ui/space_time.py | 18 +++++++------- release/scripts/ui/space_userpref_keymap.py | 10 ++++---- release/scripts/ui/space_view3d.py | 30 +++++++++++------------ 15 files changed, 84 insertions(+), 84 deletions(-) (limited to 'release') diff --git a/release/scripts/op/nla.py b/release/scripts/op/nla.py index bec5f5b3909..44bd5d91e32 100644 --- a/release/scripts/op/nla.py +++ b/release/scripts/op/nla.py @@ -150,7 +150,7 @@ class BakeAction(bpy.types.Operator): def execute(self, context): props = self.properties - action = bake(props.frame_start, props.frame_end, props.step, props.only_selected) + action = bake(props.frame_start, props.frame_end, props.step, props.show_only_selected) # basic cleanup, could move elsewhere for fcu in action.fcurves: diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py index ba4eae89982..5758e5d841a 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.manipulator', 'LEFTMOUSE', 'PRESS', any=True) +kmi = km.items.add('view3d.use_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) @@ -126,11 +126,11 @@ kmi.properties.nr = 9 kmi = km.items.add('view3d.layers', 'ZERO', 'PRESS', any=True) kmi.properties.nr = 10 kmi = km.items.add('wm.context_toggle_enum', 'Z', 'PRESS') -kmi.properties.data_path = 'space_data.viewport_shading' +kmi.properties.data_path = 'space_data.viewport_shade' kmi.properties.value_1 = 'SOLID' kmi.properties.value_2 = 'WIREFRAME' kmi = km.items.add('wm.context_toggle_enum', 'Z', 'PRESS', alt=True) -kmi.properties.data_path = 'space_data.viewport_shading' +kmi.properties.data_path = 'space_data.viewport_shade' kmi.properties.value_1 = 'TEXTURED' kmi.properties.value_2 = 'SOLID' kmi = km.items.add('view3d.select', 'SELECTMOUSE', 'PRESS') @@ -173,9 +173,9 @@ kmi = km.items.add('wm.context_set_enum', 'COMMA', 'PRESS', ctrl=True) kmi.properties.data_path = 'space_data.pivot_point' kmi.properties.value = 'MEDIAN_POINT' kmi = km.items.add('wm.context_toggle', 'COMMA', 'PRESS', alt=True) -kmi.properties.data_path = 'space_data.pivot_point_align' +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.manipulator' +kmi.properties.data_path = 'space_data.use_manipulator' kmi = km.items.add('wm.context_set_enum', 'PERIOD', 'PRESS') kmi.properties.data_path = 'space_data.pivot_point' kmi.properties.value = 'CURSOR' diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 21cdae98524..cf7554a7b10 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -122,7 +122,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel): col = split.column() if not space.pin_id: - col.prop(space, "brush_texture", text="Brush", toggle=True) + col.prop(space, "show_brush_texture", text="Brush", toggle=True) if tex: split = layout.split(percentage=0.2) diff --git a/release/scripts/ui/space_console.py b/release/scripts/ui/space_console.py index feda3a54b41..f2264a5c926 100644 --- a/release/scripts/ui/space_console.py +++ b/release/scripts/ui/space_console.py @@ -48,7 +48,7 @@ class CONSOLE_HT_header(bpy.types.Header): row.prop(sc, "show_report_debug", text="Debug") row.prop(sc, "show_report_info", text="Info") row.prop(sc, "show_report_operator", text="Operators") - row.prop(sc, "show_report_warn", text="Warnings") + row.prop(sc, "show_report_warning", text="Warnings") row.prop(sc, "show_report_error", text="Errors") row = layout.row() diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/ui/space_dopesheet.py index f7e7ee724d7..71f7490c209 100644 --- a/release/scripts/ui/space_dopesheet.py +++ b/release/scripts/ui/space_dopesheet.py @@ -56,7 +56,7 @@ class DOPESHEET_HT_header(bpy.types.Header): layout.template_ID(st, "action", new="action.new") if st.mode != 'GPENCIL': - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") row = layout.row(align=True) row.operator("action.copy", text="", icon='COPYDOWN') @@ -73,10 +73,10 @@ class DOPESHEET_MT_view(bpy.types.Menu): layout.column() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.prop(st, "show_sliders") - layout.prop(st, "automerge_keyframes") + layout.prop(st, "use_auto_merge_keyframes") layout.prop(st, "use_marker_sync") if st.show_seconds: diff --git a/release/scripts/ui/space_graph.py b/release/scripts/ui/space_graph.py index 7eb728cc668..e5ba894f8ad 100644 --- a/release/scripts/ui/space_graph.py +++ b/release/scripts/ui/space_graph.py @@ -44,7 +44,7 @@ class GRAPH_HT_header(bpy.types.Header): layout.template_dopesheet_filter(st.dopesheet) - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") layout.prop(st, "pivot_point", text="", icon_only=True) row = layout.row(align=True) @@ -71,19 +71,19 @@ class GRAPH_MT_view(bpy.types.Menu): layout.operator("graph.properties", icon='MENU_PANEL') layout.separator() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.prop(st, "show_cursor") layout.prop(st, "show_sliders") - layout.prop(st, "automerge_keyframes") + layout.prop(st, "use_auto_merge_keyframes") layout.separator() if st.show_handles: layout.operator("graph.handles_view_toggle", icon='CHECKBOX_HLT', text="Show All Handles") else: layout.operator("graph.handles_view_toggle", icon='CHECKBOX_DEHLT', text="Show All Handles") - layout.prop(st, "only_selected_curves_handles") - layout.prop(st, "only_selected_keyframe_handles") + layout.prop(st, "use_only_selected_curves_handles") + layout.prop(st, "use_only_selected_keyframe_handles") layout.operator("anim.time_toggle") layout.separator() diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index b3598b4d04c..0e6c3922685 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -48,10 +48,10 @@ class IMAGE_MT_view(bpy.types.Menu): layout.separator() - layout.prop(sima, "update_automatically") + layout.prop(sima, "use_realtime_update") if show_uvedit: layout.prop(toolsettings, "uv_local_view") # Numpad / - layout.prop(uv, "draw_other_objects") + layout.prop(uv, "show_other_objects") layout.separator() @@ -144,7 +144,7 @@ class IMAGE_MT_image(bpy.types.Menu): layout.separator() - layout.prop(sima, "image_painting") + layout.prop(sima, "use_image_paint") class IMAGE_MT_uvs_showhide(bpy.types.Menu): @@ -217,12 +217,12 @@ class IMAGE_MT_uvs(bpy.types.Menu): uv = sima.uv_editor toolsettings = context.tool_settings - layout.prop(uv, "snap_to_pixels") - layout.prop(uv, "constrain_to_image_bounds") + layout.prop(uv, "use_snap_to_pixels") + layout.prop(uv, "lock_bounds") layout.separator() - layout.prop(uv, "live_unwrap") + layout.prop(uv, "use_live_unwrap") layout.operator("uv.unwrap") layout.operator("uv.pin", text="Unpin").clear = True layout.operator("uv.pin") @@ -288,13 +288,13 @@ class IMAGE_HT_header(bpy.types.Header): layout.template_ID(sima, "image", new="image.new") if not show_render: - layout.prop(sima, "image_pin", text="") + layout.prop(sima, "use_image_pin", text="") # uv editing if show_uvedit: uvedit = sima.uv_editor - layout.prop(uvedit, "pivot", text="", icon_only=True) + layout.prop(uvedit, "pivot_point", text="", icon_only=True) layout.prop(toolsettings, "uv_sync_selection", text="") if toolsettings.uv_sync_selection: @@ -304,7 +304,7 @@ class IMAGE_HT_header(bpy.types.Header): row.prop(toolsettings, "mesh_selection_mode", text="", index=2, icon='FACESEL') else: layout.prop(toolsettings, "uv_selection_mode", text="", expand=True) - layout.prop(uvedit, "sticky_selection_mode", text="", icon_only=True) + layout.prop(uvedit, "sticky_select_mode", text="", icon_only=True) row = layout.row(align=True) row.prop(toolsettings, "proportional_editing", text="", icon_only=True) @@ -323,7 +323,7 @@ class IMAGE_HT_header(bpy.types.Header): layout.template_image_layers(ima, iuser) # painting - layout.prop(sima, "image_painting", text="") + layout.prop(sima, "use_image_paint", text="") # draw options row = layout.row(align=True) @@ -335,8 +335,8 @@ class IMAGE_HT_header(bpy.types.Header): if ima.type == 'COMPOSITE' and ima.source in ('MOVIE', 'SEQUENCE'): row.operator("image.play_composite", icon='PLAY') - if show_uvedit or sima.image_painting: - layout.prop(sima, "update_automatically", text="", icon_only=True, icon='LOCKED') + if show_uvedit or sima.use_image_paint: + layout.prop(sima, "use_realtime_update", text="", icon_only=True, icon='LOCKED') class IMAGE_PT_image_properties(bpy.types.Panel): @@ -525,13 +525,13 @@ class IMAGE_PT_view_properties(bpy.types.Panel): col = split.column() col.label(text="Coordinates:") - col.prop(sima, "draw_repeated", text="Repeat") + col.prop(sima, "show_repeat", text="Repeat") if show_uvedit: - col.prop(uvedit, "normalized_coordinates", text="Normalized") + col.prop(uvedit, "show_normalized_coords", text="Normalized") elif show_uvedit: col.label(text="Coordinates:") - col.prop(uvedit, "normalized_coordinates", text="Normalized") + col.prop(uvedit, "show_normalized_coords", text="Normalized") if show_uvedit: @@ -545,15 +545,15 @@ class IMAGE_PT_view_properties(bpy.types.Panel): split = layout.split() col = split.column() - col.prop(uvedit, "draw_smooth_edges", text="Smooth") - col.prop(uvedit, "draw_modified_edges", text="Modified") + col.prop(uvedit, "show_smooth_edges", text="Smooth") + col.prop(uvedit, "show_modified_edges", text="Modified") #col.prop(uvedit, "draw_edges") #col.prop(uvedit, "draw_faces") col = split.column() - col.prop(uvedit, "draw_stretch", text="Stretch") + col.prop(uvedit, "show_stretch", text="Stretch") sub = col.column() - sub.active = uvedit.draw_stretch + sub.active = uvedit.show_stretch sub.row().prop(uvedit, "draw_stretch_type", expand=True) diff --git a/release/scripts/ui/space_nla.py b/release/scripts/ui/space_nla.py index 1141a640534..ceabc0af00f 100644 --- a/release/scripts/ui/space_nla.py +++ b/release/scripts/ui/space_nla.py @@ -42,7 +42,7 @@ class NLA_HT_header(bpy.types.Header): layout.template_dopesheet_filter(st.dopesheet) - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") class NLA_MT_view(bpy.types.Menu): @@ -59,8 +59,8 @@ class NLA_MT_view(bpy.types.Menu): layout.separator() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.operator("anim.time_toggle", text="Show Frames" if st.show_seconds else "Show Seconds") diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index 0a3cebf5faa..715d684e288 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -67,7 +67,7 @@ class NODE_HT_header(bpy.types.Header): layout.prop(scene, "use_nodes") layout.prop(scene.render, "free_unused_nodes", text="Free Unused") - layout.prop(snode, "backdrop") + layout.prop(snode, "show_backdrop") layout.separator() @@ -90,7 +90,7 @@ class NODE_MT_view(bpy.types.Menu): layout.operator("node.view_all") - if context.space_data.backdrop: + if context.space_data.show_backdrop: layout.separator() layout.operator("node.backimage_move",text = "Backdrop move") diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/ui/space_outliner.py index 6b2743027ba..e170dc0322c 100644 --- a/release/scripts/ui/space_outliner.py +++ b/release/scripts/ui/space_outliner.py @@ -42,7 +42,7 @@ class OUTLINER_HT_header(bpy.types.Header): layout.prop(space, "display_mode", text="") - layout.prop(space, "display_filter", icon='VIEWZOOM', text="") + layout.prop(space, "filter_text", icon='VIEWZOOM', text="") layout.separator() @@ -73,7 +73,7 @@ class OUTLINER_MT_view(bpy.types.Menu): col = layout.column() if space.display_mode not in ('DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'): - col.prop(space, "show_restriction_columns") + col.prop(space, "show_restrict_columns") col.separator() col.operator("outliner.show_active") @@ -96,8 +96,8 @@ class OUTLINER_MT_search(bpy.types.Menu): col = layout.column() - col.prop(space, "match_case_sensitive") - col.prop(space, "match_complete") + col.prop(space, "use_filter_case_sensitive") + col.prop(space, "use_filter_complete") class OUTLINER_MT_edit_datablocks(bpy.types.Menu): diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 3a828bfb6d0..582384660e0 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -143,12 +143,12 @@ class SEQUENCER_MT_view(bpy.types.Menu): layout.operator("sequencer.view_selected") - layout.prop(st, "draw_frames") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "show_frames") + layout.prop(st, "show_frame_indicator") if st.display_mode == 'IMAGE': - layout.prop(st, "draw_safe_margin") + layout.prop(st, "show_safe_margin") if st.display_mode == 'WAVEFORM': - layout.prop(st, "separate_color_preview") + layout.prop(st, "show_separate_color") layout.separator() layout.prop(st, "use_marker_sync") @@ -787,9 +787,9 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, bpy.types.Panel): col = layout.column() if st.display_mode == 'IMAGE': col.prop(st, "draw_overexposed") # text="Zebra" - col.prop(st, "draw_safe_margin") + col.prop(st, "show_safe_margin") if st.display_mode == 'WAVEFORM': - col.prop(st, "separate_color_preview") + col.prop(st, "show_separate_color") col.prop(st, "proxy_render_size") def register(): diff --git a/release/scripts/ui/space_text.py b/release/scripts/ui/space_text.py index d9fce39fee8..59acb66a2d3 100644 --- a/release/scripts/ui/space_text.py +++ b/release/scripts/ui/space_text.py @@ -85,7 +85,7 @@ class TEXT_PT_properties(bpy.types.Panel): flow.prop(st, "show_word_wrap") flow.prop(st, "show_syntax_highlight") flow.prop(st, "show_line_highlight") - flow.prop(st, "live_edit") + flow.prop(st, "use_live_edit") flow = layout.column_flow() flow.prop(st, "font_size") @@ -125,8 +125,8 @@ class TEXT_PT_find(bpy.types.Panel): # settings row = layout.row() - row.prop(st, "find_wrap", text="Wrap") - row.prop(st, "find_all", text="All") + row.prop(st, "use_find_wrap", text="Wrap") + row.prop(st, "use_find_all", text="All") class TEXT_MT_view(bpy.types.Menu): diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index 3825d774f1e..9b8eb3327cd 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -95,8 +95,8 @@ class TIME_MT_view(bpy.types.Menu): layout.separator() - layout.prop(st, "show_cframe_indicator") - layout.prop(st, "only_selected") + layout.prop(st, "show_frame_indicator") + layout.prop(st, "show_only_selected") layout.separator() @@ -166,13 +166,13 @@ class TIME_MT_playback(bpy.types.Menu): st = context.space_data scene = context.scene - layout.prop(st, "play_top_left") - layout.prop(st, "play_all_3d") - layout.prop(st, "play_anim") - layout.prop(st, "play_buttons") - layout.prop(st, "play_image") - layout.prop(st, "play_sequencer") - layout.prop(st, "play_nodes") + layout.prop(st, "use_play_top_left_3d_editor") + layout.prop(st, "use_play_3d_editors") + layout.prop(st, "use_play_animation_editors") + layout.prop(st, "use_play_properties_editors") + layout.prop(st, "use_play_image_editors") + layout.prop(st, "use_play_sequence_editors") + layout.prop(st, "use_play_node_editors") layout.separator() diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index 24d77dbed32..ed245d2ee91 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -369,13 +369,13 @@ class InputKeyMapPanel(bpy.types.Panel): layout.set_context_pointer("keyconfig", wm.active_keyconfig) row.operator("wm.keyconfig_remove", text="", icon='X') - row.prop(context.space_data, "filter", icon="VIEWZOOM") + row.prop(context.space_data, "filter_text", icon="VIEWZOOM") col.separator() display_keymaps = _merge_keymaps(kc, defkc) - if context.space_data.filter != "": - filter = context.space_data.filter.lower() + if context.space_data.filter_text != "": + filter_text = context.space_data.filter_text.lower() self.draw_filtered(display_keymaps, filter, col) else: self.draw_hierarchy(display_keymaps, col) @@ -739,8 +739,8 @@ class WM_OT_keyitem_add(bpy.types.Operator): km.items.add("none", 'A', 'PRESS') # kmi # clear filter and expand keymap so we can see the newly added item - if context.space_data.filter != '': - context.space_data.filter = '' + if context.space_data.filter_text != "": + context.space_data.filter_text = "" km.items_expanded = True km.children_expanded = True diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 38e91de3884..6dd7cc5187c 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -71,8 +71,8 @@ class VIEW3D_HT_header(bpy.types.Header): row.prop(toolsettings.particle_edit, "selection_mode", text="", expand=True, toggle=True) # Occlude geometry - if view.viewport_shading in ('SOLID', 'SHADED', 'TEXTURED') and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')): - row.prop(view, "occlude_geometry", text="") + if view.viewport_shade in ('SOLID', 'SHADED', 'TEXTURED') and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')): + row.prop(view, "use_occlude_geometry", text="") # Proportional editing if obj.mode in ('EDIT', 'PARTICLE_EDIT'): @@ -2016,14 +2016,14 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): ob = context.object col = layout.column() - col.prop(view, "display_render_override") + col.prop(view, "show_only_render") col = layout.column() - display_all = not view.display_render_override + display_all = not view.show_only_render col.active = display_all - col.prop(view, "outline_selected") - col.prop(view, "all_object_origins") - col.prop(view, "relationship_lines") + col.prop(view, "show_outline_selected") + col.prop(view, "show_all_objects_origin") + col.prop(view, "show_relationship_lines") if ob and ob.type == 'MESH': mesh = ob.data col.prop(mesh, "all_edges") @@ -2031,15 +2031,15 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): col = layout.column() col.active = display_all split = col.split(percentage=0.55) - split.prop(view, "display_floor", text="Grid Floor") + split.prop(view, "show_floor", text="Grid Floor") row = split.row(align=True) - row.prop(view, "display_x_axis", text="X", toggle=True) - row.prop(view, "display_y_axis", text="Y", toggle=True) - row.prop(view, "display_z_axis", text="Z", toggle=True) + row.prop(view, "show_axis_x", text="X", toggle=True) + row.prop(view, "show_axis_y", text="Y", toggle=True) + row.prop(view, "show_axis_z", text="Z", toggle=True) sub = col.column(align=True) - sub.active = (display_all and view.display_floor) + sub.active = (display_all and view.show_floor) sub.prop(view, "grid_lines", text="Lines") sub.prop(view, "grid_spacing", text="Spacing") sub.prop(view, "grid_subdivisions", text="Subdivisions") @@ -2047,7 +2047,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): col = layout.column() col.label(text="Shading:") col.prop(gs, "material_mode", text="") - col.prop(view, "textured_solid") + col.prop(view, "show_textured_solid") layout.separator() @@ -2141,7 +2141,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel): layout = self.layout view = context.space_data - layout.prop(view, "display_background_images", text="") + layout.prop(view, "show_background_images", text="") def draw(self, context): layout = self.layout @@ -2152,7 +2152,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel): col.operator("view3d.add_background_image", text="Add Image") for i, bg in enumerate(view.background_images): - layout.active = view.display_background_images + layout.active = view.show_background_images box = layout.box() row = box.row(align=True) row.prop(bg, "show_expanded", text="", emboss=False) -- cgit v1.2.3