Merge pull request 'Fix misc image scaling hangs' (#54) from tobtoht/feather:img_hang into master

Reviewed-on: https://git.wownero.com/feather/feather/pulls/54

src/assets.qrc

@@ -23,6 +23,7 @@
     <file>assets/images/coldcard.png</file>
     <file>assets/images/coldcard_unpaired.png</file>
     <file>assets/images/confirmed.png</file>
+    <file>assets/images/confirmed_icon.png</file>
     <file>assets/images/confirmed.svg</file>
     <file>assets/images/connect.svg</file>
     <file>assets/images/copy.png</file>
@@ -30,10 +31,12 @@
     <file>assets/images/edit.png</file>
     <file>assets/images/exchange.png</file>
     <file>assets/images/expired.png</file>
+    <file>assets/images/expired_icon.png</file>
     <file>assets/images/eye1.png</file>
     <file>assets/images/feather.png</file>
     <file>assets/images/file.png</file>
     <file>assets/images/ghost.png</file>
+    <file>assets/images/ghost_icon.png</file>
     <file>assets/images/history.png</file>
     <file>assets/images/info.png</file>
     <file>assets/images/key.png</file>

src/model/NodeModel.cpp

@@ -8,8 +8,8 @@
 NodeModel::NodeModel(unsigned int nodeSource, QObject *parent)
         : QAbstractTableModel(parent)
         , m_nodeSource(nodeSource)
-        , m_offline(QIcon(":/assets/images/expired.png"))
+        , m_offline(QIcon(":/assets/images/expired_icon.png"))
-        , m_online(QIcon(":/assets/images/confirmed.png"))
+        , m_online(QIcon(":/assets/images/confirmed_icon.png"))
 {
 }
 

src/utils/utils.cpp

@@ -334,15 +334,15 @@ int Utils::showMessageBox(const QString &windowTitle, const QString &body, bool
     msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
     msgBox.setDefaultButton(QMessageBox::Ok);
 
-    QPixmap iconWarning = QPixmap(":/assets/images/ghost.png")
+    if(warning) {
-            .scaled(QSize(48,48), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        QPixmap iconWarning = QPixmap(":/assets/images/ghost_icon.png");
+        msgBox.setIconPixmap(iconWarning);
+    }
+    else {
         QPixmap iconInfo = QPixmap(":/assets/images/info.png")
                 .scaled(QSize(48,48), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-
-    if(warning)
-        msgBox.setIconPixmap(iconWarning);
-    else
         msgBox.setIconPixmap(iconInfo);
+    }
 
     return msgBox.exec();
 }