mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Hopefully fixed fonts collector

Browse source 
Originally committed to SVN as r132.
This commit is contained in:
Rodrigo Braz Monteiro 2006-02-23 22:03:37 +00:00
parent 49acbaa6e5
commit 7e1d5f4fa8
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/fonts_collector.cpp
View file

@ -211,7 +211,7 @@ wxArrayString FontsCollectorThread::GetFontFiles (wxString face) {
n++; n++;
} }
} }
if (n==0) throw wxString(_T("Font not found: %s"), face); if (n==0) throw wxString(_T("Font not found"));
return files; return files;
} }
@ -229,7 +229,7 @@ void FontsCollectorThread::CollectFontData () {
reg = new wxRegKey(_T("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Fonts")); reg = new wxRegKey(_T("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Fonts"));
if (!reg->Exists()) { if (!reg->Exists()) {
delete reg; delete reg;
throw _("Could not locate fonts directory"); throw _T("Could not locate fonts directory");
} }
} }
wxString curName; wxString curName;
@ -345,7 +345,18 @@ void FontsCollectorThread::Collect() {
try { try {
work = GetFontFiles(fonts[i]); work = GetFontFiles(fonts[i]);
for (size_t j=0;j<work.GetCount();j++) { for (size_t j=0;j<work.GetCount();j++) {
wxString dstFile = destination + work[j]; // Get path to font file
wxString srcFile,dstFile;
wxFileName srcFileName(work[j]);
if (srcFileName.FileExists() && srcFileName.IsAbsolute()) {
srcFile = work[j];
dstFile = destination + srcFileName.GetFullName();
}
else {
srcFile = source + work[j];
dstFile = destination + work[j];
}
if (copied.Index(work[j]) == wxNOT_FOUND) { if (copied.Index(work[j]) == wxNOT_FOUND) {
copied.Add(work[j]); copied.Add(work[j]);
@ -360,12 +371,6 @@ void FontsCollectorThread::Collect() {
// Copy // Copy
else { else {
// Get path to font file
wxString srcFile;
wxFileName srcFileName(work[j]);
if (srcFileName.FileExists() && srcFileName.IsAbsolute()) srcFile = work[j];
else srcFile = source + work[j];
// Copy font // Copy font
bool success = Copy(srcFile,dstFile); bool success = Copy(srcFile,dstFile);
@ -377,7 +382,7 @@ void FontsCollectorThread::Collect() {
} }
else { else {
LogBox->SetDefaultStyle(wxTextAttr(wxColour(220,0,0))); LogBox->SetDefaultStyle(wxTextAttr(wxColour(220,0,0)));
LogBox->AppendText(wxString(_("Failed copying \"")) + work[j] + _T("\".\n")); LogBox->AppendText(wxString(_("Failed copying \"")) + srcFile + _T("\".\n"));
} }
wxSafeYield(); wxSafeYield();
wxMutexGuiLeave(); wxMutexGuiLeave();