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

Merge pull request #88084 from ckaiser/feature/use_indeterminate_progressbar

Browse source 
Use indeterminate progressbars for editor downloads (export templates & assets)
This commit is contained in:
Rémi Verschelde 2024-02-09 12:35:53 +01:00
commit a1e1002ba4
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/export/export_template_manager.cpp
View file

@ -146,6 +146,9 @@ void ExportTemplateManager::_download_template(const String &p_url, bool p_skip_
install_options_vb->hide();
download_progress_hb->show();
download_progress_bar->show();
download_progress_bar->set_indeterminate(true);
_set_current_progress_status(TTR("Starting the download..."));
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);
if (err != OK) {
_set_current_progress_status(TTR("Error requesting URL:") + " " + p_url, true);
download_progress_hb->hide();
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) {
download_progress_bar->hide();
download_progress_label->set_text(p_status);
if (p_error) {
download_progress_bar->hide();
download_progress_label->add_theme_color_override("font_color", get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
} else {
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) {
download_progress_bar->show();
download_progress_bar->set_indeterminate(false);
download_progress_bar->set_value(p_value);
download_progress_label->set_text(p_status);
}
@ -955,6 +960,7 @@ ExportTemplateManager::ExportTemplateManager() {
download_progress_bar->set_max(1);
download_progress_bar->set_value(0);
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_label = memnew(Label);

12
editor/plugins/asset_library_editor_plugin.cpp
View file

@ -384,6 +384,10 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
} break;
}
// Make the progress bar invisible but don't reflow other Controls around it.
progress->set_modulate(Color(0, 0, 0, 0));
progress->set_indeterminate(false);
if (!error_text.is_empty()) {
download_error->set_text(TTR("Asset Download Error:") + "\n" + error_text);
download_error->popup_centered();
@ -394,8 +398,6 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int
install_button->set_disabled(false);
status->set_text(TTR("Ready to install!"));
// Make the progress bar invisible but don't reflow other Controls around it.
progress->set_modulate(Color(0, 0, 0, 0));
set_process(false);
@ -436,13 +438,13 @@ void EditorAssetLibraryItemDownload::_notification(int p_what) {
if (cstatus == HTTPClient::STATUS_BODY) {
if (download->get_body_size() > 0) {
progress->set_indeterminate(false);
status->set_text(vformat(
TTR("Downloading (%s / %s)..."),
String::humanize_size(download->get_downloaded_bytes()),
String::humanize_size(download->get_body_size())));
} else {
// Total file size is unknown, so it cannot be displayed.
progress->set_modulate(Color(0, 0, 0, 0));
progress->set_indeterminate(true);
status->set_text(vformat(
TTR("Downloading...") + " (%s)",
String::humanize_size(download->get_downloaded_bytes())));
@ -508,6 +510,7 @@ void EditorAssetLibraryItemDownload::_make_request() {
if (err != OK) {
status->set_text(TTR("Error making request"));
} else {
progress->set_indeterminate(true);
set_process(true);
}
}
@ -548,6 +551,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() {
status = memnew(Label(TTR("Idle")));
vb->add_child(status);
progress = memnew(ProgressBar);
progress->set_editor_preview_indeterminate(true);
vb->add_child(progress);
HBoxContainer *hb2 = memnew(HBoxContainer);