From 71de1bf02aa7de551d64212fa24da4a0505eb2c1 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 14 Feb 2018 04:13:40 +0100
Subject: [PATCH] UI improvements installer/update info

---
 .../components/installxswiftbuscomponent.cpp  |  4 ++--
 .../components/updateinfocomponent.ui         | 20 +++++++++----------
 src/blackmisc/db/updateinfo.cpp               |  7 +++++++
 src/blackmisc/db/updateinfo.h                 |  3 +++
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/blackgui/components/installxswiftbuscomponent.cpp b/src/blackgui/components/installxswiftbuscomponent.cpp
index 80d60ee20..5ac8fe0ae 100644
--- a/src/blackgui/components/installxswiftbuscomponent.cpp
+++ b/src/blackgui/components/installxswiftbuscomponent.cpp
@@ -206,7 +206,7 @@ namespace BlackGui
             const CRemoteFileList remoteFiles = artifacts.asRemoteFiles();
             if (!remoteFiles.isEmpty())
             {
-                const QStringList xSwiftBusFiles(remoteFiles.getNamesPlusSize(true));
+                const QStringList xSwiftBusFiles(remoteFiles.getNamesPlusSize(false));
                 ui->cb_DownloadFile->addItems(xSwiftBusFiles);
 
                 // current text
@@ -218,7 +218,7 @@ namespace BlackGui
                 }
                 ui->cb_DownloadFile->setCurrentText(
                     current.isEmpty() ?
-                    remoteFiles.backOrDefault().getNameAndSize() :
+                    remoteFiles.frontOrDefault().getNameAndSize() :
                     current
                 ); // latest version
             }
diff --git a/src/blackgui/components/updateinfocomponent.ui b/src/blackgui/components/updateinfocomponent.ui
index f06039721..e35227dd2 100644
--- a/src/blackgui/components/updateinfocomponent.ui
+++ b/src/blackgui/components/updateinfocomponent.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>262</width>
-    <height>126</height>
+    <width>230</width>
+    <height>108</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>90</height>
+    <height>100</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -85,13 +85,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="pb_CheckForUpdates">
-     <property name="text">
-      <string> check again </string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="1">
     <widget class="QLabel" name="lbl_CurrentVersionDisplay">
      <property name="text">
@@ -120,6 +113,13 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="2" rowspan="2">
+    <widget class="QPushButton" name="pb_CheckForUpdates">
+     <property name="text">
+      <string> check again </string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/blackmisc/db/updateinfo.cpp b/src/blackmisc/db/updateinfo.cpp
index 384cb6b97..16a2433bb 100644
--- a/src/blackmisc/db/updateinfo.cpp
+++ b/src/blackmisc/db/updateinfo.cpp
@@ -47,6 +47,13 @@ namespace BlackMisc
             return artifacts;
         }
 
+        CArtifactList CUpdateInfo::getArtifactsXSwiftBusOldestVersionFirst() const
+        {
+            CArtifactList artifacts(m_artifactsXSwiftBus);
+            artifacts.sortByVersion(Qt::DescendingOrder);
+            return artifacts;
+        }
+
         CArtifactList CUpdateInfo::getArtifactsXSwiftBusForCurrentPlatform() const
         {
             CArtifactList artifacts = m_artifactsXSwiftBus.findMatchingForCurrentPlatform();
diff --git a/src/blackmisc/db/updateinfo.h b/src/blackmisc/db/updateinfo.h
index 64895fcf3..e4bb26e03 100644
--- a/src/blackmisc/db/updateinfo.h
+++ b/src/blackmisc/db/updateinfo.h
@@ -58,6 +58,9 @@ namespace BlackMisc
             //! Artifacts (XSwiftBus)
             CArtifactList getArtifactsXSwiftBusLatestVersionFirst() const;
 
+            //! Artifacts (XSwiftBus)
+            CArtifactList getArtifactsXSwiftBusOldestVersionFirst() const;
+
             //! Artifacts for current platform
             //! \note sorted by version
             CArtifactList getArtifactsXSwiftBusForCurrentPlatform() const;