godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +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

38
editor/script_editor_debugger.cpp
View File

@@ -1578,13 +1578,11 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
hbc->add_child(memnew(VSeparator));
step = memnew(Button);
step->set_flat(true);
hbc->add_child(step);
step->set_tooltip(TTR("Step Into"));
step->connect("pressed", this, "debug_step");
next = memnew(Button);
next->set_flat(true);
hbc->add_child(next);
next->set_tooltip(TTR("Step Over"));
next->connect("pressed", this, "debug_next");
@@ -1592,13 +1590,11 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
hbc->add_child(memnew(VSeparator));
dobreak = memnew(Button);
dobreak->set_flat(true);
hbc->add_child(dobreak);
dobreak->set_tooltip(TTR("Break"));
dobreak->connect("pressed", this, "debug_break");
docontinue = memnew(Button);
docontinue->set_flat(true);
hbc->add_child(docontinue);
docontinue->set_tooltip(TTR("Continue"));
docontinue->connect("pressed", this, "debug_continue");
@@ -1606,13 +1602,11 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
//hbc->add_child( memnew( VSeparator) );
back = memnew(Button);
back->set_flat(true);
hbc->add_child(back);
back->set_tooltip(TTR("Inspect Previous Instance"));
back->hide();
forward = memnew(Button);
forward->set_flat(true);
hbc->add_child(forward);
forward->set_tooltip(TTR("Inspect Next Instance"));
forward->hide();
@@ -1774,7 +1768,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
vmem_total->set_custom_minimum_size(Size2(100, 1) * EDSCALE);
vmem_hb->add_child(vmem_total);
vmem_refresh = memnew(Button);
vmem_refresh->set_flat(true);
vmem_hb->add_child(vmem_refresh);
vmem_vb->add_child(vmem_hb);
vmem_refresh->connect("pressed", this, "_video_mem_request");
@@ -1807,35 +1800,30 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
}
{ // misc
GridContainer *grid_cont = memnew(GridContainer);
grid_cont->set_h_size_flags(SIZE_EXPAND_FILL);
grid_cont->set_name(TTR("Misc"));
grid_cont->set_columns(2);
tabs->add_child(grid_cont);
grid_cont->add_child(memnew(Label(TTR("Clicked Control:"))));
VBoxContainer *info_left = memnew(VBoxContainer);
info_left->set_h_size_flags(SIZE_EXPAND_FILL);
info_left->set_name(TTR("Misc"));
tabs->add_child(info_left);
clicked_ctrl = memnew(LineEdit);
grid_cont->add_child(clicked_ctrl);
grid_cont->add_child(memnew(Label(TTR("Clicked Control Type:"))));
info_left->add_margin_child(TTR("Clicked Control:"), clicked_ctrl);
clicked_ctrl_type = memnew(LineEdit);
grid_cont->add_child(clicked_ctrl_type);
info_left->add_margin_child(TTR("Clicked Control Type:"), clicked_ctrl_type);
live_edit_root = memnew(LineEdit);
live_edit_root->set_h_size_flags(SIZE_EXPAND_FILL);
{
grid_cont->add_child(memnew(Label(TTR("Live Edit Root:"))));
HBoxContainer *lehb = memnew(HBoxContainer);
lehb->set_h_size_flags(SIZE_EXPAND_FILL);
lehb->add_child(live_edit_root);
Label *l = memnew(Label(TTR("Live Edit Root:")));
lehb->add_child(l);
l->set_h_size_flags(SIZE_EXPAND_FILL);
le_set = memnew(Button(TTR("Set From Tree")));
lehb->add_child(le_set);
le_clear = memnew(Button(TTR("Clear")));
lehb->add_child(le_clear);
grid_cont->add_child(lehb);
info_left->add_child(lehb);
MarginContainer *mc = memnew(MarginContainer);
mc->add_child(live_edit_root);
info_left->add_child(mc);
le_set->set_disabled(true);
le_clear->set_disabled(true);
}