feat: updated engine version to 4.4-rc1
This commit is contained in:
Sara
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -34,11 +34,8 @@
|
|||
#include "core/io/config_file.h"
|
||||
#include "core/io/dir_access.h"
|
||||
#include "core/io/file_access.h"
|
||||
#include "core/io/resource_saver.h"
|
||||
#include "core/io/stream_peer_tls.h"
|
||||
#include "core/os/keyboard.h"
|
||||
#include "core/os/os.h"
|
||||
#include "core/os/time.h"
|
||||
#include "core/version.h"
|
||||
#include "editor/editor_about.h"
|
||||
#include "editor/editor_settings.h"
|
||||
|
|
@ -46,17 +43,15 @@
|
|||
#include "editor/engine_update_label.h"
|
||||
#include "editor/gui/editor_file_dialog.h"
|
||||
#include "editor/gui/editor_title_bar.h"
|
||||
#include "editor/gui/editor_version_button.h"
|
||||
#include "editor/plugins/asset_library_editor_plugin.h"
|
||||
#include "editor/project_manager/project_dialog.h"
|
||||
#include "editor/project_manager/project_list.h"
|
||||
#include "editor/project_manager/project_tag.h"
|
||||
#include "editor/project_manager/quick_settings_dialog.h"
|
||||
#include "editor/themes/editor_icons.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "editor/themes/editor_theme_manager.h"
|
||||
#include "main/main.h"
|
||||
#include "scene/gui/check_box.h"
|
||||
#include "scene/gui/color_rect.h"
|
||||
#include "scene/gui/flow_container.h"
|
||||
#include "scene/gui/line_edit.h"
|
||||
#include "scene/gui/margin_container.h"
|
||||
|
|
@ -64,7 +59,6 @@
|
|||
#include "scene/gui/panel_container.h"
|
||||
#include "scene/gui/rich_text_label.h"
|
||||
#include "scene/gui/separator.h"
|
||||
#include "scene/gui/texture_rect.h"
|
||||
#include "scene/main/window.h"
|
||||
#include "scene/theme/theme_db.h"
|
||||
#include "servers/display_server.h"
|
||||
|
|
@ -93,6 +87,7 @@ void ProjectManager::_notification(int p_what) {
|
|||
} break;
|
||||
|
||||
case NOTIFICATION_READY: {
|
||||
DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/keep_screen_on"));
|
||||
const int default_sorting = (int)EDITOR_GET("project_manager/sorting_order");
|
||||
filter_option->select(default_sorting);
|
||||
project_list->set_order_option(default_sorting);
|
||||
|
|
@ -154,9 +149,9 @@ void ProjectManager::_build_icon_type_cache(Ref<Theme> p_theme) {
|
|||
|
||||
// Main layout.
|
||||
|
||||
void ProjectManager::_update_size_limits() {
|
||||
const Size2 minimum_size = Size2(680, 450) * EDSCALE;
|
||||
const Size2 default_size = Size2(1024, 600) * EDSCALE;
|
||||
void ProjectManager::_update_size_limits(bool p_custom_res) {
|
||||
const Size2 minimum_size = Size2(720, 450) * EDSCALE;
|
||||
const Size2 default_size = Size2(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT) * EDSCALE;
|
||||
|
||||
// Define a minimum window size to prevent UI elements from overlapping or being cut off.
|
||||
Window *w = Object::cast_to<Window>(SceneTree::get_singleton()->get_root());
|
||||
|
|
@ -164,16 +159,21 @@ void ProjectManager::_update_size_limits() {
|
|||
// Calling Window methods this early doesn't sync properties with DS.
|
||||
w->set_min_size(minimum_size);
|
||||
DisplayServer::get_singleton()->window_set_min_size(minimum_size);
|
||||
w->set_size(default_size);
|
||||
DisplayServer::get_singleton()->window_set_size(default_size);
|
||||
if (!p_custom_res) {
|
||||
// Only set window size if it currently matches the default, which is defined in `main/main.cpp`.
|
||||
// This allows CLI arguments to override the window size.
|
||||
w->set_size(default_size);
|
||||
DisplayServer::get_singleton()->window_set_size(default_size);
|
||||
}
|
||||
}
|
||||
Size2 real_size = DisplayServer::get_singleton()->window_get_size();
|
||||
|
||||
Rect2i screen_rect = DisplayServer::get_singleton()->screen_get_usable_rect(DisplayServer::get_singleton()->window_get_current_screen());
|
||||
if (screen_rect.size != Vector2i()) {
|
||||
// Center the window on the screen.
|
||||
Vector2i window_position;
|
||||
window_position.x = screen_rect.position.x + (screen_rect.size.x - default_size.x) / 2;
|
||||
window_position.y = screen_rect.position.y + (screen_rect.size.y - default_size.y) / 2;
|
||||
window_position.x = screen_rect.position.x + (screen_rect.size.x - real_size.x) / 2;
|
||||
window_position.y = screen_rect.position.y + (screen_rect.size.y - real_size.y) / 2;
|
||||
DisplayServer::get_singleton()->window_set_position(window_position);
|
||||
|
||||
// Limit popup menus to prevent unusably long lists.
|
||||
|
|
@ -190,7 +190,7 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
|
|||
DisplayServer::set_early_window_clear_color_override(true, theme->get_color(SNAME("background"), EditorStringName(Editor)));
|
||||
}
|
||||
|
||||
List<Ref<Theme>> editor_themes;
|
||||
Vector<Ref<Theme>> editor_themes;
|
||||
editor_themes.push_back(theme);
|
||||
editor_themes.push_back(ThemeDB::get_singleton()->get_default_theme());
|
||||
|
||||
|
|
@ -223,7 +223,7 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
|
|||
background_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("Background"), EditorStringName(EditorStyles)));
|
||||
main_view_container->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("TabContainer")));
|
||||
|
||||
title_bar_logo->set_icon(get_editor_theme_icon(SNAME("TitleBarLogo")));
|
||||
title_bar_logo->set_button_icon(get_editor_theme_icon(SNAME("TitleBarLogo")));
|
||||
|
||||
_set_main_view_icon(MAIN_VIEW_PROJECTS, get_editor_theme_icon(SNAME("ProjectList")));
|
||||
_set_main_view_icon(MAIN_VIEW_ASSETLIB, get_editor_theme_icon(SNAME("AssetLib")));
|
||||
|
|
@ -233,28 +233,29 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
|
|||
loading_label->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
|
||||
project_list_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("project_list"), SNAME("ProjectManager")));
|
||||
|
||||
empty_list_create_project->set_icon(get_editor_theme_icon(SNAME("Add")));
|
||||
empty_list_import_project->set_icon(get_editor_theme_icon(SNAME("Load")));
|
||||
empty_list_open_assetlib->set_icon(get_editor_theme_icon(SNAME("AssetLib")));
|
||||
empty_list_create_project->set_button_icon(get_editor_theme_icon(SNAME("Add")));
|
||||
empty_list_import_project->set_button_icon(get_editor_theme_icon(SNAME("Load")));
|
||||
empty_list_open_assetlib->set_button_icon(get_editor_theme_icon(SNAME("AssetLib")));
|
||||
|
||||
empty_list_online_warning->add_theme_font_override(SceneStringName(font), get_theme_font(SNAME("italic"), EditorStringName(EditorFonts)));
|
||||
empty_list_online_warning->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("font_placeholder_color"), EditorStringName(Editor)));
|
||||
|
||||
// Top bar.
|
||||
search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
|
||||
quick_settings_button->set_icon(get_editor_theme_icon(SNAME("Tools")));
|
||||
quick_settings_button->set_button_icon(get_editor_theme_icon(SNAME("Tools")));
|
||||
|
||||
// Sidebar.
|
||||
create_btn->set_icon(get_editor_theme_icon(SNAME("Add")));
|
||||
import_btn->set_icon(get_editor_theme_icon(SNAME("Load")));
|
||||
scan_btn->set_icon(get_editor_theme_icon(SNAME("Search")));
|
||||
open_btn->set_icon(get_editor_theme_icon(SNAME("Edit")));
|
||||
run_btn->set_icon(get_editor_theme_icon(SNAME("Play")));
|
||||
rename_btn->set_icon(get_editor_theme_icon(SNAME("Rename")));
|
||||
manage_tags_btn->set_icon(get_editor_theme_icon("Script"));
|
||||
erase_btn->set_icon(get_editor_theme_icon(SNAME("Remove")));
|
||||
erase_missing_btn->set_icon(get_editor_theme_icon(SNAME("Clear")));
|
||||
create_tag_btn->set_icon(get_editor_theme_icon("Add"));
|
||||
create_btn->set_button_icon(get_editor_theme_icon(SNAME("Add")));
|
||||
import_btn->set_button_icon(get_editor_theme_icon(SNAME("Load")));
|
||||
scan_btn->set_button_icon(get_editor_theme_icon(SNAME("Search")));
|
||||
open_btn->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
|
||||
open_options_btn->set_button_icon(get_editor_theme_icon(SNAME("Collapse")));
|
||||
run_btn->set_button_icon(get_editor_theme_icon(SNAME("Play")));
|
||||
rename_btn->set_button_icon(get_editor_theme_icon(SNAME("Rename")));
|
||||
manage_tags_btn->set_button_icon(get_editor_theme_icon("Script"));
|
||||
erase_btn->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
|
||||
erase_missing_btn->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
|
||||
create_tag_btn->set_button_icon(get_editor_theme_icon("Add"));
|
||||
|
||||
tag_error->add_theme_color_override(SceneStringName(font_color), get_theme_color("error_color", EditorStringName(Editor)));
|
||||
tag_edit_error->add_theme_color_override(SceneStringName(font_color), get_theme_color("error_color", EditorStringName(Editor)));
|
||||
|
|
@ -268,6 +269,9 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
|
|||
manage_tags_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
|
||||
erase_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
|
||||
erase_missing_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
|
||||
|
||||
open_btn_container->add_theme_constant_override("separation", 0);
|
||||
open_options_popup->set_item_icon(0, get_editor_theme_icon(SNAME("NodeWarning")));
|
||||
}
|
||||
|
||||
// Asset library popup.
|
||||
|
|
@ -309,17 +313,17 @@ void ProjectManager::_set_main_view_icon(MainViewTab p_id, const Ref<Texture2D>
|
|||
|
||||
Button *toggle_button = main_view_toggle_map[p_id];
|
||||
|
||||
Ref<Texture2D> old_icon = toggle_button->get_icon();
|
||||
Ref<Texture2D> old_icon = toggle_button->get_button_icon();
|
||||
if (old_icon.is_valid()) {
|
||||
old_icon->disconnect_changed(callable_mp((Control *)toggle_button, &Control::update_minimum_size));
|
||||
}
|
||||
|
||||
if (p_icon.is_valid()) {
|
||||
toggle_button->set_icon(p_icon);
|
||||
toggle_button->set_button_icon(p_icon);
|
||||
// Make sure the control is updated if the icon is reimported.
|
||||
p_icon->connect_changed(callable_mp((Control *)toggle_button, &Control::update_minimum_size));
|
||||
} else {
|
||||
toggle_button->set_icon(Ref<Texture2D>());
|
||||
toggle_button->set_button_icon(Ref<Texture2D>());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -397,12 +401,6 @@ void ProjectManager::_restart_confirmed() {
|
|||
get_tree()->quit();
|
||||
}
|
||||
|
||||
// Footer.
|
||||
|
||||
void ProjectManager::_version_button_pressed() {
|
||||
DisplayServer::get_singleton()->clipboard_set(version_btn->get_text());
|
||||
}
|
||||
|
||||
// Project list.
|
||||
|
||||
void ProjectManager::_update_list_placeholder() {
|
||||
|
|
@ -506,6 +504,10 @@ void ProjectManager::_open_selected_projects() {
|
|||
|
||||
args.push_back("--editor");
|
||||
|
||||
if (open_in_recovery_mode) {
|
||||
args.push_back("--recovery-mode");
|
||||
}
|
||||
|
||||
Error err = OS::get_singleton()->create_instance(args);
|
||||
if (err != OK) {
|
||||
loading_label->hide();
|
||||
|
|
@ -521,7 +523,7 @@ void ProjectManager::_open_selected_projects() {
|
|||
get_tree()->quit();
|
||||
}
|
||||
|
||||
void ProjectManager::_open_selected_projects_ask() {
|
||||
void ProjectManager::_open_selected_projects_check_warnings() {
|
||||
const HashSet<String> &selected_list = project_list->get_selected_project_keys();
|
||||
if (selected_list.size() < 1) {
|
||||
return;
|
||||
|
|
@ -579,7 +581,7 @@ void ProjectManager::_open_selected_projects_ask() {
|
|||
if (!unsupported_features.is_empty()) {
|
||||
String warning_message = "";
|
||||
for (int i = 0; i < unsupported_features.size(); i++) {
|
||||
String feature = unsupported_features[i];
|
||||
const String &feature = unsupported_features[i];
|
||||
if (feature == "Double Precision") {
|
||||
warning_message += TTR("Warning: This project uses double precision floats, but this version of\nGodot uses single precision floats. Opening this project may cause data loss.\n\n");
|
||||
unsupported_features.remove_at(i);
|
||||
|
|
@ -589,6 +591,7 @@ void ProjectManager::_open_selected_projects_ask() {
|
|||
unsupported_features.remove_at(i);
|
||||
i--;
|
||||
} else if (ProjectList::project_feature_looks_like_version(feature)) {
|
||||
version_convert_feature = feature;
|
||||
warning_message += vformat(TTR("Warning: This project was last edited in Godot %s. Opening will change it to Godot %s.\n\n"), Variant(feature), Variant(VERSION_BRANCH));
|
||||
unsupported_features.remove_at(i);
|
||||
i--;
|
||||
|
|
@ -609,6 +612,38 @@ void ProjectManager::_open_selected_projects_ask() {
|
|||
_open_selected_projects();
|
||||
}
|
||||
|
||||
void ProjectManager::_open_selected_projects_check_recovery_mode() {
|
||||
Vector<ProjectList::Item> selected_projects = project_list->get_selected_projects();
|
||||
|
||||
if (selected_projects.is_empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const ProjectList::Item &project = selected_projects[0];
|
||||
if (project.missing) {
|
||||
return;
|
||||
}
|
||||
|
||||
open_in_recovery_mode = false;
|
||||
// Check if the project failed to load during last startup.
|
||||
if (project.recovery_mode) {
|
||||
_open_recovery_mode_ask(false);
|
||||
return;
|
||||
}
|
||||
|
||||
_open_selected_projects_check_warnings();
|
||||
}
|
||||
|
||||
void ProjectManager::_open_selected_projects_with_migration() {
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
if (project_list->get_selected_projects().size() == 1) {
|
||||
// Only migrate if a single project is opened.
|
||||
_minor_project_migrate();
|
||||
}
|
||||
#endif
|
||||
_open_selected_projects();
|
||||
}
|
||||
|
||||
void ProjectManager::_install_project(const String &p_zip_path, const String &p_title) {
|
||||
project_dialog->set_mode(ProjectDialog::MODE_INSTALL);
|
||||
project_dialog->set_zip_path(p_zip_path);
|
||||
|
|
@ -691,6 +726,7 @@ void ProjectManager::_update_project_buttons() {
|
|||
|
||||
erase_btn->set_disabled(empty_selection);
|
||||
open_btn->set_disabled(empty_selection || is_missing_project_selected);
|
||||
open_options_btn->set_disabled(empty_selection || is_missing_project_selected);
|
||||
rename_btn->set_disabled(empty_selection || is_missing_project_selected);
|
||||
manage_tags_btn->set_disabled(empty_selection || is_missing_project_selected || selected_projects.size() > 1);
|
||||
run_btn->set_disabled(empty_selection || is_missing_project_selected);
|
||||
|
|
@ -698,6 +734,38 @@ void ProjectManager::_update_project_buttons() {
|
|||
erase_missing_btn->set_disabled(!project_list->is_any_project_missing());
|
||||
}
|
||||
|
||||
void ProjectManager::_open_options_popup() {
|
||||
Rect2 rect = open_btn_container->get_screen_rect();
|
||||
rect.position.y += rect.size.height;
|
||||
open_options_popup->set_size(Size2(rect.size.width, 0));
|
||||
open_options_popup->set_position(rect.position);
|
||||
|
||||
open_options_popup->popup();
|
||||
}
|
||||
|
||||
void ProjectManager::_open_recovery_mode_ask(bool manual) {
|
||||
String recovery_mode_details;
|
||||
|
||||
// Only show the initial crash preamble if this popup wasn't manually triggered.
|
||||
if (!manual) {
|
||||
recovery_mode_details +=
|
||||
TTR("It looks like Godot crashed when opening this project the last time. If you're having problems editing this project, you can try to open it in Recovery Mode.") +
|
||||
String::utf8("\n\n");
|
||||
}
|
||||
|
||||
recovery_mode_details +=
|
||||
TTR("Recovery Mode is a special mode that may help to recover projects that crash the engine during initialization. This mode temporarily disables the following features:") +
|
||||
String::utf8("\n\n• ") + TTR("Tool scripts") +
|
||||
String::utf8("\n• ") + TTR("Editor plugins") +
|
||||
String::utf8("\n• ") + TTR("GDExtension addons") +
|
||||
String::utf8("\n• ") + TTR("Automatic scene restoring") +
|
||||
String::utf8("\n\n") + TTR("This mode is intended only for basic editing to troubleshoot such issues, and therefore it will not be possible to run the project during this mode. It is also a good idea to make a backup of your project before proceeding.") +
|
||||
String::utf8("\n\n") + TTR("Edit the project in Recovery Mode?");
|
||||
|
||||
open_recovery_mode_ask->set_text(recovery_mode_details);
|
||||
open_recovery_mode_ask->popup_centered(Size2(550, 70) * EDSCALE);
|
||||
}
|
||||
|
||||
void ProjectManager::_on_projects_updated() {
|
||||
Vector<ProjectList::Item> selected_projects = project_list->get_selected_projects();
|
||||
int index = 0;
|
||||
|
|
@ -711,14 +779,39 @@ void ProjectManager::_on_projects_updated() {
|
|||
project_list->update_dock_menu();
|
||||
}
|
||||
|
||||
void ProjectManager::_on_project_created(const String &dir) {
|
||||
void ProjectManager::_on_open_options_selected(int p_option) {
|
||||
switch (p_option) {
|
||||
case 0: // Edit in recovery mode.
|
||||
_open_recovery_mode_ask(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ProjectManager::_on_recovery_mode_popup_open_normal() {
|
||||
open_recovery_mode_ask->hide();
|
||||
open_in_recovery_mode = false;
|
||||
_open_selected_projects_check_warnings();
|
||||
}
|
||||
|
||||
void ProjectManager::_on_recovery_mode_popup_open_recovery() {
|
||||
open_in_recovery_mode = true;
|
||||
_open_selected_projects_check_warnings();
|
||||
}
|
||||
|
||||
void ProjectManager::_on_project_created(const String &dir, bool edit) {
|
||||
project_list->add_project(dir, false);
|
||||
project_list->save_config();
|
||||
search_box->clear();
|
||||
|
||||
int i = project_list->refresh_project(dir);
|
||||
project_list->select_project(i);
|
||||
project_list->ensure_project_visible(i);
|
||||
_open_selected_projects_ask();
|
||||
_update_project_buttons();
|
||||
_update_list_placeholder();
|
||||
|
||||
if (edit) {
|
||||
_open_selected_projects_check_warnings();
|
||||
}
|
||||
|
||||
project_list->update_dock_menu();
|
||||
}
|
||||
|
|
@ -745,7 +838,7 @@ void ProjectManager::_on_search_term_submitted(const String &p_text) {
|
|||
return;
|
||||
}
|
||||
|
||||
_open_selected_projects_ask();
|
||||
_open_selected_projects_check_recovery_mode();
|
||||
}
|
||||
|
||||
LineEdit *ProjectManager::get_search_box() {
|
||||
|
|
@ -834,7 +927,7 @@ void ProjectManager::_set_new_tag_name(const String p_name) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (p_name.contains(" ")) {
|
||||
if (p_name.contains_char(' ')) {
|
||||
tag_error->set_text(TTR("Tag name can't contain spaces."));
|
||||
return;
|
||||
}
|
||||
|
|
@ -876,6 +969,34 @@ void ProjectManager::add_new_tag(const String &p_tag) {
|
|||
|
||||
// Project converter/migration tool.
|
||||
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
void ProjectManager::_minor_project_migrate() {
|
||||
const ProjectList::Item migrated_project = project_list->get_selected_projects()[0];
|
||||
|
||||
if (version_convert_feature.begins_with("4.3")) {
|
||||
// Migrate layout after scale changes.
|
||||
const float edscale = EDSCALE;
|
||||
if (edscale != 1.0) {
|
||||
Ref<ConfigFile> layout_file;
|
||||
layout_file.instantiate();
|
||||
|
||||
const String layout_path = migrated_project.path.path_join(".godot/editor/editor_layout.cfg");
|
||||
Error err = layout_file->load(layout_path);
|
||||
if (err == OK) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
const String key = "dock_hsplit_" + itos(i + 1);
|
||||
int old_value = layout_file->get_value("docks", key, 0);
|
||||
if (old_value != 0) {
|
||||
layout_file->set_value("docks", key, old_value / edscale);
|
||||
}
|
||||
}
|
||||
layout_file->save(layout_path);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void ProjectManager::_full_convert_button_pressed() {
|
||||
ask_update_settings->hide();
|
||||
ask_full_convert_dialog->popup_centered(Size2i(600.0 * EDSCALE, 0));
|
||||
|
|
@ -934,7 +1055,7 @@ void ProjectManager::shortcut_input(const Ref<InputEvent> &p_ev) {
|
|||
|
||||
switch (k->get_keycode()) {
|
||||
case Key::ENTER: {
|
||||
_open_selected_projects_ask();
|
||||
_open_selected_projects_check_recovery_mode();
|
||||
} break;
|
||||
case Key::HOME: {
|
||||
if (project_list->get_project_count() > 0) {
|
||||
|
|
@ -1038,9 +1159,11 @@ void ProjectManager::_titlebar_resized() {
|
|||
|
||||
// Object methods.
|
||||
|
||||
ProjectManager::ProjectManager() {
|
||||
ProjectManager::ProjectManager(bool p_custom_res) {
|
||||
singleton = this;
|
||||
|
||||
set_translation_domain("godot.editor");
|
||||
|
||||
// Turn off some servers we aren't going to be using in the Project Manager.
|
||||
NavigationServer3D::get_singleton()->set_active(false);
|
||||
PhysicsServer3D::get_singleton()->set_active(false);
|
||||
|
|
@ -1106,7 +1229,7 @@ ProjectManager::ProjectManager() {
|
|||
}
|
||||
|
||||
// TRANSLATORS: This refers to the application where users manage their Godot projects.
|
||||
DisplayServer::get_singleton()->window_set_title(VERSION_NAME + String(" - ") + TTR("Project Manager", "Application"));
|
||||
SceneTree::get_singleton()->get_root()->set_title(VERSION_NAME + String(" - ") + TTR("Project Manager", "Application"));
|
||||
|
||||
SceneTree::get_singleton()->get_root()->connect("files_dropped", callable_mp(this, &ProjectManager::_files_dropped));
|
||||
|
||||
|
|
@ -1223,19 +1346,19 @@ ProjectManager::ProjectManager() {
|
|||
|
||||
create_btn = memnew(Button);
|
||||
create_btn->set_text(TTR("Create"));
|
||||
create_btn->set_shortcut(ED_SHORTCUT("project_manager/new_project", TTR("New Project"), KeyModifierMask::CMD_OR_CTRL | Key::N));
|
||||
create_btn->set_shortcut(ED_SHORTCUT("project_manager/new_project", TTRC("New Project"), KeyModifierMask::CMD_OR_CTRL | Key::N));
|
||||
create_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_new_project));
|
||||
hb->add_child(create_btn);
|
||||
|
||||
import_btn = memnew(Button);
|
||||
import_btn->set_text(TTR("Import"));
|
||||
import_btn->set_shortcut(ED_SHORTCUT("project_manager/import_project", TTR("Import Project"), KeyModifierMask::CMD_OR_CTRL | Key::I));
|
||||
import_btn->set_shortcut(ED_SHORTCUT("project_manager/import_project", TTRC("Import Project"), KeyModifierMask::CMD_OR_CTRL | Key::I));
|
||||
import_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_import_project));
|
||||
hb->add_child(import_btn);
|
||||
|
||||
scan_btn = memnew(Button);
|
||||
scan_btn->set_text(TTR("Scan"));
|
||||
scan_btn->set_shortcut(ED_SHORTCUT("project_manager/scan_projects", TTR("Scan Projects"), KeyModifierMask::CMD_OR_CTRL | Key::S));
|
||||
scan_btn->set_shortcut(ED_SHORTCUT("project_manager/scan_projects", TTRC("Scan Projects"), KeyModifierMask::CMD_OR_CTRL | Key::S));
|
||||
scan_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_scan_projects));
|
||||
hb->add_child(scan_btn);
|
||||
|
||||
|
|
@ -1249,7 +1372,7 @@ ProjectManager::ProjectManager() {
|
|||
search_box->set_tooltip_text(TTR("This field filters projects by name and last path component.\nTo filter projects by name and full path, the query must contain at least one `/` character."));
|
||||
search_box->set_clear_button_enabled(true);
|
||||
search_box->connect(SceneStringName(text_changed), callable_mp(this, &ProjectManager::_on_search_term_changed));
|
||||
search_box->connect("text_submitted", callable_mp(this, &ProjectManager::_on_search_term_submitted));
|
||||
search_box->connect(SceneStringName(text_submitted), callable_mp(this, &ProjectManager::_on_search_term_submitted));
|
||||
search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||
hb->add_child(search_box);
|
||||
|
||||
|
|
@ -1264,15 +1387,10 @@ ProjectManager::ProjectManager() {
|
|||
filter_option->connect(SceneStringName(item_selected), callable_mp(this, &ProjectManager::_on_order_option_changed));
|
||||
hb->add_child(filter_option);
|
||||
|
||||
Vector<String> sort_filter_titles;
|
||||
sort_filter_titles.push_back(TTR("Last Edited"));
|
||||
sort_filter_titles.push_back(TTR("Name"));
|
||||
sort_filter_titles.push_back(TTR("Path"));
|
||||
sort_filter_titles.push_back(TTR("Tags"));
|
||||
|
||||
for (int i = 0; i < sort_filter_titles.size(); i++) {
|
||||
filter_option->add_item(sort_filter_titles[i]);
|
||||
}
|
||||
filter_option->add_item(TTR("Last Edited"));
|
||||
filter_option->add_item(TTR("Name"));
|
||||
filter_option->add_item(TTR("Path"));
|
||||
filter_option->add_item(TTR("Tags"));
|
||||
}
|
||||
|
||||
// Project list and its sidebar.
|
||||
|
|
@ -1291,7 +1409,7 @@ ProjectManager::ProjectManager() {
|
|||
project_list->connect(ProjectList::SIGNAL_LIST_CHANGED, callable_mp(this, &ProjectManager::_update_project_buttons));
|
||||
project_list->connect(ProjectList::SIGNAL_LIST_CHANGED, callable_mp(this, &ProjectManager::_update_list_placeholder));
|
||||
project_list->connect(ProjectList::SIGNAL_SELECTION_CHANGED, callable_mp(this, &ProjectManager::_update_project_buttons));
|
||||
project_list->connect(ProjectList::SIGNAL_PROJECT_ASK_OPEN, callable_mp(this, &ProjectManager::_open_selected_projects_ask));
|
||||
project_list->connect(ProjectList::SIGNAL_PROJECT_ASK_OPEN, callable_mp(this, &ProjectManager::_open_selected_projects_check_recovery_mode));
|
||||
|
||||
// Empty project list placeholder.
|
||||
{
|
||||
|
|
@ -1312,8 +1430,8 @@ ProjectManager::ProjectManager() {
|
|||
empty_list_message->set_text(vformat("[center][b]%s[/b] %s[/center]", line1, line2));
|
||||
empty_list_placeholder->add_child(empty_list_message);
|
||||
|
||||
HBoxContainer *empty_list_actions = memnew(HBoxContainer);
|
||||
empty_list_actions->set_alignment(BoxContainer::ALIGNMENT_CENTER);
|
||||
FlowContainer *empty_list_actions = memnew(FlowContainer);
|
||||
empty_list_actions->set_alignment(FlowContainer::ALIGNMENT_CENTER);
|
||||
empty_list_placeholder->add_child(empty_list_actions);
|
||||
|
||||
empty_list_create_project = memnew(Button);
|
||||
|
|
@ -1350,22 +1468,41 @@ ProjectManager::ProjectManager() {
|
|||
|
||||
project_list_sidebar->add_child(memnew(HSeparator));
|
||||
|
||||
open_btn_container = memnew(HBoxContainer);
|
||||
open_btn_container->set_anchors_preset(Control::PRESET_FULL_RECT);
|
||||
project_list_sidebar->add_child(open_btn_container);
|
||||
|
||||
open_btn = memnew(Button);
|
||||
open_btn->set_text(TTR("Edit"));
|
||||
open_btn->set_shortcut(ED_SHORTCUT("project_manager/edit_project", TTR("Edit Project"), KeyModifierMask::CMD_OR_CTRL | Key::E));
|
||||
open_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects_ask));
|
||||
project_list_sidebar->add_child(open_btn);
|
||||
open_btn->set_shortcut(ED_SHORTCUT("project_manager/edit_project", TTRC("Edit Project"), KeyModifierMask::CMD_OR_CTRL | Key::E));
|
||||
open_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects_check_recovery_mode));
|
||||
open_btn->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||
open_btn_container->add_child(open_btn);
|
||||
|
||||
open_btn_container->add_child(memnew(VSeparator));
|
||||
|
||||
open_options_btn = memnew(Button);
|
||||
open_options_btn->set_icon_alignment(HorizontalAlignment::HORIZONTAL_ALIGNMENT_CENTER);
|
||||
open_options_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_options_popup));
|
||||
open_btn_container->add_child(open_options_btn);
|
||||
|
||||
open_options_popup = memnew(PopupMenu);
|
||||
open_options_popup->add_item(TTR("Edit in recovery mode"));
|
||||
open_options_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ProjectManager::_on_open_options_selected));
|
||||
open_options_btn->add_child(open_options_popup);
|
||||
|
||||
open_btn_container->set_custom_minimum_size(Size2(120, open_btn->get_combined_minimum_size().y));
|
||||
|
||||
run_btn = memnew(Button);
|
||||
run_btn->set_text(TTR("Run"));
|
||||
run_btn->set_shortcut(ED_SHORTCUT("project_manager/run_project", TTR("Run Project"), KeyModifierMask::CMD_OR_CTRL | Key::R));
|
||||
run_btn->set_shortcut(ED_SHORTCUT("project_manager/run_project", TTRC("Run Project"), KeyModifierMask::CMD_OR_CTRL | Key::R));
|
||||
run_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_run_project));
|
||||
project_list_sidebar->add_child(run_btn);
|
||||
|
||||
rename_btn = memnew(Button);
|
||||
rename_btn->set_text(TTR("Rename"));
|
||||
// The F2 shortcut isn't overridden with Enter on macOS as Enter is already used to edit a project.
|
||||
rename_btn->set_shortcut(ED_SHORTCUT("project_manager/rename_project", TTR("Rename Project"), Key::F2));
|
||||
rename_btn->set_shortcut(ED_SHORTCUT("project_manager/rename_project", TTRC("Rename Project"), Key::F2));
|
||||
rename_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_rename_project));
|
||||
project_list_sidebar->add_child(rename_btn);
|
||||
|
||||
|
|
@ -1375,7 +1512,7 @@ ProjectManager::ProjectManager() {
|
|||
|
||||
erase_btn = memnew(Button);
|
||||
erase_btn->set_text(TTR("Remove"));
|
||||
erase_btn->set_shortcut(ED_SHORTCUT("project_manager/remove_project", TTR("Remove Project"), Key::KEY_DELETE));
|
||||
erase_btn->set_shortcut(ED_SHORTCUT("project_manager/remove_project", TTRC("Remove Project"), Key::KEY_DELETE));
|
||||
erase_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_erase_project));
|
||||
project_list_sidebar->add_child(erase_btn);
|
||||
|
||||
|
|
@ -1417,23 +1554,9 @@ ProjectManager::ProjectManager() {
|
|||
update_label->connect("offline_clicked", callable_mp(this, &ProjectManager::_show_quick_settings));
|
||||
#endif
|
||||
|
||||
version_btn = memnew(LinkButton);
|
||||
String hash = String(VERSION_HASH);
|
||||
if (hash.length() != 0) {
|
||||
hash = " " + vformat("[%s]", hash.left(9));
|
||||
}
|
||||
version_btn->set_text("v" VERSION_FULL_BUILD + hash);
|
||||
EditorVersionButton *version_btn = memnew(EditorVersionButton(EditorVersionButton::FORMAT_WITH_BUILD));
|
||||
// Fade the version label to be less prominent, but still readable.
|
||||
version_btn->set_self_modulate(Color(1, 1, 1, 0.6));
|
||||
version_btn->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
||||
String build_date;
|
||||
if (VERSION_TIMESTAMP > 0) {
|
||||
build_date = Time::get_singleton()->get_datetime_string_from_unix_time(VERSION_TIMESTAMP, true) + " UTC";
|
||||
} else {
|
||||
build_date = TTR("(unknown)");
|
||||
}
|
||||
version_btn->set_tooltip_text(vformat(TTR("Git commit date: %s\nClick to copy the version information."), build_date));
|
||||
version_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_version_button_pressed));
|
||||
footer_bar->add_child(version_btn);
|
||||
}
|
||||
|
||||
|
|
@ -1484,9 +1607,17 @@ ProjectManager::ProjectManager() {
|
|||
multi_run_ask->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_run_project_confirm));
|
||||
add_child(multi_run_ask);
|
||||
|
||||
open_recovery_mode_ask = memnew(ConfirmationDialog);
|
||||
open_recovery_mode_ask->set_min_size(Size2(550, 70) * EDSCALE);
|
||||
open_recovery_mode_ask->set_autowrap(true);
|
||||
open_recovery_mode_ask->add_button(TTR("Edit normally"))->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_on_recovery_mode_popup_open_normal));
|
||||
open_recovery_mode_ask->set_ok_button_text(TTR("Edit in Recovery Mode"));
|
||||
open_recovery_mode_ask->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_on_recovery_mode_popup_open_recovery));
|
||||
add_child(open_recovery_mode_ask);
|
||||
|
||||
ask_update_settings = memnew(ConfirmationDialog);
|
||||
ask_update_settings->set_autowrap(true);
|
||||
ask_update_settings->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects));
|
||||
ask_update_settings->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects_with_migration));
|
||||
full_convert_button = ask_update_settings->add_button(TTR("Convert Full Project"), !GLOBAL_GET("gui/common/swap_cancel_ok"));
|
||||
full_convert_button->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_full_convert_button_pressed));
|
||||
add_child(ask_update_settings);
|
||||
|
|
@ -1567,7 +1698,7 @@ ProjectManager::ProjectManager() {
|
|||
new_tag_name = memnew(LineEdit);
|
||||
tag_vb->add_child(new_tag_name);
|
||||
new_tag_name->connect(SceneStringName(text_changed), callable_mp(this, &ProjectManager::_set_new_tag_name));
|
||||
new_tag_name->connect("text_submitted", callable_mp(this, &ProjectManager::_create_new_tag).unbind(1));
|
||||
new_tag_name->connect(SceneStringName(text_submitted), callable_mp(this, &ProjectManager::_create_new_tag).unbind(1));
|
||||
create_tag_dialog->connect("about_to_popup", callable_mp(new_tag_name, &LineEdit::clear));
|
||||
create_tag_dialog->connect("about_to_popup", callable_mp((Control *)new_tag_name, &Control::grab_focus), CONNECT_DEFERRED);
|
||||
|
||||
|
|
@ -1616,7 +1747,7 @@ ProjectManager::ProjectManager() {
|
|||
title_bar->connect(SceneStringName(item_rect_changed), callable_mp(this, &ProjectManager::_titlebar_resized));
|
||||
}
|
||||
|
||||
_update_size_limits();
|
||||
_update_size_limits(p_custom_res);
|
||||
}
|
||||
|
||||
ProjectManager::~ProjectManager() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue