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

Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Browse source
This commit is contained in:
graffy76 2013-11-03 21:38:10 -06:00
commit 6d439d032f
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/launcher/maindialog.cpp
View file

@ -496,12 +496,12 @@ bool Launcher::MainDialog::setupGameSettings()
QAbstractButton *dirSelectButton = QAbstractButton *dirSelectButton =
msgBox.addButton(QObject::tr("Browse to &Install..."), QMessageBox::ActionRole); msgBox.addButton(QObject::tr("Browse to &Install..."), QMessageBox::ActionRole);
#ifndef WIN32 #ifndef WIN32
QAbstractButton *cdSelectButton = QAbstractButton *cdSelectButton =
msgBox.addButton(QObject::tr("Browse to &CD..."), QMessageBox::ActionRole); msgBox.addButton(QObject::tr("Browse to &CD..."), QMessageBox::ActionRole);
#endif #endif
msgBox.exec(); msgBox.exec();
@ -516,14 +516,14 @@ bool Launcher::MainDialog::setupGameSettings()
#ifndef WIN32 #ifndef WIN32
else if(msgBox.clickedButton() == cdSelectButton) { else if(msgBox.clickedButton() == cdSelectButton) {
UnshieldThread cd; UnshieldThread cd;
{ {
TextSlotMsgBox cdbox; TextSlotMsgBox cdbox;
cdbox.setStandardButtons(QMessageBox::Cancel); cdbox.setStandardButtons(QMessageBox::Cancel);
QObject::connect(&cd,SIGNAL(signalGUI(const QString&)), &cdbox, SLOT(setTextSlot(const QString&))); QObject::connect(&cd,SIGNAL(signalGUI(const QString&)), &cdbox, SLOT(setTextSlot(const QString&)));
QObject::connect(&cd,SIGNAL(close()), &cdbox, SLOT(reject())); QObject::connect(&cd,SIGNAL(close()), &cdbox, SLOT(reject()));
cd.SetMorrowindPath( cd.SetMorrowindPath(
QFileDialog::getOpenFileName( QFileDialog::getOpenFileName(
NULL, NULL,
@ -537,11 +537,11 @@ bool Launcher::MainDialog::setupGameSettings()
QObject::tr("Select where to extract files to"), QObject::tr("Select where to extract files to"),
QDir::currentPath(), QDir::currentPath(),
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toUtf8().constData()); QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toUtf8().constData());
cd.start(); cd.start();
cdbox.exec(); cdbox.exec();
} }
while(expansions(cd)); while(expansions(cd));
selectedFile = QString::fromStdString(cd.GetMWEsmPath()); selectedFile = QString::fromStdString(cd.GetMWEsmPath());
@ -753,11 +753,11 @@ void Launcher::MainDialog::play()
if(!mGameSettings.hasMaster()) { if(!mGameSettings.hasMaster()) {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setWindowTitle(tr("No master file selected")); msgBox.setWindowTitle(tr("No game file selected"));
msgBox.setIcon(QMessageBox::Warning); msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(tr("<br><b>You do not have any master files selected.</b><br><br> \ msgBox.setText(tr("<br><b>You do not have no game file selected.</b><br><br> \
OpenMW will not start without a master file selected.<br>")); OpenMW will not start without a game file selected.<br>"));
msgBox.exec(); msgBox.exec();
return; return;
} }