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

Refactor X-Plane Plugin Config Window to use DBus server address selector

Browse Source 
ref T291
This commit is contained in:
Roland Winklmeier
2018-07-27 17:02:05 +02:00
committed by Klaus Basan
parent 488ff96ce6
commit 6a7a9ff710
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,24 @@ namespace BlackSimPlugin
{
ui->setupUi(this);
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::close);
ui->comp_SettingsXSwiftBus->set(m_xswiftbusServerSetting.getThreadLocal());
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::settingsAccepted);
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorXPlaneConfigWindow::close);
}
CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow()
{ }
void CSimulatorXPlaneConfigWindow::settingsAccepted()
{
QString currentAddress = m_xswiftbusServerSetting.getThreadLocal();
if (currentAddress != ui->comp_SettingsXSwiftBus->getDBusAddress())
{
m_xswiftbusServerSetting.set(ui->comp_SettingsXSwiftBus->getDBusAddress());
}
close();
}
} // ns
} // ns

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

@@ -13,6 +13,7 @@
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#include "blackgui/pluginconfigwindow.h"
#include "blackmisc/simulation/settings/xswiftbussettings.h"
#include "simulatorxplaneconfig.h"
#include <QObject>
#include <QScopedPointer>
@@ -39,7 +40,10 @@ namespace BlackSimPlugin
virtual ~CSimulatorXPlaneConfigWindow();
private:
void settingsAccepted();
QScopedPointer<Ui::CSimulatorXPlaneConfigWindow> ui;
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusServer> m_xswiftbusServerSetting { this };
};
} // ns
} // ns

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

@@ -6,14 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
<width>184</width>
<height>66</height>
<width>273</width>
<height>191</height>
</rect>
</property>
<property name="windowTitle">
<string>X-Plane plugin settings</string>
</property>
<layout class="QGridLayout" name="gl_ConfigWindow">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<property name="horizontalSpacing">
<number>2</number>
</property>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="bb_OkCancel">
<property name="standardButtons">
@@ -25,7 +40,7 @@
</widget>
</item>
<item row="0" column="0">
<widget class="BlackGui::Components::CSettingsXSwiftBusComponent" name="comp_SettingsXSwiftBus">
<widget class="BlackGui::Components::CDBusServerAddressSelector" name="comp_SettingsXSwiftBus">
<property name="minimumSize">
<size>
<width>0</width>
@@ -38,9 +53,9 @@
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Components::CSettingsXSwiftBusComponent</class>
<class>BlackGui::Components::CDBusServerAddressSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/settingsxswiftbuscomponent.h</header>
<header>blackgui/components/dbusserveraddressselector.h</header>
<container>1</container>
</customwidget>
</customwidgets>