godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Revert "Add new editor and default theme (WIP)"

Browse Source 
This reverts commit f045efe007.
This commit is contained in:
volzhs
2017-05-03 06:02:06 +09:00
parent 5a6ccce97d
commit 17e8e343fb
354 changed files with 944 additions and 8751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -118,7 +118,16 @@ void AnimationPlayerEditor::_notification(int p_what) {
blend_editor.next->connect("item_selected", this, "_blend_editor_next_changed");
// nodename->set_icon(get_icon("AnimationPlayer", "EditorIcons"));
nodename->set_icon(get_icon("AnimationPlayer", "EditorIcons"));
/*
anim_editor_load->set_normal_texture( get_icon("AnimGet","EditorIcons"));
anim_editor_store->set_normal_texture( get_icon("AnimSet","EditorIcons"));
anim_editor_load->set_pressed_texture( get_icon("AnimGet","EditorIcons"));
anim_editor_store->set_pressed_texture( get_icon("AnimSet","EditorIcons"));
anim_editor_load->set_hover_texture( get_icon("AnimGetHl","EditorIcons"));
anim_editor_store->set_hover_texture( get_icon("AnimSetHl","EditorIcons"));
*/
get_tree()->connect("node_removed", this, "_node_removed");
}
@@ -784,7 +793,7 @@ void AnimationPlayerEditor::_update_player() {
if (player)
nodename->set_text(player->get_name());
else
nodename->set_text(TTR("No player selected"));
nodename->set_text("<empty>");
add_anim->set_disabled(player == NULL);
load_anim->set_disabled(player == NULL);
@@ -1358,14 +1367,9 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
//tool_anim->get_popup()->add_item("Edit Anim Resource",TOOL_PASTE_ANIM);
hb->add_child(tool_anim);
hb->add_child(memnew(VSeparator));
nodename_icon = memnew(TextureRect);
nodename_icon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
hb->add_child(nodename_icon);
nodename = memnew(Label);
nodename = memnew(Button);
hb->add_child(nodename);
pin = memnew(ToolButton);
pin->set_tooltip(TTR("Keep this animation selected?"));
pin->set_toggle_mode(true);
hb->add_child(pin);