mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-15 01:05:35 +08:00
refactor: Remove advanced login dialog
All functionalities from the advanced dialog are also available somewhere else.
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#include "blackgui/components/logcomponent.h"
|
||||
#include "blackgui/components/dbloaddatadialog.h"
|
||||
#include "blackgui/components/autopublishdialog.h"
|
||||
#include "blackgui/components/logindialog.h"
|
||||
#include "blackgui/components/modelbrowserdialog.h"
|
||||
#include "blackgui/components/settingscomponent.h"
|
||||
#include "blackgui/components/textmessagecomponent.h"
|
||||
@@ -244,22 +243,12 @@ void SwiftGuiStd::loginRequested()
|
||||
{
|
||||
if (!sGui || sGui->isShuttingDown() || !sGui->getIContextNetwork()) { return; }
|
||||
|
||||
const bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
|
||||
if (shift)
|
||||
const bool changed = MainPageLogin != ui->sw_MainMiddle->currentIndex();
|
||||
this->setMainPage(MainPageLogin);
|
||||
if (!changed)
|
||||
{
|
||||
if (!m_loginDialog) { m_loginDialog.reset(new CLoginDialog(this)); }
|
||||
connect(m_loginDialog.data(), &CLoginDialog::requestNetworkSettings, this, &SwiftGuiStd::displayNetworkSettings);
|
||||
m_loginDialog->show();
|
||||
}
|
||||
else
|
||||
{
|
||||
const bool changed = MainPageLogin != ui->sw_MainMiddle->currentIndex();
|
||||
this->setMainPage(MainPageLogin);
|
||||
if (!changed)
|
||||
{
|
||||
// fake changed signal to trigger blinking disconnect button (issue #115)
|
||||
emit this->currentMainInfoAreaChanged(ui->sw_MainMiddle->currentWidget());
|
||||
}
|
||||
// fake changed signal to trigger blinking disconnect button (issue #115)
|
||||
emit this->currentMainInfoAreaChanged(ui->sw_MainMiddle->currentWidget());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,6 @@ namespace BlackGui::Components
|
||||
{
|
||||
class CDbLoadDataDialog;
|
||||
class CAutoPublishDialog;
|
||||
class CLoginDialog;
|
||||
class CModelBrowserDialog;
|
||||
}
|
||||
namespace Ui
|
||||
@@ -122,7 +121,6 @@ private:
|
||||
QScopedPointer<BlackGui::Components::CNavigatorDialog> m_navigator { new BlackGui::Components::CNavigatorDialog() }; //!< navigator dialog bar, if I pass the parent, the dialog is always centered over the parent
|
||||
QScopedPointer<BlackGui::Components::CDbLoadDataDialog> m_dbLoadDialog; //!< load DB data, lazy init UI component
|
||||
QScopedPointer<BlackGui::Components::CAutoPublishDialog> m_autoPublishDialog; //!< auto publish dialog
|
||||
QScopedPointer<BlackGui::Components::CLoginDialog> m_loginDialog; //!< login dialog
|
||||
QScopedPointer<BlackGui::Components::CModelBrowserDialog> m_modelBrower; //!< model browser
|
||||
QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
|
||||
BlackMisc::CData<BlackMisc::Simulation::Data::TLastAutoPublish> m_lastAutoPublish { this };
|
||||
|
||||
Reference in New Issue
Block a user