From 3550a18fa20193b36dfd4d8ec1c2c0e8d7519e13 Mon Sep 17 00:00:00 2001 From: marynate Date: Tue, 18 Feb 2014 12:21:06 +0800 Subject: Able to open project manager inside editor (Scene->Project Manager) Remove unnecessary include of project_manager.h --- tools/editor/editor_node.cpp | 23 ++++++++++++++++++++++- tools/editor/editor_node.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 83ebde1c4f..94f44c6a05 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -94,6 +94,7 @@ #include "tools/editor/io_plugins/editor_sample_import_plugin.h" #include "tools/editor/io_plugins/editor_translation_import_plugin.h" + EditorNode *EditorNode::singleton=NULL; void EditorNode::_update_title() { @@ -2130,9 +2131,28 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { } break; case RUN_SETTINGS: { - project_settings->popup_project_settings(); } break; + case RUN_PROJECT_MANAGER: { + + if (!p_confirmed) { + confirmation->get_ok()->set_text("Yes"); + confirmation->set_text("Open Project Manager? \n(Unsaved changes will be lost)"); + confirmation->popup_centered(Size2(300,70)); + break; + } + + get_scene()->quit(); + String exec = OS::get_singleton()->get_executable_path(); + + List args; + args.push_back ( "-path" ); + args.push_back (exec.get_base_dir() ); + + OS::ProcessID pid=0; + Error err = OS::get_singleton()->execute(exec,args,false,&pid); + ERR_FAIL_COND(err); + } break; case RUN_FILE_SERVER: { //file_server @@ -3407,6 +3427,7 @@ EditorNode::EditorNode() { p->add_item("Redo",EDIT_REDO,KEY_MASK_CMD+KEY_MASK_SHIFT+KEY_Z); p->add_separator(); p->add_item("Project Settings",RUN_SETTINGS); + p->add_item("Project Manager",RUN_PROJECT_MANAGER); p->add_separator(); p->add_item("Quit",FILE_QUIT,KEY_MASK_CMD+KEY_Q); diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 41d38c1ca9..89b3917d7c 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -137,6 +137,7 @@ class EditorNode : public Node { RUN_PLAY_CUSTOM_SCENE, RUN_SCENE_SETTINGS, RUN_SETTINGS, + RUN_PROJECT_MANAGER, RUN_FILE_SERVER, RUN_DEPLOY_DUMB_CLIENTS, SETTINGS_UPDATE_ALWAYS, -- cgit v1.2.3