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

Save unexpanded path in font collector (#79)

Browse source 
Fixes #78
This commit is contained in:
Myaamori 2021-01-16 11:13:37 +00:00 committed by GitHub
parent 35b2ca5532
commit b42da504a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dialog_fonts_collector.cpp
View file

@ -243,7 +243,7 @@ DialogFontsCollector::DialogFontsCollector(agi::Context *c)
wxStaticBoxSizer *destination_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Destination")); wxStaticBoxSizer *destination_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Destination"));
dest_label = new wxStaticText(this, -1, " "); dest_label = new wxStaticText(this, -1, " ");
dest_ctrl = new wxTextCtrl(this, -1, c->path->Decode(OPT_GET("Path/Fonts Collector Destination")->GetString()).wstring()); dest_ctrl = new wxTextCtrl(this, -1, to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString()));
dest_browse_button = new wxButton(this, -1, _("&Browse...")); dest_browse_button = new wxButton(this, -1, _("&Browse..."));
wxSizer *dest_browse_sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *dest_browse_sizer = new wxBoxSizer(wxHORIZONTAL);
@ -294,29 +294,29 @@ void DialogFontsCollector::OnStart(wxCommandEvent &) {
collection_log->ClearAll(); collection_log->ClearAll();
collection_log->SetReadOnly(true); collection_log->SetReadOnly(true);
agi::fs::path dest; agi::fs::path dest_path;
if (mode != FcMode::CheckFontsOnly) { if (mode != FcMode::CheckFontsOnly) {
dest = path.Decode(mode == FcMode::CopyToScriptFolder ? "?script/" : from_wx(dest_ctrl->GetValue())); auto dest = mode == FcMode::CopyToScriptFolder ? "?script/" : from_wx(dest_ctrl->GetValue());
dest_path = path.Decode(dest);
if (mode != FcMode::CopyToZip) { if (mode != FcMode::CopyToZip) {
if (agi::fs::FileExists(dest)) if (agi::fs::FileExists(dest_path))
wxMessageBox(_("Invalid destination."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this); wxMessageBox(_("Invalid destination."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this);
try { try {
agi::fs::CreateDirectory(dest); agi::fs::CreateDirectory(dest_path);
} }
catch (agi::Exception const&) { catch (agi::Exception const&) {
wxMessageBox(_("Could not create destination folder."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this); wxMessageBox(_("Could not create destination folder."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this);
return; return;
} }
} }
else if (agi::fs::DirectoryExists(dest) || dest.filename().empty()) { else if (agi::fs::DirectoryExists(dest_path) || dest_path.filename().empty()) {
wxMessageBox(_("Invalid path for .zip file."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this); wxMessageBox(_("Invalid path for .zip file."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this);
return; return;
} }
}
if (mode != FcMode::CheckFontsOnly) OPT_SET("Path/Fonts Collector Destination")->SetString(dest);
OPT_SET("Path/Fonts Collector Destination")->SetString(dest.string()); }
// Disable the UI while it runs as we don't support canceling // Disable the UI while it runs as we don't support canceling
EnableCloseButton(false); EnableCloseButton(false);
@ -327,7 +327,7 @@ void DialogFontsCollector::OnStart(wxCommandEvent &) {
collection_mode->Enable(false); collection_mode->Enable(false);
dest_label->Enable(false); dest_label->Enable(false);
FontsCollectorThread(subs, dest, mode, GetEventHandler()); FontsCollectorThread(subs, dest_path, mode, GetEventHandler());
} }
void DialogFontsCollector::OnBrowse(wxCommandEvent &) { void DialogFontsCollector::OnBrowse(wxCommandEvent &) {