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

Fixed pilot client UI "model set LED"

Browse Source 
and some minor formatting adjustments
This commit is contained in:
Klaus Basan
2017-03-06 04:20:02 +01:00
committed by Mathew Sutcliffe
parent fef6cba645
commit c6f7896939
2 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ namespace BlackGui
{
if (status > 0 && (status & ISimulator::Connected))
{
QString s(
const QString s(
sGui->getIContextSimulator()->getSimulatorPluginInfo().getDescription() + ": " +
ISimulator::statusToString(status));
@@ -131,6 +131,9 @@ namespace BlackGui
{
ui->led_Simulator->setOn(false);
}
// simulator status has impact on model set available
this->ps_onMapperReady();
}
void CInfoBarStatusComponent::ps_onNetworkConnectionChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
@@ -195,14 +198,14 @@ namespace BlackGui
void CInfoBarStatusComponent::ps_onMapperReady()
{
if (!sGui->getIContextSimulator())
if (!sGui || !sGui->getIContextSimulator())
{
ui->led_MapperReady->setOn(false);
return;
}
int models = sGui->getIContextSimulator()->getModelSetCount();
bool on = (models > 0);
const int models = sGui->getIContextSimulator()->getModelSetCount();
const bool on = (models > 0);
ui->led_MapperReady->setOn(on);
if (on)
{

42
src/blackgui/components/infobarstatuscomponent.ui
View File

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>184</width>
<width>191</width>
<height>20</height>
</rect>
</property>
@@ -19,19 +19,6 @@
<property name="windowTitle">
<string>Info status bar</string>
</property>
<property name="windowIcon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/own/icons/own/swift/swift24.png</normaloff>:/own/icons/own/swift/swift24.png</iconset>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QHBoxLayout" name="hl_InfoBarStatus">
<property name="spacing">
<number>0</number>
@@ -50,12 +37,6 @@
</property>
<item>
<widget class="QLabel" name="lbl_Network">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Network</string>
</property>
@@ -82,7 +63,7 @@
<string>sim</string>
</property>
<property name="indent">
<number>6</number>
<number>4</number>
</property>
</widget>
</item>
@@ -105,7 +86,7 @@
<string>map</string>
</property>
<property name="indent">
<number>6</number>
<number>4</number>
</property>
</widget>
</item>
@@ -121,10 +102,10 @@
</sizepolicy>
</property>
<property name="text">
<string>DB</string>
<string>DBus</string>
</property>
<property name="indent">
<number>6</number>
<number>4</number>
</property>
</widget>
</item>
@@ -153,7 +134,7 @@
<string>ptt</string>
</property>
<property name="indent">
<number>6</number>
<number>4</number>
</property>
</widget>
</item>
@@ -165,14 +146,11 @@
<property name="toolTip">
<string>Audio</string>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="text">
<string>au.</string>
<string>au</string>
</property>
<property name="indent">
<number>6</number>
<number>4</number>
</property>
</widget>
</item>
@@ -189,8 +167,6 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../blackmisc/blackmisc.qrc"/>
</resources>
<resources/>
<connections/>
</ui>