mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2673 from Capostrophic/wizard

Browse source 
Make Wizard less shy (bug #4493)
This commit is contained in:
Bret Curtis 2020-02-25 21:34:49 +01:00 committed by GitHub
commit 04f2b320b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -37,6 +37,7 @@
Bug #4411: Reloading a saved game while falling prevents damage in some cases Bug #4411: Reloading a saved game while falling prevents damage in some cases
Bug #4449: Value returned by GetWindSpeed is incorrect Bug #4449: Value returned by GetWindSpeed is incorrect
Bug #4456: AiActivate should not be cancelled after target activation Bug #4456: AiActivate should not be cancelled after target activation
Bug #4493: If the setup doesn't find what it is expecting, it fails silently and displays the requester again instead of letting the user know what wasn't found.
Bug #4523: "player->ModCurrentFatigue -0.001" in global script does not cause the running player to fall Bug #4523: "player->ModCurrentFatigue -0.001" in global script does not cause the running player to fall
Bug #4540: Rain delay when exiting water Bug #4540: Rain delay when exiting water
Bug #4594: Actors without AI packages don't use Hello dialogue Bug #4594: Actors without AI packages don't use Hello dialogue

8
apps/wizard/installationpage.cpp
View file

@ -154,6 +154,14 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
name = QLatin1String("Bloodmoon"); name = QLatin1String("Bloodmoon");
break; break;
} }
logTextEdit->appendHtml(tr("<p>Attempting to install component %1.</p>").arg(name));
mWizard->addLogText(tr("Attempting to install component %1.").arg(name));
QMessageBox msgBox;
msgBox.setWindowTitle(tr("%1 Installation").arg(name));
msgBox.setIcon(QMessageBox::Information);
msgBox.setText(QObject::tr("Select a valid %1 installation media.<br><b>Hint</b>: make sure that it contains at least one <b>.cab</b> file.").arg(name));
msgBox.exec();
QString path = QFileDialog::getExistingDirectory(this, QString path = QFileDialog::getExistingDirectory(this,
tr("Select %1 installation media").arg(name), tr("Select %1 installation media").arg(name),

4
apps/wizard/unshield/unshieldworker.cpp
View file

@ -493,7 +493,9 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
} }
if (!found) { if (!found)
{
emit textChanged(tr("Failed to find a valid archive containing %1.bsa! Retrying.").arg(name));
QReadLocker readLock(&mLock); QReadLocker readLock(&mLock);
emit requestFileDialog(component); emit requestFileDialog(component);
mWait.wait(&mLock); mWait.wait(&mLock);