[Bf-blender-cvs] [48d7cf680eb] blender2.8: Keymap: Select/De-Select support for anim-editors
Campbell Barton
noreply at git.blender.org
Tue Jul 3 16:29:49 CEST 2018
Commit: 48d7cf680ebe8ea7c09ef3e0e4abd1dc93d3fa5f
Author: Campbell Barton
Date: Tue Jul 3 15:44:56 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB48d7cf680ebe8ea7c09ef3e0e4abd1dc93d3fa5f
Keymap: Select/De-Select support for anim-editors
Also update menu items, adding select/de-select.
===================================================================
M release/scripts/startup/bl_ui/properties_mask_common.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_nla.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/space_action/action_intern.h
M source/blender/editors/space_action/action_ops.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_file/file_intern.h
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_intern.h
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_nla/nla_intern.h
M source/blender/editors/space_nla/nla_ops.c
M source/blender/editors/space_nla/nla_select.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py
index 450ca80bbc2..c766c8dedbc 100644
--- a/release/scripts/startup/bl_ui/properties_mask_common.py
+++ b/release/scripts/startup/bl_ui/properties_mask_common.py
@@ -378,6 +378,12 @@ class MASK_MT_select(Menu):
def draw(self, context):
layout = self.layout
+ layout.operator("mask.select_all", text="All").action = 'SELECT'
+ layout.operator("mask.select_all", text="None").action = 'DESELECT'
+ layout.operator("mask.select_all", text="Invert").action = 'INVERT'
+
+ layout.separator()
+
layout.operator("mask.select_border")
layout.operator("mask.select_circle")
@@ -388,8 +394,6 @@ class MASK_MT_select(Menu):
layout.separator()
- layout.operator("mask.select_all").action = 'TOGGLE'
- layout.operator("mask.select_all", text="Inverse").action = 'INVERT'
layout.operator("mask.select_linked", text="Select Linked")
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index aeda521ba04..93fbc7799bf 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -358,9 +358,9 @@ class DOPESHEET_MT_select(Menu):
def draw(self, context):
layout = self.layout
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("action.select_all_toggle").invert = False
- layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
+ layout.operator("action.select_all", text="All").action = 'SELECT'
+ layout.operator("action.select_all", text="None").action = 'DESELECT'
+ layout.operator("action.select_all", text="Invert").action = 'INVERT'
layout.separator()
layout.operator("action.select_border").axis_range = False
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index 0a6077e6b57..de5dcdbc36d 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -165,11 +165,12 @@ class GRAPH_MT_select(Menu):
def draw(self, context):
layout = self.layout
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("graph.select_all_toggle").invert = False
- layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
+ layout.operator("graph.select_all", text="All").action = 'SELECT'
+ layout.operator("graph.select_all", text="None").action = 'DESELECT'
+ layout.operator("graph.select_all", text="Invert").action = 'INVERT'
layout.separator()
+
props = layout.operator("graph.select_border")
props.axis_range = False
props.include_handles = False
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index ba63b2b216e..e20c3ccd7f5 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -139,14 +139,20 @@ class IMAGE_MT_select(Menu):
def draw(self, context):
layout = self.layout
+ layout.operator("uv.select_all", text="All").action = 'SELECT'
+ layout.operator("uv.select_all", text="None").action = 'DESELECT'
+ layout.operator("uv.select_all", text="Invert").action = 'INVERT'
+
+ layout.separator()
+
layout.operator("uv.select_border").pinned = False
layout.operator("uv.select_border", text="Border Select Pinned").pinned = True
layout.operator("uv.circle_select")
layout.separator()
- layout.operator("uv.select_all").action = 'TOGGLE'
- layout.operator("uv.select_all", text="Inverse").action = 'INVERT'
+ layout.operator("uv.select_less", text="Less")
+ layout.operator("uv.select_more", text="More")
layout.separator()
@@ -155,11 +161,6 @@ class IMAGE_MT_select(Menu):
layout.separator()
- layout.operator("uv.select_less", text="Less")
- layout.operator("uv.select_more", text="More")
-
- layout.separator()
-
layout.operator("uv.select_split")
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index 304fc799fea..4bf338b89d6 100644
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -126,9 +126,9 @@ class NLA_MT_select(Menu):
def draw(self, context):
layout = self.layout
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("nla.select_all_toggle").invert = False
- layout.operator("nla.select_all_toggle", text="Invert Selection").invert = True
+ layout.operator("nla.select_all", text="All").action = 'SELECT'
+ layout.operator("nla.select_all", text="None").action = 'DESELECT'
+ layout.operator("nla.select_all", text="Invert").action = 'INVERT'
layout.separator()
layout.operator("nla.select_border").axis_range = False
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index dc966850b69..0bdfcc39ed9 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -249,6 +249,12 @@ class SEQUENCER_MT_select(Menu):
def draw(self, context):
layout = self.layout
+ layout.operator("sequencer.select_all", text="All").action = 'SELECT'
+ layout.operator("sequencer.select_all", text="None").action = 'DESELECT'
+ layout.operator("sequencer.select_all", text="Invert").action = 'INVERT'
+
+ layout.separator()
+
layout.operator("sequencer.select_active_side", text="Strips to the Left").side = 'LEFT'
layout.operator("sequencer.select_active_side", text="Strips to the Right").side = 'RIGHT'
props = layout.operator("sequencer.select", text="All Strips to the Left")
@@ -267,8 +273,6 @@ class SEQUENCER_MT_select(Menu):
layout.operator("sequencer.select_linked")
layout.operator("sequencer.select_less")
layout.operator("sequencer.select_more")
- layout.operator("sequencer.select_all").action = 'TOGGLE'
- layout.operator("sequencer.select_all", text="Inverse").action = 'INVERT'
class SEQUENCER_MT_marker(Menu):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 672a5d081bf..f5d451a1189 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -739,15 +739,19 @@ class VIEW3D_MT_select_object(Menu):
def draw(self, context):
layout = self.layout
+ layout.operator("object.select_all", text="All").action = 'SELECT'
+ layout.operator("object.select_all", text="None").action = 'DESELECT'
+ layout.operator("object.select_all", text="Invert").action = 'INVERT'
+
+ layout.separator()
+
layout.operator("view3d.select_border")
layout.operator("view3d.select_circle")
layout.separator()
- layout.operator("object.select_all", text="Select/Deselect All").action = 'TOGGLE'
layout.operator_menu_enum("object.select_by_type", "type", text="Select All by Type...")
layout.operator("object.select_camera", text="Select Active Camera")
- layout.operator("object.select_all", text="Inverse Selection").action = 'INVERT'
layout.operator("object.select_mirror", text="Mirror Selection")
layout.operator("object.select_random", text="Select Random")
@@ -795,13 +799,17 @@ class VIEW3D_MT_select_pose(Menu):
def draw(self, context):
layout = self.layout
+ layout.operator("pose.select_all", text="All").action = 'SELECT'
+ layout.operator("pose.select_all", text="None").action = 'DESELECT'
+ layout.operator("pose.select_all", text="Invert").action = 'INVERT'
+
+ layout.separator()
+
layout.operator("view3d.select_border")
layout.operator("view3d.select_circle")
layout.separator()
- layout.operator("pose.select_all").action = 'TOGGLE'
- layout.operator("pose.select_all", text="Inverse").action = 'INVERT'
layout.operator("pose.select_mirror", text="Flip Active")
layout.separator()
@@ -825,14 +833,18 @@ class VIEW3D_MT_select_particle(Menu):
def draw(self, context):
layout = self.layout
+ layout.operator("particle.select_all", text="All").action = 'SELECT'
+ layout.operator("particle.select_all", text="None").action = 'DESELECT'
+ layout.operator("particle.select_all", text="Invert").action = 'INVERT'
+
+ layout.separator()
+
layout.operator("view3d.select_border")
layout.operator("view3d.select_circle")
layout.separator()
- layout.operator("particle.select_all").action = 'TOGGLE'
layout.operator("particle.select_linked")
- layout.operator("particle.select_all", text="Inverse").action = 'INVERT'
layout.separator()
@@ -926,14 +938,15 @@ class VIEW3D_MT_select_edit_mesh(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("view3d.select_border")
- layout.operator("view3d.select_circle")
+ # primitive
+ layout.operator("mesh.select_all", text="All").action = 'SELECT'
+ layout.operator("mesh.select_all", text="None").action = 'DESELECT'
+ layout.operator("mesh.select_all", text="Invert").action = 'INVERT'
layout.separator()
- # primitive
- layout.operator("mesh.select_all", text="Select/Deselect All").action = 'TOGGLE'
- layout.operator("mesh.select_all", text="Inverse Selection").action = 'INVERT'
+ layout.operator("view3d.select_bo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list