Icons for tx table and settings core dump fix

src/mainwindow.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 The Hush Developers
+// Copyright 2019-2021 The Hush Developers
 // Released under the GPLv3
 #include "mainwindow.h"
 #include "addressbook.h"
@@ -466,19 +466,24 @@ void MainWindow::setupSettingsModal() {
             settings.lblTor->setToolTip(tooltip);
         }
 
-        //Use Consolidation
+        // Wallet Size
+        if (rpc->getConnection() != nullptr) {
+            int size = 0;
+            qDebug() << __func__ << ": settings hushDir=" << rpc->getConnection()->config->hushDir;
+
+            QDir hushdir(rpc->getConnection()->config->hushDir);
+            QFile WalletSize(hushdir.filePath("wallet.dat"));
+
+            if (WalletSize.open(QIODevice::ReadOnly)){
+                size = WalletSize.size() / 1000000;  //when file does open.
+                //QString size1 = QString::number(size) ;
+                settings.WalletSize->setText(QString::number(size));
+                WalletSize.close();
+            }
+        }
+
+        // Use Consolidation
         bool isUsingConsolidation = false;
-        int size = 0;
-        qDebug() << __func__ << ": hushDir=" << rpc->getConnection()->config->hushDir;
-
-        QDir hushdir(rpc->getConnection()->config->hushDir);
-        QFile WalletSize(hushdir.filePath("wallet.dat"));
-        if (WalletSize.open(QIODevice::ReadOnly)){
-        size = WalletSize.size() / 1000000;  //when file does open.
-        //QString size1 = QString::number(size) ;
-        settings.WalletSize->setText(QString::number(size));
-        WalletSize.close();
-        } 
         if (rpc->getConnection() != nullptr) {
             isUsingConsolidation = !rpc->getConnection()->config->consolidation.isEmpty() == true;
         }
@@ -487,8 +492,7 @@ void MainWindow::setupSettingsModal() {
             settings.chkConso->setEnabled(false);
         }
 
-         //Use Deletetx
-
+        // Use Deletetx
         bool isUsingDeletetx = false;
         if (rpc->getConnection() != nullptr) {
             isUsingDeletetx = !rpc->getConnection()->config->deletetx.isEmpty() == true;
@@ -498,8 +502,7 @@ void MainWindow::setupSettingsModal() {
             settings.chkDeletetx->setEnabled(false);
         }
 
-          //Use Zindex
-
+        // Use Zindex
         bool isUsingZindex = false;
         if (rpc->getConnection() != nullptr) {
             isUsingZindex = !rpc->getConnection()->config->zindex.isEmpty() == true;
@@ -1617,6 +1620,7 @@ void MainWindow::setupTransactionsTab() {
         QString memo = txModel->getMemo(index.row());
 
         if (!memo.isEmpty()) {
+            /* TODO: Add reply button/functionality */
             QMessageBox mb(QMessageBox::Information, tr("Memo"), memo, QMessageBox::Ok, this);
             mb.setTextFormat(Qt::PlainText);
             mb.setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);

src/mainwindow.ui

@@ -22,7 +22,7 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>2</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">

src/txtablemodel.cpp

@@ -161,6 +161,9 @@ void TxTableModel::updateAllData() {
     }
 
     if (role == Qt::DecorationRole && index.column() == 0) {
+
+        qDebug() << "TX Type = " + dat.type;
+
         if (!dat.memo.isEmpty()) {
             // If the memo is a Payment URI, then show a payment request icon
             if (dat.memo.startsWith("hush:")) {
@@ -172,6 +175,9 @@ void TxTableModel::updateAllData() {
                 return QVariant(icon.pixmap(16, 16));
                 }
         } else {
+            // TODO: Add appropriate icons for types of txs instead of empty pixmap
+            //if(this->getType(index.row()) == "incoming"){}
+
             // Empty pixmap to make it align
             QPixmap p(16, 16);
             p.fill(Qt::white);