Skip to content

Commit a866b7e

Browse files
committed
refactor: Remove attach to sim feature
This feature is not documented and not implemented for new simulators
1 parent 3c896f2 commit a866b7e

6 files changed

+1
-201
lines changed

src/gui/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
add_library(gui SHARED
55
showhidebar.cpp
6-
foreignwindows.h
76
dockwidget.cpp
87
labelandicon.cpp
98
altitudeedit.cpp
@@ -794,7 +793,6 @@ add_library(gui SHARED
794793
elidedpushbutton.h
795794
enableforframelesswindow.cpp
796795
overlaymessages.cpp
797-
foreignwindows.cpp
798796
stylesheetutility.cpp
799797
dropbase.h
800798
eventfilter.cpp

src/gui/enableforframelesswindow.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <QWidget>
2222
#include <QtGlobal>
2323

24-
#include "gui/foreignwindows.h"
2524
#include "gui/guiutility.h"
2625
#include "misc/icons.h"
2726
#include "misc/stringutils.h"

src/gui/foreignwindows.cpp

-106
This file was deleted.

src/gui/foreignwindows.h

-57
This file was deleted.

src/swiftguistandard/swiftguistd.h

-6
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,6 @@ class SwiftGuiStd :
240240
//! Menu item clicked
241241
void onMenuClicked();
242242

243-
//! Attach the simulator window
244-
void attachSimulatorWindow();
245-
246-
//! Detach simulator window
247-
void detachSimulatorWindow();
248-
249243
//! Kicked from network
250244
void onKickedFromNetwork(const QString &kickMessage);
251245

src/swiftguistandard/swiftguistdmenus.cpp

+1-29
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "gui/components/maininfoareacomponent.h"
1919
#include "gui/components/settingscomponent.h"
2020
#include "gui/copyxswiftbusdialog.h"
21-
#include "gui/foreignwindows.h"
2221
#include "gui/guiactionbind.h"
2322
#include "gui/guiapplication.h"
2423
#include "misc/aviation/altitude.h"
@@ -86,26 +85,6 @@ void SwiftGuiStd::onMenuClicked()
8685
}
8786
}
8887

89-
void SwiftGuiStd::attachSimulatorWindow()
90-
{
91-
this->activateWindow(); // attaching requires active window
92-
QWindow *w = CForeignWindows::getFirstFoundSimulatorWindow();
93-
if (!w)
94-
{
95-
CLogMessage(this).warning(u"No simulator window found");
96-
return;
97-
}
98-
const bool a = CForeignWindows::setSimulatorAsParent(w, this);
99-
if (a) { CLogMessage(this).info(u"Attached to simulator"); }
100-
else { CLogMessage(this).warning(u"No simulator window found"); }
101-
}
102-
103-
void SwiftGuiStd::detachSimulatorWindow()
104-
{
105-
if (CForeignWindows::unsetSimulatorAsParent(this)) { CLogMessage(this).info(u"Detached simulator window"); }
106-
else { CLogMessage(this).info(u"No simulator window to detach"); }
107-
}
108-
10988
void SwiftGuiStd::initMenus()
11089
{
11190
Q_ASSERT_X(ui->menu_InfoAreas, Q_FUNC_INFO, "No menu");
@@ -114,13 +93,6 @@ void SwiftGuiStd::initMenus()
11493
sGui->addMenuFile(*ui->menu_File);
11594
sGui->addMenuInternals(*ui->menu_Internals);
11695
sGui->addMenuWindow(*ui->menu_Window);
117-
ui->menu_Window->addSeparator();
118-
QAction *a = ui->menu_Window->addAction("Attach simulator window");
119-
bool c = connect(a, &QAction::triggered, this, &SwiftGuiStd::attachSimulatorWindow);
120-
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
121-
a = ui->menu_Window->addAction("Detach simulator window");
122-
c = connect(a, &QAction::triggered, this, &SwiftGuiStd::detachSimulatorWindow);
123-
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
12496

12597
sGui->addMenuHelp(*ui->menu_Help);
12698
ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
@@ -130,7 +102,7 @@ void SwiftGuiStd::initMenus()
130102
QAction *act = new QAction(CIcons::swift16(), "Copy xswiftbus dialog");
131103
ui->menu_File->insertAction(ui->menu_File->actions().at(5), act);
132104
// clang-format off
133-
c = connect(act, &QAction::triggered, this,
105+
bool c = connect(act, &QAction::triggered, this,
134106
[=] { this->copyXSwiftBusDialog(false); }, Qt::QueuedConnection);
135107
// clang-format on
136108
Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");

0 commit comments

Comments
 (0)