From 4ea378f751c816cc83437e732bbbae21a39e7162 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sat, 24 Aug 2024 00:11:45 +0200 Subject: [PATCH] refactor(ui): Remove manual pilot overwrite functionality This functionality was rarely known. --- .../components/networkdetailscomponent.cpp | 19 ------------- .../components/networkdetailscomponent.h | 3 -- .../components/networkdetailscomponent.ui | 28 ------------------- 3 files changed, 50 deletions(-) diff --git a/src/blackgui/components/networkdetailscomponent.cpp b/src/blackgui/components/networkdetailscomponent.cpp index c2b5f20f7..2856b9bc5 100644 --- a/src/blackgui/components/networkdetailscomponent.cpp +++ b/src/blackgui/components/networkdetailscomponent.cpp @@ -27,8 +27,6 @@ namespace BlackGui::Components connect(ui->comp_VatsimServers, &CServerListSelector::serverChanged, this, &CNetworkDetailsComponent::onSelectedServerChanged); connect(ui->tw_Network, &QTabWidget::currentChanged, this, &CNetworkDetailsComponent::onServerTabWidgetChanged); connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CNetworkDetailsComponent::requestNetworkSettings); - connect(ui->pb_OverrideCredentialsVatsim, &QPushButton::clicked, this, &CNetworkDetailsComponent::onOverrideCredentialsToPilot); - connect(ui->pb_OverrideCredentialsOtherServers, &QPushButton::clicked, this, &CNetworkDetailsComponent::onOverrideCredentialsToPilot); connect(&m_networkSetup, &CNetworkSetup::setupChanged, this, &CNetworkDetailsComponent::reloadOtherServersSetup, Qt::QueuedConnection); // web service data @@ -81,23 +79,6 @@ namespace BlackGui::Components ui->wi_VatsimButtons->setVisible(visible); } - void CNetworkDetailsComponent::onOverrideCredentialsToPilot() - { - CServer server; - const QObject *s = QObject::sender(); - if (s == ui->pb_OverrideCredentialsOtherServers) - { - server = this->getCurrentOtherServer(); - } - else if (s == ui->pb_OverrideCredentialsVatsim) - { - // the VATSIM server selected has no valid user credentials - server = m_networkSetup.getLastVatsimServer(); - } - else { return; } - emit this->overridePilot(server.getUser()); - } - void CNetworkDetailsComponent::onServerTabWidgetChanged(int index) { Q_UNUSED(index) diff --git a/src/blackgui/components/networkdetailscomponent.h b/src/blackgui/components/networkdetailscomponent.h index 0e16f3945..715c329f1 100644 --- a/src/blackgui/components/networkdetailscomponent.h +++ b/src/blackgui/components/networkdetailscomponent.h @@ -90,9 +90,6 @@ namespace BlackGui::Components //! Set the server buttons visible void setServerButtonsVisible(bool visible); - //! Override credentials - void onOverrideCredentialsToPilot(); - //! VATSIM data file was loaded void onWebServiceDataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number, const QUrl &url); diff --git a/src/blackgui/components/networkdetailscomponent.ui b/src/blackgui/components/networkdetailscomponent.ui index 9594a6e25..e97aa03ab 100644 --- a/src/blackgui/components/networkdetailscomponent.ui +++ b/src/blackgui/components/networkdetailscomponent.ui @@ -103,22 +103,6 @@ - - - - - 0 - 0 - - - - copy credentials to pilot section - - - override pilot - - - @@ -196,16 +180,6 @@ - - - - copy credentials to pilot section - - - override pilot - - - @@ -295,12 +269,10 @@ tw_Network comp_VatsimServers - pb_OverrideCredentialsVatsim le_PartnerCallsign comp_OtherServers pb_RefreshOtherServers pb_OtherServersGotoSettings - pb_OverrideCredentialsOtherServers