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

Changed UI text for legal component and improved "guarding" for shutdown

Browse Source
This commit is contained in:
Klaus Basan
2018-07-13 01:47:17 +02:00
parent 6fd32bb00d
commit 5d615f5585
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@
<html><head><meta name="qrichtext" content="1" /><title>About swift</title><style type="text/css"> <html><head><meta name="qrichtext" content="1" /><title>About swift</title><style type="text/css">
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.1pt; font-weight:400; font-style:normal;"> </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.1pt; font-weight:400; font-style:normal;">
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8.25pt;&quot;&gt;Credits will go here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Loading credits and legal information, be patient ......&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>

4
src/blackgui/components/interpolationsetupcomponent.cpp
View File

@@ -54,12 +54,14 @@ namespace BlackGui
QPointer<CInterpolationSetupComponent> myself(this); QPointer<CInterpolationSetupComponent> myself(this);
QTimer::singleShot(1000, this, [ = ] QTimer::singleShot(1000, this, [ = ]
{ {
if (!sGui || sGui->isShuttingDown()) { return; }
if (myself.isNull()) { return; } if (myself.isNull()) { return; }
this->onModeChanged(); this->onModeChanged();
}); });
QTimer::singleShot(30 * 1000, this, [ = ] QTimer::singleShot(30 * 1000, this, [ = ]
{ {
if (!sGui || sGui->isShuttingDown()) { return; }
if (myself.isNull()) { return; } if (myself.isNull()) { return; }
this->onSetupChanged(); this->onSetupChanged();
}); });
@@ -85,6 +87,7 @@ namespace BlackGui
void CInterpolationSetupComponent::onModeChanged() void CInterpolationSetupComponent::onModeChanged()
{ {
if (!sGui || sGui->isShuttingDown()) { return; }
bool enableCallsign = false; bool enableCallsign = false;
if (this->getSetupMode() == CInterpolationSetupComponent::Global) if (this->getSetupMode() == CInterpolationSetupComponent::Global)
{ {
@@ -237,6 +240,7 @@ namespace BlackGui
void CInterpolationSetupComponent::onSetupChanged() void CInterpolationSetupComponent::onSetupChanged()
{ {
if (!sGui || sGui->isShuttingDown()) { return; }
this->displaySetupsPerCallsign(); this->displaySetupsPerCallsign();
} }