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

refs #883, launcher improvements

Browse Source 
* check if core is running before starting pilot client DBus UI
* avoid starting pilot client when already running
* save UI state (cache)
* made lauchner BlackMisc::CIdentifiable
This commit is contained in:
Klaus Basan
2017-02-17 20:11:54 +01:00
committed by Mathew Sutcliffe
parent 5d81b23386
commit 3b3cdf4566
3 changed files with 138 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/swiftlauncher/swiftlauncher.h
View File

@@ -17,8 +17,9 @@
#include "blackgui/mainwindowaccess.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/data/updateinfo.h"
#include "blackcore/data/launchersetup.h"
#include "blackcore/coremodeenums.h"
#include "blackcore/application/applicationsettings.h"
#include "blackmisc/identifiable.h"
#include <QDialog>
#include <QTimer>
#include <QScopedPointer>
@@ -35,7 +36,8 @@ namespace Ui { class CSwiftLauncher; }
class CSwiftLauncher :
public QDialog,
public BlackGui::CEnableForFramelessWindow,
public BlackGui::IMainWindowAccess
public BlackGui::IMainWindowAccess,
public BlackMisc::CIdentifiable
{
Q_OBJECT
Q_INTERFACES(BlackGui::IMainWindowAccess)
@@ -56,7 +58,7 @@ public:
//! Destructor
virtual ~CSwiftLauncher();
//! Executable
//! Executable (to be started)
const QString &getExecutable() const { return m_executable; }
//! Arguments
@@ -72,19 +74,16 @@ protected:
//! \copydoc QDialog::mouseMoveEvent
void mouseMoveEvent(QMouseEvent *event) override;
private slots:
//! Display latest news
void ps_displayLatestNews(QNetworkReply *reply);
private:
QScopedPointer<Ui::CSwiftLauncher> ui;
QScopedPointer<Ui::CSwiftLauncher> ui;
BlackMisc::CData<BlackCore::Data::TUpdateInfo> m_updateInfo { this, &CSwiftLauncher::ps_changedUpdateInfoCache }; //!< version cache
BlackMisc::CSetting<BlackCore::Application::TDBusServerAddress> m_dbusServerAddress { this }; //!< DBus address
BlackMisc::CData<BlackCore::Data::TLauncherSetup> m_setup { this }; //! setup, ie 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
@@ -128,13 +127,16 @@ private:
bool setSwiftGuiExecutable();
//! Can DBus server be connected
bool canConnectDBusServer(QString &msg) const;
bool canConnectSwiftOnDBusServer(const QString &dbusAddress, QString &msg) const;
//! Standalone GUI selected
bool isStandaloneGuiSelected() const;
//! Set default
void setDefault(const QString &value);
void setDefaults();
//! Save state
void saveSetup();
//! Command line
static QString toCmdLine(const QString &exe, const QStringList &exeArgs);
@@ -146,6 +148,9 @@ private slots:
//! Loaded latest version
void ps_loadedUpdateInfo(bool success);
//! Display latest news
void ps_displayLatestNews(QNetworkReply *reply);
//! Cache values have been changed
void ps_changedUpdateInfoCache();
@@ -177,7 +182,7 @@ private slots:
void ps_showLogPage();
//! Check if applicationas are already running
void ps_checkRunningApplications();
void ps_checkRunningApplicationsAndCore();
};
#endif // guard