mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-25 20:12:34 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add shortcuts for SpriteFrames editor. Small renaming changes for clarity & consistency.

Browse source
This commit is contained in:
Eric M 2022-09-24 18:01:52 +10:00
parent 2eda77c682
commit b322b3d649
2 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
editor/plugins/sprite_frames_editor_plugin.cpp
View file

@ -414,16 +414,16 @@ void SpriteFramesEditor::_notification(int p_what) {
load_sheet->set_icon(get_theme_icon(SNAME("SpriteSheet"), SNAME("EditorIcons"))); load_sheet->set_icon(get_theme_icon(SNAME("SpriteSheet"), SNAME("EditorIcons")));
copy->set_icon(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons"))); copy->set_icon(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")));
paste->set_icon(get_theme_icon(SNAME("ActionPaste"), SNAME("EditorIcons"))); paste->set_icon(get_theme_icon(SNAME("ActionPaste"), SNAME("EditorIcons")));
empty->set_icon(get_theme_icon(SNAME("InsertBefore"), SNAME("EditorIcons"))); empty_before->set_icon(get_theme_icon(SNAME("InsertBefore"), SNAME("EditorIcons")));
empty2->set_icon(get_theme_icon(SNAME("InsertAfter"), SNAME("EditorIcons"))); empty_after->set_icon(get_theme_icon(SNAME("InsertAfter"), SNAME("EditorIcons")));
move_up->set_icon(get_theme_icon(SNAME("MoveLeft"), SNAME("EditorIcons"))); move_up->set_icon(get_theme_icon(SNAME("MoveLeft"), SNAME("EditorIcons")));
move_down->set_icon(get_theme_icon(SNAME("MoveRight"), SNAME("EditorIcons"))); move_down->set_icon(get_theme_icon(SNAME("MoveRight"), SNAME("EditorIcons")));
_delete->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons"))); delete_frame->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
zoom_out->set_icon(get_theme_icon(SNAME("ZoomLess"), SNAME("EditorIcons"))); zoom_out->set_icon(get_theme_icon(SNAME("ZoomLess"), SNAME("EditorIcons")));
zoom_reset->set_icon(get_theme_icon(SNAME("ZoomReset"), SNAME("EditorIcons"))); zoom_reset->set_icon(get_theme_icon(SNAME("ZoomReset"), SNAME("EditorIcons")));
zoom_in->set_icon(get_theme_icon(SNAME("ZoomMore"), SNAME("EditorIcons"))); zoom_in->set_icon(get_theme_icon(SNAME("ZoomMore"), SNAME("EditorIcons")));
new_anim->set_icon(get_theme_icon(SNAME("New"), SNAME("EditorIcons"))); add_anim->set_icon(get_theme_icon(SNAME("New"), SNAME("EditorIcons")));
remove_anim->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons"))); delete_anim->set_icon(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
anim_search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons"))); anim_search_box->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
split_sheet_zoom_out->set_icon(get_theme_icon(SNAME("ZoomLess"), SNAME("EditorIcons"))); split_sheet_zoom_out->set_icon(get_theme_icon(SNAME("ZoomLess"), SNAME("EditorIcons")));
split_sheet_zoom_reset->set_icon(get_theme_icon(SNAME("ZoomReset"), SNAME("EditorIcons"))); split_sheet_zoom_reset->set_icon(get_theme_icon(SNAME("ZoomReset"), SNAME("EditorIcons")));
@ -1016,19 +1016,19 @@ void SpriteFramesEditor::edit(SpriteFrames *p_frames) {
hide(); hide();
} }
new_anim->set_disabled(read_only); add_anim->set_disabled(read_only);
remove_anim->set_disabled(read_only); delete_anim->set_disabled(read_only);
anim_speed->set_editable(!read_only); anim_speed->set_editable(!read_only);
anim_loop->set_disabled(read_only); anim_loop->set_disabled(read_only);
load->set_disabled(read_only); load->set_disabled(read_only);
load_sheet->set_disabled(read_only); load_sheet->set_disabled(read_only);
copy->set_disabled(read_only); copy->set_disabled(read_only);
paste->set_disabled(read_only); paste->set_disabled(read_only);
empty->set_disabled(read_only); empty_before->set_disabled(read_only);
empty2->set_disabled(read_only); empty_after->set_disabled(read_only);
move_up->set_disabled(read_only); move_up->set_disabled(read_only);
move_down->set_disabled(read_only); move_down->set_disabled(read_only);
_delete->set_disabled(read_only); delete_frame->set_disabled(read_only);
} }
void SpriteFramesEditor::set_undo_redo(Ref<EditorUndoRedoManager> p_undo_redo) { void SpriteFramesEditor::set_undo_redo(Ref<EditorUndoRedoManager> p_undo_redo) {
@ -1187,18 +1187,16 @@ SpriteFramesEditor::SpriteFramesEditor() {
HBoxContainer *hbc_animlist = memnew(HBoxContainer); HBoxContainer *hbc_animlist = memnew(HBoxContainer);
sub_vb->add_child(hbc_animlist); sub_vb->add_child(hbc_animlist);
new_anim = memnew(Button); add_anim = memnew(Button);
new_anim->set_flat(true); add_anim->set_flat(true);
new_anim->set_tooltip_text(TTR("New Animation")); hbc_animlist->add_child(add_anim);
hbc_animlist->add_child(new_anim); add_anim->connect("pressed", callable_mp(this, &SpriteFramesEditor::_animation_add));
new_anim->connect("pressed", callable_mp(this, &SpriteFramesEditor::_animation_add));
remove_anim = memnew(Button); delete_anim = memnew(Button);
remove_anim->set_flat(true); delete_anim->set_flat(true);
remove_anim->set_tooltip_text(TTR("Remove Animation")); hbc_animlist->add_child(delete_anim);
hbc_animlist->add_child(remove_anim); delete_anim->set_disabled(true);
remove_anim->set_disabled(true); delete_anim->connect("pressed", callable_mp(this, &SpriteFramesEditor::_animation_remove));
remove_anim->connect("pressed", callable_mp(this, &SpriteFramesEditor::_animation_remove));
anim_search_box = memnew(LineEdit); anim_search_box = memnew(LineEdit);
hbc_animlist->add_child(anim_search_box); hbc_animlist->add_child(anim_search_box);
@ -1215,6 +1213,11 @@ SpriteFramesEditor::SpriteFramesEditor() {
animations->connect("item_edited", callable_mp(this, &SpriteFramesEditor::_animation_name_edited)); animations->connect("item_edited", callable_mp(this, &SpriteFramesEditor::_animation_name_edited));
animations->set_allow_reselect(true); animations->set_allow_reselect(true);
add_anim->set_shortcut_context(animations);
add_anim->set_shortcut(ED_SHORTCUT("sprite_frames/new_animation", TTR("Add Animation"), KeyModifierMask::CMD_OR_CTRL | Key::N));
delete_anim->set_shortcut_context(animations);
delete_anim->set_shortcut(ED_SHORTCUT("sprite_frames/delete_animation", TTR("Delete Animation"), Key::KEY_DELETE));
HBoxContainer *hbc_anim_speed = memnew(HBoxContainer); HBoxContainer *hbc_anim_speed = memnew(HBoxContainer);
hbc_anim_speed->add_child(memnew(Label(TTR("Speed:")))); hbc_anim_speed->add_child(memnew(Label(TTR("Speed:"))));
vbc_animlist->add_child(hbc_anim_speed); vbc_animlist->add_child(hbc_anim_speed);
@ -1244,54 +1247,45 @@ SpriteFramesEditor::SpriteFramesEditor() {
load = memnew(Button); load = memnew(Button);
load->set_flat(true); load->set_flat(true);
load->set_tooltip_text(TTR("Add a Texture from File"));
hbc->add_child(load); hbc->add_child(load);
load_sheet = memnew(Button); load_sheet = memnew(Button);
load_sheet->set_flat(true); load_sheet->set_flat(true);
load_sheet->set_tooltip_text(TTR("Add Frames from a Sprite Sheet"));
hbc->add_child(load_sheet); hbc->add_child(load_sheet);
hbc->add_child(memnew(VSeparator)); hbc->add_child(memnew(VSeparator));
copy = memnew(Button); copy = memnew(Button);
copy->set_flat(true); copy->set_flat(true);
copy->set_tooltip_text(TTR("Copy"));
hbc->add_child(copy); hbc->add_child(copy);
paste = memnew(Button); paste = memnew(Button);
paste->set_flat(true); paste->set_flat(true);
paste->set_tooltip_text(TTR("Paste"));
hbc->add_child(paste); hbc->add_child(paste);
hbc->add_child(memnew(VSeparator)); hbc->add_child(memnew(VSeparator));
empty = memnew(Button); empty_before = memnew(Button);
empty->set_flat(true); empty_before->set_flat(true);
empty->set_tooltip_text(TTR("Insert Empty (Before)")); hbc->add_child(empty_before);
hbc->add_child(empty);
empty2 = memnew(Button); empty_after = memnew(Button);
empty2->set_flat(true); empty_after->set_flat(true);
empty2->set_tooltip_text(TTR("Insert Empty (After)")); hbc->add_child(empty_after);
hbc->add_child(empty2);
hbc->add_child(memnew(VSeparator)); hbc->add_child(memnew(VSeparator));
move_up = memnew(Button); move_up = memnew(Button);
move_up->set_flat(true); move_up->set_flat(true);
move_up->set_tooltip_text(TTR("Move (Before)"));
hbc->add_child(move_up); hbc->add_child(move_up);
move_down = memnew(Button); move_down = memnew(Button);
move_down->set_flat(true); move_down->set_flat(true);
move_down->set_tooltip_text(TTR("Move (After)"));
hbc->add_child(move_down); hbc->add_child(move_down);
_delete = memnew(Button); delete_frame = memnew(Button);
_delete->set_flat(true); delete_frame->set_flat(true);
_delete->set_tooltip_text(TTR("Delete")); hbc->add_child(delete_frame);
hbc->add_child(_delete);
hbc->add_spacer(); hbc->add_spacer();
@ -1333,13 +1327,40 @@ SpriteFramesEditor::SpriteFramesEditor() {
load->connect("pressed", callable_mp(this, &SpriteFramesEditor::_load_pressed)); load->connect("pressed", callable_mp(this, &SpriteFramesEditor::_load_pressed));
load_sheet->connect("pressed", callable_mp(this, &SpriteFramesEditor::_open_sprite_sheet)); load_sheet->connect("pressed", callable_mp(this, &SpriteFramesEditor::_open_sprite_sheet));
_delete->connect("pressed", callable_mp(this, &SpriteFramesEditor::_delete_pressed)); delete_frame->connect("pressed", callable_mp(this, &SpriteFramesEditor::_delete_pressed));
copy->connect("pressed", callable_mp(this, &SpriteFramesEditor::_copy_pressed)); copy->connect("pressed", callable_mp(this, &SpriteFramesEditor::_copy_pressed));
paste->connect("pressed", callable_mp(this, &SpriteFramesEditor::_paste_pressed)); paste->connect("pressed", callable_mp(this, &SpriteFramesEditor::_paste_pressed));
empty->connect("pressed", callable_mp(this, &SpriteFramesEditor::_empty_pressed)); empty_before->connect("pressed", callable_mp(this, &SpriteFramesEditor::_empty_pressed));
empty2->connect("pressed", callable_mp(this, &SpriteFramesEditor::_empty2_pressed)); empty_after->connect("pressed", callable_mp(this, &SpriteFramesEditor::_empty2_pressed));
move_up->connect("pressed", callable_mp(this, &SpriteFramesEditor::_up_pressed)); move_up->connect("pressed", callable_mp(this, &SpriteFramesEditor::_up_pressed));
move_down->connect("pressed", callable_mp(this, &SpriteFramesEditor::_down_pressed)); move_down->connect("pressed", callable_mp(this, &SpriteFramesEditor::_down_pressed));
load->set_shortcut_context(tree);
load->set_shortcut(ED_SHORTCUT("sprite_frames/load_from_file", TTR("Add frame from file"), KeyModifierMask::CMD_OR_CTRL | Key::O));
load_sheet->set_shortcut_context(tree);
load_sheet->set_shortcut(ED_SHORTCUT("sprite_frames/load_from_sheet", TTR("Add frames from sprite sheet"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::O));
delete_frame->set_shortcut_context(tree);
delete_frame->set_shortcut(ED_SHORTCUT("sprite_frames/delete", TTR("Delete Frame"), Key::KEY_DELETE));
copy->set_shortcut_context(tree);
copy->set_shortcut(ED_SHORTCUT("sprite_frames/copy", TTR("Copy Frame"), KeyModifierMask::CMD_OR_CTRL | Key::C));
paste->set_shortcut_context(tree);
paste->set_shortcut(ED_SHORTCUT("sprite_frames/paste", TTR("Paste Frame"), KeyModifierMask::CMD_OR_CTRL | Key::V));
empty_before->set_shortcut_context(tree);
empty_before->set_shortcut(ED_SHORTCUT("sprite_frames/empty_before", TTR("Insert Empty (Before Selected)"), KeyModifierMask::ALT | Key::LEFT));
empty_after->set_shortcut_context(tree);
empty_after->set_shortcut(ED_SHORTCUT("sprite_frames/empty_after", TTR("Insert Empty (After Selected)"), KeyModifierMask::ALT | Key::RIGHT));
move_up->set_shortcut_context(tree);
move_up->set_shortcut(ED_SHORTCUT("sprite_frames/move_left", TTR("Move Frame Left"), KeyModifierMask::CMD_OR_CTRL | Key::LEFT));
move_down->set_shortcut_context(tree);
move_down->set_shortcut(ED_SHORTCUT("sprite_frames/move_right", TTR("Move Frame Right"), KeyModifierMask::CMD_OR_CTRL | Key::RIGHT));
zoom_out->set_shortcut_context(tree);
zoom_out->set_shortcut(ED_SHORTCUT_ARRAY("sprite_frames/zoom_out", TTR("Zoom Out"),
{ int32_t(KeyModifierMask::CMD_OR_CTRL | Key::MINUS), int32_t(KeyModifierMask::CMD_OR_CTRL | Key::KP_SUBTRACT) }));
zoom_in->set_shortcut_context(tree);
zoom_in->set_shortcut(ED_SHORTCUT_ARRAY("sprite_frames/zoom_in", TTR("Zoom In"),
{ int32_t(KeyModifierMask::CMD_OR_CTRL | Key::EQUAL), int32_t(KeyModifierMask::CMD_OR_CTRL | Key::KP_ADD) }));
file->connect("files_selected", callable_mp(this, &SpriteFramesEditor::_file_load_request).bind(-1)); file->connect("files_selected", callable_mp(this, &SpriteFramesEditor::_file_load_request).bind(-1));
loading_scene = false; loading_scene = false;
sel = -1; sel = -1;

10
editor/plugins/sprite_frames_editor_plugin.h
View file

@ -61,11 +61,11 @@ class SpriteFramesEditor : public HSplitContainer {
Button *load = nullptr; Button *load = nullptr;
Button *load_sheet = nullptr; Button *load_sheet = nullptr;
Button *_delete = nullptr; Button *delete_frame = nullptr;
Button *copy = nullptr; Button *copy = nullptr;
Button *paste = nullptr; Button *paste = nullptr;
Button *empty = nullptr; Button *empty_before = nullptr;
Button *empty2 = nullptr; Button *empty_after = nullptr;
Button *move_up = nullptr; Button *move_up = nullptr;
Button *move_down = nullptr; Button *move_down = nullptr;
Button *zoom_out = nullptr; Button *zoom_out = nullptr;
@ -75,8 +75,8 @@ class SpriteFramesEditor : public HSplitContainer {
bool loading_scene; bool loading_scene;
int sel; int sel;
Button *new_anim = nullptr; Button *add_anim = nullptr;
Button *remove_anim = nullptr; Button *delete_anim = nullptr;
LineEdit *anim_search_box = nullptr; LineEdit *anim_search_box = nullptr;
Tree *animations = nullptr; Tree *animations = nullptr;