From d97a12cbae2e5061ca359e3b2fa79281e8046299 Mon Sep 17 00:00:00 2001
From: Charles <18726788+csharpee@users.noreply.github.com>
Date: Fri, 1 May 2020 14:32:35 -0400
Subject: [PATCH] fixed setBasePixmap after UI change for animations, plus
 updated string to The Dragon Awakens...

---
 src/connection.ui  | 15 ++++-----------
 src/controller.cpp |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/connection.ui b/src/connection.ui
index c421f68..69c6a7c 100644
--- a/src/connection.ui
+++ b/src/connection.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>513</width>
-    <height>201</height>
+    <width>512</width>
+    <height>513</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,7 +33,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="FilledIconLabel" name="topIcon">
+    <widget class="QLabel" name="topIcon">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
@@ -55,7 +55,7 @@
    <item>
     <widget class="QLabel" name="status">
      <property name="text">
-      <string>Starting Up</string>
+      <string>The Dragon Awakens...</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
@@ -84,13 +84,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>FilledIconLabel</class>
-   <extends>QLabel</extends>
-   <header>fillediconlabel.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/controller.cpp b/src/controller.cpp
index 18a158e..3667401 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1523,7 +1523,7 @@ void Controller::shutdownhushd()
         QDialog d(main);
         Ui_ConnectionDialog connD;
         connD.setupUi(&d);
-        connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
+        connD.topIcon->setPixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
         connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit"));
         connD.statusDetail->setText(QObject::tr("Waiting for hushd to exit"));
         bool finished = false;