Skip to content

Commit 41bba30

Browse files
committed
Merge pull request godotengine#109306 from Calinou/editor-run-bar-tweak-shortcut-tooltips
Improve EditorRunBar shortcut tooltips to be more informative
2 parents 42cb935 + 49cf945 commit 41bba30

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

editor/run/editor_run_bar.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ void EditorRunBar::_reset_play_buttons() {
119119

120120
play_button->set_pressed(false);
121121
play_button->set_button_icon(get_editor_theme_icon(SNAME("MainPlay")));
122-
play_button->set_tooltip_text(TTRC("Play the project."));
122+
play_button->set_tooltip_text(TTRC("Run the project's main scene."));
123123

124124
play_scene_button->set_pressed(false);
125125
play_scene_button->set_button_icon(get_editor_theme_icon(SNAME("PlayScene")));
126-
play_scene_button->set_tooltip_text(TTRC("Play the edited scene."));
126+
play_scene_button->set_tooltip_text(TTRC("Play the currently edited scene."));
127127

128128
play_custom_scene_button->set_pressed(false);
129129
play_custom_scene_button->set_button_icon(get_editor_theme_icon(SNAME("PlayCustom")));
@@ -143,16 +143,18 @@ void EditorRunBar::_update_play_buttons() {
143143
Button *active_button = nullptr;
144144
if (current_mode == RUN_CURRENT) {
145145
active_button = play_scene_button;
146+
active_button->set_tooltip_text(TTRC("Reload the played scene that was being edited."));
146147
} else if (current_mode == RUN_CUSTOM) {
147148
active_button = play_custom_scene_button;
149+
active_button->set_tooltip_text(TTRC("Reload the played custom scene."));
148150
} else {
149151
active_button = play_button;
152+
active_button->set_tooltip_text(TTRC("Reload the played main scene."));
150153
}
151154

152155
if (active_button) {
153156
active_button->set_pressed(true);
154157
active_button->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
155-
active_button->set_tooltip_text(TTRC("Reload the played scene."));
156158
}
157159
}
158160

@@ -581,12 +583,11 @@ EditorRunBar::EditorRunBar() {
581583
play_button->set_theme_type_variation("RunBarButton");
582584
play_button->set_toggle_mode(true);
583585
play_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
584-
play_button->set_tooltip_text(TTRC("Run the project's default scene."));
585-
play_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::play_main_scene).bind(false, Vector<String>()));
586-
587586
ED_SHORTCUT_AND_COMMAND("editor/run_project", TTRC("Run Project"), Key::F5);
588587
ED_SHORTCUT_OVERRIDE("editor/run_project", "macos", KeyModifierMask::META | Key::B);
589588
play_button->set_shortcut(ED_GET_SHORTCUT("editor/run_project"));
589+
play_button->set_tooltip_text(TTRC("Run the project's main scene."));
590+
play_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::play_main_scene).bind(false, Vector<String>()));
590591

591592
pause_button = memnew(Button);
592593
main_hbox->add_child(pause_button);
@@ -640,13 +641,13 @@ EditorRunBar::EditorRunBar() {
640641
play_scene_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_play_current_pressed).bind(-1));
641642
}
642643
main_hbox->add_child(play_scene_button);
643-
play_scene_button->set_theme_type_variation("RunBarButton");
644-
play_scene_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
645-
play_scene_button->set_tooltip_text(TTRC("Run the currently edited scene."));
646644

647645
ED_SHORTCUT_AND_COMMAND("editor/run_current_scene", TTRC("Run Current Scene"), Key::F6);
648646
ED_SHORTCUT_OVERRIDE("editor/run_current_scene", "macos", KeyModifierMask::META | Key::R);
649647
play_scene_button->set_shortcut(ED_GET_SHORTCUT("editor/run_current_scene"));
648+
play_scene_button->set_tooltip_text(TTRC("Play the currently edited scene."));
649+
play_scene_button->set_theme_type_variation("RunBarButton");
650+
play_scene_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
650651

651652
if (add_play_xr_mode_options) {
652653
MenuButton *menu_button = memnew(MenuButton);
@@ -661,13 +662,13 @@ EditorRunBar::EditorRunBar() {
661662
play_custom_scene_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_play_custom_pressed).bind(-1));
662663
}
663664
main_hbox->add_child(play_custom_scene_button);
664-
play_custom_scene_button->set_theme_type_variation("RunBarButton");
665-
play_custom_scene_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
666-
play_custom_scene_button->set_tooltip_text(TTRC("Run a specific scene."));
667665

668666
ED_SHORTCUT_AND_COMMAND("editor/run_specific_scene", TTRC("Run Specific Scene"), KeyModifierMask::CTRL | KeyModifierMask::SHIFT | Key::F5);
669667
ED_SHORTCUT_OVERRIDE("editor/run_specific_scene", "macos", KeyModifierMask::META | KeyModifierMask::SHIFT | Key::R);
670668
play_custom_scene_button->set_shortcut(ED_GET_SHORTCUT("editor/run_specific_scene"));
669+
play_custom_scene_button->set_tooltip_text(TTRC("Play a custom scene."));
670+
play_custom_scene_button->set_theme_type_variation("RunBarButton");
671+
play_custom_scene_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY);
671672

672673
write_movie_panel = memnew(PanelContainer);
673674
main_hbox->add_child(write_movie_panel);

0 commit comments

Comments
 (0)