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

Ref T41, download auto info triggered in mapping tool

Browse Source
This commit is contained in:
Klaus Basan
2017-04-25 14:39:54 +02:00
committed by Mathew Sutcliffe
parent b2d95f471e
commit 83adc66ec7
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/swiftdata/swiftdata.cpp
View File

@@ -113,7 +113,7 @@ void CSwiftData::init()
this->setWindowTitle(t); this->setWindowTitle(t);
} }
QTimer::singleShot(10 * 1000, this, &CSwiftData::checkNewVersion); sGui->triggerNewVersionCheck(10 * 1000);
emit sGui->startUpCompleted(true); emit sGui->startUpCompleted(true);
} }
@@ -151,21 +151,6 @@ void CSwiftData::performGracefulShutdown()
// void // void
} }
void CSwiftData::checkNewVersion()
{
const QStringList channelPlatform = m_distributionSettings.get();
Q_ASSERT_X(channelPlatform.size() == 2, Q_FUNC_INFO, "wrong setting");
const QVersionNumber v = m_distributionInfo.get().getQVersionForChannelAndPlatform(channelPlatform);
if (v.isNull() || v.segmentCount() < 4) return;
const QVersionNumber vCurrent = CBuildConfig::getVersion();
if (v <= vCurrent) return;
// new version
const CStatusMessage m = CStatusMessage(this).info("New version '%1' from %2 for %3. Current version is '%4'") << v.toString() << channelPlatform.first() << channelPlatform.last() << vCurrent.toString();
this->displayInOverlayWindow(m, 5000);
CLogMessage::preformatted(m);
}
void CSwiftData::displayConsole() void CSwiftData::displayConsole()
{ {
ui->comp_MainInfoArea->displayConsole(); ui->comp_MainInfoArea->displayConsole();

9
src/swiftdata/swiftdata.h
View File

@@ -14,9 +14,6 @@
#include "blackgui/mainwindowaccess.h" #include "blackgui/mainwindowaccess.h"
#include "blackgui/managedstatusbar.h" #include "blackgui/managedstatusbar.h"
#include "blackmisc/datacache.h"
#include "blackmisc/db/distributionlist.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/identifiable.h" #include "blackmisc/identifiable.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
@@ -69,16 +66,14 @@ private:
void initStyleSheet(); void initStyleSheet();
void initMenu(); void initMenu();
void initDynamicMenus(); void initDynamicMenus();
void performGracefulShutdown(); void performGracefulShutdown();
void checkNewVersion();
void displayConsole(); void displayConsole();
void displayLog(); void displayLog();
QScopedPointer<Ui::CSwiftData> ui;
BlackGui::CManagedStatusBar m_statusBar; BlackGui::CManagedStatusBar m_statusBar;
BlackMisc::CDataReadOnly<BlackMisc::Db::TDistributionInfo> m_distributionInfo { this }; //!< version cache QScopedPointer<Ui::CSwiftData> ui;
BlackMisc::CSettingReadOnly<BlackMisc::Db::TDistributionSetting> m_distributionSettings { this }; //!< channel/platform selected
}; };
#endif // guard #endif // guard