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

refactor: Rename blackgui to swift::gui

Browse Source
This commit is contained in:
Lars Toenning
2024-11-10 20:59:19 +01:00
parent 3a2447770f
commit 6d1812b164
979 changed files with 5394 additions and 5394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "simulatoremulated.h"
#include "blackgui/guiapplication.h"
#include "gui/guiapplication.h"
#include "core/context/contextsimulator.h"
#include "misc/simulation/simulatorplugininfo.h"
#include "misc/aviation/altitude.h"
@@ -12,7 +12,7 @@
#include <QTimer>
#include <QApplication>
using namespace BlackGui;
using namespace swift::gui;
using namespace swift::misc;
using namespace swift::misc::aviation;
using namespace swift::misc::physical_quantities;

10
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
View File

@@ -5,8 +5,8 @@
#include "ui_simulatoremulatedmonitordialog.h"
#include "simulatoremulated.h"
#include "core/context/contextsimulator.h"
#include "blackgui/components/cockpitcomtransmissioncomponent.h"
#include "blackgui/guiapplication.h"
#include "gui/components/cockpitcomtransmissioncomponent.h"
#include "gui/guiapplication.h"
#include "misc/logmessage.h"
#include <QIntValidator>
@@ -15,9 +15,9 @@ using namespace swift::config;
using namespace swift::misc;
using namespace swift::misc::aviation;
using namespace swift::misc::simulation;
using namespace BlackGui;
using namespace BlackGui::Components;
using namespace BlackGui::Editors;
using namespace swift::gui;
using namespace swift::gui::components;
using namespace swift::gui::editors;
namespace BlackSimPlugin::Emulated
{

54
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui
View File

@@ -37,7 +37,7 @@
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Receiving" native="true"/>
<widget class="swift::gui::CLedWidget" name="led_Receiving" native="true"/>
</item>
<item>
<widget class="QLabel" name="lbl_Sending">
@@ -47,7 +47,7 @@
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Sending" native="true"/>
<widget class="swift::gui::CLedWidget" name="led_Sending" native="true"/>
</item>
<item>
<spacer name="hs_LedHeader">
@@ -88,7 +88,7 @@
<number>6</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CSituationForm" name="editor_Situation">
<widget class="swift::gui::editors::CSituationForm" name="editor_Situation">
<property name="minimumSize">
<size>
<width>0</width>
@@ -124,7 +124,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="BlackGui::Editors::CCockpitComForm" name="editor_Com">
<widget class="swift::gui::editors::CCockpitComForm" name="editor_Com">
<property name="minimumSize">
<size>
<width>0</width>
@@ -143,7 +143,7 @@
</property>
<layout class="QVBoxLayout" name="vl_GroupBoxParts">
<item>
<widget class="BlackGui::Editors::CAircraftPartsForm" name="editor_AircraftParts">
<widget class="swift::gui::editors::CAircraftPartsForm" name="editor_AircraftParts">
<property name="minimumSize">
<size>
<width>0</width>
@@ -156,7 +156,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="BlackGui::Components::CCockpitComTransmissionComponent" name="comp_ComTransmissions">
<widget class="swift::gui::components::CCockpitComTransmissionComponent" name="comp_ComTransmissions">
<property name="minimumSize">
<size>
<width>0</width>
@@ -283,7 +283,7 @@
<number>0</number>
</property>
<item>
<widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
<widget class="swift::gui::components::CCallsignCompleter" name="comp_CallsignCompleter">
<property name="minimumSize">
<size>
<width>125</width>
@@ -370,7 +370,7 @@
</widget>
</item>
<item row="1" column="5">
<widget class="BlackGui::Components::CCallsignCompleter" name="comp_LogInterpolatorCallsign">
<widget class="swift::gui::components::CCallsignCompleter" name="comp_LogInterpolatorCallsign">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@@ -400,7 +400,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="BlackGui::CLedWidget" name="led_Fetching" native="true"/>
<widget class="swift::gui::CLedWidget" name="led_Fetching" native="true"/>
</item>
</layout>
</widget>
@@ -606,7 +606,7 @@
</property>
<layout class="QVBoxLayout" name="vl_LogMessagesScrollArea">
<item>
<widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_LogComponent">
<widget class="swift::gui::components::CStatusMessagesDetail" name="comp_LogComponent">
<property name="minimumSize">
<size>
<width>0</width>
@@ -636,7 +636,7 @@
</property>
<layout class="QVBoxLayout" name="vl_GroupBoxSettings">
<item>
<widget class="BlackGui::Components::CSettingsSwiftPlugin" name="comp_Settings"/>
<widget class="swift::gui::components::CSettingsSwiftPlugin" name="comp_Settings"/>
</item>
</layout>
</widget>
@@ -659,51 +659,51 @@
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CSettingsSwiftPlugin</class>
<class>swift::gui::components::CSettingsSwiftPlugin</class>
<extends>QFrame</extends>
<header>blackgui/components/settingsswiftplugin.h</header>
<header>gui/components/settingsswiftplugin.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CStatusMessagesDetail</class>
<class>swift::gui::components::CStatusMessagesDetail</class>
<extends>QFrame</extends>
<header>blackgui/components/statusmessagesdetail.h</header>
<header>gui/components/statusmessagesdetail.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CSituationForm</class>
<class>swift::gui::editors::CSituationForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/situationform.h</header>
<header>gui/editors/situationform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CAircraftPartsForm</class>
<class>swift::gui::editors::CAircraftPartsForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/aircraftpartsform.h</header>
<header>gui/editors/aircraftpartsform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CCockpitComForm</class>
<class>swift::gui::editors::CCockpitComForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/cockpitcomform.h</header>
<header>gui/editors/cockpitcomform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CLedWidget</class>
<class>swift::gui::CLedWidget</class>
<extends>QWidget</extends>
<header>blackgui/led.h</header>
<header>gui/led.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CCallsignCompleter</class>
<class>swift::gui::components::CCallsignCompleter</class>
<extends>QFrame</extends>
<header>blackgui/components/callsigncompleter.h</header>
<header>gui/components/callsigncompleter.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CCockpitComTransmissionComponent</class>
<class>swift::gui::components::CCockpitComTransmissionComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/cockpitcomtransmissioncomponent.h</header>
<header>gui/components/cockpitcomtransmissioncomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp
View File

@@ -11,7 +11,7 @@ namespace BlackSimPlugin::Emulated
// void
}
BlackGui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent)
swift::gui::CPluginConfigWindow *CSimulatorEmulatedConfig::createConfigWindow(QWidget *parent)
{
return new CSimulatorEmulatedConfigWidget(parent);
}

