From 83dbd3fcb6076e8b8807854412c6ae11dbaaa365 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 14 Feb 2017 04:32:20 +0100
Subject: [PATCH] refs #883, display core mode selection first * show news only
 if new * removed duplicate call of this->ps_loadedUpdateInfo (avoid redundant
 loads)

---
 src/swiftlauncher/swiftlauncher.cpp | 18 ++++++++++++++++--
 src/swiftlauncher/swiftlauncher.h   |  3 ++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 136be4ce6..c6363798e 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -40,7 +40,6 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
 {
     ui->setupUi(this);
     this->init();
-    ui->tb_Launcher->setCurrentIndex(0);
     connect(ui->pb_CheckForUpdates, &QPushButton::pressed, this, &CSwiftLauncher::ps_loadSetup);
     connect(ui->tb_SwiftCore, &QPushButton::pressed, this, &CSwiftLauncher::ps_startButtonPressed);
     connect(ui->tb_SwiftMappingTool, &QPushButton::pressed, this, &CSwiftLauncher::ps_startButtonPressed);
@@ -50,8 +49,12 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
     connect(ui->tb_Launcher, &QToolBox::currentChanged, this, &CSwiftLauncher::ps_tabChanged);
 
     // use version signal as trigger for completion
-    this->ps_loadedUpdateInfo(true); // defaults from settings, overridden by signal/slot when changed
     connect(sGui, &CApplication::updateInfoAvailable, this, &CSwiftLauncher::ps_loadedUpdateInfo);
+    QTimer::singleShot(10 * 1000, this, [ = ]
+    {
+        if (this->m_updateInfoLoaded) { return; }
+        this->ps_loadedUpdateInfo(true); // failover
+    });
 
     new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this, SLOT(ps_showLogPage()));
     ui->le_DBusServerPort->setValidator(new QIntValidator(0, 65535, this));
@@ -112,7 +115,14 @@ void CSwiftLauncher::ps_displayLatestNews(QNetworkReply *reply)
     if (nwReply->error() == QNetworkReply::NoError)
     {
         const QString html = nwReply->readAll().trimmed();
+        if (html.isEmpty()) { return; }
         ui->te_LatestNews->setHtml(html);
+        constexpr qint64 newNews = 72 * 3600 * 1000;
+        const qint64 deltaT = CNetworkUtils::lastModifiedSinceNow(nwReply.data());
+        if (deltaT > 0 && deltaT < newNews)
+        {
+            ui->tb_Launcher->setCurrentWidget(ui->pg_LatestNews);
+        }
     }
 }
 
@@ -140,6 +150,9 @@ void CSwiftLauncher::init()
     this->initLogDisplay();
     this->initDBusGui();
     this->initVersion();
+
+    ui->sw_SwiftLauncher->setCurrentWidget(ui->pg_SwiftLauncherMain);
+    ui->tb_Launcher->setCurrentWidget(ui->pg_CoreMode);
 }
 
 void CSwiftLauncher::initStyleSheet()
@@ -316,6 +329,7 @@ void CSwiftLauncher::ps_loadedUpdateInfo(bool success)
         return;
     }
 
+    this->m_updateInfoLoaded = true;
     const CUpdateInfo updateInfo(this->m_updateInfo.get());
     const QString latestVersion(updateInfo.getLatestVersion()) ; // need to get this from somewhere
     CFailoverUrlList downloadUrls(updateInfo.getDownloadUrls());
diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h
index 08875c179..1b2f3f4aa 100644
--- a/src/swiftlauncher/swiftlauncher.h
+++ b/src/swiftlauncher/swiftlauncher.h
@@ -55,7 +55,7 @@ public:
     explicit CSwiftLauncher(QWidget *parent = nullptr);
 
     //! Destructor
-    ~CSwiftLauncher();
+    virtual ~CSwiftLauncher();
 
     //! Executable
     const QString &getExecutable() const { return m_executable; }
@@ -85,6 +85,7 @@ private:
     QTimer      m_checkTimer { this };
     int         m_startCoreWaitCycles = 0;
     int         m_startMappingToolWaitCycles = 0;
+    bool        m_updateInfoLoaded = false;
 
     //! Get core mode
     BlackCore::CoreModes::CoreMode getCoreMode() const;