From 02abb636a35b2f3dfcb430a87219f5d15cf35a77 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 17 Mar 2012 19:14:08 +0000 Subject: UI messages: unification of select/deselect stuff. Previously we had three versions, Select/Deselect, Select or Deselect, and (De)select, choosen the third (shortest) one for now. --- release/scripts/startup/bl_ui/space_clip.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 16 ++++++++-------- source/blender/editors/animation/keyingsets.c | 2 +- source/blender/editors/armature/editarmature.c | 4 ++-- source/blender/editors/curve/editcurve.c | 6 +++--- source/blender/editors/mesh/bmesh_tools.c | 2 +- source/blender/editors/metaball/mball_edit.c | 2 +- source/blender/editors/object/object_lattice.c | 2 +- source/blender/editors/object/object_select.c | 2 +- source/blender/editors/space_clip/clip_graph_ops.c | 2 +- source/blender/editors/space_clip/tracking_ops.c | 2 +- source/blender/editors/space_file/file_ops.c | 4 ++-- source/blender/editors/space_info/info_report.c | 4 ++-- source/blender/editors/space_nla/nla_select.c | 4 ++-- source/blender/editors/space_node/node_select.c | 2 +- .../blender/editors/space_sequencer/sequencer_select.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 72fee8d4c2e..4cd5cddba11 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -985,7 +985,7 @@ class CLIP_MT_select(Menu): layout.separator() - props = layout.operator("clip.select_all", text="Select/Deselect all") + props = layout.operator("clip.select_all") props.action = 'TOGGLE' layout.operator("clip.select_all", text="Inverse").action = 'INVERT' diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index cf94fff0f2c..60cfabe2eb1 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -427,7 +427,7 @@ class VIEW3D_MT_select_object(Menu): layout.separator() - layout.operator("object.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("object.select_all").action = 'TOGGLE' layout.operator("object.select_all", text="Inverse").action = 'INVERT' layout.operator("object.select_random", text="Random") layout.operator("object.select_mirror", text="Mirror") @@ -452,7 +452,7 @@ class VIEW3D_MT_select_pose(Menu): layout.separator() - layout.operator("pose.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("pose.select_all").action = 'TOGGLE' layout.operator("pose.select_all", text="Inverse").action = 'INVERT' layout.operator("pose.select_flip_active", text="Flip Active") layout.operator("pose.select_constraint_target", text="Constraint Target") @@ -489,7 +489,7 @@ class VIEW3D_MT_select_particle(Menu): layout.separator() - layout.operator("particle.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("particle.select_all").action = 'TOGGLE' layout.operator("particle.select_linked") layout.operator("particle.select_all").action = 'INVERT' @@ -515,7 +515,7 @@ class VIEW3D_MT_select_edit_mesh(Menu): layout.separator() - layout.operator("mesh.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("mesh.select_all").action = 'TOGGLE' layout.operator("mesh.select_all", text="Inverse").action = 'INVERT' layout.separator() @@ -566,7 +566,7 @@ class VIEW3D_MT_select_edit_curve(Menu): layout.separator() - layout.operator("curve.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("curve.select_all").action = 'TOGGLE' layout.operator("curve.select_all", text="Inverse").action = 'INVERT' layout.operator("curve.select_random") layout.operator("curve.select_nth", text="Every Nth Number of Points") @@ -595,7 +595,7 @@ class VIEW3D_MT_select_edit_surface(Menu): layout.separator() - layout.operator("curve.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("curve.select_all").action = 'TOGGLE' layout.operator("curve.select_all", text="Inverse").action = 'INVERT' layout.operator("curve.select_random") layout.operator("curve.select_nth", text="Every Nth Number of Points") @@ -638,7 +638,7 @@ class VIEW3D_MT_select_edit_lattice(Menu): layout.separator() - layout.operator("lattice.select_all", text="Select/Deselect All") + layout.operator("lattice.select_all") layout.operator("lattice.select_all", text="Inverse").action = 'INVERT' @@ -652,7 +652,7 @@ class VIEW3D_MT_select_edit_armature(Menu): layout.separator() - layout.operator("armature.select_all", text="Select/Deselect All").action = 'TOGGLE' + layout.operator("armature.select_all").action = 'TOGGLE' layout.operator("armature.select_all", text="Inverse").action = 'INVERT' layout.separator() diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index bc066b074ea..82d0bff79b8 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -187,7 +187,7 @@ static int remove_active_keyingset_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Removed Active Keying Set"; + ot->name= "Remove Active Keying Set"; ot->idname= "ANIM_OT_keying_set_remove"; ot->description= "Remove the active Keying Set"; diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 2a9436fdb41..ec02f406fcf 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4013,7 +4013,7 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->idname= "ARMATURE_OT_select_all"; ot->description= "Toggle selection status of all bones"; @@ -5077,7 +5077,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op) void POSE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->idname= "POSE_OT_select_all"; ot->description= "Toggle selection status of all bones"; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index aa8dad08ac2..8caa6cc6e26 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2502,7 +2502,7 @@ static int de_select_first_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_de_select_first(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect First"; + ot->name= "(De)select First"; ot->idname= "CURVE_OT_de_select_first"; /* api cfirstbacks */ @@ -2526,7 +2526,7 @@ static int de_select_last_exec(bContext *C, wmOperator *UNUSED(op)) void CURVE_OT_de_select_last(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect Last"; + ot->name= "(De)select Last"; ot->idname= "CURVE_OT_de_select_last"; /* api clastbacks */ @@ -2604,7 +2604,7 @@ static int de_select_all_exec(bContext *C, wmOperator *op) void CURVE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->idname= "CURVE_OT_select_all"; /* api callbacks */ diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 3a62bcb3b79..aa6f6b6944a 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -671,7 +671,7 @@ static int mesh_select_all_exec(bContext *C, wmOperator *op) void MESH_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select/Deselect All"; + ot->name = "(De)select All"; ot->idname = "MESH_OT_select_all"; ot->description = "(De)select all vertices, edges or faces"; diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 1287d903020..2d349f6a7bf 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -167,7 +167,7 @@ static int mball_select_all_exec(bContext *C, wmOperator *op) void MBALL_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->description= "Change selection of all meta elements"; ot->idname= "MBALL_OT_select_all"; diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 9f3bc9bbf37..67fdb1777b0 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -240,7 +240,7 @@ static int lattice_select_all_exec(bContext *C, wmOperator *op) void LATTICE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->description= "Change selection of all UVW control points"; ot->idname= "LATTICE_OT_select_all"; diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 9e11146db70..66fe2b98968 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -787,7 +787,7 @@ void OBJECT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->description = "Change selection of all visible objects in scene"; ot->idname= "OBJECT_OT_select_all"; diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index aecce3b1ba1..d75c14df054 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -444,7 +444,7 @@ static int graph_select_all_markers_exec(bContext *C, wmOperator *op) void CLIP_OT_graph_select_all_markers(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select or Deselect All Markers"; + ot->name = "(De)select All Markers"; ot->description = "Change selection of all markers of active track"; ot->idname = "CLIP_OT_graph_select_all_markers"; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 2c03db5032d..15bbcd910b6 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1080,7 +1080,7 @@ static int select_all_exec(bContext *C, wmOperator *op) void CLIP_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->description= "Change selection of all tracking markers"; ot->idname= "CLIP_OT_select_all"; diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index f663307507a..055d978b9c9 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -398,8 +398,8 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void FILE_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select/Deselect All Files"; - ot->description= "Select/deselect all files"; + ot->name= "(De)select All Files"; + ot->description= "Select or deselect all files"; ot->idname= "FILE_OT_select_all_toggle"; /* api callbacks */ diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index a1ea0449128..89abb7ad1f0 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -199,8 +199,8 @@ static int report_select_all_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void INFO_OT_select_all_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)Select All"; - ot->description= "(de)select all reports"; + ot->name= "(De)select All"; + ot->description= "Select or deselect all reports"; ot->idname= "INFO_OT_select_all_toggle"; /* api callbacks */ diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 6ad83f6591a..683dfc4f7a3 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -186,9 +186,9 @@ static int nlaedit_deselectall_exec(bContext *C, wmOperator *op) void NLA_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->idname= "NLA_OT_select_all_toggle"; - ot->description= "(De)Select all NLA-Strips"; + ot->description= "Select or deselect all NLA-Strips"; /* api callbacks */ ot->exec= nlaedit_deselectall_exec; diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index f354fd7472d..fba961b9d16 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -654,7 +654,7 @@ static int node_select_all_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name = "Select or Deselect All"; + ot->name = "(De)select All"; ot->description = "(De)select all nodes"; ot->idname = "NODE_OT_select_all"; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 32c7be99e94..32ccccd84d0 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -259,7 +259,7 @@ static int sequencer_de_select_all_exec(bContext *C, wmOperator *op) void SEQUENCER_OT_select_all(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->idname= "SEQUENCER_OT_select_all"; ot->description="Select or deselect all strips"; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 28981d55793..20eee42bce0 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1688,7 +1688,7 @@ static int select_all_exec(bContext *C, wmOperator *op) static void UV_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= "(De)select All"; ot->description= "Change selection of all UV vertices"; ot->idname= "UV_OT_select_all"; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; -- cgit v1.2.3