12
src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
View File

@@ -6,18 +6,18 @@
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
#include "blackgui/pluginconfig.h"
#include "gui/pluginconfig.h"
namespace BlackSimPlugin::Emulated
{
/*!
* Window for setting up the FSX plugin.
*/
class CSimulatorEmulatedConfig : public QObject, public BlackGui::IPluginConfig
class CSimulatorEmulatedConfig : public QObject, public swift::gui::IPluginConfig
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json")
Q_INTERFACES(BlackGui::IPluginConfig)
Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatoremulatedconfig.json")
Q_INTERFACES(swift::gui::IPluginConfig)
public:
//! Ctor
@@ -26,8 +26,8 @@ namespace BlackSimPlugin::Emulated
//! Dtor
virtual ~CSimulatorEmulatedConfig() override {}
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
};
} // ns

4
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp
View File

@@ -4,11 +4,11 @@
#include "simulatoremulatedconfigwidget.h"
#include "ui_simulatoremulatedconfigwidget.h"
using namespace BlackGui;
using namespace swift::gui;
namespace BlackSimPlugin::Emulated
{
CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) : BlackGui::CPluginConfigWindow(parent),
CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) : swift::gui::CPluginConfigWindow(parent),
ui(new Ui::CSimulatorEmulatedConfigWidget)
{
ui->setupUi(this);

4
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
#include <blackgui/pluginconfigwindow.h>
#include "gui/pluginconfigwindow.h"
#include <QScopedPointer>
namespace Ui
@@ -18,7 +18,7 @@ namespace BlackSimPlugin::Emulated
/*!
* Configuration window for CSimulatorEmulatedConfig
*/
class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public BlackGui::CPluginConfigWindow
class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public swift::gui::CPluginConfigWindow
{
Q_OBJECT

6
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.ui
View File

@@ -21,7 +21,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="BlackGui::Components::CSettingsSwiftPlugin" name="comp_Settings">
<widget class="swift::gui::components::CSettingsSwiftPlugin" name="comp_Settings">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@@ -44,9 +44,9 @@
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CSettingsSwiftPlugin</class>
<class>swift::gui::components::CSettingsSwiftPlugin</class>
<extends>QFrame</extends>
<header>blackgui/components/settingsswiftplugin.h</header>
<header>gui/components/settingsswiftplugin.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
View File

@@ -12,7 +12,7 @@ namespace BlackSimPlugin::Flightgear
{
}
BlackGui::CPluginConfigWindow *CSimulatorFlightgearConfig::createConfigWindow(QWidget *parent)
swift::gui::CPluginConfigWindow *CSimulatorFlightgearConfig::createConfigWindow(QWidget *parent)
{
CSimulatorFlightgearConfigWindow *w = new CSimulatorFlightgearConfigWindow(parent);
return w;

14
src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
#define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
#include "blackgui/pluginconfig.h"
#include "gui/pluginconfig.h"
#include "misc/settingscache.h"
#include <QObject>
@@ -14,7 +14,7 @@
class QWidget;
namespace BlackGui
namespace swift::gui
{
class CPluginConfigWindow;
}
@@ -23,11 +23,11 @@ namespace BlackSimPlugin::Flightgear
/*!
* Config plugin for the Flightgear plugin.
*/
class CSimulatorFlightgearConfig : public QObject, public BlackGui::IPluginConfig
class CSimulatorFlightgearConfig : public QObject, public swift::gui::IPluginConfig
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorflightgearconfig.json")
Q_INTERFACES(BlackGui::IPluginConfig)
Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorflightgearconfig.json")
Q_INTERFACES(swift::gui::IPluginConfig)
public:
//! Ctor
@@ -36,8 +36,8 @@ namespace BlackSimPlugin::Flightgear
//! Dtor
virtual ~CSimulatorFlightgearConfig() {}
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
};
} // ns

4
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
View File

@@ -4,12 +4,12 @@
#include "ui_simulatorflightgearconfigwindow.h"
#include "simulatorflightgearconfigwindow.h"
#include "core/application.h"
#include "blackgui/guiapplication.h"
#include "gui/guiapplication.h"
#include <QComboBox>
#include <QDialogButtonBox>
using namespace BlackGui;
using namespace swift::gui;
using namespace swift::misc;
using namespace swift::misc::simulation::settings;
// using namespace swift::misc::simulation::Flightgear;

4
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
#define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
#include "blackgui/pluginconfigwindow.h"
#include "gui/pluginconfigwindow.h"
#include "misc/simulation/settings/fgswiftbussettings.h"
#include "simulatorflightgearconfig.h"
#include <QObject>
@@ -21,7 +21,7 @@ namespace BlackSimPlugin::Flightgear
/*!
* A window that shows all the Flightgear plugin options.
*/
class CSimulatorFlightgearConfigWindow : public BlackGui::CPluginConfigWindow
class CSimulatorFlightgearConfigWindow : public swift::gui::CPluginConfigWindow
{
Q_OBJECT

6
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui
View File

@@ -44,7 +44,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_SettingsFGSwiftBus">
<widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_SettingsFGSwiftBus">
<property name="minimumSize">
<size>
<width>0</width>
@@ -60,9 +60,9 @@
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CDBusServerAddressSelector</class>
<class>swift::gui::components::CDBusServerAddressSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/dbusserveraddressselector.h</header>
<header>gui/components/dbusserveraddressselector.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
src/plugins/simulator/fs9/fs9client.h
View File

@@ -96,7 +96,7 @@ namespace BlackSimPlugin::Fs9
void handleConnectionCompleted();
//! Simulator interface
const swift::core::ISimulator *simulator() const;
const swift::coree::ISimulator *simulator() const;
swift::misc::simulation::CSimulatedAircraft m_remoteAircraft;
swift::misc::physical_quantities::CTime m_updateInterval;

6
src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp
View File

@@ -4,8 +4,8 @@
#include "fsxsettingscomponent.h"
#include "ui_fsxsettingscomponent.h"
#include "simulatorfsxcommon.h"
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/guiapplication.h"
#include "gui/overlaymessagesframe.h"
#include "gui/guiapplication.h"
#include "core/context/contextsimulator.h"
#include "config/buildconfig.h"
@@ -14,7 +14,7 @@
using namespace swift::core;
using namespace swift::core::context;
using namespace BlackGui;
using namespace swift::gui;
using namespace swift::misc;
using namespace swift::misc::simulation;
using namespace swift::config;

4
src/plugins/simulator/fsxcommon/fsxsettingscomponent.h
View File

@@ -16,7 +16,7 @@ namespace Ui
{
class CFsxSettingsComponent;
}
namespace BlackGui
namespace swift::gui
{
class COverlayMessagesFrame;
}
@@ -68,7 +68,7 @@ namespace BlackSimPlugin::FsxCommon
CSimulatorFsxCommon *getFsxOrP3DSimulator() const;
swift::misc::simulation::CSimulatorInfo m_simulator { "FSX" };
BlackGui::COverlayMessagesFrame *m_mf = nullptr;
swift::gui::COverlayMessagesFrame *m_mf = nullptr;
QScopedPointer<Ui::CFsxSettingsComponent> ui;
};
} // ns

