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

fix: Unify xswiftbus spelling

Browse Source
This commit is contained in:
Lars Toenning
2024-04-22 22:36:57 +02:00
parent d5a74e9baa
commit b39e8c3a7e
40 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/data/globalsetup.h
View File

@@ -102,7 +102,7 @@ namespace BlackCore::Data
//! \remark based on getDbRootDirectoryUrl
BlackMisc::Network::CUrl getDbLoginServiceUrl() const;
//! alpha XSwiftBus files available
//! alpha xswiftbus files available
BlackMisc::Network::CUrl getAlphaXSwiftBusFilesServiceUrl() const;
//! Shared URLs

4
src/blackgui/components/configurationwizard.ui
View File

@@ -233,7 +233,7 @@
<string>Simulator specific installations</string>
</property>
<property name="subTitle">
<string>Install XSwiftBus (X-Plane only) or swift terrain probe (FSX/P3D only)</string>
<string>Install xswiftbus (X-Plane only) or swift terrain probe (FSX/P3D only)</string>
</property>
<layout class="QVBoxLayout" name="vl_SimulatorSpecific">
<item>
@@ -276,7 +276,7 @@
</rect>
</property>
<attribute name="label">
<string extracomment="Install the XSwiftBus component">XPlane: Install XSwiftBus</string>
<string extracomment="Install the xswiftbus component">XPlane: Install xswiftbus</string>
</attribute>
<layout class="QVBoxLayout" name="vl_XPlane">
<item alignment="Qt::AlignTop">

2
src/blackgui/components/dbusserveraddressselector.h
View File

@@ -52,7 +52,7 @@ namespace BlackGui::Components
//! P2P visible
void setP2PDBusVisible(bool visible);
//! Set to be used for XSwiftBus
//! Set to be used for xswiftbus
void setForXSwiftBus();
signals:

12
src/blackgui/components/installxswiftbuscomponent.cpp
View File

