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

Allow text messages on the splash screen, currently used with setup reader

Browse Source
This commit is contained in:
Klaus Basan
2018-12-22 06:27:13 +01:00
committed by Mat Sutcliffe
parent 0817d38b4c
commit e7a807efdf
6 changed files with 182 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/setupreader.cpp
View File

@@ -385,7 +385,8 @@ namespace BlackCore
nwReplyPtr->close();
if (setupJson.isEmpty())
{
CLogMessage(this).info("No bootstrap setup file at '%1'") << urlString;
const CStatusMessage m = CLogMessage(this).info("No bootstrap setup file at '%1'") << urlString;
emit this->setupLoadingMessages(m);
}
else
{
@@ -416,7 +417,8 @@ namespace BlackCore
{
// no issue with cache
m_updateInfoUrls = loadedSetup.getSwiftUpdateInfoFileUrls();
CLogMessage(this).info("Loaded setup from '%1'") << urlString;
const CStatusMessage m = CLogMessage(this).info("Loaded setup from '%1'") << urlString;
emit this->setupLoadingMessages(m);
CLogMessage(this).info("Setup: Updated data cache in '%1'") << m_setup.getFilename();
{
QWriteLocker l(&m_lockSetup);

3
src/blackcore/setupreader.h
View File

@@ -129,6 +129,9 @@ namespace BlackCore
//! A shared URL was successfully read
void successfullyReadSharedUrl(const BlackMisc::Network::CUrl &sharedUrl);
//! Message about the loading status
void setupLoadingMessages(const BlackMisc::CStatusMessageList &messages);
protected:
//! Constructor
explicit CSetupReader(QObject *parent);