|
@@ -146,6 +146,9 @@ void ExportTemplateManager::_download_template(const String &p_url, bool p_skip_
|
|
|
|
|
|
install_options_vb->hide();
|
|
install_options_vb->hide();
|
|
download_progress_hb->show();
|
|
download_progress_hb->show();
|
|
|
|
+ download_progress_bar->show();
|
|
|
|
+ download_progress_bar->set_indeterminate(true);
|
|
|
|
+
|
|
_set_current_progress_status(TTR("Starting the download..."));
|
|
_set_current_progress_status(TTR("Starting the download..."));
|
|
|
|
|
|
download_templates->set_download_file(EditorPaths::get_singleton()->get_cache_dir().path_join("tmp_templates.tpz"));
|
|
download_templates->set_download_file(EditorPaths::get_singleton()->get_cache_dir().path_join("tmp_templates.tpz"));
|
|
@@ -159,6 +162,7 @@ void ExportTemplateManager::_download_template(const String &p_url, bool p_skip_
|
|
Error err = download_templates->request(p_url);
|
|
Error err = download_templates->request(p_url);
|
|
if (err != OK) {
|
|
if (err != OK) {
|
|
_set_current_progress_status(TTR("Error requesting URL:") + " " + p_url, true);
|
|
_set_current_progress_status(TTR("Error requesting URL:") + " " + p_url, true);
|
|
|
|
+ download_progress_hb->hide();
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -357,10 +361,10 @@ bool ExportTemplateManager::_humanize_http_status(HTTPRequest *p_request, String
|
|
}
|
|
}
|
|
|
|
|
|
void ExportTemplateManager::_set_current_progress_status(const String &p_status, bool p_error) {
|
|
void ExportTemplateManager::_set_current_progress_status(const String &p_status, bool p_error) {
|
|
- download_progress_bar->hide();
|
|
|
|
download_progress_label->set_text(p_status);
|
|
download_progress_label->set_text(p_status);
|
|
|
|
|
|
if (p_error) {
|
|
if (p_error) {
|
|
|
|
+ download_progress_bar->hide();
|
|
download_progress_label->add_theme_color_override("font_color", get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
|
|
download_progress_label->add_theme_color_override("font_color", get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
|
|
} else {
|
|
} else {
|
|
download_progress_label->add_theme_color_override("font_color", get_theme_color(SNAME("font_color"), SNAME("Label")));
|
|
download_progress_label->add_theme_color_override("font_color", get_theme_color(SNAME("font_color"), SNAME("Label")));
|
|
@@ -369,6 +373,7 @@ void ExportTemplateManager::_set_current_progress_status(const String &p_status,
|
|
|
|
|
|
void ExportTemplateManager::_set_current_progress_value(float p_value, const String &p_status) {
|
|
void ExportTemplateManager::_set_current_progress_value(float p_value, const String &p_status) {
|
|
download_progress_bar->show();
|
|
download_progress_bar->show();
|
|
|
|
+ download_progress_bar->set_indeterminate(false);
|
|
download_progress_bar->set_value(p_value);
|
|
download_progress_bar->set_value(p_value);
|
|
download_progress_label->set_text(p_status);
|
|
download_progress_label->set_text(p_status);
|
|
}
|
|
}
|
|
@@ -955,6 +960,7 @@ ExportTemplateManager::ExportTemplateManager() {
|
|
download_progress_bar->set_max(1);
|
|
download_progress_bar->set_max(1);
|
|
download_progress_bar->set_value(0);
|
|
download_progress_bar->set_value(0);
|
|
download_progress_bar->set_step(0.01);
|
|
download_progress_bar->set_step(0.01);
|
|
|
|
+ download_progress_bar->set_editor_preview_indeterminate(true);
|
|
download_progress_hb->add_child(download_progress_bar);
|
|
download_progress_hb->add_child(download_progress_bar);
|
|
|
|
|
|
download_progress_label = memnew(Label);
|
|
download_progress_label = memnew(Label);
|