mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Fixed settings file error message

Browse Source 
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
This commit is contained in:
graffy76 2013-06-25 19:32:36 -05:00
parent 8f4fd8202e
commit f0f895ad10
2 changed files with 69 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
apps/opencs/model/settings/usersettings.cpp
View File

@ -61,57 +61,49 @@ QTextStream *CSMSettings::UserSettings::openFileStream (const QString &filePath,
else
openFlags = QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate;
if (!(file->open(openFlags)))
{
// File cannot be opened or created
QMessageBox msgBox;
msgBox.setWindowTitle(QObject::tr("OpenCS configuration file I/O error"));
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
QString fileMessage = QObject::tr("<br> File: %0").arg(file->fileName());
if (!isReadOnly)
msgBox.setText (mReadWriteMessage + fileMessage);
else
msgBox.setText (mReadOnlyMessage + fileMessage);
msgBox.exec();
delete file;
file = 0;
}
QTextStream *stream = 0;
if (file)
if (file->open(openFlags))
{
stream = new QTextStream(file);
stream->setCodec(QTextCodec::codecForName("UTF-8"));
}
if (!stream)
{
delete file;
file = 0;
}
return stream;
}
bool CSMSettings::UserSettings::writeSettings(QMap<QString, CSMSettings::SettingList *> &settings)
{
QTextStream *stream = openFileStream(mPaths.back());
QTextStream *stream = openFileStream(mUserFilePath);
QList<QString> keyList = settings.keys();
if (!stream)
displayFileErrorMessage(mReadWriteMessage, false);
foreach (QString key, keyList)
if (stream)
{
SettingList *sectionSettings = settings[key];
QList<QString> keyList = settings.keys();
*stream << "[" << key << "]" << '\n';
foreach (QString key, keyList)
{
SettingList *sectionSettings = settings[key];
foreach (SettingContainer *item, *sectionSettings)
*stream << item->objectName() << " = " << item->getValue() << '\n';
*stream << "[" << key << "]" << '\n';
foreach (SettingContainer *item, *sectionSettings)
*stream << item->objectName() << " = " << item->getValue() << '\n';
}
stream->device()->close();
}
stream->device()->close();
return true;
return (stream);
}
@ -120,10 +112,10 @@ const CSMSettings::SectionMap &CSMSettings::UserSettings::getSettings() const
return mSectionSettings;
}
void CSMSettings::UserSettings::loadFromFile(const QString &filePath)
bool CSMSettings::UserSettings::loadFromFile(const QString &filePath)
{
if (filePath.isEmpty())
return;
return false;
mSectionSettings.clear();
@ -181,22 +173,37 @@ void CSMSettings::UserSettings::loadFromFile(const QString &filePath)
stream->device()->close();
}
return;
return (stream);
}
void CSMSettings::UserSettings::loadSettings (const QString &fileName)
{
if (mPaths.count() == 0)
{
mPaths.append(QString::fromStdString(mCfgMgr.getGlobalPath().string()) + fileName);
mPaths.append(QString::fromStdString(mCfgMgr.getLocalPath().string()) + fileName);
mPaths.append(QString::fromStdString(mCfgMgr.getUserPath().string()) + fileName);
}
bool globalOk;
bool localOk;
foreach (const QString &path, mPaths)
//global
QString globalFilePath = QString::fromStdString(mCfgMgr.getGlobalPath().string()) + fileName;
globalOk = loadFromFile(globalFilePath);
//local
QString localFilePath = QString::fromStdString(mCfgMgr.getLocalPath().string()) + fileName;
localOk = loadFromFile(localFilePath);
//user
mUserFilePath = QString::fromStdString(mCfgMgr.getUserPath().string()) + fileName;
loadFromFile(mUserFilePath);
if (!(localOk || globalOk))
{
qDebug() << "Loading config file:" << qPrintable(path);
loadFromFile(path);
QString message = QObject::tr("<br><b>Could not open user settings files for reading</b><br><br> \
Global and local settings files could not be read.\
You may have incorrect file permissions or the OpenCS installation may be corrupted.<br>");
message += QObject::tr("<br>Global filepath: ") + globalFilePath;
message += QObject::tr("<br>Local filepath: ") + localFilePath;
displayFileErrorMessage ( message, true);
}
}
@ -245,3 +252,18 @@ CSMSettings::UserSettings& CSMSettings::UserSettings::instance()
return *mUserSettingsInstance;
}
void CSMSettings::UserSettings::displayFileErrorMessage(const QString &message, bool isReadOnly)
{
// File cannot be opened or created
QMessageBox msgBox;
msgBox.setWindowTitle(QObject::tr("OpenCS configuration file I/O error"));
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
if (!isReadOnly)
msgBox.setText (mReadWriteMessage + message);
else
msgBox.setText (message);
msgBox.exec();
}

6
apps/opencs/model/settings/usersettings.hpp
View File

@ -28,7 +28,7 @@ namespace CSMSettings {
SectionMap mSectionSettings;
static UserSettings *mUserSettingsInstance;
QStringList mPaths;
QString mUserFilePath;
Files::ConfigurationManager mCfgMgr;
QString mReadOnlyMessage;
QString mReadWriteMessage;
@ -70,7 +70,9 @@ namespace CSMSettings {
QTextStream *openFileStream (const QString &filePath, bool isReadOnly = false) const;
/// Parses a setting file specified in filePath from the provided text stream.
void loadFromFile (const QString &filePath = "");
bool loadFromFile (const QString &filePath = "");
void displayFileErrorMessage(const QString &message, bool isReadOnly);
signals: