mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 15:06:43 +00:00
Code Issues Releases Wiki Activity

Removed error code for missing opencs.ini files.

Browse source
This commit is contained in:
graffy76 2014-05-06 19:22:45 -05:00
parent 042670fc73
commit 8fb96e1be3
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/opencs/model/settings/usersettings.cpp
View file

@ -318,7 +318,7 @@ CSMSettings::UserSettings::~UserSettings()
{ {
mUserSettingsInstance = 0; mUserSettingsInstance = 0;
} }
/*
void CSMSettings::UserSettings::displayFileErrorMessage void CSMSettings::UserSettings::displayFileErrorMessage
(const QString &userpath, (const QString &userpath,
const QString &globalpath, const QString &globalpath,
@ -343,7 +343,7 @@ void CSMSettings::UserSettings::displayFileErrorMessage
msgBox.setText (mReadWriteMessage + message); msgBox.setText (mReadWriteMessage + message);
msgBox.exec(); msgBox.exec();
} }
*/
void CSMSettings::UserSettings::loadSettings (const QString &fileName) void CSMSettings::UserSettings::loadSettings (const QString &fileName)
{ {
QString userFilePath = QString::fromUtf8 QString userFilePath = QString::fromUtf8
@ -366,14 +366,14 @@ void CSMSettings::UserSettings::loadSettings (const QString &fileName)
isSystem = QFile (localFilePath + fileName).exists(); isSystem = QFile (localFilePath + fileName).exists();
otherFilePath = localFilePath; otherFilePath = localFilePath;
} }
/*
//error condition - notify and return //error condition - notify and return
if (!isUser || !isSystem) if (!isUser || !isSystem)
{ {
displayFileErrorMessage (userFilePath, globalFilePath, localFilePath); displayFileErrorMessage (userFilePath, globalFilePath, localFilePath);
return; return;
} }
*/
QSettings::setPath QSettings::setPath
(QSettings::IniFormat, QSettings::UserScope, userFilePath); (QSettings::IniFormat, QSettings::UserScope, userFilePath);

3
apps/opencs/model/settings/usersettings.hpp
View file

@ -73,9 +73,6 @@ namespace CSMSettings {
void addDefinitions(); void addDefinitions();
void buildSettingModelDefaults(); void buildSettingModelDefaults();
void displayFileErrorMessage(const QString &userpath,
const QString &globalpath,
const QString &localpath) const;
///add a new setting to the model and return it ///add a new setting to the model and return it
Setting *createSetting (CSMSettings::SettingType typ, Setting *createSetting (CSMSettings::SettingType typ,

1
apps/opencs/view/settings/dialog.cpp
View file

@ -123,6 +123,7 @@ void CSVSettings::Dialog::show()
{ {
if (pages().isEmpty()) if (pages().isEmpty())
buildPages(); buildPages();
QPoint screenCenter = QApplication::desktop()->screenGeometry().center(); QPoint screenCenter = QApplication::desktop()->screenGeometry().center();
move (screenCenter - geometry().center()); move (screenCenter - geometry().center());