@@ -149,7 +149,7 @@ namespace BlackGui::Components
const QFileInfo destFile(destFileName);
if (!destFile.exists())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"XSwiftBus file '%1' does not exist") << destFileName;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).error(u"xswiftbus file '%1' does not exist") << destFileName;
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -159,7 +159,7 @@ namespace BlackGui::Components
if (CCompressUtils::zip7Uncompress(destFile.absoluteFilePath(), xSwiftBusDirectory, &stdOutAndError))
{
// capture values by copy!
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).info(u"Uncompressed XSwiftBus in '%1'") << xSwiftBusDirectory;
const CStatusMessage msg = CStatusMessage(this, CLogCategories::validation()).info(u"Uncompressed xswiftbus in '%1'") << xSwiftBusDirectory;
this->showOverlayMessagesWithConfirmation(msg, false, "Delete downloaded file?", [=] {
if (!myself) { return; }
QFile downloadFile(downloadFileName);
@@ -178,7 +178,7 @@ namespace BlackGui::Components
//! fixme Ref T253, once we have a zip library we will directly unzip
const QMessageBox::StandardButton reply = QMessageBox::question(this,
"Install XSwiftXBus",
"You need to manually unzip XSwiftBus into the plugins directory.\nIt needs to look like 'plugin/xswiftbus'.\n\nOpen the archive?",
"You need to manually unzip xswiftbus into the plugins directory.\nIt needs to look like 'plugin/xswiftbus'.\n\nOpen the archive?",
QMessageBox::Yes | QMessageBox::No);
if (reply == QMessageBox::Yes)
@@ -194,9 +194,9 @@ namespace BlackGui::Components
if (!rf.getBaseName().contains(CBuildConfig::getVersionString()))
{
const QMessageBox::StandardButton reply = QMessageBox::question(this,
"Download XSwiftBus",
"Download xswiftbus",
QStringLiteral(
u"The XSwiftBus versions seems to be for a different version\n"
u"The xswiftbus versions seems to be for a different version\n"
u"Your version is '%1'. Use this version.\n\n"
u"If not available, you can try the version next to your version number.\n\n"
u"Continue with this version?")
@@ -244,7 +244,7 @@ namespace BlackGui::Components
const QNetworkReply *r = sGui->downloadFromNetwork(download, saveAsFile, { this, &CInstallXSwiftBusComponent::downloadedXSwiftBusFile });
if (r)
{
CLogMessage(this).info(u"Triggered downloading of XSwiftBus file from '%1'") << download.getHost();
CLogMessage(this).info(u"Triggered downloading of xswiftbus file from '%1'") << download.getHost();
this->showLoading(120 * 1000); // timeout in any case
}
else

10
src/blackgui/components/installxswiftbuscomponent.h
View File

@@ -25,7 +25,7 @@ namespace Ui
namespace BlackGui::Components
{
/*!
* Download and install XSwiftBus
* Download and install xswiftbus
*/
class CInstallXSwiftBusComponent :
public COverlayMessagesFrame,
@@ -65,19 +65,19 @@ namespace BlackGui::Components
//! Install from download directory to X-Plane directory
void installXSwiftBus();
//! Trigger downloading of the XSwiftBus file
//! Trigger downloading of the xswiftbus file
void triggerDownloadingOfXSwiftBusFile();
//! Downloaded XSwiftBus file
//! Downloaded xswiftbus file
void downloadedXSwiftBusFile(const BlackMisc::CStatusMessage &status);
//! Full filename + path for the downloaded XSwiftBus file
//! Full filename + path for the downloaded xswiftbus file
BlackMisc::Network::CRemoteFile getRemoteFileSelected() const;
//! Download dir from UI
QString downloadDir() const;
//! XSwiftBus dir from UI
//! xswiftbus dir from UI
QString xSwiftBusDir() const;
//! Is the download dir existing?

10
src/blackgui/components/installxswiftbuscomponent.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Install XSwiftBus</string>
<string>Install xswiftbus</string>
</property>
<layout class="QVBoxLayout" name="vl_XSwiftBusComponent">
<item>
@@ -42,7 +42,7 @@
<item>
<widget class="QLabel" name="lbl_Explaination">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;XSwiftBus&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; is an X-Plane plugin that allows X-Plane and &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;swift&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; to communicate with each other. If you want to use &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;swift&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; with X-Plane you will need to install &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;XSwiftBus&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;. Download &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;XSwiftBus&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; and extract it into the &lt;/span&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline;&quot;&gt;X-Plane/Resources/plugins&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; folder.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;xswiftbus&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; is an X-Plane plugin that allows X-Plane and &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;swift&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; to communicate with each other. If you want to use &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;swift&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; with X-Plane you will need to install &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;xswiftbus&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;. Download &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;xswiftbus&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; and extract it into the &lt;/span&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline;&quot;&gt;X-Plane/Resources/plugins&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; folder.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
@@ -58,7 +58,7 @@
<item>
<widget class="QGroupBox" name="gb_DownloadAndInstall">
<property name="title">
<string>Download and install XSwiftBus</string>
<string>Download and install xswiftbus</string>
</property>
<layout class="QGridLayout" name="gl_DownloadAndInstall">
<property name="leftMargin">
@@ -162,7 +162,7 @@
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="lbl_Warning">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Warning: &lt;/span&gt;Possible conflicts with plugins using the same libraries &lt;span style=&quot; font-style:italic;&quot;&gt;(e.g. XSquawkBox&lt;/span&gt;). You have to disable those pluigns before you can use &lt;span style=&quot; font-style:italic;&quot;&gt;swiftXSwiftBus&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Warning: &lt;/span&gt;Possible conflicts with plugins using the same libraries &lt;span style=&quot; font-style:italic;&quot;&gt;(e.g. XSquawkBox&lt;/span&gt;). You have to disable those plugins before you can use &lt;span style=&quot; font-style:italic;&quot;&gt;xswiftbus&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -175,7 +175,7 @@
<item>
<widget class="QGroupBox" name="gb_XSwiftBusSettings">
<property name="title">
<string>XSwiftBus settings</string>
<string>xswiftbus settings</string>
</property>
<layout class="QVBoxLayout" name="vl_XSwiftBusSettings">
<property name="leftMargin">

2
src/blackgui/components/installxswiftbusdialog.ui
View File

@@ -17,7 +17,7 @@
</size>
</property>
<property name="windowTitle">
<string>Install XSwiftBus dialog</string>
<string>Install xswiftbus dialog</string>
</property>
<layout class="QVBoxLayout" name="vl_XSiwftBusDialog">
<property name="leftMargin">

2
src/blackgui/components/settingsxswiftbuscomponent.h
View File

@@ -20,7 +20,7 @@ namespace Ui
namespace BlackGui::Components
{
/*!
* XSwiftBus setup
* xswiftbus setup
*/
class BLACKGUI_EXPORT CSettingsXSwiftBusComponent : public QFrame
{

2
src/blackgui/components/settingsxswiftbuscomponent.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>XSwiftBus settings</string>
<string>xswiftbus settings</string>
</property>
<layout class="QHBoxLayout" name="hl_SettingsXSwiftBus">
<item>

6
src/blackgui/components/updateinfocomponent.cpp
View File

@@ -126,8 +126,8 @@ namespace BlackGui::Components
if (!stringCompare(currentXsb, currentSwift, Qt::CaseInsensitive))
{
const QString msg = QStringLiteral("XSwiftBus '%1' does NOT match swift version, download anyway?").arg(currentXsb, currentSwift);
const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Download XSwiftBus"), msg, QMessageBox::Yes | QMessageBox::No);
const QString msg = QStringLiteral("xswiftbus '%1' does NOT match swift version, download anyway?").arg(currentXsb, currentSwift);
const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Download xswiftbus"), msg, QMessageBox::Yes | QMessageBox::No);
if (reply != QMessageBox::Yes) { return; }
}
@@ -206,7 +206,7 @@ namespace BlackGui::Components
const CDistribution selectedDistribution(this->getSelectedOrDefaultDistribution());
const CPlatform selectedPlatform(this->getSelectedOrDefaultPlatform());
// for XSwiftBus we only show public (unrestricted) ones, as the follow up dialog will only show unrestricted
// for xswiftbus we only show public (unrestricted) ones, as the follow up dialog will only show unrestricted
const CUpdateInfo updateInfo(m_updateInfo.get());
const CArtifactList artifactsPilotClient = updateInfo.getArtifactsPilotClient().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const CArtifactList artifactsXsb = updateInfo.getArtifactsXSwiftBus().findWithUnrestrictedDistributions().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);

2
src/blackgui/components/updateinfocomponent.h
View File

@@ -82,7 +82,7 @@ namespace BlackGui::Components
//! Selection changed
void uiSelectionChanged();
//! Install XSwiftBus dialog
//! Install xswiftbus dialog
void downloadXSwiftBusDialog();
//! Download installer dialog

2
src/blackgui/components/updateinfocomponent.ui
View File

@@ -81,7 +81,7 @@
<string>Only required for XP</string>
</property>
<property name="text">
<string>XSwiftBus:</string>
<string>xswiftbus:</string>
</property>
</widget>
</item>

4
src/blackgui/copyxswiftbusdialog.cpp
View File

@@ -33,8 +33,8 @@ namespace BlackGui
}
const QMessageBox::StandardButton reply = QMessageBox::question(parent,
"Copy XSwiftBus",
QStringLiteral("Copy XSwiftBus from build directory '%1' to plugin directory '%2'?").arg(CSwiftDirectories::getXSwiftBusBuildDirectory(), CXPlaneUtil::xswiftbusPluginDir(xplaneRootDir)),
"Copy xswiftbus",
QStringLiteral("Copy xswiftbus from build directory '%1' to plugin directory '%2'?").arg(CSwiftDirectories::getXSwiftBusBuildDirectory(), CXPlaneUtil::xswiftbusPluginDir(xplaneRootDir)),
QMessageBox::Yes | QMessageBox::No);
if (reply != QMessageBox::Yes) { return 0; }
return CXPlaneUtil::copyXSwiftBusBuildFiles(xplaneRootDir);

4
src/blackgui/copyxswiftbusdialog.h
View File

@@ -11,11 +11,11 @@
namespace BlackGui
{
//! Show dialog about to copy XSwiftBus build files
//! Show dialog about to copy xswiftbus build files
class BLACKGUI_EXPORT CCopyXSwiftBusDialog
{
public:
//! Display a dialog to copy the latest XSwiftBus files
//! Display a dialog to copy the latest xswiftbus files
//! \remark normally only displayed in a local environment
static int displayDialogAndCopyBuildFiles(const QString &xplaneRootDir, bool checkLatestFile = true, QWidget *parent = nullptr);
};

2
src/blackmisc/db/artifact.cpp
View File

@@ -183,7 +183,7 @@ namespace BlackMisc::Db
const QString &CArtifact::typeToString(CArtifact::ArtifactType type)
{
static const QString xswb("XSwiftBus");
static const QString xswb("xswiftbus");
static const QString installer("pilot client installer");
static const QString symbols("symbols");
static const QString unknown("unknown");

8
src/blackmisc/db/updateinfo.h
View File

@@ -46,13 +46,13 @@ namespace BlackMisc::Db
//! \note sorted by version
CArtifactList getArtifactsPilotClientForCurrentPlatform() const;
//! Artifacts (XSwiftBus)
//! Artifacts (xswiftbus)
const CArtifactList &getArtifactsXSwiftBus() const { return m_artifactsXSwiftBus; }
//! Artifacts (XSwiftBus)
//! Artifacts (xswiftbus)
CArtifactList getArtifactsXSwiftBusLatestVersionFirst() const;
//! Artifacts (XSwiftBus)
//! Artifacts (xswiftbus)
CArtifactList getArtifactsXSwiftBusOldestVersionFirst() const;
//! Artifacts for current platform
@@ -97,7 +97,7 @@ namespace BlackMisc::Db
private:
CArtifactList m_artifactsPilotClient; //!< artifacts pilot client
CArtifactList m_artifactsXSwiftBus; //!< artifacts XSwiftBus
CArtifactList m_artifactsXSwiftBus; //!< artifacts xswiftbus
CDistributionList m_distributions; //!< all distributions (for any artifacts)
BLACK_METACLASS(

2
src/blackmisc/registermetadata.cpp
View File

@@ -96,7 +96,7 @@ namespace BlackMisc
SharedState::CAnyMatch::registerMetadata();
// needed by XSwiftBus proxy class
// needed by xswiftbus proxy class
qDBusRegisterMetaType<CSequence<double>>();
qRegisterMetaTypeStreamOperators<CSequence<double>>();
}

6
src/blackmisc/simulation/settings/xswiftbussettings.h
View File

@@ -19,7 +19,7 @@ BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CXSwiftBusSett
namespace BlackMisc::Simulation::Settings
{
//! XSwiftBus settings
//! xswiftbus settings
class BLACKMISC_EXPORT CXSwiftBusSettings final :
public CValueObject<CXSwiftBusSettings>,
public CXSwiftBusSettingsQtFree,
@@ -105,7 +105,7 @@ namespace BlackMisc::Simulation::Settings
};
/*!
* Setting for XSwiftBus.
* Setting for xswiftbus.
*/
struct TXSwiftBusSettings : public TSettingTrait<CXSwiftBusSettings>
{
@@ -115,7 +115,7 @@ namespace BlackMisc::Simulation::Settings
//! \copydoc BlackMisc::TSettingTrait::humanReadable
static const QString &humanReadable()
{
static const QString name("XSwiftBus");
static const QString name("xswiftbus");
return name;
}

4
src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
View File

@@ -12,8 +12,8 @@
namespace BlackMisc::Simulation::Settings
{
/*!
* XSwiftBus/swift side settings class, JSON capable, shared among all services
* \details Used on swift and XSwiftBus side, MUST BE Qt free
* xswiftbus/swift side settings class, JSON capable, shared among all services
* \details Used on swift and xswiftbus side, MUST BE Qt free
*/
class CXSwiftBusSettingsQtFree
{

4
src/blackmisc/simulation/xplane/qtfreeutils.h
View File

@@ -14,8 +14,8 @@
#include <algorithm>
#include <iterator>
// Strict header only X-Plane model parser utils shared between BlackMisc and XSwiftBus.
// Header only is necessary to no require XSwiftBus to link against BlackMisc.
// Strict header only X-Plane model parser utils shared between BlackMisc and xswiftbus.
// Header only is necessary to no require xswiftbus to link against BlackMisc.
namespace BlackMisc::Simulation::XPlane::QtFreeUtils
{

10
src/blackmisc/simulation/xplane/xplaneutil.h
View File

@@ -62,10 +62,10 @@ namespace BlackMisc::Simulation::XPlane
//! Exclude directories for models
static const QStringList &xplaneModelExcludeDirectoryPatterns();
//! XSwiftBus plugin directory
//! xswiftbus plugin directory
static QString xswiftbusPluginDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
//! XSwiftBus legacy directory
//! xswiftbus legacy directory
static QString xswiftbusLegacyDir(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
//! Both directories, plugin and
@@ -78,17 +78,17 @@ namespace BlackMisc::Simulation::XPlane
//! \remark uses CXPlaneUtil::xplanePluginPath as default
static QStringList findAllXplFiles(const QString &pluginDir = {});
//! Newer XSwiftBus build
//! Newer xswiftbus build
static bool hasNewerXSwiftBusBuild(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
//! Copy a XSwiftBus build
//! Copy a xswiftbus build
//! \remark only copying in a local build environment
static int copyXSwiftBusBuildFiles(const QString &xplaneRootDir = CXPlaneUtil::xplaneRootDir());
//! XPlane relative plugin path
static const QString &xplanePluginPathName();
//! XSwiftBus path name
//! xswiftbus path name
static const QString &xswiftbusPathName();
//! Filter filter for xpl files

2
src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp
View File

@@ -72,7 +72,7 @@ namespace BlackMisc::Simulation::XPlane
configFile.remove();
if (configFile.open(QIODevice::WriteOnly))
{
// this code should be similar to XSwiftBus config.cpp
// this code should be similar to xswiftbus config.cpp
QTextStream ts(&configFile);
ts << "# DBus Mode - Options: p2p, session" << Qt::endl;
ts << "dbusMode = " << m_dbusMode << Qt::endl;

2
src/blackmisc/simulation/xplane/xswiftbusconfigwriter.h
View File

@@ -12,7 +12,7 @@
namespace BlackMisc::Simulation::XPlane
{
//! XSwiftBus configuration file writer
//! xswiftbus configuration file writer
class BLACKMISC_EXPORT CXSwiftBusConfigWriter : public QObject
{
Q_OBJECT

8
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -1558,16 +1558,16 @@ namespace BlackSimPlugin::XPlane
const QString xswiftbusCommitHash = service.getCommitHash();
if (xswiftbusVersion.isEmpty())
{
CLogMessage(this).warning(u"Could not determine which version of XSwiftBus is running. Mismatched versions might cause instability.");
CLogMessage(this).warning(u"Could not determine which version of xswiftbus is running. Mismatched versions might cause instability.");
}
else if (commitHash() != xswiftbusCommitHash)
{
CLogMessage(this).error(u"You are using an incorrect version of XSwiftBus. The version of XSwiftBus (%1) should match the version of swift (%2). Consider upgrading!") << xswiftbusVersion << swiftVersion;
CLogMessage(this).error(u"You are using an incorrect version of xswiftbus. The version of xswiftbus (%1) should match the version of swift (%2). Consider upgrading!") << xswiftbusVersion << swiftVersion;
}
if (!traffic.initialize())
{
CLogMessage(this).error(u"Connection to XSwiftBus successful, but could not initialize XSwiftBus. Check X-Plane Log.txt.");
CLogMessage(this).error(u"Connection to xswiftbus successful, but could not initialize xswiftbus. Check X-Plane Log.txt.");
return;
}
@@ -1575,7 +1575,7 @@ namespace BlackSimPlugin::XPlane
if (!info.hasAcquired)
{
const QString owner = info.owner.trimmed().isEmpty() ? QStringLiteral("unknown plugin") : info.owner.trimmed();
CLogMessage(this).error(u"Connection to XSwiftBus successful, but could not acquire multiplayer planes. '%1' has acquired them already. Disable '%2' or remove it if not required and reload XSwiftBus.") << owner << owner.toLower();
CLogMessage(this).error(u"Connection to xswiftbus successful, but could not acquire multiplayer planes. '%1' has acquired them already. Disable '%2' or remove it if not required and reload xswiftbus.") << owner << owner.toLower();
return;
}

2
src/plugins/simulator/xplane/simulatorxplane.json
View File

@@ -2,6 +2,6 @@
"identifier" : "org.swift-project.plugins.simulator.xplane",
"name" : "X-Plane",
"simulator" : "xplane",
"description" : "Support for the X-Plane simulator via the XSwiftBus plugin.",
"description" : "Support for the X-Plane simulator via the xswiftbus plugin.",
"config" : "org.swift-project.plugins.simulator.xplane.config"
}

2
src/plugins/simulator/xplane/xswiftbusserviceproxy.h
View File

@@ -92,7 +92,7 @@ namespace BlackSimPlugin::XPlane
void sceneryLoaded();
public slots:
//! Get XSwiftBus version number
//! Get xswiftbus version number
QString getVersionNumber();
//! Get SHA1 of the last commit that could influence xswiftbus

2
src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp
View File

@@ -152,7 +152,7 @@ namespace BlackSimPlugin::XPlane
else
{
const QString errorMsg = reply.error().message();
CLogMessage(this).warning(u"XSwiftBus DBus error getRemoteAircraftData: %1") << errorMsg;
CLogMessage(this).warning(u"xswiftbus DBus error getRemoteAircraftData: %1") << errorMsg;
}
watcher->deleteLater();
};

2
src/plugins/simulator/xplane/xswiftbustrafficproxy.h
View File

@@ -138,7 +138,7 @@ namespace BlackSimPlugin::XPlane
//! Multiplayer Acquire Info
struct MultiplayerAcquireInfo
{
bool hasAcquired; //!< Has XSwiftBus acquired multiplayer planes?
bool hasAcquired; //!< Has xswiftbus acquired multiplayer planes?
QString owner; //!< Name of the plugin having multiplayer planes acquired
};

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

@@ -38,7 +38,7 @@
<item row="0" column="0">
<widget class="QGroupBox" name="gb_DBus">
<property name="title">
<string>XSwiftBus DBus</string>
<string>xswiftbus DBus</string>
</property>
<layout class="QVBoxLayout" name="vl_DBus">
<property name="leftMargin">

2
src/swiftguistandard/swiftguistd.h
View File

@@ -314,7 +314,7 @@ private:
//! Ckeck if the DB data have been loaded
void checkDbDataLoaded();
//! Copy the XSwiftBus files from build directory
//! Copy the xswiftbus files from build directory
void copyXSwiftBusDialog(bool checkFileTimestamp);
//! Auto publish diloag

4
src/swiftguistandard/swiftguistdmenus.cpp
View File

@@ -144,7 +144,7 @@ void SwiftGuiStd::initMenus()
if (CBuildConfig::isLocalDeveloperDebugBuild() && ui->menu_File && ui->menu_File->actions().size() > 5)
{
QAction *act = new QAction(CIcons::swift16(), "Copy XSwiftBus dialog");
QAction *act = new QAction(CIcons::swift16(), "Copy xswiftbus dialog");
ui->menu_File->insertAction(ui->menu_File->actions().at(5), act);
c = connect(
act, &QAction::triggered, this, [=] {
@@ -170,7 +170,7 @@ void SwiftGuiStd::copyXSwiftBusDialog(bool checkFileTimestamp)
if (!xpDirExists)
{
if (checkFileTimestamp) { return; }
QMessageBox::warning(this, tr("Copy XSwiftBus"), tr("XPlane directory does not exists!"), QMessageBox::Close);
QMessageBox::warning(this, tr("Copy xswiftbus"), tr("XPlane directory does not exists!"), QMessageBox::Close);
return;
}

4
src/xswiftbus/config.cpp
View File

@@ -70,7 +70,7 @@ namespace XSwiftBus
void CConfig::print()
{
DEBUG_LOG("XSwiftBus configuration:");
DEBUG_LOG("xswiftbus configuration:");
DEBUG_LOG("DBus mode: " + dbusModeToString(m_dbusMode));
DEBUG_LOG("DBus server address: " + m_dbusAddress);
DEBUG_LOG("DBus server port: " + std::to_string(m_dbusPort));
@@ -114,7 +114,7 @@ namespace XSwiftBus
localtime_r(&now, &tms);
#endif
configFile << std::endl;
configFile << "# Updated by XSwiftBus plugin " << std::put_time(&tms, "%T");
configFile << "# Updated by xswiftbus plugin " << std::put_time(&tms, "%T");
configFile << std::endl;
configFile.close();
return true;

2
src/xswiftbus/config.h
View File

@@ -9,7 +9,7 @@
namespace XSwiftBus
{
/*!
* XSwiftBus configuration class
* xswiftbus configuration class
*/
class CConfig
{

4
src/xswiftbus/main.cpp
View File

@@ -24,8 +24,8 @@ PLUGIN_API int XPluginStart(char *o_name, char *o_sig, char *o_desc)
XPLMEnableFeature("XPLM_USE_NATIVE_PATHS", 1);
#endif
INFO_LOG("XSwiftBus plugin starting");
std::strcpy(o_name, "XSwiftBus");
INFO_LOG("xswiftbus plugin starting");
std::strcpy(o_name, "xswiftbus");
std::strcpy(o_sig, "org.swift-project.xswiftbus");
std::strcpy(o_desc, "Allows swift to connect to X-Plane via D-Bus IPC");
return 1;

14
src/xswiftbus/messages.cpp
View File

@@ -102,13 +102,13 @@ namespace XSwiftBus
}
CMessageBoxControl::CMessageBoxControl(int left, int right, int top) : m_messageBox(left, right, top),
m_showCommand("org/swift-project/xswiftbus/show_messages", "Show XSwiftBus text messages", [this] { show(); }),
m_hideCommand("org/swift-project/xswiftbus/hide_messages", "Hide XSwiftBus text messages", [this] { hide(); }),
m_toggleCommand("org/swift-project/xswiftbus/toggle_messages", "Toggle XSwiftBus text messages", [this] { toggle(); }),
m_scrollUpCommand("org/swift-project/xswiftbus/scroll_up", "Scroll up XSwiftBus text messages", [this] { scrollUp(); }),
m_scrollDownCommand("org/swift-project/xswiftbus/scroll_down", "Scroll down XSwiftBus text messages", [this] { scrollDown(); }),
m_scrollToTopCommand("org/swift-project/xswiftbus/scroll_top", "Scroll to top of XSwiftBus text messages", [this] { scrollToTop(); }),
m_scrollToBottomCommand("org/swift-project/xswiftbus/scroll_bottom", "Scroll to bottom of XSwiftBus text messages", [this] { scrollToBottom(); })
m_showCommand("org/swift-project/xswiftbus/show_messages", "Show xswiftbus text messages", [this] { show(); }),
m_hideCommand("org/swift-project/xswiftbus/hide_messages", "Hide xswiftbus text messages", [this] { hide(); }),
m_toggleCommand("org/swift-project/xswiftbus/toggle_messages", "Toggle xswiftbus text messages", [this] { toggle(); }),
m_scrollUpCommand("org/swift-project/xswiftbus/scroll_up", "Scroll up xswiftbus text messages", [this] { scrollUp(); }),
m_scrollDownCommand("org/swift-project/xswiftbus/scroll_down", "Scroll down xswiftbus text messages", [this] { scrollDown(); }),
m_scrollToTopCommand("org/swift-project/xswiftbus/scroll_top", "Scroll to top of xswiftbus text messages", [this] { scrollToTop(); }),
m_scrollToBottomCommand("org/swift-project/xswiftbus/scroll_bottom", "Scroll to bottom of xswiftbus text messages", [this] { scrollToBottom(); })
{
show();
}

10
src/xswiftbus/plugin.cpp
View File

@@ -22,7 +22,7 @@ namespace
namespace XSwiftBus
{
CPlugin::CPlugin()
: m_dbusConnection(std::make_shared<CDBusConnection>()), m_menu(CMenu::mainMenu().subMenu("XSwiftBus"))
: m_dbusConnection(std::make_shared<CDBusConnection>()), m_menu(CMenu::mainMenu().subMenu("xswiftbus"))
{
m_showHideLabelsMenuItem = m_menu.item("Show/Hide Aircraft Labels", [this] {
m_traffic->setDrawingLabels(!m_traffic->isDrawingLabels());
@@ -55,7 +55,7 @@ namespace XSwiftBus
}
});*/
// Delay the start of XSwiftBus.
// Delay the start of xswiftbus.
// http://www.xsquawkbox.net/xpsdk/mediawiki/DeferredInitialization
XPLMRegisterFlightLoopCallback(startServerDeferred, -1, this);
@@ -102,7 +102,7 @@ namespace XSwiftBus
std::string listenAddress = "tcp:host=" + m_pluginConfig.getDBusAddress() + ",port=" + std::to_string(m_pluginConfig.getDBusPort());
if (!m_dbusP2PServer->listen(listenAddress))
{
m_service->addTextMessage("XSwiftBus startup failed!", 255, 0, 0);
m_service->addTextMessage("xswiftbus startup failed!", 255, 0, 0);
return;
}
m_dbusP2PServer->setDispatcher(&m_dbusDispatcher);
@@ -141,7 +141,7 @@ namespace XSwiftBus
}
//! todo RR: Send all logs to the the message window.
const std::string msg = "XSwiftBus " + m_service->getVersionNumber() + " started.";
const std::string msg = "xswiftbus " + m_service->getVersionNumber() + " started.";
INFO_LOG(msg);
m_service->addTextMessage(msg, 0, 255, 255);
}
@@ -179,7 +179,7 @@ namespace XSwiftBus
{
plugin->startServer();
plugin->m_isRunning = true;
INFO_LOG("XSwiftBus plugin started (deferred)");
INFO_LOG("xswiftbus plugin started (deferred)");
}
return 0;
}

4
src/xswiftbus/service.h
View File

@@ -28,7 +28,7 @@
namespace XSwiftBus
{
/*!
* XSwiftBus service object which is accessible through DBus
* xswiftbus service object which is accessible through DBus
*/
class CService : public CDBusObject
{
@@ -59,7 +59,7 @@ namespace XSwiftBus
//! Called by XPluginReceiveMessage when some scenery is loaded.
void onSceneryLoaded();
//! Returns the XSwiftBus version number
//! Returns the xswiftbus version number
std::string getVersionNumber() const;
//! Returns the SHA1 of the last commit that could influence xswiftbus.

2
src/xswiftbus/settings.h
View File

@@ -12,7 +12,7 @@
namespace XSwiftBus
{
/*!
* XSwiftBus/swift side settings class, JSON capable, shared among all services
* xswiftbus/swift side settings class, JSON capable, shared among all services
*/
class CSettings final : public BlackMisc::Simulation::Settings::CXSwiftBusSettingsQtFree
{

2
src/xswiftbus/traffic.h
View File

@@ -27,7 +27,7 @@
namespace XSwiftBus
{
/*!
* XSwiftBus service object for traffic aircraft which is accessible through DBus
* xswiftbus service object for traffic aircraft which is accessible through DBus
*/
class CTraffic : public CDBusObject
{

2
src/xswiftbus/weather.h
View File

@@ -20,7 +20,7 @@
namespace XSwiftBus
{
/*!
* XSwiftBus weather object which is accessible through DBus
* xswiftbus weather object which is accessible through DBus
*/
class CWeather : public CDBusObject
{