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

Display the full list of supported character sets if detection fails catastrophically

Browse source
This commit is contained in:
Thomas Goyne 2013-02-04 19:17:04 -08:00
parent 1f831be170
commit 3d48f18542
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/src/charset_detect.cpp
View file

@ -39,6 +39,7 @@
#include "compat.h" #include "compat.h"
#include <libaegisub/charset.h> #include <libaegisub/charset.h>
#include <libaegisub/charset_conv.h>
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
@ -55,7 +56,7 @@ std::string GetEncoding(agi::fs::path const& filename) {
try { try {
list = agi::charset::DetectAll(filename); list = agi::charset::DetectAll(filename);
} catch (const agi::charset::UnknownCharset&) { } catch (const agi::charset::UnknownCharset&) {
/// @todo If the charset is unknown we need to display a complete list of character sets. // will be set to the full list of charsets below
} }
if (list.size() == 1) { if (list.size() == 1) {
@ -74,11 +75,16 @@ std::string GetEncoding(agi::fs::path const& filename) {
LOG_I("charset/file") << filename << " (" << log_choice << ")"; LOG_I("charset/file") << filename << " (" << log_choice << ")";
if (choices.empty())
choices = agi::charset::GetEncodingsList<wxArrayString>();
int choice = wxGetSingleChoiceIndex( int choice = wxGetSingleChoiceIndex(
_("Aegisub could not narrow down the character set to a single one.\nPlease pick one below:"), _("Aegisub could not narrow down the character set to a single one.\nPlease pick one below:"),
_("Choose character set"), _("Choose character set"),
choices); choices);
if (choice == -1) throw agi::UserCancelException("Cancelled encoding selection"); if (choice == -1) throw agi::UserCancelException("Cancelled encoding selection");
if (list.empty())
return agi::charset::GetEncodingsList<std::vector<std::string>>()[choice];
return list[choice].second; return list[choice].second;
} }