flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 10:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some smaller fixes in prephase of T285

Browse Source
This commit is contained in:
Klaus Basan
2018-06-25 01:54:07 +02:00
parent 7bb6d84e93
commit 40582fcf59
6 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/components/dblogincomponent.cpp
View File

@@ -63,10 +63,10 @@ namespace BlackGui
ui->lbl_DatabaseName->setTextInteractionFlags(Qt::TextBrowserInteraction);
ui->lbl_DatabaseName->setOpenExternalLinks(true);
connect(ui->pb_Login, &QPushButton::clicked, this, &CDbLoginComponent::ps_onLoginClicked);
connect(ui->pb_Logoff, &QPushButton::clicked, this, &CDbLoginComponent::ps_onLogoffClicked);
connect(&m_loginService, &CDatabaseAuthenticationService::userAuthenticationFinished, this, &CDbLoginComponent::ps_authenticationFinished);
connect(ui->le_Password, &QLineEdit::returnPressed, this, &CDbLoginComponent::ps_onLoginClicked);
connect(ui->pb_Login, &QPushButton::clicked, this, &CDbLoginComponent::onLoginClicked);
connect(ui->pb_Logoff, &QPushButton::clicked, this, &CDbLoginComponent::onLogoffClicked);
connect(&m_loginService, &CDatabaseAuthenticationService::userAuthenticationFinished, this, &CDbLoginComponent::onAuthenticationFinished);
connect(ui->le_Password, &QLineEdit::returnPressed, this, &CDbLoginComponent::onLoginClicked);
// init GUI
this->setUserInfo(this->getDbUser());
@@ -77,12 +77,12 @@ namespace BlackGui
CAuthenticatedUser CDbLoginComponent::getDbUser() const
{
return this->m_loginService.getDbUser();
return m_loginService.getDbUser();
}
bool CDbLoginComponent::isUserAuthenticated() const
{
return this->m_loginService.isUserAuthenticated();
return m_loginService.isUserAuthenticated();
}
void CDbLoginComponent::displayOverlayMessages(const CStatusMessageList &msgs)
@@ -94,7 +94,7 @@ namespace BlackGui
mf->showOverlayMessages(msgs);
}
void CDbLoginComponent::ps_onLoginClicked()
void CDbLoginComponent::onLoginClicked()
{
const QString un(ui->le_Username->text().trimmed());
const QString pw(ui->le_Password->text().trimmed());
@@ -113,13 +113,13 @@ namespace BlackGui
this->showLoading(5000);
}
void CDbLoginComponent::ps_onLogoffClicked()
void CDbLoginComponent::onLogoffClicked()
{
this->m_loginService.logoff();
m_loginService.logoff();
this->setModeLogin(true);
}
void CDbLoginComponent::ps_authenticationFinished(const CAuthenticatedUser &user, const CStatusMessageList &statusMsgs)
void CDbLoginComponent::onAuthenticationFinished(const CAuthenticatedUser &user, const CStatusMessageList &statusMsgs)
{
this->hideLoading();
this->setUserInfo(user);

7
src/blackgui/components/dblogincomponent.h
View File

@@ -62,15 +62,14 @@ namespace BlackGui
//! Set the user fields
void setUserInfo(const BlackMisc::Network::CAuthenticatedUser &user);
private slots:
//! Login
void ps_onLoginClicked();
void onLoginClicked();
//! Logoff
void ps_onLogoffClicked();
void onLogoffClicked();
//! User authentication completed
void ps_authenticationFinished(const BlackMisc::Network::CAuthenticatedUser &user, const BlackMisc::CStatusMessageList &statusMsgs);
void onAuthenticationFinished(const BlackMisc::Network::CAuthenticatedUser &user, const BlackMisc::CStatusMessageList &statusMsgs);
};
} // ns
} // ns