diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp index 38b60833..453fd869 100644 --- a/src/gui/src/PluginManager.cpp +++ b/src/gui/src/PluginManager.cpp @@ -156,6 +156,7 @@ void PluginManager::saveOpenSslSetup() // openssl installer no longer needed QFile::remove(filename); + emit info(tr("SSL tools ready")); #endif emit openSslBinaryReady(); @@ -304,6 +305,8 @@ void PluginManager::downloadOpenSslSetup() SLOT(saveOpenSslSetup())); m_DataDownloader.download(url); + + emit info(tr("Downloading SSL tools...")); } void PluginManager::doGenerateCertificate() @@ -331,8 +334,8 @@ void PluginManager::doGenerateCertificate() // subject information arguments.append("-subj"); - QString info(kCertificateSubjectInfo); - arguments.append(info); + QString subInfo(kCertificateSubjectInfo); + arguments.append(subInfo); // private key arguments.append("-newkey"); @@ -359,6 +362,8 @@ void PluginManager::doGenerateCertificate() return; } + emit info(tr("SSL certificate generated")); + // generate fingerprint arguments.clear(); arguments.append("x509"); @@ -395,6 +400,7 @@ void PluginManager::doGenerateCertificate() QTextStream out(&file); out << fingerprint << "\n"; file.close(); + emit info(tr("SSL fingerprint generated")); } } diff --git a/src/gui/src/PluginManager.h b/src/gui/src/PluginManager.h index 51e58e0a..54cab017 100644 --- a/src/gui/src/PluginManager.h +++ b/src/gui/src/PluginManager.h @@ -58,6 +58,7 @@ private: signals: void error(QString e); + void info(QString i); void downloadNext(); void downloadFinished(); void openSslBinaryReady(); diff --git a/src/gui/src/PluginWizardPage.cpp b/src/gui/src/PluginWizardPage.cpp index 0cc5d782..8c0a4d05 100644 --- a/src/gui/src/PluginWizardPage.cpp +++ b/src/gui/src/PluginWizardPage.cpp @@ -135,6 +135,11 @@ void PluginWizardPage::downloadPlugins() this, SLOT(showError(QString))); + connect(m_pPluginManager, + SIGNAL(info(QString)), + this, + SLOT(updateStatus(QString))); + connect(m_pPluginManager, SIGNAL(downloadNext()), this, diff --git a/src/gui/src/PluginWizardPage.h b/src/gui/src/PluginWizardPage.h index ed224201..0300ebac 100644 --- a/src/gui/src/PluginWizardPage.h +++ b/src/gui/src/PluginWizardPage.h @@ -46,13 +46,13 @@ protected: protected slots: void showError(QString error); + void updateStatus(QString info); void queryPluginDone(); void updateDownloadStatus(); void finished(); void generateCertificate(); private: - void updateStatus(QString info); void downloadPlugins(); void showFinished();