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

Implement double-click on remaining dialogs

Browse source
This commit is contained in:
Franklin Sobrinho 2015-12-14 08:43:56 -03:00
parent 451b1d9144
commit 12bfb55c6c
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/editor/editor_dir_dialog.cpp
View file

@ -205,31 +205,36 @@ void EditorDirDialog::_bind_methods() {
EditorDirDialog::EditorDirDialog() { EditorDirDialog::EditorDirDialog() {
updating=false;
set_title("Choose a Directory"); set_title("Choose a Directory");
set_hide_on_ok(false);
tree = memnew( Tree ); tree = memnew( Tree );
add_child(tree); add_child(tree);
set_child_rect(tree); set_child_rect(tree);
updating=false; tree->connect("item_activated",this,"_ok");
get_ok()->set_text("Choose");
set_hide_on_ok(false);
makedir = add_button("Create Folder",OS::get_singleton()->get_swap_ok_cancel()?true:false,"makedir"); makedir = add_button("Create Folder",OS::get_singleton()->get_swap_ok_cancel()?true:false,"makedir");
makedir->connect("pressed",this,"_make_dir"); makedir->connect("pressed",this,"_make_dir");
makedialog = memnew( ConfirmationDialog ); makedialog = memnew( ConfirmationDialog );
makedialog->set_title("Create Folder"); makedialog->set_title("Create Folder");
add_child(makedialog);
VBoxContainer *makevb= memnew( VBoxContainer ); VBoxContainer *makevb= memnew( VBoxContainer );
makedialog->add_child(makevb); makedialog->add_child(makevb);
makedialog->set_child_rect(makevb); makedialog->set_child_rect(makevb);
makedirname = memnew( LineEdit ); makedirname = memnew( LineEdit );
makevb->add_margin_child("Name:",makedirname); makevb->add_margin_child("Name:",makedirname);
add_child(makedialog);
makedialog->register_text_enter(makedirname); makedialog->register_text_enter(makedirname);
makedialog->connect("confirmed",this,"_make_dir_confirm"); makedialog->connect("confirmed",this,"_make_dir_confirm");
mkdirerr = memnew( AcceptDialog ); mkdirerr = memnew( AcceptDialog );
mkdirerr->set_text("Could not create folder."); mkdirerr->set_text("Could not create folder.");
add_child(mkdirerr); add_child(mkdirerr);
get_ok()->set_text("Choose");
} }

12
tools/editor/editor_sub_scene.cpp
View file

@ -196,7 +196,11 @@ void EditorSubScene::_bind_methods() {
EditorSubScene::EditorSubScene() { EditorSubScene::EditorSubScene() {
scene=NULL;
set_title("Select Sub-Scene.."); set_title("Select Sub-Scene..");
set_hide_on_ok(false);
VBoxContainer *vb = memnew( VBoxContainer ); VBoxContainer *vb = memnew( VBoxContainer );
add_child(vb); add_child(vb);
set_child_rect(vb); set_child_rect(vb);
@ -211,9 +215,11 @@ EditorSubScene::EditorSubScene() {
hb->add_child(b); hb->add_child(b);
b->connect("pressed",this,"_path_browse"); b->connect("pressed",this,"_path_browse");
vb->add_margin_child("Scene Path:",hb); vb->add_margin_child("Scene Path:",hb);
tree = memnew( Tree ); tree = memnew( Tree );
tree->set_v_size_flags(SIZE_EXPAND_FILL); tree->set_v_size_flags(SIZE_EXPAND_FILL);
vb->add_margin_child("Import From Node:",tree)->set_v_size_flags(SIZE_EXPAND_FILL); vb->add_margin_child("Import From Node:",tree,true);
tree->connect("item_activated",this,"_ok");
file_dialog = memnew( EditorFileDialog ); file_dialog = memnew( EditorFileDialog );
List<String> extensions; List<String> extensions;
@ -228,8 +234,4 @@ EditorSubScene::EditorSubScene() {
add_child(file_dialog); add_child(file_dialog);
file_dialog->connect("file_selected",this,"_path_selected"); file_dialog->connect("file_selected",this,"_path_selected");
scene=NULL;
set_hide_on_ok(false);
} }