mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-11 23:05:34 +08:00
fix: Unify xswiftbus spelling
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
namespace XSwiftBus
|
||||
{
|
||||
/*!
|
||||
* XSwiftBus configuration class
|
||||
* xswiftbus configuration class
|
||||
*/
|
||||
class CConfig
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user