|
|
@ -21,36 +21,35 @@ Wizard::InstallationPage::InstallationPage(QWidget *parent, Config::GameSettings
|
|
|
|
mUnshield = std::make_unique<UnshieldWorker>(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
|
|
|
|
mUnshield = std::make_unique<UnshieldWorker>(mGameSettings.value("morrowind-bsa-filesize").toLongLong());
|
|
|
|
mUnshield->moveToThread(mThread.get());
|
|
|
|
mUnshield->moveToThread(mThread.get());
|
|
|
|
|
|
|
|
|
|
|
|
connect(mThread.get(), SIGNAL(started()),
|
|
|
|
connect(mThread.get(), &QThread::started,
|
|
|
|
mUnshield.get(), SLOT(extract()));
|
|
|
|
mUnshield.get(), &UnshieldWorker::extract);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(finished()),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::finished,
|
|
|
|
mThread.get(), SLOT(quit()));
|
|
|
|
mThread.get(), &QThread::quit);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(finished()),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::finished,
|
|
|
|
this, SLOT(installationFinished()), Qt::QueuedConnection);
|
|
|
|
this, &InstallationPage::installationFinished, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(error(QString, QString)),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::error,
|
|
|
|
this, SLOT(installationError(QString, QString)), Qt::QueuedConnection);
|
|
|
|
this, &InstallationPage::installationError, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(textChanged(QString)),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::textChanged,
|
|
|
|
installProgressLabel, SLOT(setText(QString)), Qt::QueuedConnection);
|
|
|
|
installProgressLabel, &QLabel::setText, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(textChanged(QString)),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::textChanged,
|
|
|
|
logTextEdit, SLOT(appendPlainText(QString)), Qt::QueuedConnection);
|
|
|
|
logTextEdit, &QPlainTextEdit::appendPlainText, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(textChanged(QString)),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::textChanged,
|
|
|
|
mWizard, SLOT(addLogText(QString)), Qt::QueuedConnection);
|
|
|
|
mWizard, &MainWizard::addLogText, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(progressChanged(int)),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::progressChanged,
|
|
|
|
installProgressBar, SLOT(setValue(int)), Qt::QueuedConnection);
|
|
|
|
installProgressBar, &QProgressBar::setValue, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(requestFileDialog(Wizard::Component)),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::requestFileDialog,
|
|
|
|
this, SLOT(showFileDialog(Wizard::Component)), Qt::QueuedConnection);
|
|
|
|
this, &InstallationPage::showFileDialog, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
|
|
|
|
connect(mUnshield.get(), SIGNAL(requestOldVersionDialog()),
|
|
|
|
connect(mUnshield.get(), &UnshieldWorker::requestOldVersionDialog,
|
|
|
|
this, SLOT(showOldVersionDialog())
|
|
|
|
this, &InstallationPage::showOldVersionDialog, Qt::QueuedConnection);
|
|
|
|
, Qt::QueuedConnection);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Wizard::InstallationPage::~InstallationPage()
|
|
|
|
Wizard::InstallationPage::~InstallationPage()
|
|
|
|