flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove attach to sim feature

Browse Source 
This feature is not documented and not implemented for new simulators
This commit is contained in:
Lars Toenning
2024-12-23 08:33:29 +01:00
parent 3c896f24f2
commit a866b7e75a
6 changed files with 1 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/CMakeLists.txt
View File

@@ -3,7 +3,6 @@
add_library(gui SHARED
showhidebar.cpp
foreignwindows.h
dockwidget.cpp
labelandicon.cpp
altitudeedit.cpp
@@ -794,7 +793,6 @@ add_library(gui SHARED
elidedpushbutton.h
enableforframelesswindow.cpp
overlaymessages.cpp
foreignwindows.cpp
stylesheetutility.cpp
dropbase.h
eventfilter.cpp

1
src/gui/enableforframelesswindow.cpp
View File

@@ -21,7 +21,6 @@
#include <QWidget>
#include <QtGlobal>
#include "gui/foreignwindows.h"
#include "gui/guiutility.h"
#include "misc/icons.h"
#include "misc/stringutils.h"

106
src/gui/foreignwindows.cpp
View File

@@ -1,106 +0,0 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "gui/foreignwindows.h"
#include <QWidget>
#include <QWindow>
#include <QtGlobal>
#include "gui/windowfinder.h"
using namespace swift::misc::simulation;
namespace swift::gui
{
QScopedPointer<IWindowFinder> CForeignWindows::m_windowFinder(IWindowFinder::create());
QWindow *CForeignWindows::getFS9Window()
{
if (!m_windowFinder) { return nullptr; }
QWindow *simulatorWindow = m_windowFinder->findForeignWindow("", "FS98MAIN");
return simulatorWindow;
}
QWindow *CForeignWindows::getFSXWindow()
{
if (!m_windowFinder) { return nullptr; }
QWindow *simulatorWindow = m_windowFinder->findForeignWindow("", "FS98MAIN");
return simulatorWindow;
}
QWindow *CForeignWindows::getP3DWindow()
{
if (!m_windowFinder) { return nullptr; }
QWindow *simulatorWindow = m_windowFinder->findForeignWindow("", "FS98MAIN");
return simulatorWindow;
}
QWindow *CForeignWindows::getXPlaneWindow()
{
QWindow *simulatorWindow = nullptr;
// FIXME:
// Use datarefs Sim/operation/windows/system window via xswiftbus to grab the OS's native window handle
// http://www.xsquawkbox.net/xpsdk/mediawiki/sim%252Foperation%252Fwindows%252Fsystem_window
// For the time being, use IWindowFinder.
// The if condition is to prevent a crash on Linux/MacOS.
if (!m_windowFinder.isNull()) simulatorWindow = m_windowFinder->findForeignWindow("X-System", "");
return simulatorWindow;
}
QWindow *CForeignWindows::getFirstFoundSimulatorWindow()
{
QWindow *w = CForeignWindows::getP3DWindow();
if (w) { return w; }
w = CForeignWindows::getXPlaneWindow();
if (w) { return w; }
w = CForeignWindows::getFSXWindow();
if (w) { return w; }
w = CForeignWindows::getFS9Window();
return w;
}
QWindow *CForeignWindows::getSimulatorWindow(const CSimulatorInfo &simulator)
{
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return CForeignWindows::getFS9Window();
case CSimulatorInfo::FSX: return CForeignWindows::getFSXWindow();
case CSimulatorInfo::P3D: return CForeignWindows::getP3DWindow();
case CSimulatorInfo::XPLANE: return CForeignWindows::getXPlaneWindow();
default: break;
}
return nullptr;
}
bool CForeignWindows::setSimulatorAsParent(QWindow *simulatorWindow, QWidget *child)
{
if (!simulatorWindow) { return false; }
if (!child) { return false; }
// If visible, hide it during the reparent. Otherwise setting the parent will have no effect.
const bool isVisible = child->isVisible();
if (isVisible) { child->hide(); }
QWindow *childWindow = child->windowHandle();
Q_ASSERT_X(
childWindow, Q_FUNC_INFO,
"Native resources for child widget have not yet been allocated. Did you call QWidget::show() before?");
childWindow->setTransientParent(simulatorWindow);
// If it was visible before, make it visible again
if (isVisible) { child->show(); }
return true;
}
bool CForeignWindows::unsetSimulatorAsParent(QWidget *child)
{
if (!child) { return false; }
if (!child->windowHandle()) { return false; }
if (!child->windowHandle()->transientParent()) { return false; }
child->windowHandle()->setTransientParent(nullptr);
return true;
}
} // namespace swift::gui

57
src/gui/foreignwindows.h
View File

@@ -1,57 +0,0 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
//! \file
#ifndef SWIFT_GUI_FOREIGNWINDOWS_H
#define SWIFT_GUI_FOREIGNWINDOWS_H
#include <QScopedPointer>
#include "gui/swiftguiexport.h"
#include "misc/simulation/simulatorinfo.h"
class QWidget;
class QWindow;
namespace swift::gui
{
class IWindowFinder;
//! Foreign windows
class SWIFT_GUI_EXPORT CForeignWindows
{
public:
//! FS9 window
static QWindow *getFS9Window();
//! FSX window
static QWindow *getFSXWindow();
//! P3D window
static QWindow *getP3DWindow();
//! X-Plane window
static QWindow *getXPlaneWindow();
//! First simulator window found
static QWindow *getFirstFoundSimulatorWindow();
//! Simulator window
static QWindow *getSimulatorWindow(const swift::misc::simulation::CSimulatorInfo &simulator);
//! Set simulator as transient parent for child widget
static bool setSimulatorAsParent(QWindow *simulatorWindow, QWidget *child);
//! Unset the parent
static bool unsetSimulatorAsParent(QWidget *child);
private:
//! Constructor, use static methods only
CForeignWindows() {}
static QScopedPointer<IWindowFinder> m_windowFinder;
};
} // namespace swift::gui
#endif // SWIFT_GUI_FOREIGNWINDOWS_H

6
src/swiftguistandard/swiftguistd.h
View File

@@ -240,12 +240,6 @@ private:
//! Menu item clicked
void onMenuClicked();
//! Attach the simulator window
void attachSimulatorWindow();
//! Detach simulator window
void detachSimulatorWindow();
//! Kicked from network
void onKickedFromNetwork(const QString &kickMessage);

30
src/swiftguistandard/swiftguistdmenus.cpp
View File

@@ -18,7 +18,6 @@
#include "gui/components/maininfoareacomponent.h"
#include "gui/components/settingscomponent.h"
#include "gui/copyxswiftbusdialog.h"
#include "gui/foreignwindows.h"
#include "gui/guiactionbind.h"
#include "gui/guiapplication.h"
#include "misc/aviation/altitude.h"
@@ -86,26 +85,6 @@ void SwiftGuiStd::onMenuClicked()
}
}
void SwiftGuiStd::attachSimulatorWindow()
{
this->activateWindow(); // attaching requires active window
QWindow *w = CForeignWindows::getFirstFoundSimulatorWindow();
if (!w)
{
CLogMessage(this).warning(u"No simulator window found");
return;
}
const bool a = CForeignWindows::setSimulatorAsParent(w, this);
if (a) { CLogMessage(this).info(u"Attached to simulator"); }
else { CLogMessage(this).warning(u"No simulator window found"); }
}
void SwiftGuiStd::detachSimulatorWindow()
{
if (CForeignWindows::unsetSimulatorAsParent(this)) { CLogMessage(this).info(u"Detached simulator window"); }
else { CLogMessage(this).info(u"No simulator window to detach"); }
}
void SwiftGuiStd::initMenus()
{
Q_ASSERT_X(ui->menu_InfoAreas, Q_FUNC_INFO, "No menu");
@@ -114,13 +93,6 @@ void SwiftGuiStd::initMenus()
sGui->addMenuFile(*ui->menu_File);
sGui->addMenuInternals(*ui->menu_Internals);
sGui->addMenuWindow(*ui->menu_Window);
ui->menu_Window->addSeparator();
QAction *a = ui->menu_Window->addAction("Attach simulator window");
bool c = connect(a, &QAction::triggered, this, &SwiftGuiStd::attachSimulatorWindow);
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
a = ui->menu_Window->addAction("Detach simulator window");
c = connect(a, &QAction::triggered, this, &SwiftGuiStd::detachSimulatorWindow);
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
sGui->addMenuHelp(*ui->menu_Help);
ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
@@ -130,7 +102,7 @@ void SwiftGuiStd::initMenus()
QAction *act = new QAction(CIcons::swift16(), "Copy xswiftbus dialog");
ui->menu_File->insertAction(ui->menu_File->actions().at(5), act);
// clang-format off
c = connect(act, &QAction::triggered, this,
bool c = connect(act, &QAction::triggered, this,
[=] { this->copyXSwiftBusDialog(false); }, Qt::QueuedConnection);
// clang-format on
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");