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

Some small launcher fixes

Browse source
This commit is contained in:
Alexander "Ace" Olofsson 2011-08-02 19:21:27 +02:00
parent df270d54da
commit 141e779e81
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/launcher/datafilespage.cpp
View file

@ -164,6 +164,7 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict)
ESMReader fileReader; ESMReader fileReader;
QStringList availableMasters; // Will contain all found masters QStringList availableMasters; // Will contain all found masters
fileReader.setEncoding("win1252");
fileReader.open(iter->second.string()); fileReader.open(iter->second.string());
// First we fill the availableMasters and the mMastersWidget // First we fill the availableMasters and the mMastersWidget

7
apps/launcher/graphicspage.cpp
View file

@ -258,7 +258,7 @@ void GraphicsPage::setupOgre()
// Direct3D // Direct3D
if (mDirect3DRenderSystem) { if (mDirect3DRenderSystem) {
mD3DRenderDeviceComboBox->addItems(getAvailableOptions(QString("Rendering Device"), mDirect3DRenderSystem)); mD3DRenderDeviceComboBox->addItems(getAvailableOptions(QString("Rendering Device"), mDirect3DRenderSystem));
mD3DAntiAliasingComboBox->addItems(getAvailableOptions(QString("Anti aliasing"), mDirect3DRenderSystem)); mD3DAntiAliasingComboBox->addItems(getAvailableOptions(QString("FSAA"), mDirect3DRenderSystem));
mD3DFloatingPointComboBox->addItems(getAvailableOptions(QString("Floating-point mode"), mDirect3DRenderSystem)); mD3DFloatingPointComboBox->addItems(getAvailableOptions(QString("Floating-point mode"), mDirect3DRenderSystem));
QStringList videoModes = getAvailableOptions(QString("Video Mode"), mDirect3DRenderSystem); QStringList videoModes = getAvailableOptions(QString("Video Mode"), mDirect3DRenderSystem);
@ -311,7 +311,7 @@ void GraphicsPage::readConfig()
mD3DRenderDeviceComboBox->setCurrentIndex(index); mD3DRenderDeviceComboBox->setCurrentIndex(index);
} }
index = mD3DAntiAliasingComboBox->findText(getConfigValue("Anti aliasing", mDirect3DRenderSystem)); index = mD3DAntiAliasingComboBox->findText(getConfigValue("FSAA", mDirect3DRenderSystem));
if ( index != -1) { if ( index != -1) {
mD3DAntiAliasingComboBox->setCurrentIndex(index); mD3DAntiAliasingComboBox->setCurrentIndex(index);
} }
@ -395,7 +395,7 @@ void GraphicsPage::writeConfig()
out << direct3DName << endl; out << direct3DName << endl;
out << "Rendering Device=" << mD3DRenderDeviceComboBox->currentText() << endl; out << "Rendering Device=" << mD3DRenderDeviceComboBox->currentText() << endl;
out << "Anti aliasing=" << mD3DAntiAliasingComboBox->currentText() << endl; out << "FSAA=" << mD3DAntiAliasingComboBox->currentText() << endl;
out << "Floating-point mode=" << mD3DFloatingPointComboBox->currentText() << endl; out << "Floating-point mode=" << mD3DFloatingPointComboBox->currentText() << endl;
out << "Video Mode=" << mD3DResolutionComboBox->currentText() << endl; out << "Video Mode=" << mD3DResolutionComboBox->currentText() << endl;
@ -470,4 +470,5 @@ void GraphicsPage::rendererChanged(const QString &renderer)
mDisplayStackedWidget->setCurrentIndex(0); mDisplayStackedWidget->setCurrentIndex(0);
} }
mSelectedRenderSystem = mOgre->getRenderSystemByName(renderer.toStdString());
} }