AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-11 21:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added support for different encodings

Browse Source
This commit is contained in:
Pieter van der Kloet 2012-10-30 11:26:48 +01:00
parent 433773e0ea
commit 64c348c39e
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/launcher/datafilespage.cpp
View File

@ -418,6 +418,13 @@ bool DataFilesPage::setupDataFiles()
return false; return false;
} }
// Set the charset for reading the esm/esp files
QString encoding = QString::fromStdString(variables["encoding"].as<std::string>());
if (!encoding.isEmpty() && encoding != QLatin1String("win1252")) {
mMastersModel->setEncoding(encoding);
mPluginsModel->setEncoding(encoding);
}
// Add the paths to the respective models // Add the paths to the respective models
for (Files::PathContainer::iterator it = mDataDirs.begin(); it != mDataDirs.end(); ++it) { for (Files::PathContainer::iterator it = mDataDirs.begin(); it != mDataDirs.end(); ++it) {
QString path = QString::fromStdString(it->string()); QString path = QString::fromStdString(it->string());

10
apps/launcher/model/datafilesmodel.cpp
View File

@ -13,12 +13,18 @@
DataFilesModel::DataFilesModel(QObject *parent) : DataFilesModel::DataFilesModel(QObject *parent) :
QAbstractTableModel(parent) QAbstractTableModel(parent)
{ {
mEncoding = QString("win1252");
} }
DataFilesModel::~DataFilesModel() DataFilesModel::~DataFilesModel()
{ {
} }
void DataFilesModel::setEncoding(const QString &encoding)
{
mEncoding = encoding;
}
void DataFilesModel::setCheckState(const QModelIndex &index, Qt::CheckState state) void DataFilesModel::setCheckState(const QModelIndex &index, Qt::CheckState state)
{ {
setData(index, state, Qt::CheckStateRole); setData(index, state, Qt::CheckStateRole);
@ -268,7 +274,7 @@ void DataFilesModel::addMasters(const QString &path)
try { try {
ESM::ESMReader fileReader; ESM::ESMReader fileReader;
fileReader.setEncoding(std::string("win1252")); fileReader.setEncoding(mEncoding.toStdString());
fileReader.open(dir.absoluteFilePath(path).toStdString()); fileReader.open(dir.absoluteFilePath(path).toStdString());
ESM::ESMReader::MasterList mlist = fileReader.getMasters(); ESM::ESMReader::MasterList mlist = fileReader.getMasters();
@ -328,7 +334,7 @@ void DataFilesModel::addPlugins(const QString &path)
try { try {
ESM::ESMReader fileReader; ESM::ESMReader fileReader;
fileReader.setEncoding(std::string("win1252")); fileReader.setEncoding(mEncoding.toStdString());
fileReader.open(dir.absoluteFilePath(path).toStdString()); fileReader.open(dir.absoluteFilePath(path).toStdString());
ESM::ESMReader::MasterList mlist = fileReader.getMasters(); ESM::ESMReader::MasterList mlist = fileReader.getMasters();

4
apps/launcher/model/datafilesmodel.hpp
View File

@ -32,6 +32,8 @@ public:
inline QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const inline QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const
{ return QAbstractTableModel::index(row, column, parent); } { return QAbstractTableModel::index(row, column, parent); }
void setEncoding(const QString &encoding);
void addFile(EsmFile *file); void addFile(EsmFile *file);
void addMasters(const QString &path); void addMasters(const QString &path);
@ -62,6 +64,8 @@ private:
QHash<QString, QStringList> mDependencies; QHash<QString, QStringList> mDependencies;
QHash<QString, Qt::CheckState> mCheckStates; QHash<QString, Qt::CheckState> mCheckStates;
QString mEncoding;
}; };
#endif // DATAFILESMODEL_HPP #endif // DATAFILESMODEL_HPP