flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T709, changed settings component to "new" TXSwiftBusSettings

Browse Source
This commit is contained in:
Klaus Basan
2019-07-27 02:24:02 +02:00
committed by Mat Sutcliffe
parent 5ebf119acb
commit f2f9ee8818
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackgui/components/settingsxswiftbuscomponent.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackGui
connect(ui->pb_Save, &QPushButton::released, this, &CSettingsXSwiftBusComponent::saveServer); connect(ui->pb_Save, &QPushButton::released, this, &CSettingsXSwiftBusComponent::saveServer);
connect(ui->pb_Reset, &QPushButton::released, this, &CSettingsXSwiftBusComponent::resetServer); connect(ui->pb_Reset, &QPushButton::released, this, &CSettingsXSwiftBusComponent::resetServer);
const QString dBusAddress = m_xSwiftBusServerSetting.get(); const QString dBusAddress = m_xSwiftBusSettings.get().getDBusServerAddressQt();
ui->comp_DBusServer->setForXSwiftBus(); ui->comp_DBusServer->setForXSwiftBus();
ui->comp_DBusServer->set(dBusAddress); ui->comp_DBusServer->set(dBusAddress);
} }
@@ -47,7 +47,7 @@ namespace BlackGui
void CSettingsXSwiftBusComponent::resetServer() void CSettingsXSwiftBusComponent::resetServer()
{ {
const QString s = TXSwiftBusServer::defaultValue(); const QString s = TXSwiftBusSettings::defaultValue().getDBusServerAddressQt();
ui->comp_DBusServer->set(s); ui->comp_DBusServer->set(s);
} }
@@ -55,9 +55,12 @@ namespace BlackGui
{ {
const QString dBusAddress = ui->comp_DBusServer->getDBusAddress(); const QString dBusAddress = ui->comp_DBusServer->getDBusAddress();
if (dBusAddress.isEmpty()) { return; } if (dBusAddress.isEmpty()) { return; }
if (dBusAddress != m_xSwiftBusServerSetting.getThreadLocal()) CXSwiftBusSettings s = m_xSwiftBusSettings.getThreadLocal();
if (dBusAddress != s.getDBusServerAddressQt())
{ {
const CStatusMessage msg = m_xSwiftBusServerSetting.setAndSave(dBusAddress); s.setDBusServerAddressQt(dBusAddress);
const CStatusMessage msg = m_xSwiftBusSettings.setAndSave(dBusAddress);
CXSwiftBusConfigWriter xswiftbusConfigWriter; CXSwiftBusConfigWriter xswiftbusConfigWriter;
xswiftbusConfigWriter.setDBusAddress(dBusAddress); xswiftbusConfigWriter.setDBusAddress(dBusAddress);
xswiftbusConfigWriter.updateInAllXPlaneVersions(); xswiftbusConfigWriter.updateInAllXPlaneVersions();

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

@@ -38,11 +38,11 @@ namespace BlackGui
explicit CSettingsXSwiftBusComponent(QWidget *parent = nullptr); explicit CSettingsXSwiftBusComponent(QWidget *parent = nullptr);
//! Dtor //! Dtor
virtual ~CSettingsXSwiftBusComponent(); virtual ~CSettingsXSwiftBusComponent() override;
private: private:
QScopedPointer<Ui::CSettingsXSwiftBusComponent> ui; QScopedPointer<Ui::CSettingsXSwiftBusComponent> ui;
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusServer> m_xSwiftBusServerSetting { this }; BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusSettings> m_xSwiftBusSettings { this };
void resetServer(); void resetServer();
void saveServer(); void saveServer();