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

Fix importing styles from files in non-local charsets (i.e. hopefully all of them)

Browse source
This commit is contained in:
Thomas Goyne 2013-06-09 07:53:07 -07:00
parent ef2a39fc7b
commit 2a2a623bb4
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/dialog_style_manager.cpp
View file

@ -38,6 +38,7 @@
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_style.h" #include "ass_style.h"
#include "charset_detect.h"
#include "compat.h" #include "compat.h"
#include "dialog_selected_choices.h" #include "dialog_selected_choices.h"
#include "dialog_style_editor.h" #include "dialog_style_editor.h"
@ -565,13 +566,21 @@ void DialogStyleManager::OnCurrentImport() {
auto filename = OpenFileSelector(_("Open subtitles file"), "Path/Last/Subtitles", "", "", SubtitleFormat::GetWildcards(0), this); auto filename = OpenFileSelector(_("Open subtitles file"), "Path/Last/Subtitles", "", "", SubtitleFormat::GetWildcards(0), this);
if (filename.empty()) return; if (filename.empty()) return;
std::string charset;
try {
charset = CharSetDetect::GetEncoding(filename);
}
catch (agi::UserCancelException const&) {
return;
}
AssFile temp; AssFile temp;
try { try {
auto reader = SubtitleFormat::GetReader(filename); auto reader = SubtitleFormat::GetReader(filename);
if (!reader) if (!reader)
wxMessageBox("Unsupported subtitle format", "Error", wxOK | wxICON_ERROR | wxCENTER, this); wxMessageBox("Unsupported subtitle format", "Error", wxOK | wxICON_ERROR | wxCENTER, this);
else else
reader->ReadFile(&temp, filename); reader->ReadFile(&temp, filename, charset);
} }
catch (agi::Exception const& err) { catch (agi::Exception const& err) {
wxMessageBox(to_wx(err.GetChainedMessage()), "Error", wxOK | wxICON_ERROR | wxCENTER, this); wxMessageBox(to_wx(err.GetChainedMessage()), "Error", wxOK | wxICON_ERROR | wxCENTER, this);

4
aegisub/src/subtitle_format.h
View file

@ -110,8 +110,8 @@ public:
/// Load a subtitle file /// Load a subtitle file
/// @param[out] target Destination to read lines into /// @param[out] target Destination to read lines into
/// @param filename File to load /// @param filename File to load
/// @param forceEncoding Encoding to use or empty string for default /// @param encoding Encoding to use. May be ignored by the reader.
virtual void ReadFile(AssFile *target, agi::fs::path const& filename, std::string const& forceEncoding="") const { } virtual void ReadFile(AssFile *target, agi::fs::path const& filename, std::string const& encoding) const { }
/// Save a subtitle file /// Save a subtitle file
/// @param src Data to write /// @param src Data to write