4
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
View File

@@ -3,7 +3,7 @@
#include "simconnectsettingscomponent.h"
#include "ui_simconnectsettingscomponent.h"
#include "blackgui/guiapplication.h"
#include "gui/guiapplication.h"
#include "core/context/contextapplication.h"
#include "core/context/contextsimulator.h"
#include "misc/simulation/fsx/simconnectutilities.h"
@@ -22,7 +22,7 @@ using namespace swift::misc;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::Fsx;
using namespace swift::misc::network;
using namespace BlackGui;
using namespace swift::gui;
namespace BlackSimPlugin::FsxCommon
{

4
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h
View File

@@ -7,7 +7,7 @@
#define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "blackgui/overlaymessagesframe.h"
#include "gui/overlaymessagesframe.h"
#include "misc/settingscache.h"
#include "misc/simulation/settings/simulatorsettings.h"
#include "misc/simulation/simulatorinfo.h"
@@ -23,7 +23,7 @@ namespace BlackSimPlugin::FsxCommon
/*!
* A component that gathers all SimConnect related settings.
*/
class FSXCOMMON_EXPORT CSimConnectSettingsComponent : public BlackGui::COverlayMessagesFrame
class FSXCOMMON_EXPORT CSimConnectSettingsComponent : public swift::gui::COverlayMessagesFrame
{
Q_OBJECT

2
src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp
View File

@@ -4,7 +4,7 @@
#include "simulatorfsxconfigwindow.h"
#include "ui_simulatorfsxconfigwindow.h"
using namespace BlackGui;
using namespace swift::gui;
namespace BlackSimPlugin::FsxCommon
{

4
src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
View File

@@ -7,7 +7,7 @@
#define BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "blackgui/pluginconfigwindow.h"
#include "gui/pluginconfigwindow.h"
#include "misc/simulation/simulatorinfo.h"
#include <QScopedPointer>
@@ -20,7 +20,7 @@ namespace BlackSimPlugin::FsxCommon
/*!
* A window that lets user set up the FSX plugin.
*/
class FSXCOMMON_EXPORT CSimulatorFsxConfigWindow : public BlackGui::CPluginConfigWindow
class FSXCOMMON_EXPORT CSimulatorFsxConfigWindow : public swift::gui::CPluginConfigWindow
{
Q_OBJECT

2
src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp
View File

@@ -4,7 +4,7 @@
#include "simulatorfsxconfig.h"
#include "../fsxcommon/simulatorfsxconfigwindow.h"
using namespace BlackGui;
using namespace swift::gui;
using namespace BlackSimPlugin::FsxCommon;
namespace BlackSimPlugin::Fsx

12
src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
#define BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
#include "blackgui/pluginconfig.h"
#include "gui/pluginconfig.h"
#include "misc/settingscache.h"
namespace BlackSimPlugin::Fsx
@@ -14,11 +14,11 @@ namespace BlackSimPlugin::Fsx
/*!
* Window for setting up the FSX plugin.
*/
class CSimulatorFsxConfig : public QObject, public BlackGui::IPluginConfig
class CSimulatorFsxConfig : public QObject, public swift::gui::IPluginConfig
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorfsxconfig.json")
Q_INTERFACES(BlackGui::IPluginConfig)
Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorfsxconfig.json")
Q_INTERFACES(swift::gui::IPluginConfig)
public:
//! Ctor
@@ -27,8 +27,8 @@ namespace BlackSimPlugin::Fsx
//! Dtor
virtual ~CSimulatorFsxConfig() override {}
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
};
} // ns

2
src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp
View File

@@ -11,7 +11,7 @@ namespace BlackSimPlugin::P3D
// void
}
BlackGui::CPluginConfigWindow *CSimulatorP3DConfig::createConfigWindow(QWidget *parent)
swift::gui::CPluginConfigWindow *CSimulatorP3DConfig::createConfigWindow(QWidget *parent)
{
return new FsxCommon::CSimulatorFsxConfigWindow("P3D", parent);
}

12
src/plugins/simulator/p3dconfig/simulatorp3dconfig.h
View File

@@ -6,18 +6,18 @@
#ifndef BLACKSIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
#define BLACKSIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
#include "blackgui/pluginconfig.h"
#include "gui/pluginconfig.h"
namespace BlackSimPlugin::P3D
{
/*!
* Window for setting up the P3D plugin.
*/
class CSimulatorP3DConfig : public QObject, public BlackGui::IPluginConfig
class CSimulatorP3DConfig : public QObject, public swift::gui::IPluginConfig
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorp3dconfig.json")
Q_INTERFACES(BlackGui::IPluginConfig)
Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorp3dconfig.json")
Q_INTERFACES(swift::gui::IPluginConfig)
public:
//! Ctor
@@ -26,8 +26,8 @@ namespace BlackSimPlugin::P3D
//! Dtor
virtual ~CSimulatorP3DConfig() {}
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
};
}

