|
@@ -101,7 +101,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() {
|
|
add_style_override("panel", border);
|
|
add_style_override("panel", border);
|
|
|
|
|
|
HBoxContainer *hb = memnew(HBoxContainer);
|
|
HBoxContainer *hb = memnew(HBoxContainer);
|
|
- // Add some spacing to visually separate the icon from the asset details
|
|
|
|
|
|
+ // Add some spacing to visually separate the icon from the asset details.
|
|
hb->add_constant_override("separation", 15 * EDSCALE);
|
|
hb->add_constant_override("separation", 15 * EDSCALE);
|
|
add_child(hb);
|
|
add_child(hb);
|
|
|
|
|
|
@@ -118,25 +118,21 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() {
|
|
vb->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
vb->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
|
|
|
|
title = memnew(LinkButton);
|
|
title = memnew(LinkButton);
|
|
- title->set_text("My Awesome Addon");
|
|
|
|
title->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
|
title->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
|
title->connect("pressed", this, "_asset_clicked");
|
|
title->connect("pressed", this, "_asset_clicked");
|
|
vb->add_child(title);
|
|
vb->add_child(title);
|
|
|
|
|
|
category = memnew(LinkButton);
|
|
category = memnew(LinkButton);
|
|
- category->set_text("Editor Tools");
|
|
|
|
category->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
|
category->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
|
category->connect("pressed", this, "_category_clicked");
|
|
category->connect("pressed", this, "_category_clicked");
|
|
vb->add_child(category);
|
|
vb->add_child(category);
|
|
|
|
|
|
author = memnew(LinkButton);
|
|
author = memnew(LinkButton);
|
|
- author->set_text("Johny Tolengo");
|
|
|
|
author->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
|
author->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
|
|
author->connect("pressed", this, "_author_clicked");
|
|
author->connect("pressed", this, "_author_clicked");
|
|
vb->add_child(author);
|
|
vb->add_child(author);
|
|
|
|
|
|
price = memnew(Label);
|
|
price = memnew(Label);
|
|
- price->set_text(TTR("Free"));
|
|
|
|
vb->add_child(price);
|
|
vb->add_child(price);
|
|
|
|
|
|
set_custom_minimum_size(Size2(250, 100) * EDSCALE);
|
|
set_custom_minimum_size(Size2(250, 100) * EDSCALE);
|
|
@@ -278,12 +274,8 @@ void EditorAssetLibraryItemDescription::add_preview(int p_id, bool p_video, cons
|
|
|
|
|
|
EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
|
|
EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
|
|
|
|
|
|
- VBoxContainer *vbox = memnew(VBoxContainer);
|
|
|
|
- add_child(vbox);
|
|
|
|
-
|
|
|
|
HBoxContainer *hbox = memnew(HBoxContainer);
|
|
HBoxContainer *hbox = memnew(HBoxContainer);
|
|
- vbox->add_child(hbox);
|
|
|
|
- vbox->add_constant_override("separation", 15 * EDSCALE);
|
|
|
|
|
|
+ add_child(hbox);
|
|
VBoxContainer *desc_vbox = memnew(VBoxContainer);
|
|
VBoxContainer *desc_vbox = memnew(VBoxContainer);
|
|
hbox->add_child(desc_vbox);
|
|
hbox->add_child(desc_vbox);
|
|
hbox->add_constant_override("separation", 15 * EDSCALE);
|
|
hbox->add_constant_override("separation", 15 * EDSCALE);
|
|
@@ -298,17 +290,20 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
|
|
desc_bg->set_v_size_flags(SIZE_EXPAND_FILL);
|
|
desc_bg->set_v_size_flags(SIZE_EXPAND_FILL);
|
|
|
|
|
|
description = memnew(RichTextLabel);
|
|
description = memnew(RichTextLabel);
|
|
|
|
+ desc_bg->add_child(description);
|
|
description->connect("meta_clicked", this, "_link_click");
|
|
description->connect("meta_clicked", this, "_link_click");
|
|
description->set_custom_minimum_size(Size2(440 * EDSCALE, 300 * EDSCALE));
|
|
description->set_custom_minimum_size(Size2(440 * EDSCALE, 300 * EDSCALE));
|
|
- desc_bg->add_child(description);
|
|
|
|
|
|
|
|
VBoxContainer *previews_vbox = memnew(VBoxContainer);
|
|
VBoxContainer *previews_vbox = memnew(VBoxContainer);
|
|
hbox->add_child(previews_vbox);
|
|
hbox->add_child(previews_vbox);
|
|
previews_vbox->add_constant_override("separation", 15 * EDSCALE);
|
|
previews_vbox->add_constant_override("separation", 15 * EDSCALE);
|
|
|
|
+ previews_vbox->set_v_size_flags(SIZE_EXPAND_FILL);
|
|
|
|
|
|
preview = memnew(TextureRect);
|
|
preview = memnew(TextureRect);
|
|
- preview->set_custom_minimum_size(Size2(640 * EDSCALE, 345 * EDSCALE));
|
|
|
|
previews_vbox->add_child(preview);
|
|
previews_vbox->add_child(preview);
|
|
|
|
+ preview->set_expand(true);
|
|
|
|
+ preview->set_stretch_mode(TextureRect::STRETCH_KEEP_ASPECT_CENTERED);
|
|
|
|
+ preview->set_custom_minimum_size(Size2(640 * EDSCALE, 345 * EDSCALE));
|
|
|
|
|
|
previews_bg = memnew(PanelContainer);
|
|
previews_bg = memnew(PanelContainer);
|
|
previews_vbox->add_child(previews_bg);
|
|
previews_vbox->add_child(previews_bg);
|
|
@@ -392,7 +387,7 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
|
|
|
|
|
|
install->set_disabled(false);
|
|
install->set_disabled(false);
|
|
status->set_text(TTR("Success!"));
|
|
status->set_text(TTR("Success!"));
|
|
- // Make the progress bar invisible but don't reflow other Controls around it
|
|
|
|
|
|
+ // Make the progress bar invisible but don't reflow other Controls around it.
|
|
progress->set_modulate(Color(0, 0, 0, 0));
|
|
progress->set_modulate(Color(0, 0, 0, 0));
|
|
|
|
|
|
set_process(false);
|
|
set_process(false);
|
|
@@ -661,7 +656,7 @@ const char *EditorAssetLibrary::sort_key[SORT_MAX] = {
|
|
const char *EditorAssetLibrary::sort_text[SORT_MAX] = {
|
|
const char *EditorAssetLibrary::sort_text[SORT_MAX] = {
|
|
"Downloads",
|
|
"Downloads",
|
|
"Name",
|
|
"Name",
|
|
- "License", // "cost" stores the SPDX license name in the Godot Asset Library
|
|
|
|
|
|
+ "License", // "cost" stores the SPDX license name in the Godot Asset Library.
|
|
"Updated"
|
|
"Updated"
|
|
};
|
|
};
|
|
|
|
|
|
@@ -673,7 +668,7 @@ const char *EditorAssetLibrary::support_key[SUPPORT_MAX] = {
|
|
|
|
|
|
void EditorAssetLibrary::_select_author(int p_id) {
|
|
void EditorAssetLibrary::_select_author(int p_id) {
|
|
|
|
|
|
- // Open author window
|
|
|
|
|
|
+ // Open author window.
|
|
}
|
|
}
|
|
|
|
|
|
void EditorAssetLibrary::_select_category(int p_id) {
|
|
void EditorAssetLibrary::_select_category(int p_id) {
|
|
@@ -1345,7 +1340,6 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
|
|
library_main->add_child(search_hb);
|
|
library_main->add_child(search_hb);
|
|
library_main->add_constant_override("separation", 10 * EDSCALE);
|
|
library_main->add_constant_override("separation", 10 * EDSCALE);
|
|
|
|
|
|
- search_hb->add_child(memnew(Label(TTR("Search:") + " ")));
|
|
|
|
filter = memnew(LineEdit);
|
|
filter = memnew(LineEdit);
|
|
search_hb->add_child(filter);
|
|
search_hb->add_child(filter);
|
|
filter->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
filter->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
@@ -1358,12 +1352,12 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
|
|
search_hb->add_child(memnew(VSeparator));
|
|
search_hb->add_child(memnew(VSeparator));
|
|
|
|
|
|
Button *open_asset = memnew(Button);
|
|
Button *open_asset = memnew(Button);
|
|
- open_asset->set_text(TTR("Import"));
|
|
|
|
|
|
+ open_asset->set_text(TTR("Import..."));
|
|
search_hb->add_child(open_asset);
|
|
search_hb->add_child(open_asset);
|
|
open_asset->connect("pressed", this, "_asset_open");
|
|
open_asset->connect("pressed", this, "_asset_open");
|
|
|
|
|
|
Button *plugins = memnew(Button);
|
|
Button *plugins = memnew(Button);
|
|
- plugins->set_text(TTR("Plugins"));
|
|
|
|
|
|
+ plugins->set_text(TTR("Plugins..."));
|
|
search_hb->add_child(plugins);
|
|
search_hb->add_child(plugins);
|
|
plugins->connect("pressed", this, "_manage_plugins");
|
|
plugins->connect("pressed", this, "_manage_plugins");
|
|
|
|
|
|
@@ -1420,7 +1414,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
|
|
|
|
|
|
support = memnew(MenuButton);
|
|
support = memnew(MenuButton);
|
|
search_hb2->add_child(support);
|
|
search_hb2->add_child(support);
|
|
- support->set_text(TTR("Support..."));
|
|
|
|
|
|
+ support->set_text(TTR("Support"));
|
|
support->get_popup()->add_check_item(TTR("Official"), SUPPORT_OFFICIAL);
|
|
support->get_popup()->add_check_item(TTR("Official"), SUPPORT_OFFICIAL);
|
|
support->get_popup()->add_check_item(TTR("Community"), SUPPORT_COMMUNITY);
|
|
support->get_popup()->add_check_item(TTR("Community"), SUPPORT_COMMUNITY);
|
|
support->get_popup()->add_check_item(TTR("Testing"), SUPPORT_TESTING);
|
|
support->get_popup()->add_check_item(TTR("Testing"), SUPPORT_TESTING);
|