mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 12:45:33 +00:00
Code Issues Releases Wiki Activity

Settings tab is fully functional now

Browse source
This commit is contained in:
pvdk 2014-04-16 18:34:24 +02:00
parent a2c129f655
commit f8bb797b8a
5 changed files with 104 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/launcher/datafilespage.cpp
View file

@ -42,7 +42,7 @@ void Launcher::DataFilesPage::loadSettings()
QString profileName = ui.profilesComboBox->currentText();
QStringList files = mLauncherSettings.values(QString("Profiles/") + profileName, Qt::MatchExactly);
QStringList files = mLauncherSettings.values(QString("Profiles/") + profileName + QString("/content"), Qt::MatchExactly);
QStringList filepaths;
@ -75,7 +75,7 @@ void Launcher::DataFilesPage::saveSettings(const QString &profile)
mLauncherSettings.setValue(QString("Profiles/currentprofile"), ui.profilesComboBox->currentText());
foreach(const ContentSelectorModel::EsmFile *item, items) {
mLauncherSettings.setMultiValue(QString("Profiles/") + profileName, item->fileName());
mLauncherSettings.setMultiValue(QString("Profiles/") + profileName + QString("/content"), item->fileName());
mGameSettings.setMultiValue(QString("content"), item->fileName());
}
@ -192,21 +192,21 @@ void Launcher::DataFilesPage::setupDataFiles()
if (!mDataLocal.isEmpty())
mSelector->addFiles(mDataLocal);
QStringList profiles;
QStringList profiles = mLauncherSettings.subKeys(QString("Profiles/"));
QString currentProfile = mLauncherSettings.getSettings().value("Profiles/currentprofile");
foreach (QString key, mLauncherSettings.getSettings().keys())
{
if (key.contains("Profiles/"))
{
QString profile = key.mid (9);
if (profile != "currentprofile")
{
if (!profiles.contains(profile))
profiles << profile;
}
}
}
// foreach (QString key, mLauncherSettings.getSettings().keys())
// {
// if (key.contains("Profiles/"))
// {
// QString profile = key.mid (9);
// if (profile != "currentprofile")
// {
// if (!profiles.contains(profile))
// profiles << profile;
// }
// }
// }
foreach (const QString &item, profiles)
addProfile (item, false);

107
apps/launcher/settingspage.cpp
View file