8
src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
View File

@@ -2,12 +2,12 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "simulatorplugincommon.h"
#include "blackgui/components/interpolationlogdisplaydialog.h"
#include "blackgui/guiapplication.h"
#include "gui/components/interpolationlogdisplaydialog.h"
#include "gui/guiapplication.h"
#include "misc/simplecommandparser.h"
using namespace BlackGui;
using namespace BlackGui::Components;
using namespace swift::gui;
using namespace swift::gui::components;
using namespace swift::core;
using namespace swift::misc;
using namespace swift::misc::network;

4
src/plugins/simulator/plugincommon/simulatorplugincommon.h
View File

@@ -11,7 +11,7 @@
#include <QObject>
#include <QPointer>
namespace BlackGui::Components
namespace swift::gui::components
{
class CInterpolationLogDisplayDialog;
}
@@ -57,7 +57,7 @@ namespace BlackSimPlugin::Common
//! Clean up the interpolation log.display if any
void deleteInterpolationDisplay();
QPointer<BlackGui::Components::CInterpolationLogDisplayDialog> m_interpolationDisplayDialog; //!< can be owned by main window after setting a parent
QPointer<swift::gui::components::CInterpolationLogDisplayDialog> m_interpolationDisplayDialog; //!< can be owned by main window after setting a parent
};
} // namespace

