Added more status details #4537
This commit is contained in:
parent
586a893201
commit
365d16c94b
|
@ -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"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -58,6 +58,7 @@ private:
|
|||
|
||||
signals:
|
||||
void error(QString e);
|
||||
void info(QString i);
|
||||
void downloadNext();
|
||||
void downloadFinished();
|
||||
void openSslBinaryReady();
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Loading…
Reference in New Issue