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

Fixed: Spinner doesn't stop when no plugins #4168 

Also refactored duplicate code
This commit is contained in:
Nick Bolton 2015-02-25 08:35:07 +00:00
parent c300b65662
commit 595e403c87
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,9 +64,7 @@ void PluginWizardPage::changeEvent(QEvent *e)
void PluginWizardPage::showError(QString error)
{
updateStatus(error);
stopSpinning();
m_Finished = true;
emit completeChanged();
showFinished();
}
void PluginWizardPage::queryPluginDone()
@ -74,8 +72,7 @@ void PluginWizardPage::queryPluginDone()
QStringList pluginList = m_pWebClient->getPluginList();
if (pluginList.isEmpty()) {
updateStatus(tr("Setup complete."));
m_Finished = true;
emit completeChanged();
showFinished();
}
else {
downloadPlugins();
@ -95,14 +92,11 @@ void PluginWizardPage::updateDownloadStatus()
void PluginWizardPage::finished()
{
updateStatus(tr("Plugins installed successfully."));
stopSpinning();
// ideally this should check if ns plugin is ready
// TODO: we should check if ns plugin exists
m_AppConfig.setCryptoEnabled(true);
m_Finished = true;
emit completeChanged();
updateStatus(tr("Plugins installed successfully."));
showFinished();
}
void PluginWizardPage::generateCertificate()
@ -173,9 +167,11 @@ void PluginWizardPage::downloadPlugins()
Qt::QueuedConnection);
}
void PluginWizardPage::stopSpinning()
void PluginWizardPage::showFinished()
{
m_pLabelSpinning->hide();
m_Finished = true;
emit completeChanged();
}
bool PluginWizardPage::isComplete() const
@ -190,10 +186,7 @@ void PluginWizardPage::initializePage()
if (m_Email.isEmpty() ||
m_Password.isEmpty()) {
updateStatus(tr("Setup complete."));
stopSpinning();
m_Finished = true;
emit completeChanged();
showFinished();
return;
}

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

@ -54,7 +54,7 @@ protected slots:
private:
void updateStatus(QString info);
void downloadPlugins();
void stopSpinning();
void showFinished();
private:
bool m_Finished;