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

ProjectManager: Show error dialog if unable to run project.

Browse source
This commit is contained in:
Andreas Haas 2017-08-07 21:41:04 +02:00
parent 9e938bf3c1
commit bc034c1d4d
No known key found for this signature in database
GPG key ID: B5FFAE1B65FBD2E1
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
editor/project_manager.cpp
View file

@ -491,17 +491,8 @@ void ProjectManager::_update_project_buttons() {
item->update(); item->update();
} }
bool has_runnable_scene = false;
for (Map<String, String>::Element *E = selected_list.front(); E; E = E->next()) {
const String &selected_main = E->get();
if (selected_main == "") continue;
has_runnable_scene = true;
break;
}
erase_btn->set_disabled(selected_list.size() < 1); erase_btn->set_disabled(selected_list.size() < 1);
open_btn->set_disabled(selected_list.size() < 1); open_btn->set_disabled(selected_list.size() < 1);
run_btn->set_disabled(!has_runnable_scene);
} }
void ProjectManager::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) { void ProjectManager::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) {
@ -969,10 +960,22 @@ void ProjectManager::_run_project_confirm() {
for (Map<String, String>::Element *E = selected_list.front(); E; E = E->next()) { for (Map<String, String>::Element *E = selected_list.front(); E; E = E->next()) {
const String &selected_main = E->get(); const String &selected_main = E->get();
if (selected_main == "") continue; if (selected_main == "") {
run_error_diag->set_text(TTR("Can't run project: no main scene defined.\nPlease edit the project and set the main scene in \"Project Settings\" under the \"Application\" category."));
run_error_diag->popup_centered();
return;
}
const String &selected = E->key(); const String &selected = E->key();
String path = EditorSettings::get_singleton()->get("projects/" + selected); String path = EditorSettings::get_singleton()->get("projects/" + selected);
if (!DirAccess::exists(path + "/.import")) {
run_error_diag->set_text(TTR("Can't run project: Assets need to be imported.\nPlease edit the project to trigger the initial import."));
run_error_diag->popup_centered();
return;
}
print_line("OPENING: " + path + " (" + selected + ")"); print_line("OPENING: " + path + " (" + selected + ")");
List<String> args; List<String> args;
@ -1390,6 +1393,10 @@ ProjectManager::ProjectManager() {
last_clicked = ""; last_clicked = "";
SceneTree::get_singleton()->connect("files_dropped", this, "_files_dropped"); SceneTree::get_singleton()->connect("files_dropped", this, "_files_dropped");
run_error_diag = memnew(AcceptDialog);
gui_base->add_child(run_error_diag);
run_error_diag->set_title(TTR("Can't run project"));
} }
ProjectManager::~ProjectManager() { ProjectManager::~ProjectManager() {

1
editor/project_manager.h
View file

@ -57,6 +57,7 @@ class ProjectManager : public Control {
ConfirmationDialog *multi_open_ask; ConfirmationDialog *multi_open_ask;
ConfirmationDialog *multi_run_ask; ConfirmationDialog *multi_run_ask;
ConfirmationDialog *multi_scan_ask; ConfirmationDialog *multi_scan_ask;
AcceptDialog *run_error_diag;
NewProjectDialog *npdialog; NewProjectDialog *npdialog;
ScrollContainer *scroll; ScrollContainer *scroll;
VBoxContainer *scroll_childs; VBoxContainer *scroll_childs;