[Bf-blender-cvs] [c71be9a5523] master: UI: rename "Select Playhead" to "Select -> Side of Current Frame"

[Campbell Barton]

Commit: c71be9a552359855e90abbe89c65df0eec6755bb
Author: Campbell Barton
Date:   Mon Jun 1 14:46:46 2020 +1000
Branches: master
https://developer.blender.org/rBc71be9a552359855e90abbe89c65df0eec6755bb

UI: rename "Select Playhead" to "Select -> Side of Current Frame"

Make this consistent with meshes select side of active,
also rename "Under" to "Overlap" as this is confusing since
strips can be considered above/under each other
relative to their channels.

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_ui/space_sequencer.py
M	source/blender/editors/space_sequencer/sequencer_intern.h
M	source/blender/editors/space_sequencer/sequencer_select.c

===================================================================

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 3a95b3e4e0e..0db7b79d8c9 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2522,13 +2522,13 @@ def km_sequencer(params):
         ("sequencer.select", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
          {"properties": [("left_right", 'RIGHT'), ("linked_time", True)]}),
         ("sequencer.select", {"type": 'EQUAL', "value": 'PRESS'},
-         {"properties": [("left_right", 'UNDER'), ("linked_time", True)]}),
+         {"properties": [("left_right", 'OVERLAP'), ("linked_time", True)]}),
         ("sequencer.select", {"type": 'LEFT_BRACKET', "value": 'PRESS', "shift": True},
          {"properties": [("left_right", 'LEFT'), ("linked_time", True), ("extend", True)]}),
         ("sequencer.select", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "shift": True},
          {"properties": [("left_right", 'RIGHT'), ("linked_time", True), ("extend", True)]}),
         ("sequencer.select", {"type": 'EQUAL', "value": 'PRESS', "shift": True},
-         {"properties": [("left_right", 'UNDER'), ("linked_time", True), ("extend", True)]}),
+         {"properties": [("left_right", 'OVERLAP'), ("linked_time", True), ("extend", True)]}),
 
         *_template_items_context_menu("SEQUENCER_MT_context_menu", params.context_menu_event),
     ])
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 76523e1ab04..4f317a97b38 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -394,14 +394,14 @@ class SEQUENCER_MT_select_linked(Menu):
         layout.operator("sequencer.select_more", text="More")
 
 
-class SEQUENCER_MT_select_playhead(Menu):
-    bl_label = "Select Playhead"
+class SEQUENCER_MT_select_side_of_frame(Menu):
+    bl_label = "Side of Current Frame"
 
     def draw(self, _context):
         layout = self.layout
 
-        props = layout.operator("sequencer.select", text="Under")
-        props.left_right = 'UNDER'
+        props = layout.operator("sequencer.select", text="Overlap")
+        props.left_right = 'OVERLAP'
         props.linked_time = True
         props = layout.operator("sequencer.select", text="Left")
         props.left_right = 'LEFT'
@@ -429,7 +429,7 @@ class SEQUENCER_MT_select(Menu):
 
         layout.separator()
 
-        layout.menu("SEQUENCER_MT_select_playhead", text="Playhead")
+        layout.menu("SEQUENCER_MT_select_side_of_frame")
         layout.menu("SEQUENCER_MT_select_handle", text="Handle")
         layout.menu("SEQUENCER_MT_select_channel", text="Channel")
         layout.menu("SEQUENCER_MT_select_linked", text="Linked")
@@ -2221,7 +2221,7 @@ classes = (
     SEQUENCER_MT_view_toggle,
     SEQUENCER_MT_preview_zoom,
     SEQUENCER_MT_proxy,
-    SEQUENCER_MT_select_playhead,
+    SEQUENCER_MT_select_side_of_frame,
     SEQUENCER_MT_select_handle,
     SEQUENCER_MT_select_channel,
     SEQUENCER_MT_select_linked,
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 5f525bf913c..0e7e691c748 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -191,7 +191,7 @@ enum {
   SEQ_SELECT_LR_MOUSE,
   SEQ_SELECT_LR_LEFT,
   SEQ_SELECT_LR_RIGHT,
-  SEQ_SELECT_LR_UNDER_PLAYHEAD,
+  SEQ_SELECT_LR_OVERLAP,
 };
 
 /* Defines used internally. */
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 25e1b70482e..2e6cd7f7442 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -436,7 +436,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op)
       case SEQ_SELECT_LR_RIGHT:
         x = CFRA + 1.0f;
         break;
-      case SEQ_SELECT_LR_UNDER_PLAYHEAD:
+      case SEQ_SELECT_LR_OVERLAP:
       default:
         x = CFRA;
         break;
@@ -645,7 +645,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot)
       {SEQ_SELECT_LR_MOUSE, "MOUSE", 0, "Mouse", "Use mouse position for selection"},
       {SEQ_SELECT_LR_LEFT, "LEFT", 0, "Left", "Select to the left of the current frame"},
       {SEQ_SELECT_LR_RIGHT, "RIGHT", 0, "Right", "Select to the right of the current frame"},
-      {SEQ_SELECT_LR_UNDER_PLAYHEAD, "UNDER", 0, "Under", "Select under the current frame"},
+      {SEQ_SELECT_LR_OVERLAP, "OVERLAP", 0, "Overlap", "Select overlapping the current frame"},
       {0, NULL, 0, NULL, NULL},
   };
   PropertyRNA *prop;