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

refs #921, moved distribution info UI into an own component

Browse Source
This commit is contained in:
Klaus Basan
2017-03-29 02:30:40 +02:00
committed by Mathew Sutcliffe
parent cbf69d9847
commit 83a80bf739
6 changed files with 408 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/swiftlauncher/swiftlauncher.h
View File

@@ -16,7 +16,6 @@
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/mainwindowaccess.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/data/updateinfo.h"
#include "blackcore/data/launchersetup.h"
#include "blackcore/coremodeenums.h"
#include "blackmisc/identifiable.h"
@@ -78,15 +77,14 @@ protected:
private:
QScopedPointer<Ui::CSwiftLauncher> ui;
QScopedPointer<BlackGui::Components::CConfigurationWizard> m_wizard;
BlackMisc::CData<BlackCore::Data::TUpdateInfo> m_updateInfo { this, &CSwiftLauncher::ps_changedUpdateInfoCache }; //!< version cache
BlackMisc::CData<BlackCore::Data::TLauncherSetup> m_setup { this }; //!< setup, i.e. last user selection
BlackMisc::CData<BlackCore::Data::TLauncherSetup> m_setup { this }; //!< setup, i.e. last user selection
QString m_executable;
QStringList m_executableArgs;
QTimer m_checkTimer { this };
int m_startCoreWaitCycles = 0;
int m_startMappingToolWaitCycles = 0;
int m_startGuiWaitCycles = 0;
bool m_updateInfoLoaded = false;
//! Get core mode
BlackCore::CoreModes::CoreMode getCoreMode() const;
@@ -106,12 +104,12 @@ private:
//! combobox for DBus
void initDBusGui();
//! Version string
void initVersion();
//! Log display
void initLogDisplay();
//! Set header info
void setHeaderInfo(const QString &newVersionAvailable);
//! Latest news
//! \sa CSwiftLauncher::ps_displayLatestNews
void loadLatestNews();
@@ -147,17 +145,11 @@ private:
static QString toCmdLine(const QString &exe, const QStringList &exeArgs);
private slots:
//! Load latest version
void ps_loadSetup();
//! Loaded latest version
void ps_loadedUpdateInfo(bool success);
//! Display latest news
void ps_displayLatestNews(QNetworkReply *reply);
//! Cache values have been changed
void ps_changedUpdateInfoCache();
//! Distribution info is available
void ps_distributionInfoAvailable(bool success);
//! Start button pressed
void ps_startButtonPressed();