teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Revert "Remove user preference setting option."

Browse source 
This reverts commit d3b7cf44d3.
This commit is contained in:
scrawl 2015-06-13 23:49:27 +02:00
parent c560f8b8a2
commit b7cd62e4de
3 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/launcher/maindialog.cpp
View file

@ -490,7 +490,16 @@ bool Launcher::MainDialog::writeSettings()
// Game settings
QFile file(userPath + QString("openmw.cfg"));
if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) {
QIODevice::OpenMode mode(0);
bool keepComments = mLauncherSettings.value(QString("Settings/keep-comments"), QString("true"))
== QLatin1String("true");
if (keepComments)
mode = QIODevice::ReadWrite | QIODevice::Text;
else
mode = QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate;
if (!file.open(mode)) {
// File cannot be opened or created
QMessageBox msgBox;
msgBox.setWindowTitle(tr("Error writing OpenMW configuration file"));
@ -503,8 +512,16 @@ bool Launcher::MainDialog::writeSettings()
return false;
}
QTextStream stream(&file);
if (keepComments)
mGameSettings.writeFileWithComments(file);
else
{
stream.setCodec(QTextCodec::codecForName("UTF-8"));
mGameSettings.writeFile(stream);
}
mGameSettings.writeFileWithComments(file);
file.close();
// Graphics settings
@ -523,7 +540,6 @@ bool Launcher::MainDialog::writeSettings()
return false;
}
QTextStream stream(&file);
stream.setDevice(&file);
stream.setCodec(QTextCodec::codecForName("UTF-8"));

8
apps/launcher/settingspage.cpp
View file

@ -260,6 +260,10 @@ void Launcher::SettingsPage::saveSettings()
} else {
mGameSettings.setValue(QLatin1String("encoding"), QLatin1String("win1252"));
}
QString keepComments(saveCommentsCheckBox->isChecked() ? "true" : "false");
mLauncherSettings.setValue(QLatin1String("Settings/keep-comments"), keepComments);
}
bool Launcher::SettingsPage::loadSettings()
@ -271,5 +275,9 @@ bool Launcher::SettingsPage::loadSettings()
if (index != -1)
languageComboBox->setCurrentIndex(index);
QString keepComments(mLauncherSettings.value(QLatin1String("Settings/keep-comments")));
saveCommentsCheckBox->setChecked(keepComments == "true");
return true;
}

10
files/ui/settingspage.ui
View file

@ -40,6 +40,16 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="saveCommentsCheckBox">
<property name="text">
<string>Keep comments in openmw.cfg</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>