Ref T219, renaming buttons/function to "override"

This commit is contained in:
Klaus Basan
2018-01-17 01:17:06 +01:00
parent 18c7d7cf59
commit 3375ca1b25
3 changed files with 8 additions and 8 deletions

View File

@@ -154,8 +154,8 @@ namespace BlackGui
} }
ui->comp_OtherServers->setServers(otherServers); ui->comp_OtherServers->setServers(otherServers);
connect(ui->pb_copyCredentialsVatsim, &QPushButton::clicked, this, &CLoginComponent::copyCredentialsToPilot); connect(ui->pb_OverrideCredentialsVatsim, &QPushButton::clicked, this, &CLoginComponent::overrideCredentialsToPilot);
connect(ui->pb_CopyCredentialsOtherServers, &QPushButton::clicked, this, &CLoginComponent::copyCredentialsToPilot); connect(ui->pb_OverrideCredentialsOtherServers, &QPushButton::clicked, this, &CLoginComponent::overrideCredentialsToPilot);
this->setUiLoginState(false); this->setUiLoginState(false);
} }
@@ -348,15 +348,15 @@ namespace BlackGui
} }
} }
void CLoginComponent::copyCredentialsToPilot() void CLoginComponent::overrideCredentialsToPilot()
{ {
const QObject *s = QObject::sender(); const QObject *s = QObject::sender();
CServer server; CServer server;
if (s == ui->pb_CopyCredentialsOtherServers) if (s == ui->pb_OverrideCredentialsOtherServers)
{ {
server = this->getCurrentOtherServer(); server = this->getCurrentOtherServer();
} }
else if (s == ui->pb_copyCredentialsVatsim) else if (s == ui->pb_OverrideCredentialsVatsim)
{ {
// the VATSIM server selected has no valid user credentials // the VATSIM server selected has no valid user credentials
server = m_lastVatsimServer.get(); server = m_lastVatsimServer.get();

View File

@@ -193,7 +193,7 @@ namespace BlackGui
void loadRememberedUserData(); void loadRememberedUserData();
//! Copy credentials to pilot //! Copy credentials to pilot
void copyCredentialsToPilot(); void overrideCredentialsToPilot();
//! Server changed //! Server changed
void onSelectedServerChanged(const BlackMisc::Network::CServer &server); void onSelectedServerChanged(const BlackMisc::Network::CServer &server);

View File

@@ -114,7 +114,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_copyCredentialsVatsim"> <widget class="QPushButton" name="pb_OverrideCredentialsVatsim">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -185,7 +185,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_CopyCredentialsOtherServers"> <widget class="QPushButton" name="pb_OverrideCredentialsOtherServers">
<property name="toolTip"> <property name="toolTip">
<string>copy credentials to pilot section</string> <string>copy credentials to pilot section</string>
</property> </property>