From 80ab55c4be62e5d7ee409291ccb6bd414cec51f2 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 16 Jul 2016 02:54:18 +0200
Subject: [PATCH] refs #709, GUI component (load info) added to launcher (plus
 enabled webservices for launcher)

---
 src/swiftlauncher/main.cpp          |  8 ++-
 src/swiftlauncher/swiftlauncher.cpp |  1 +
 src/swiftlauncher/swiftlauncher.ui  | 77 ++++++++++++++++++++---------
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp
index 4da150db3..7a30be856 100644
--- a/src/swiftlauncher/main.cpp
+++ b/src/swiftlauncher/main.cpp
@@ -10,6 +10,7 @@
 #include "swiftlauncher.h"
 #include "blackgui/guiapplication.h"
 #include "blackcore/registermetadata.h"
+#include "blackcore/db/databasereaderconfig.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/icons.h"
 
@@ -23,16 +24,19 @@
 using namespace BlackGui;
 using namespace BlackMisc;
 using namespace BlackCore;
+using namespace BlackCore::Db;
 
 int main(int argc, char *argv[])
 {
-    //! [CSwiftGuiStdApplication]
+    //! [SwiftApplicationDemo]
     CGuiApplication::highDpiScreenSupport();
     QApplication qa(argc, argv);
     CGuiApplication a("swift launcher", CGuiApplication::Laucher, CIcons::swift1024());
+    a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
     a.addParserOption({{"i", "installer"}, QCoreApplication::translate("main", "Installer setup."), "installer"});
     a.parse();
-    //! [CSwiftGuiStdApplication]
+    if (!a.start()) { return EXIT_FAILURE; }
+    //! [SwiftApplicationDemo]
 
     // Dialog to decide external or internal core
     CSwiftLauncher launcher;
diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 72471cf93..233b6e2ee 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -315,6 +315,7 @@ void CSwiftLauncher::ps_loadedUpdateInfo(bool success)
     this->ui->wi_NewVersionAvailable->setVisible(newVersionAvailable);
     this->ui->wi_NoNewVersion->setVisible(!newVersionAvailable);
     this->ui->le_LatestVersion->setText(latestVersion);
+    this->ui->le_Channel->setText(updateInfo.getChannel());
 
     if (!downloadUrls.isEmpty())
     {
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index d0eedbf2f..657d482c5 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -78,7 +78,7 @@
           <item>
            <widget class="QToolBox" name="tb_Launcher">
             <property name="currentIndex">
-             <number>3</number>
+             <number>0</number>
             </property>
             <property name="tabSpacing">
              <number>6</number>
@@ -423,17 +423,24 @@
                  <enum>QFrame::Raised</enum>
                 </property>
                 <layout class="QGridLayout" name="gridLayout_2">
-                 <item row="0" column="1">
-                  <widget class="QLineEdit" name="le_CurrentVersion">
+                 <item row="1" column="0">
+                  <widget class="QLabel" name="lbl_Channel">
+                   <property name="text">
+                    <string>Channel:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QLineEdit" name="le_Channel">
                    <property name="readOnly">
                     <bool>true</bool>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="lbl_CurrentVersion">
-                   <property name="text">
-                    <string>This version:</string>
+                 <item row="0" column="1">
+                  <widget class="QLineEdit" name="le_CurrentVersion">
+                   <property name="readOnly">
+                    <bool>true</bool>
                    </property>
                   </widget>
                  </item>
@@ -444,7 +451,21 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="4" column="1" colspan="3">
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="lbl_CurrentVersion">
+                   <property name="text">
+                    <string>This version:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="3">
+                  <widget class="QLineEdit" name="le_LatestVersion">
+                   <property name="readOnly">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="3" column="1" colspan="3">
                   <widget class="QWidget" name="wi_NoNewVersion" native="true">
                    <layout class="QVBoxLayout" name="vl_NoNewVersion">
                     <property name="leftMargin">
@@ -469,14 +490,7 @@
                    </layout>
                   </widget>
                  </item>
-                 <item row="0" column="3">
-                  <widget class="QLineEdit" name="le_LatestVersion">
-                   <property name="readOnly">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="3" column="1" colspan="3">
+                 <item row="2" column="1" colspan="3">
                   <widget class="QWidget" name="wi_NewVersionAvailable" native="true">
                    <layout class="QVBoxLayout" name="vl_NewVersionAvailable">
                     <property name="leftMargin">
@@ -508,10 +522,10 @@
                    </layout>
                   </widget>
                  </item>
-                 <item row="1" column="1" colspan="2">
+                 <item row="1" column="2">
                   <widget class="QPushButton" name="pb_CheckForUpdates">
                    <property name="text">
-                    <string>check for updates</string>
+                    <string>check again</string>
                    </property>
                   </widget>
                  </item>
@@ -519,7 +533,17 @@
                </widget>
               </item>
               <item>
-               <widget class="QFrame" name="fr_DataUpdates">
+               <widget class="BlackGui::Components::CInfoBarWebReadersStatusSmallComponent" name="comp_InfoBar">
+                <property name="frameShape">
+                 <enum>QFrame::StyledPanel</enum>
+                </property>
+                <property name="frameShadow">
+                 <enum>QFrame::Raised</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="BlackGui::Components::CDbLoadOverviewComponent" name="fr_DataUpdates">
                 <property name="frameShape">
                  <enum>QFrame::StyledPanel</enum>
                 </property>
@@ -529,9 +553,6 @@
                </widget>
               </item>
              </layout>
-             <zorder>fr_SoftwareUpdates</zorder>
-             <zorder>lbl_NoNewVersion</zorder>
-             <zorder>fr_DataUpdates</zorder>
             </widget>
             <widget class="QWidget" name="pg_CreditsLicense">
              <property name="geometry">
@@ -772,6 +793,18 @@ p, li { white-space: pre-wrap; }
    <header>blackgui/components/logcomponent.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CDbLoadOverviewComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/dbloadoverviewcomponent.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CInfoBarWebReadersStatusSmallComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/infobarwebreadersstatussmallcomponent.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../blackmisc/blackmisc.qrc"/>