From 3bfb76c1e6226a4967f2bff2183a7aea2d41735a Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 16 Jul 2018 15:47:12 +0200
Subject: [PATCH] "Try to fix" for setup loading dialog

---
 src/blackgui/components/setuploadingdialog.cpp | 10 ++++++++++
 src/blackgui/components/setuploadingdialog.h   |  3 +++
 src/blackgui/components/setuploadingdialog.ui  |  7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/src/blackgui/components/setuploadingdialog.cpp b/src/blackgui/components/setuploadingdialog.cpp
index adc5f60e1..da9b3fb1a 100644
--- a/src/blackgui/components/setuploadingdialog.cpp
+++ b/src/blackgui/components/setuploadingdialog.cpp
@@ -44,6 +44,7 @@ namespace BlackGui
             connect(ui->pb_Help, &QPushButton::clicked, this, &CSetupLoadingDialog::openHelpPage);
             connect(ui->pb_CopyFromSwift, &QPushButton::clicked, this, &CSetupLoadingDialog::copyFromOtherSwiftVersions);
             connect(ui->pb_OpemDirectory, &QPushButton::clicked, this, &CSetupLoadingDialog::openDirectory);
+            connect(ui->pb_TryToFix, &QPushButton::clicked, this, &CSetupLoadingDialog::tryToFix);
 
             QPushButton *retry = ui->bb_Dialog->button(QDialogButtonBox::Retry);
             retry->setDefault(true);
@@ -117,6 +118,14 @@ namespace BlackGui
             this->accept();
         }
 
+        void CSetupLoadingDialog::tryToFix()
+        {
+            this->prefillSetupCache();
+            QPushButton *retry = ui->bb_Dialog->button(QDialogButtonBox::Retry);
+            if (!retry) { return; }
+            retry->click();
+        }
+
         void CSetupLoadingDialog::prefillSetupCache()
         {
             if (!sApp || sApp->isShuttingDown()) { return; }
@@ -145,6 +154,7 @@ namespace BlackGui
             const bool hasCachedSetup = this->hasCachedSetup();
             ui->pb_LoadFromDisk->setEnabled(!hasCachedSetup);
             ui->pb_LoadFromDisk->setToolTip(hasCachedSetup ? "Cached setup already available" : "No cached setup");
+            ui->pb_TryToFix->setEnabled(!hasCachedSetup);
         }
 
         void CSetupLoadingDialog::displayOtherVersionsInfo()
diff --git a/src/blackgui/components/setuploadingdialog.h b/src/blackgui/components/setuploadingdialog.h
index d116b5518..c3f99c9cc 100644
--- a/src/blackgui/components/setuploadingdialog.h
+++ b/src/blackgui/components/setuploadingdialog.h
@@ -64,6 +64,9 @@ namespace BlackGui
             //! Try again without explicit bootstrap URL
             void tryAgainWithoutBootstrapUrl();
 
+            //! Try to fix
+            void tryToFix();
+
             //! Prefill setup cache
             void prefillSetupCache();
 
diff --git a/src/blackgui/components/setuploadingdialog.ui b/src/blackgui/components/setuploadingdialog.ui
index ab8dce351..1ac140bfb 100644
--- a/src/blackgui/components/setuploadingdialog.ui
+++ b/src/blackgui/components/setuploadingdialog.ui
@@ -195,6 +195,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="2" colspan="2">
+       <widget class="QPushButton" name="pb_TryToFix">
+        <property name="text">
+         <string>try to fix</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>