libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 08:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Compute the required icon packs download

Browse Source
This commit is contained in:
Eugene Sandulenko 2021-11-17 00:42:43 +01:00
parent c82b1f88bc
commit ea10ec1c71
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
6 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gui/downloadiconsdialog.cpp
View File

@ -53,6 +53,9 @@ DownloadIconsDialog::DownloadIconsDialog() :
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
_statusText = new StaticTextWidget(this, "GlobalOptions_DownloadIconsDialog.StatusText", _("Downloading icons list..."));
_errorText = new StaticTextWidget(this, "GlobalOptions_DownloadIconsDialog.ErrorText", Common::U32String(""));
uint32 progress = (uint32)(100 * CloudMan.getDownloadingProgress());
_progressBar = new SliderWidget(this, "GlobalOptions_DownloadIconsDialog.ProgressBar");
_progressBar->setMinValue(0);
@ -96,7 +99,6 @@ void DownloadIconsDialog::close() {
}
void DownloadIconsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
warning("CMD is: %s", tag2str(cmd));
switch (cmd) {
case kDownloadIconsDialogButtonCmd:
{
@ -115,7 +117,8 @@ void DownloadIconsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
_close = true;
break;
case kListEndedCmd:
warning("List download ended");
_statusText->setLabel(Common::U32String::format(_("Downloading icons list... %d entries"), _fileHash.size()));
calculateList();
break;
default:
Dialog::handleCommand(sender, cmd, data);
@ -206,4 +209,44 @@ void DownloadIconsDialog::downloadList() {
rq->start();
}
void DownloadIconsDialog::calculateList() {
if (!ConfMan.hasKey("iconspath")) {
_errorText->setLabel(_("ERROR: No icons path set"));
return;
}
// Scan all files in iconspath and remove present ones from the
// donwloaded files list
Common::FSDirectory *iconDir = new Common::FSDirectory(ConfMan.get("iconspath"));
Common::ArchiveMemberList iconFiles;
iconDir->listMatchingMembers(iconFiles, "gui-icons*.dat");
for (auto ic = iconFiles.begin(); ic != iconFiles.end(); ++ic) {
Common::String fname = (*ic)->getName();
if (_fileHash.contains(fname))
_fileHash.erase(fname);
}
delete iconDir;
// Now calculate the size of the missing files
uint32 totalsize = 0;
for (auto f = _fileHash.begin(); f != _fileHash.end(); ++f) {
totalsize += f->_value;
}
if (totalsize == 0) {
_statusText->setLabel(_("No new icons packs available"));
return;
}
Common::String size, sizeUnits;
size = getHumanReadableBytes(totalsize, sizeUnits);
_statusText->setLabel(Common::U32String::format(_("Need to download %d files, %s %S"), _fileHash.size(), size.c_str(), _(sizeUnits).c_str()));
}
} // End of namespace GUI

3
gui/downloadiconsdialog.h
View File

@ -38,6 +38,8 @@ class ButtonWidget;
class SliderWidget;
class DownloadIconsDialog : public Dialog, public CommandSender {
StaticTextWidget *_statusText;
StaticTextWidget *_errorText;
StaticTextWidget *_percentLabel;
StaticTextWidget *_downloadSizeLabel;
StaticTextWidget *_downloadSpeedLabel;
@ -73,6 +75,7 @@ public:
private:
void downloadList();
void calculateList();
};
} // End of namespace GUI

BIN
gui/themes/scummremastered.zip
View File

Binary file not shown.

6
gui/themes/scummremastered/remastered_layout.stx
View File

@ -1025,6 +1025,12 @@
<dialog name = 'GlobalOptions_DownloadIconsDialog' overlays = 'Dialog.GlobalOptions'>
<layout type = 'vertical' padding = '16, 16, 16, 8' spacing = '8'>
<widget name = 'StatusText'
height = 'Globals.Line.Height'
/>
<widget name = 'ErrorText'
height = 'Globals.Line.Height'
/>
<widget name = 'ProgressBar'
height = 'Globals.Button.Height'
/>

6
gui/themes/scummremastered/remastered_layout_lowres.stx
View File

@ -1003,6 +1003,12 @@
<dialog name = 'GlobalOptions_DownloadIconsDialog' overlays = 'Dialog.GlobalOptions'>
<layout type = 'vertical' padding = '8, 8, 8, 4' spacing = '8'>
<widget name = 'StatusText'
height = 'Globals.Line.Height'
/>
<widget name = 'ErrorText'
height = 'Globals.Line.Height'
/>
<widget name = 'ProgressBar'
height = 'Globals.Button.Height'
/>

1
po/POTFILES
View File

@ -4,6 +4,7 @@ gui/about.cpp
gui/browser.cpp
gui/chooser.cpp
gui/downloaddialog.cpp
gui/downloadiconsdialog.cpp
gui/editgamedialog.cpp
gui/editrecorddialog.cpp
gui/filebrowser-dialog.cpp