asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

-made it add the node name from the file, closes #3010

Browse source
This commit is contained in:
Juan Linietsky 2015-12-08 18:35:42 -03:00
parent c650d4e19c
commit 88c653a9e5
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tools/editor/project_settings.cpp
View file

@ -722,6 +722,10 @@ void ProjectSettings::_translation_file_open() {
void ProjectSettings::_autoload_file_callback(const String& p_path) { void ProjectSettings::_autoload_file_callback(const String& p_path) {
autoload_add_path->set_text(p_path); autoload_add_path->set_text(p_path);
if (autoload_add_name->get_text().strip_edges()==String()) {
autoload_add_name->set_text( p_path.get_file().basename() );
}
//_translation_add(p_translation); //_translation_add(p_translation);
} }
@ -769,6 +773,9 @@ void ProjectSettings::_autoload_add() {
undo_redo->add_undo_method(this,"_settings_changed"); undo_redo->add_undo_method(this,"_settings_changed");
undo_redo->commit_action(); undo_redo->commit_action();
autoload_add_path->set_text("");
autoload_add_name->set_text("");
//autoload_file_open->popup_centered_ratio(); //autoload_file_open->popup_centered_ratio();
} }
@ -1589,11 +1596,6 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
HBoxContainer *ahb = memnew( HBoxContainer); HBoxContainer *ahb = memnew( HBoxContainer);
avb->add_child(ahb); avb->add_child(ahb);
VBoxContainer *avb_name = memnew( VBoxContainer );
avb_name->set_h_size_flags(SIZE_EXPAND_FILL);
autoload_add_name = memnew(LineEdit);
avb_name->add_margin_child("Node Name:",autoload_add_name);
ahb->add_child(avb_name);
VBoxContainer *avb_path = memnew( VBoxContainer ); VBoxContainer *avb_path = memnew( VBoxContainer );
avb_path->set_h_size_flags(SIZE_EXPAND_FILL); avb_path->set_h_size_flags(SIZE_EXPAND_FILL);
@ -1604,13 +1606,24 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
Button *browseaa = memnew( Button("..") ); Button *browseaa = memnew( Button("..") );
ahb_path->add_child(browseaa); ahb_path->add_child(browseaa);
browseaa->connect("pressed",this,"_autoload_file_open"); browseaa->connect("pressed",this,"_autoload_file_open");
Button *addaa = memnew( Button("Add") );
ahb_path->add_child(addaa);
addaa->connect("pressed",this,"_autoload_add");
avb_path->add_margin_child("Path:",ahb_path); avb_path->add_margin_child("Path:",ahb_path);
ahb->add_child(avb_path); ahb->add_child(avb_path);
VBoxContainer *avb_name = memnew( VBoxContainer );
avb_name->set_h_size_flags(SIZE_EXPAND_FILL);
HBoxContainer *ahb_name = memnew( HBoxContainer );
autoload_add_name = memnew(LineEdit);
autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
ahb_name->add_child(autoload_add_name);
avb_name->add_margin_child("Node Name:",ahb_name);
Button *addaa = memnew( Button("Add") );
ahb_name->add_child(addaa);
addaa->connect("pressed",this,"_autoload_add");
ahb->add_child(avb_name);
autoload_list = memnew( Tree ); autoload_list = memnew( Tree );
autoload_list->set_v_size_flags(SIZE_EXPAND_FILL); autoload_list->set_v_size_flags(SIZE_EXPAND_FILL);
avb->add_margin_child("List:",autoload_list,true); avb->add_margin_child("List:",autoload_list,true);