@ -1,7 +1,9 @@
#include "settingspage.hpp"
#include <QFileDialog>
#include <QMessageBox>
#include <QDebug>
#include <QDir>
#include <components/config/gamesettings.hpp>
#include <components/config/launchersettings.hpp>
@ -20,13 +22,13 @@ Launcher::SettingsPage::SettingsPage(Config::GameSettings &gameSettings,
setupUi(this);
QStringList languages;
languages << "English"
<< "French"
<< "German"
<< "Italian"
<< "Polish"
<< "Russian"
<< "Spanish";
languages << QLatin1String("English")
<< QLatin1String("French")
<< QLatin1String("German")
<< QLatin1String("Italian")
<< QLatin1String("Polish")
<< QLatin1String("Russian")
<< QLatin1String("Spanish");
languageComboBox->addItems(languages);
@ -50,22 +52,31 @@ Launcher::SettingsPage::SettingsPage(Config::GameSettings &gameSettings,
connect(mProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
this, SLOT(updateOkButton(QString)));
// // Detect Morrowind configuration files
// foreach (const QString &path, mGameSettings.getDataDirs()) {
// QDir dir(path);
// dir.setPath(dir.canonicalPath()); // Resolve symlinks
// Detect Morrowind configuration files
QStringList iniPaths;
// if (dir.exists(QString("Morrowind.ini")))
// iniPaths.append(dir.absoluteFilePath(QString("Morrowind.ini")));
// else
// {
// if (!dir.cdUp())
// continue; // Cannot move from Data Files
foreach (const QString &path, mGameSettings.getDataDirs()) {
QDir dir(path);
dir.setPath(dir.canonicalPath()); // Resolve symlinks
// if (dir.exists(QString("Morrowind.ini")))
// iniPaths.append(dir.absoluteFilePath(QString("Morrowind.ini")));
// }
// }
if (dir.exists(QString("Morrowind.ini")))
iniPaths.append(dir.absoluteFilePath(QString("Morrowind.ini")));
else
{
if (!dir.cdUp())
continue; // Cannot move from Data Files
if (dir.exists(QString("Morrowind.ini")))
iniPaths.append(dir.absoluteFilePath(QString("Morrowind.ini")));
}
}
if (!iniPaths.isEmpty()) {
settingsComboBox->addItems(iniPaths);
importerButton->setEnabled(true);
} else {
importerButton->setEnabled(false);
}
}
void Launcher::SettingsPage::on_wizardButton_clicked()
@ -80,6 +91,32 @@ void Launcher::SettingsPage::on_importerButton_clicked()
return;
}
void Launcher::SettingsPage::on_browseButton_clicked()
{
QString iniFile = QFileDialog::getOpenFileName(
this,
QObject::tr("Select configuration file"),
QDir::currentPath(),
QString(tr("Morrowind configuration file (*.ini)")));
if (iniFile.isEmpty())
return;
QFileInfo info(iniFile);
if (!info.exists() || !info.isReadable())
return;
const QString path(QDir::toNativeSeparators(info.absoluteFilePath()));
if (settingsComboBox->findText(path) == -1) {
settingsComboBox->addItem(path);
settingsComboBox->setCurrentIndex(settingsComboBox->findText(path));
importerButton->setEnabled(true);
}
}
void Launcher::SettingsPage::wizardStarted()
{
qDebug() << "wizard started!";
@ -109,18 +146,27 @@ void Launcher::SettingsPage::importerFinished(int exitCode, QProcess::ExitStatus
if (exitCode != 0 || exitStatus == QProcess::CrashExit)
return;
mMain->writeSettings();
mMain->reloadSettings();
// Import selected data files from openmw.cfg
if (addonsCheckBox->isChecked())
{
if (mProfileDialog->exec() == QDialog::Accepted)
{
const QString profile(mProfileDialog->lineEdit()->text());
const QStringList files(mGameSettings.values(QLatin1String("content")));
// Doesn't quite work right now
mLauncherSettings.setValue(QLatin1String("Profiles/currentprofile"), profile);
if (addonsCheckBox->isChecked()) {
foreach (const QString &file, files) {
mLauncherSettings.setMultiValue(QLatin1String("Profiles/") + profile + QLatin1String("/content"), file);
}
if (mProfileDialog->exec() == QDialog::Accepted) {
QString profile = mProfileDialog->lineEdit()->text();
qDebug() << profile;
mGameSettings.remove(QLatin1String("content"));
}
}
mMain->writeSettings();
mMain->reloadSettings();
importerButton->setEnabled(true);
}
@ -132,8 +178,9 @@ void Launcher::SettingsPage::updateOkButton(const QString &text)
return;
}
const QStringList profiles(mLauncherSettings.subKeys(QString("Profiles/")));
// (profilesComboBox->findText(text) == -1)
// ? mNewProfileDialog->setOkButtonEnabled(true)
// : mNewProfileDialog->setOkButtonEnabled(false);
(profiles.contains(text))
? mProfileDialog->setOkButtonEnabled(false)
: mProfileDialog->setOkButtonEnabled(true);
}

1
apps/launcher/settingspage.hpp
View file

@ -31,6 +31,7 @@ namespace Launcher
private slots:
void on_wizardButton_clicked();
void on_importerButton_clicked();
void on_browseButton_clicked();
void wizardStarted();
void wizardFinished(int exitCode, QProcess::ExitStatus exitStatus);

5
apps/wizard/existinginstallationpage.cpp
View file

@ -72,7 +72,7 @@ bool Wizard::ExistingInstallationPage::validatePage()
QString iniFile;
if (msgBox.clickedButton() == browseButton) {
iniFile = QFileDialog::getOpenFileName(
NULL,
this,
QObject::tr("Select configuration file"),
QDir::currentPath(),
QString(tr("Morrowind configuration file (*.ini)")));
@ -100,6 +100,9 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
NULL,
QFileDialog::DontResolveSymlinks);
if (selectedFile.isEmpty())
return;
QFileInfo info(selectedFile);
if (!info.exists())

14
apps/wizard/languageselectionpage.cpp
View file

@ -14,13 +14,13 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(MainWizard *wizard) :
void Wizard::LanguageSelectionPage::initializePage()
{
QStringList languages;
languages << "English"
<< "French"
<< "German"
<< "Italian"
<< "Polish"
<< "Russian"
<< "Spanish";
languages << QLatin1String("English")
<< QLatin1String("French")
<< QLatin1String("German")
<< QLatin1String("Italian")
<< QLatin1String("Polish")
<< QLatin1String("Russian")
<< QLatin1String("Spanish");
languageComboBox->addItems(languages);
}