2
src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp
View File

@@ -13,7 +13,7 @@ namespace BlackSimPlugin::XPlane
// void
}
BlackGui::CPluginConfigWindow *CSimulatorXPlaneConfig::createConfigWindow(QWidget *parent)
swift::gui::CPluginConfigWindow *CSimulatorXPlaneConfig::createConfigWindow(QWidget *parent)
{
CSimulatorXPlaneConfigWindow *w = new CSimulatorXPlaneConfigWindow(parent);
return w;

14
src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
#include "blackgui/pluginconfig.h"
#include "gui/pluginconfig.h"
#include "misc/settingscache.h"
#include <QObject>
@@ -14,7 +14,7 @@
class QWidget;
namespace BlackGui
namespace swift::gui
{
class CPluginConfigWindow;
}
@@ -23,11 +23,11 @@ namespace BlackSimPlugin::XPlane
/*!
* Config plugin for the X-Plane plugin.
*/
class CSimulatorXPlaneConfig : public QObject, public BlackGui::IPluginConfig
class CSimulatorXPlaneConfig : public QObject, public swift::gui::IPluginConfig
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
Q_INTERFACES(BlackGui::IPluginConfig)
Q_PLUGIN_METADATA(IID "org.swift-project.swiftgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
Q_INTERFACES(swift::gui::IPluginConfig)
public:
//! Ctor
@@ -36,8 +36,8 @@ namespace BlackSimPlugin::XPlane
//! Dtor
virtual ~CSimulatorXPlaneConfig() override {}
//! \copydoc BlackGui::IPluginConfig::createConfigWindow()
BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
};
} // ns

