mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add a warning when the fonts collector finds over 32 MB of fonts

Browse source 
Originally committed to SVN as r6674.
This commit is contained in:
Thomas Goyne 2012-04-08 02:28:43 +00:00
parent c614980dca
commit 79f24a5fb2
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/dialog_fonts_collector.cpp
View file

@ -111,13 +111,17 @@ class FontsCollectorThread : public wxThread {
zip.reset(new wxZipOutputStream(*out)); zip.reset(new wxZipOutputStream(*out));
} }
int64_t total_size = 0;
bool allOk = true; bool allOk = true;
for (std::vector<wxString>::iterator cur = paths.begin(); cur != paths.end(); ++cur) { for (std::vector<wxString>::iterator cur = paths.begin(); cur != paths.end(); ++cur) {
int ret = 0; int ret = 0;
wxFileName cur_fn(*cur);
total_size += cur_fn.GetSize().GetValue();
switch (oper) { switch (oper) {
case CopyToScriptFolder: case CopyToScriptFolder:
case CopyToFolder: { case CopyToFolder: {
wxString dest = destination + wxFileName(*cur).GetFullName(); wxString dest = destination + cur_fn.GetFullName();
if (wxFileName::FileExists(dest)) if (wxFileName::FileExists(dest))
ret = 2; ret = 2;
else else
@ -129,7 +133,7 @@ class FontsCollectorThread : public wxThread {
if (!in.IsOk()) if (!in.IsOk())
ret = false; ret = false;
else { else {
ret = zip->PutNextEntry(wxFileName(*cur).GetFullName()); ret = zip->PutNextEntry(cur_fn.GetFullName());
zip->Write(in); zip->Write(in);
} }
} }
@ -150,6 +154,9 @@ class FontsCollectorThread : public wxThread {
AppendText(_("Done. All fonts copied."), 1); AppendText(_("Done. All fonts copied."), 1);
else else
AppendText(_("Done. Some fonts could not be copied."), 2); AppendText(_("Done. Some fonts could not be copied."), 2);
if (total_size > 32 * 1024 * 1024)
AppendText(_("\nOver 32 MB of fonts were copied. Some of the fonts may not be loaded by the player if they are all attached to a Matroska file."), 2);
} }
/// @brief Tell the dialog to add text to the textbox /// @brief Tell the dialog to add text to the textbox