rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added more status details #4537

This commit is contained in:
XinyuHou 2015-04-17 16:33:43 +01:00
parent 586a893201
commit 365d16c94b
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/src/PluginManager.cpp
View File

@ -156,6 +156,7 @@ void PluginManager::saveOpenSslSetup()
// openssl installer no longer needed // openssl installer no longer needed
QFile::remove(filename); QFile::remove(filename);
emit info(tr("SSL tools ready"));
#endif #endif
emit openSslBinaryReady(); emit openSslBinaryReady();
@ -304,6 +305,8 @@ void PluginManager::downloadOpenSslSetup()
SLOT(saveOpenSslSetup())); SLOT(saveOpenSslSetup()));
m_DataDownloader.download(url); m_DataDownloader.download(url);
emit info(tr("Downloading SSL tools..."));
} }
void PluginManager::doGenerateCertificate() void PluginManager::doGenerateCertificate()
@ -331,8 +334,8 @@ void PluginManager::doGenerateCertificate()
// subject information // subject information
arguments.append("-subj"); arguments.append("-subj");
QString info(kCertificateSubjectInfo); QString subInfo(kCertificateSubjectInfo);
arguments.append(info); arguments.append(subInfo);
// private key // private key
arguments.append("-newkey"); arguments.append("-newkey");
@ -359,6 +362,8 @@ void PluginManager::doGenerateCertificate()
return; return;
} }
emit info(tr("SSL certificate generated"));
// generate fingerprint // generate fingerprint
arguments.clear(); arguments.clear();
arguments.append("x509"); arguments.append("x509");
@ -395,6 +400,7 @@ void PluginManager::doGenerateCertificate()
QTextStream out(&file); QTextStream out(&file);
out << fingerprint << "\n"; out << fingerprint << "\n";
file.close(); file.close();
emit info(tr("SSL fingerprint generated"));
} }
} }

1
src/gui/src/PluginManager.h
View File

@ -58,6 +58,7 @@ private:
signals: signals:
void error(QString e); void error(QString e);
void info(QString i);
void downloadNext(); void downloadNext();
void downloadFinished(); void downloadFinished();
void openSslBinaryReady(); void openSslBinaryReady();

5
src/gui/src/PluginWizardPage.cpp
View File

@ -135,6 +135,11 @@ void PluginWizardPage::downloadPlugins()
this, this,
SLOT(showError(QString))); SLOT(showError(QString)));
connect(m_pPluginManager,
SIGNAL(info(QString)),
this,
SLOT(updateStatus(QString)));
connect(m_pPluginManager, connect(m_pPluginManager,
SIGNAL(downloadNext()), SIGNAL(downloadNext()),
this, this,

2
src/gui/src/PluginWizardPage.h
View File

@ -46,13 +46,13 @@ protected:
protected slots: protected slots:
void showError(QString error); void showError(QString error);
void updateStatus(QString info);
void queryPluginDone(); void queryPluginDone();
void updateDownloadStatus(); void updateDownloadStatus();
void finished(); void finished();
void generateCertificate(); void generateCertificate();
private: private:
void updateStatus(QString info);
void downloadPlugins(); void downloadPlugins();
void showFinished(); void showFinished();