4
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -4,14 +4,14 @@
#include "ui_simulatorxplaneconfigwindow.h"
#include "simulatorxplaneconfigwindow.h"
#include "core/context/contextsimulator.h"
#include "blackgui/guiapplication.h"
#include "gui/guiapplication.h"
#include "misc/simulation/xplane/xswiftbusconfigwriter.h"
#include <QComboBox>
#include <QDialogButtonBox>
#include <vector>
using namespace BlackGui;
using namespace swift::gui;
using namespace swift::core::context;
using namespace swift::misc;
using namespace swift::misc::simulation::settings;

4
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#include "blackgui/pluginconfigwindow.h"
#include "gui/pluginconfigwindow.h"
#include "misc/simulation/settings/xswiftbussettings.h"
#include "simulatorxplaneconfig.h"
#include <QObject>
@@ -21,7 +21,7 @@ namespace BlackSimPlugin::XPlane
/*!
* A window that shows all the X-Plane plugin options.
*/
class CSimulatorXPlaneConfigWindow : public BlackGui::CPluginConfigWindow
class CSimulatorXPlaneConfigWindow : public swift::gui::CPluginConfigWindow
{
Q_OBJECT

22
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
View File

@@ -54,7 +54,7 @@
<number>3</number>
</property>
<item>
<widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_SettingsXSwiftBus">
<widget class="swift::gui::components::CDBusServerAddressSelector" name="comp_SettingsXSwiftBus">
<property name="minimumSize">
<size>
<width>0</width>
@@ -142,7 +142,7 @@
</widget>
</item>
<item row="4" column="1">
<widget class="BlackGui::Components::CColorSelector" name="cs_LabelColor" />
<widget class="swift::gui::components::CColorSelector" name="cs_LabelColor" />
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_BundleLights">
@@ -350,11 +350,11 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="0"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorFreq" /></item>
<item row="1" column="1"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorPriv" /></item>
<item row="1" column="2"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorServ" /></item>
<item row="1" column="3"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorStat" /></item>
<item row="1" column="4"><widget class="BlackGui::Components::CColorSelector" name="cs_ColorSup" /></item>
<item row="1" column="0"><widget class="swift::gui::components::CColorSelector" name="cs_ColorFreq" /></item>
<item row="1" column="1"><widget class="swift::gui::components::CColorSelector" name="cs_ColorPriv" /></item>
<item row="1" column="2"><widget class="swift::gui::components::CColorSelector" name="cs_ColorServ" /></item>
<item row="1" column="3"><widget class="swift::gui::components::CColorSelector" name="cs_ColorStat" /></item>
<item row="1" column="4"><widget class="swift::gui::components::CColorSelector" name="cs_ColorSup" /></item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_ColorFreq">
<property name="text">
@@ -478,15 +478,15 @@
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CDBusServerAddressSelector</class>
<class>swift::gui::components::CDBusServerAddressSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/dbusserveraddressselector.h</header>
<header>gui/components/dbusserveraddressselector.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CColorSelector</class>
<class>swift::gui::components::CColorSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/colorselector.h</header>
<header>gui/components/colorselector.h</header>
</customwidget>
</customwidgets>
<tabstops>