[Bf-blender-cvs] [43fab44] master: Followup for previous commit: fix mismatches between menu entry and shortcut properties.
Bastien Montagne
noreply at git.blender.org
Thu Jan 29 17:40:17 CET 2015
Commit: 43fab448f31b910409f03e1d9c1a2d74135a2b16
Author: Bastien Montagne
Date: Thu Jan 29 17:34:05 2015 +0100
Branches: master
https://developer.blender.org/rB43fab448f31b910409f03e1d9c1a2d74135a2b16
Followup for previous commit: fix mismatches between menu entry and shortcut properties.
For now, did most of the changes in menu entries (i.e. py space UI scripts).
Note we do not get 100% same results as previously, but current situation is
globally better than previous one, though the whole system to retrieve shortcuts
remains a bit weak...
===================================================================
M release/scripts/startup/bl_ui/properties_mask_common.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_graph.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/startup/bl_ui/space_nla.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/object/object_relations.c
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py
index a455677..95afdf6 100644
--- a/release/scripts/startup/bl_ui/properties_mask_common.py
+++ b/release/scripts/startup/bl_ui/properties_mask_common.py
@@ -344,7 +344,7 @@ class MASK_MT_visibility(Menu):
layout = self.layout
layout.operator("mask.hide_view_clear", text="Show Hidden")
- layout.operator("mask.hide_view_set", text="Hide Selected")
+ layout.operator("mask.hide_view_set", text="Hide Selected").unselected = False
layout.operator("mask.hide_view_set", text="Hide Unselected").unselected = True
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index e7c95bf..727bd77 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -1215,14 +1215,17 @@ class CLIP_MT_track(Menu):
layout.operator("clip.solve_camera")
layout.separator()
- layout.operator("clip.clear_track_path",
- text="Clear After").action = 'REMAINED'
+ props = layout.operator("clip.clear_track_path", text="Clear After")
+ props.clear_active = False
+ props.action = 'REMAINED'
- layout.operator("clip.clear_track_path",
- text="Clear Before").action = 'UPTO'
+ props = layout.operator("clip.clear_track_path", text="Clear Before")
+ props.clear_active = False
+ props.action = 'UPTO'
- layout.operator("clip.clear_track_path",
- text="Clear Track Path").action = 'ALL'
+ props = layout.operator("clip.clear_track_path", text="Clear Track Path")
+ props.clear_active = False
+ props.action = 'ALL'
layout.separator()
layout.operator("clip.join_tracks")
@@ -1235,16 +1238,21 @@ class CLIP_MT_track(Menu):
layout.operator("clip.paste_tracks")
layout.separator()
- layout.operator("clip.track_markers",
- text="Track Frame Backwards").backwards = True
+ props = layout.operator("clip.track_markers", text="Track Frame Backwards")
+ props.backwards = True
+ props.sequence = False
props = layout.operator("clip.track_markers", text="Track Backwards")
props.backwards = True
props.sequence = True
- layout.operator("clip.track_markers",
- text="Track Forwards").sequence = True
- layout.operator("clip.track_markers", text="Track Frame Forwards")
+ props = layout.operator("clip.track_markers", text="Track Forwards")
+ props.backwards = False
+ props.sequence = True
+
+ props = layout.operator("clip.track_markers", text="Track Frame Forwards")
+ props.backwards = False
+ props.sequence = False
layout.separator()
layout.operator("clip.delete_track")
@@ -1286,10 +1294,8 @@ class CLIP_MT_track_visibility(Menu):
layout = self.layout
layout.operator("clip.hide_tracks_clear", text="Show Hidden")
- layout.operator("clip.hide_tracks", text="Hide Selected")
-
- layout.operator("clip.hide_tracks",
- text="Hide Unselected").unselected = True
+ layout.operator("clip.hide_tracks", text="Hide Selected").unselected = False
+ layout.operator("clip.hide_tracks", text="Hide Unselected").unselected = True
class CLIP_MT_track_transform(Menu):
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index caf1e73..e52d180 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -215,8 +215,12 @@ class DOPESHEET_MT_select(Menu):
layout.operator("action.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
layout.separator()
- layout.operator("action.select_leftright", text="Before Current Frame").mode = 'LEFT'
- layout.operator("action.select_leftright", text="After Current Frame").mode = 'RIGHT'
+ props = layout.operator("action.select_leftright", text="Before Current Frame")
+ props.extend = False
+ props.mode = 'LEFT'
+ props = layout.operator("action.select_leftright", text="After Current Frame")
+ props.extend = False
+ props.mode = 'RIGHT'
# FIXME: grease pencil mode isn't supported for these yet, so skip for that mode only
if context.space_data.mode != 'GPENCIL':
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index 6b78403..d3e1a86 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -134,9 +134,15 @@ class GRAPH_MT_select(Menu):
layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
layout.separator()
- layout.operator("graph.select_border")
- layout.operator("graph.select_border", text="Border Axis Range").axis_range = True
- layout.operator("graph.select_border", text="Border (Include Handles)").include_handles = True
+ props = layout.operator("graph.select_border")
+ props.axis_range = False
+ props.include_handles = False
+ props = layout.operator("graph.select_border", text="Border Axis Range")
+ props.axis_range = True
+ props.include_handles = False
+ props = layout.operator("graph.select_border", text="Border (Include Handles)")
+ props.axis_range = False
+ props.include_handles = True
layout.separator()
layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
@@ -146,8 +152,12 @@ class GRAPH_MT_select(Menu):
layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
layout.separator()
- layout.operator("graph.select_leftright", text="Before Current Frame").mode = 'LEFT'
- layout.operator("graph.select_leftright", text="After Current Frame").mode = 'RIGHT'
+ props = layout.operator("graph.select_leftright", text="Before Current Frame")
+ props.extend = False
+ props.mode = 'LEFT'
+ props = layout.operator("graph.select_leftright", text="After Current Frame")
+ props.extend = False
+ props.mode = 'RIGHT'
layout.separator()
layout.operator("graph.select_more")
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 44be278..a75e091 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -136,7 +136,7 @@ class IMAGE_MT_select(Menu):
layout.separator()
layout.operator("uv.select_pinned")
- layout.operator("uv.select_linked")
+ layout.operator("uv.select_linked").extend = False
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index b642b61..927967c 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -275,8 +275,8 @@ class INFO_MT_window(Menu):
layout.separator()
- layout.operator("screen.screenshot").full = True
- layout.operator("screen.screencast").full = True
+ layout.operator("screen.screenshot")
+ layout.operator("screen.screencast")
if sys.platform[:3] == "win":
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index b748e90..ae432c4 100644
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -108,8 +108,12 @@ class NLA_MT_select(Menu):
layout.operator("nla.select_border", text="Border Axis Range").axis_range = True
layout.separator()
- layout.operator("nla.select_leftright", text="Before Current Frame").mode = 'LEFT'
- layout.operator("nla.select_leftright", text="After Current Frame").mode = 'RIGHT'
+ props = layout.operator("nla.select_leftright", text="Before Current Frame")
+ props.extend = False
+ props.mode = 'LEFT'
+ props = layout.operator("nla.select_leftright", text="After Current Frame")
+ props.extend = False
+ props.mode = 'RIGHT'
class NLA_MT_marker(Menu):
@@ -135,7 +139,7 @@ class NLA_MT_edit(Menu):
layout.operator_menu_enum("nla.snap", "type", text="Snap")
layout.separator()
- layout.operator("nla.duplicate", text="Duplicate")
+ layout.operator("nla.duplicate", text="Duplicate").linked = False
layout.operator("nla.duplicate", text="Linked Duplicate").linked = True
layout.operator("nla.split")
layout.operator("nla.delete")
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index a7e8a23..8b87f3f 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -196,7 +196,7 @@ class NODE_MT_select(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("node.select_border")
+ layout.operator("node.select_border").tweak = False
layout.operator("node.select_circle")
layout.separator()
@@ -207,7 +207,7 @@ class NODE_MT_select(Menu):
layout.separator()
- layout.operator("node.select_grouped")
+ layout.operator("node.select_grouped").extend = False
layout.operator("node.select_same_type_step").prev = True
layout.operator("node.select_same_type_step").prev = False
@@ -239,14 +239,14 @@ class NODE_MT_node(Menu):
layout.separator()
- layout.operator("node.link_make")
+ layout.operator("node.link_make").replace = False
layout.operator("node.link_make", text="Make and Replace Links").replace = True
layout.operator("node.links_cut")
layout.operator("node.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list