iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity
Aegisub/src/dialog_fonts_collector.cpp

411 lines
13 KiB
C++
Raw Normal View History

Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Copyright (c) 2012, Thomas Goyne <plorkyeran@aegisub.org>
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Permission to use, copy, modify, and distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
//
Switch all headers to using Doxygen and cleanup contact info * Swap old email + website address with 'Aegisub Project http://www.aegisub.org/' * Set categories for all files (jfs) * Add descriptions for each file (jfs) * Add $Id$ keyword Originally committed to SVN as r3310.
2009-07-29 07:43:02 +02:00
// Aegisub Project http://www.aegisub.org/
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
#include "font_file_lister.h"
#include "font_file_lister_fontconfig.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
#include "compat.h"
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include "dialog_manager.h"
Fixed Shift Times window layout and added help buttons to it and translation assistant. Originally committed to SVN as r1704.
2008-01-13 23:25:26 +01:00
#include "help_button.h"
Make the fonts collector dialog modeless Originally committed to SVN as r6555.
2012-03-09 01:24:01 +01:00
#include "include/aegisub/context.h"
Move the libresrc include to the individual files that need it. Originally committed to SVN as r3244.
2009-07-24 02:08:25 +02:00
#include "libresrc/libresrc.h"
Extract options and MRU stuff from main.h Nearly all of the files including main.h are doing so only for OPT_GET and friends, which are rather unrelated to the main things that main.h declares.
2013-01-07 02:50:09 +01:00
#include "options.h"
Fix all the headers in *.cpp, this includes: * Wrapping all headers that are in agi_pre.h with AGI_PRE. * Sorting alphabetically. Originally committed to SVN as r3515.
2009-09-10 15:06:40 +02:00
#include "scintilla_text_ctrl.h"
#include "utils.h"
Semi-functional new fonts collector, using jfs's freetype2 font finding engine. Only font copying and checking work... and stuff also needs general tweaking. Originally committed to SVN as r1270.
2007-06-20 07:18:47 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
#include <libaegisub/dispatch.h>
#include <libaegisub/fs.h>
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
#include <libaegisub/path.h>
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
#include <libaegisub/make_unique.h>
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
#include <wx/button.h>
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
#include <wx/dialog.h>
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
#include <wx/dirdlg.h>
#include <wx/filedlg.h>
#include <wx/filename.h>
#include <wx/msgdlg.h>
#include <wx/radiobox.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/stattext.h>
#include <wx/stc/stc.h>
#include <wx/textctrl.h>
#include <wx/wfstream.h>
#include <wx/zipstrm.h>
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
namespace {
class DialogFontsCollector final : public wxDialog {
AssFile *subs;
ScintillaTextCtrl *collection_log;
wxButton *close_btn;
wxButton *dest_browse_button;
wxButton *start_btn;
wxRadioBox *collection_mode;
wxStaticText *dest_label;
wxTextCtrl *dest_ctrl;
void OnStart(wxCommandEvent &);
void OnBrowse(wxCommandEvent &);
void OnRadio(wxCommandEvent &e);
/// Append text to log message from worker thread
void OnAddText(wxThreadEvent &event);
/// Collection complete notification from the worker thread to reenable buttons
void OnCollectionComplete(wxThreadEvent &);
public:
DialogFontsCollector(agi::Context *c);
};
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
enum FcMode {
CheckFontsOnly = 0,
CopyToFolder = 1,
CopyToScriptFolder = 2,
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
CopyToZip = 3,
SymlinkToFolder = 4
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
};
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
wxDEFINE_EVENT(EVT_ADD_TEXT, wxThreadEvent);
wxDEFINE_EVENT(EVT_COLLECTION_DONE, wxThreadEvent);
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
void FontsCollectorThread(AssFile *subs, agi::fs::path const& destination, FcMode oper, wxEvtHandler *collector) {
agi::dispatch::Background().Async([=]{
auto AppendText = [&](wxString text, int colour) {
wxThreadEvent event(EVT_ADD_TEXT);
event.SetPayload(std::make_pair(colour, text));
collector->AddPendingEvent(event);
};
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
FontConfigFontFileLister lister(AppendText);
auto paths = FontCollector(AppendText, lister).GetFontPaths(subs);
if (paths.empty()) {
collector->AddPendingEvent(wxThreadEvent(EVT_COLLECTION_DONE));
return;
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Copy fonts
switch (oper) {
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
case CheckFontsOnly:
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
collector->AddPendingEvent(wxThreadEvent(EVT_COLLECTION_DONE));
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
return;
case SymlinkToFolder:
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(_("Symlinking fonts to folder...\n"), 0);
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
break;
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
case CopyToScriptFolder:
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
case CopyToFolder:
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(_("Copying fonts to folder...\n"), 0);
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
break;
case CopyToZip:
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(_("Copying fonts to archive...\n"), 0);
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
break;
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
}
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Open zip stream if saving to compressed archive
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
std::unique_ptr<wxFFileOutputStream> out;
std::unique_ptr<wxZipOutputStream> zip;
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (oper == CopyToZip) {
Create the output directory when collecting fonts to a zip
2014-04-20 15:42:04 +02:00
try {
agi::fs::CreateDirectory(destination.parent_path());
}
catch (agi::fs::FileSystemError const& e) {
AppendText(wxString::Format(_("* Failed to create directory '%s': %s.\n"),
destination.parent_path().wstring(), to_wx(e.GetChainedMessage())), 2);
collector->AddPendingEvent(wxThreadEvent(EVT_COLLECTION_DONE));
return;
}
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
out = agi::make_unique<wxFFileOutputStream>(destination.wstring());
Add missing error checking for opening the output zip file in the fonts collector
2014-04-20 05:04:02 +02:00
if (out->IsOk())
Move make_unique to its own header file Rebuilding the entire project after touching util.h gets old fast.
2014-04-23 22:53:24 +02:00
zip = agi::make_unique<wxZipOutputStream>(*out);
Create the output directory when collecting fonts to a zip
2014-04-20 15:42:04 +02:00
Add missing error checking for opening the output zip file in the fonts collector
2014-04-20 05:04:02 +02:00
if (!out->IsOk() || !zip || !zip->IsOk()) {
AppendText(wxString::Format(_("* Failed to open %s.\n"), destination.wstring()), 2);
collector->AddPendingEvent(wxThreadEvent(EVT_COLLECTION_DONE));
return;
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
}
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Add a warning when the fonts collector finds over 32 MB of fonts Originally committed to SVN as r6674.
2012-04-08 04:28:43 +02:00
int64_t total_size = 0;
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
bool allOk = true;
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
for (auto path : paths) {
path.make_preferred();
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
int ret = 0;
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
total_size += agi::fs::Size(path);
Add a warning when the fonts collector finds over 32 MB of fonts Originally committed to SVN as r6674.
2012-04-08 04:28:43 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
switch (oper) {
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
case SymlinkToFolder:
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
case CopyToScriptFolder:
case CopyToFolder: {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
auto dest = destination/path.filename();
if (agi::fs::FileExists(dest))
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
ret = 2;
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
#ifndef _WIN32
else if (oper == SymlinkToFolder) {
// returns 0 on success, -1 on error...
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
if (symlink(path.c_str(), dest.c_str()))
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
ret = 0;
else
ret = 3;
}
#endif
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
else {
try {
agi::fs::Copy(path, dest);
ret = true;
}
catch (...) {
ret = false;
}
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
}
break;
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
case CopyToZip: {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
wxFFileInputStream in(path.wstring());
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (!in.IsOk())
ret = false;
else {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
ret = zip->PutNextEntry(path.filename().wstring());
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
zip->Write(in);
}
}
default: break;
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (ret == 1)
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(wxString::Format(_("* Copied %s.\n"), path.wstring()), 1);
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
else if (ret == 2)
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(wxString::Format(_("* %s already exists on destination.\n"), path.filename().wstring()), 3);
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
else if (ret == 3)
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(wxString::Format(_("* Symlinked %s.\n"), path.wstring()), 1);
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
else {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText(wxString::Format(_("* Failed to copy %s.\n"), path.wstring()), 2);
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
allOk = false;
}
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (allOk)
AppendText(_("Done. All fonts copied."), 1);
else
AppendText(_("Done. Some fonts could not be copied."), 2);
Add a warning when the fonts collector finds over 32 MB of fonts Originally committed to SVN as r6674.
2012-04-08 04:28:43 +02:00
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);
Append a blank line to the end of the fonts collector log since it clips the bottom few pixels of the last line on windows Originally committed to SVN as r6675.
2012-04-08 04:28:50 +02:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
AppendText("\n", 0);
Re-worked the fonts collector log box to use wx's event system. If this doesn't fix the crashes, I'll try sacrificing a goat. Originally committed to SVN as r1787.
2008-01-20 07:46:10 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
collector->AddPendingEvent(wxThreadEvent(EVT_COLLECTION_DONE));
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
});
}
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Make the fonts collector dialog modeless Originally committed to SVN as r6555.
2012-03-09 01:24:01 +01:00
DialogFontsCollector::DialogFontsCollector(agi::Context *c)
: wxDialog(c->parent, -1, _("Fonts Collector"))
Pull some of the context (de)init out of FrameMain And actually do deinitialize more of the stuff in the context.
2014-03-25 22:49:26 +01:00
, subs(c->ass.get())
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
{
Use 16x16 icons for dialogs rather than cropping the 24x24 icons to 16x16 Originally committed to SVN as r6650.
2012-04-03 22:40:24 +02:00
SetIcon(GETICON(font_collector_button_16));
Added icons to all dialogs that have one for them. Originally committed to SVN as r1360.
2007-07-05 01:09:40 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
wxString modes[] = {
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
_("Check fonts for availability")
,_("Copy fonts to folder")
,_("Copy fonts to subtitle file's folder")
,_("Copy fonts to zipped archive")
#ifndef _WIN32
,_("Symlink fonts to folder")
#endif
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
};
Mark "Action" as translatable in the fonts collector dialog Fortunately "Action" is also used in the select lines dialog so it's already present in the translations.
2012-09-28 01:44:16 +02:00
collection_mode = new wxRadioBox(this, -1, _("Action"), wxDefaultPosition, wxDefaultSize, countof(modes), modes, 1);
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
collection_mode->SetSelection(mid<int>(0, OPT_GET("Tool/Fonts Collector/Action")->GetInt(), 4));
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
if (config::path->Decode("?script") == "?script")
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
collection_mode->Enable(2, false);
wxStaticBoxSizer *destination_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Destination"));
Fix incorrectly positioned controls in the fonts collector dialog The documentation claims that making things in static boxes children of the static box is the right thing to do, but it's broken things a few times now, so just make them children of the static box's parent. Originally committed to SVN as r6912.
2012-06-21 06:32:10 +02:00
dest_label = new wxStaticText(this, -1, " ");
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
dest_ctrl = new wxTextCtrl(this, -1, config::path->Decode(OPT_GET("Path/Fonts Collector Destination")->GetString()).wstring());
Fix incorrectly positioned controls in the fonts collector dialog The documentation claims that making things in static boxes children of the static box is the right thing to do, but it's broken things a few times now, so just make them children of the static box's parent. Originally committed to SVN as r6912.
2012-06-21 06:32:10 +02:00
dest_browse_button = new wxButton(this, -1, _("&Browse..."));
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
wxSizer *dest_browse_sizer = new wxBoxSizer(wxHORIZONTAL);
Vertically center various widgets Preferences: labels. Properties dialog: resolution textboxes. Fonts collector: path textbox. Resample resolution: resolution spin boxes. Video details: labels. Originally committed to SVN as r6804.
2012-05-15 16:07:14 +02:00
dest_browse_sizer->Add(dest_ctrl, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL));
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
dest_browse_sizer->Add(dest_browse_button, wxSizerFlags());
destination_box->Add(dest_label, wxSizerFlags().Border(wxBOTTOM));
destination_box->Add(dest_browse_sizer, wxSizerFlags().Expand());
wxStaticBoxSizer *log_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Log"));
Fix incorrectly positioned controls in the fonts collector dialog The documentation claims that making things in static boxes children of the static box is the right thing to do, but it's broken things a few times now, so just make them children of the static box's parent. Originally committed to SVN as r6912.
2012-06-21 06:32:10 +02:00
collection_log = new ScintillaTextCtrl(this, -1, "", wxDefaultPosition, wxSize(600, 300));
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
collection_log->SetWrapMode(wxSTC_WRAP_WORD);
collection_log->SetMarginWidth(1, 0);
collection_log->SetReadOnly(true);
collection_log->StyleSetForeground(1, wxColour(0, 200, 0));
collection_log->StyleSetForeground(2, wxColour(200, 0, 0));
collection_log->StyleSetForeground(3, wxColour(200, 100, 0));
log_box->Add(collection_log, wxSizerFlags().Border());
wxStdDialogButtonSizer *button_sizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL | wxHELP);
start_btn = button_sizer->GetAffirmativeButton();
close_btn = button_sizer->GetCancelButton();
start_btn->SetLabel(_("&Start!"));
start_btn->SetDefault();
wxSizer *main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(collection_mode, wxSizerFlags().Expand().Border());
main_sizer->Add(destination_box, wxSizerFlags().Expand().Border(wxALL & ~wxTOP));
main_sizer->Add(log_box, wxSizerFlags().Border(wxALL & ~wxTOP));
main_sizer->Add(button_sizer, wxSizerFlags().Right().Border(wxALL & ~wxTOP));
SetSizerAndFit(main_sizer);
Semi-functional new fonts collector, using jfs's freetype2 font finding engine. Only font copying and checking work... and stuff also needs general tweaking. Originally committed to SVN as r1270.
2007-06-20 07:18:47 +02:00
CenterOnParent();
Fixed a few dialogs and added the early medusa shortcuts stuff Originally committed to SVN as r661.
2006-12-30 21:58:24 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Update the browse button and label
Eliminate most clang warnings Originally committed to SVN as r6183.
2011-12-28 22:27:22 +01:00
wxCommandEvent evt;
OnRadio(evt);
Note: This was done using a script! it's far from perfect but 95% of the work has been done already formatting-wise. Document all functions, class, struct, union, enum, macro, variable, typedefs. This isn't the actual document in itself but empty documentation using any old documentation if it was there. This was done using exuberant ctags to get tag info, then a TCL script to parse/remove old comments and convert them into Doxygen-style. Some notes: * Anything labeled 'DOCME' needs to be documented, @param and @return have been left blank as it would be annoying to delete the 'DOCME' from every one of those. * Some multiline comments may have been munged into single line comments * Leave the /// comments above global variables with a space, if they're harder to read then we'll be less likey to use them. * Enum comments can go after the enumeration itself '[value] /// comment' * include/aegisub/*.h haven't been converted yet, this will be done in a later commit * Some documentation blocks are in the wrong place, in the .h when it should be in the .cpp, or vice versa. See http://devel.aegisub.org/wiki/Doxygen for some details on Doxygen and a 'style guide'. Originally committed to SVN as r3312.
2009-07-30 00:59:22 +02:00
Use the new much shorter event names
2013-12-12 03:25:13 +01:00
start_btn->Bind(wxEVT_BUTTON, &DialogFontsCollector::OnStart, this);
dest_browse_button->Bind(wxEVT_BUTTON, &DialogFontsCollector::OnBrowse, this);
collection_mode->Bind(wxEVT_RADIOBOX, &DialogFontsCollector::OnRadio, this);
button_sizer->GetHelpButton()->Bind(wxEVT_BUTTON, std::bind(&HelpButton::OpenPage, "Fonts Collector"));
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
Bind(EVT_ADD_TEXT, &DialogFontsCollector::OnAddText, this);
Bind(EVT_COLLECTION_DONE, &DialogFontsCollector::OnCollectionComplete, this);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
void DialogFontsCollector::OnStart(wxCommandEvent &) {
collection_log->SetReadOnly(false);
collection_log->ClearAll();
collection_log->SetReadOnly(true);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
agi::fs::path dest;
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
int action = collection_mode->GetSelection();
OPT_SET("Tool/Fonts Collector/Action")->SetInt(action);
if (action != CheckFontsOnly) {
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
dest = config::path->Decode(action == CopyToScriptFolder ? "?script/" : from_wx(dest_ctrl->GetValue()));
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (action != CopyToZip) {
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
if (agi::fs::FileExists(dest))
Center most of the message boxes over their parent windows Originally committed to SVN as r6629.
2012-03-29 01:59:19 +02:00
wxMessageBox(_("Invalid destination."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this);
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
try {
agi::fs::CreateDirectory(dest);
}
catch (agi::Exception const&) {
Center most of the message boxes over their parent windows Originally committed to SVN as r6629.
2012-03-29 01:59:19 +02:00
wxMessageBox(_("Could not create destination folder."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this);
Fonts collector seemingly all fixed and done, except for lack of font caching and use of fc on unix. Originally committed to SVN as r1272.
2007-06-20 09:10:41 +02:00
return;
}
}
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
else if (agi::fs::DirectoryExists(dest) || dest.filename().empty()) {
Center most of the message boxes over their parent windows Originally committed to SVN as r6629.
2012-03-29 01:59:19 +02:00
wxMessageBox(_("Invalid path for .zip file."), _("Error"), wxOK | wxICON_ERROR | wxCENTER, this);
Semi-functional new fonts collector, using jfs's freetype2 font finding engine. Only font copying and checking work... and stuff also needs general tweaking. Originally committed to SVN as r1270.
2007-06-20 07:18:47 +02:00
return;
}
}
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (action != CheckFontsOnly)
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
OPT_SET("Path/Fonts Collector Destination")->SetString(dest.string());
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Disable the UI while it runs as we don't support canceling
EnableCloseButton(false);
start_btn->Enable(false);
dest_browse_button->Enable(false);
dest_ctrl->Enable(false);
close_btn->Enable(false);
collection_mode->Enable(false);
dest_label->Enable(false);
Fonts collector can now collect fonts directly to a zip archive. Originally committed to SVN as r580.
2006-12-18 23:24:25 +01:00
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
FontsCollectorThread(subs, dest, static_cast<FcMode>(action), GetEventHandler());
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
void DialogFontsCollector::OnBrowse(wxCommandEvent &) {
wxString dest;
if (collection_mode->GetSelection() == CopyToZip) {
dest = wxFileSelector(
_("Select archive file name"),
dest_ctrl->GetValue(),
wxFileName(dest_ctrl->GetValue()).GetFullName(),
Don't mark file format filters as translatable Originally committed to SVN as r6616.
2012-03-27 02:49:53 +02:00
".zip", "Zip Archives (*.zip)|*.zip",
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
}
else
dest = wxDirSelector(_("Select folder to save fonts on"), dest_ctrl->GetValue(), 0);
if (!dest.empty())
dest_ctrl->SetValue(dest);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
void DialogFontsCollector::OnRadio(wxCommandEvent &) {
int value = collection_mode->GetSelection();
wxString dst = dest_ctrl->GetValue();
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
if (value == CheckFontsOnly || value == CopyToScriptFolder) {
dest_ctrl->Enable(false);
dest_browse_button->Enable(false);
dest_label->Enable(false);
dest_label->SetLabel(_("N/A"));
Re-worked the fonts collector log box to use wx's event system. If this doesn't fix the crashes, I'll try sacrificing a goat. Originally committed to SVN as r1787.
2008-01-20 07:46:10 +01:00
}
Improved (but still far from perfect) Fonts Collector performance Originally committed to SVN as r1714.
2008-01-14 06:54:58 +01:00
else {
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
dest_ctrl->Enable(true);
dest_browse_button->Enable(true);
dest_label->Enable(true);
Improved (but still far from perfect) Fonts Collector performance Originally committed to SVN as r1714.
2008-01-14 06:54:58 +01:00
Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame. Originally committed to SVN as r6755.
2012-05-10 16:18:47 +02:00
if (value == CopyToFolder || value == SymlinkToFolder) {
Bump up the size of the log window in the font collector dialog so that it can actually fit font names without wrapping Originally committed to SVN as r6418.
2012-02-01 05:17:39 +01:00
dest_label->SetLabel(_("Choose the folder where the fonts will be collected to. It will be created if it doesn't exist."));
Fonts collector seemingly all fixed and done, except for lack of font caching and use of fc on unix. Originally committed to SVN as r1272.
2007-06-20 09:10:41 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Remove filename from browse box
if (dst.Right(4) == ".zip")
dest_ctrl->SetValue(wxFileName(dst).GetPath());
Possibly fixed #606 (fonts collector crash) Originally committed to SVN as r1685.
2008-01-11 05:36:29 +01:00
}
General fixes to fonts collector, and made font attachment work. Collecting to archives still doesn't work, and there are a few destination-box related issues. Originally committed to SVN as r1271.
2007-06-20 08:29:20 +02:00
else {
Bump up the size of the log window in the font collector dialog so that it can actually fit font names without wrapping Originally committed to SVN as r6418.
2012-02-01 05:17:39 +01:00
dest_label->SetLabel(_("Enter the name of the destination zip file to collect the fonts to. If a folder is entered, a default name will be used."));
General fixes to fonts collector, and made font attachment work. Collecting to archives still doesn't work, and there are a few destination-box related issues. Originally committed to SVN as r1271.
2007-06-20 08:29:20 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
// Add filename to browse box
if (!dst.EndsWith(".zip")) {
wxFileName fn(dst + "//");
fn.SetFullName("fonts.zip");
dest_ctrl->SetValue(fn.GetFullPath());
General fixes to fonts collector, and made font attachment work. Collecting to archives still doesn't work, and there are a few destination-box related issues. Originally committed to SVN as r1271.
2007-06-20 08:29:20 +02:00
}
}
Semi-functional new fonts collector, using jfs's freetype2 font finding engine. Only font copying and checking work... and stuff also needs general tweaking. Originally committed to SVN as r1270.
2007-06-20 07:18:47 +02:00
}
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
void DialogFontsCollector::OnAddText(wxThreadEvent &event) {
Remove spaces in > > in nested templates
2012-12-11 19:58:28 +01:00
std::pair<int, wxString> str = event.GetPayload<std::pair<int, wxString>>();
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
collection_log->SetReadOnly(false);
int pos = collection_log->GetReverseUnicodePosition(collection_log->GetLength());
collection_log->AppendText(str.second);
if (str.first) {
collection_log->StartUnicodeStyling(pos, 31);
collection_log->SetUnicodeStyling(pos, str.second.size(), str.first);
}
collection_log->GotoPos(pos);
collection_log->SetReadOnly(true);
Semi-functional new fonts collector, using jfs's freetype2 font finding engine. Only font copying and checking work... and stuff also needs general tweaking. Originally committed to SVN as r1270.
2007-06-20 07:18:47 +02:00
}
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
void DialogFontsCollector::OnCollectionComplete(wxThreadEvent &) {
OS X compilation fixes Originally committed to SVN as r6512.
2012-02-23 20:28:19 +01:00
EnableCloseButton(true);
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
start_btn->Enable();
close_btn->Enable();
collection_mode->Enable();
Kill StandardPaths It's now just a pointless wrapper around agi::Path.
2013-01-30 04:35:37 +01:00
if (config::path->Decode("?script") == "?script")
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
collection_mode->Enable(2, false);
Semi-functional new fonts collector, using jfs's freetype2 font finding engine. Only font copying and checking work... and stuff also needs general tweaking. Originally committed to SVN as r1270.
2007-06-20 07:18:47 +02:00
Rewrite the font collector The fontconfig collector should now always pick the exact font files used by libass rather than a giant mishmash of vaguely related files which may or may not include the correct font. Make the freetype font collector windows-only, as it's far inferior to the fontconfig collector and is only present as a fallback. Add option to copy the fonts to the script's folder. Closes #1059. Originally committed to SVN as r6279.
2012-01-12 23:32:09 +01:00
wxCommandEvent evt;
OnRadio(evt);
Originally committed to SVN as r2.
2006-01-16 22:02:54 +01:00
}
Remove a lot of pointless headers for dialogs Most of the dialogs in Aegisub have a public interface consisting of a single function, so there's really no need to expose the actual dialog classes to the rest of the program. Add dialogs.h with the declarations of all of those functions (most of which are just ShowFooDialog()), and kill a million other headers.
2014-05-22 21:07:15 +02:00
}
void ShowFontsCollectorDialog(agi::Context *c) {
c->dialog->Show<DialogFontsCollector>(c);
}