refactor: move ModelUtils into Utils

This commit is contained in:
tobtoht
2023-03-28 22:42:12 +02:00
parent 8fd583a649
commit 0abd323bbb
21 changed files with 86 additions and 114 deletions
+1 -2
View File
@@ -8,7 +8,6 @@
#include "libwalletqt/SubaddressAccount.h"
#include "libwalletqt/WalletManager.h"
#include "model/ModelUtils.h"
#include "utils/Icons.h"
#include "utils/Utils.h"
@@ -23,7 +22,7 @@ AccountSwitcherDialog::AccountSwitcherDialog(Wallet *wallet, QWidget *parent)
m_proxyModel->setSourceModel(m_model);
ui->label_totalBalance->setFont(ModelUtils::getMonospaceFont());
ui->label_totalBalance->setFont(Utils::getMonospaceFont());
this->setWindowModality(Qt::WindowModal);
+4 -4
View File
@@ -5,7 +5,7 @@
#include "ui_BalanceDialog.h"
#include "libwalletqt/WalletManager.h"
#include "model/ModelUtils.h"
#include "utils/Utils.h"
BalanceDialog::BalanceDialog(QWidget *parent, Wallet *wallet)
: WindowModalDialog(parent)
@@ -17,13 +17,13 @@ BalanceDialog::BalanceDialog(QWidget *parent, Wallet *wallet)
"This will take 20 minutes on average.");
ui->label_unconfirmed->setText(WalletManager::displayAmount(wallet->balance() - wallet->unlockedBalance()));
ui->label_unconfirmed->setFont(ModelUtils::getMonospaceFont());
ui->label_unconfirmed->setFont(Utils::getMonospaceFont());
ui->label_spendable->setText(WalletManager::displayAmount(wallet->unlockedBalance()));
ui->label_spendable->setFont(ModelUtils::getMonospaceFont());
ui->label_spendable->setFont(Utils::getMonospaceFont());
ui->label_total->setText(WalletManager::displayAmount(wallet->balance()));
ui->label_total->setFont(ModelUtils::getMonospaceFont());
ui->label_total->setFont(Utils::getMonospaceFont());
this->adjustSize();
}
+1 -2
View File
@@ -4,7 +4,6 @@
#include "OutputInfoDialog.h"
#include "ui_OutputInfoDialog.h"
#include "model/ModelUtils.h"
#include "utils/Utils.h"
OutputInfoDialog::OutputInfoDialog(CoinsInfo *cInfo, QWidget *parent)
@@ -13,7 +12,7 @@ OutputInfoDialog::OutputInfoDialog(CoinsInfo *cInfo, QWidget *parent)
{
ui->setupUi(this);
QFont font = ModelUtils::getMonospaceFont();
QFont font = Utils::getMonospaceFont();
ui->label_pubKey->setFont(font);
ui->label_keyImage->setFont(font);
ui->label_txid->setFont(font);
+5 -6
View File
@@ -12,7 +12,6 @@
#include "libwalletqt/Input.h"
#include "libwalletqt/Transfer.h"
#include "libwalletqt/WalletManager.h"
#include "model/ModelUtils.h"
#include "qrcode/QrCode.h"
#include "utils/AppData.h"
#include "utils/config.h"
@@ -46,12 +45,12 @@ TxConfAdvDialog::TxConfAdvDialog(Wallet *wallet, const QString &description, QWi
connect(ui->btn_send, &QPushButton::clicked, this, &TxConfAdvDialog::broadcastTransaction);
connect(ui->btn_close, &QPushButton::clicked, this, &TxConfAdvDialog::closeDialog);
ui->amount->setFont(ModelUtils::getMonospaceFont());
ui->fee->setFont(ModelUtils::getMonospaceFont());
ui->total->setFont(ModelUtils::getMonospaceFont());
ui->amount->setFont(Utils::getMonospaceFont());
ui->fee->setFont(Utils::getMonospaceFont());
ui->total->setFont(Utils::getMonospaceFont());
ui->inputs->setFont(ModelUtils::getMonospaceFont());
ui->outputs->setFont(ModelUtils::getMonospaceFont());
ui->inputs->setFont(Utils::getMonospaceFont());
ui->outputs->setFont(Utils::getMonospaceFont());
this->adjustSize();
}
+6 -6
View File
@@ -7,11 +7,11 @@
#include <QMessageBox>
#include "constants.h"
#include "model/ModelUtils.h"
#include "TxConfAdvDialog.h"
#include "utils/AppData.h"
#include "utils/ColorScheme.h"
#include "utils/config.h"
#include "utils/Utils.h"
TxConfDialog::TxConfDialog(Wallet *wallet, PendingTransaction *tx, const QString &address, const QString &description, QWidget *parent)
: WindowModalDialog(parent)
@@ -46,9 +46,9 @@ TxConfDialog::TxConfDialog(Wallet *wallet, PendingTransaction *tx, const QString
int maxLengthFiat = Utils::maxLength(amounts_fiat);
std::for_each(amounts_fiat.begin(), amounts_fiat.end(), [maxLengthFiat](QString& amount){amount = amount.rightJustified(maxLengthFiat, ' ');});
ui->label_amount->setFont(ModelUtils::getMonospaceFont());
ui->label_fee->setFont(ModelUtils::getMonospaceFont());
ui->label_total->setFont(ModelUtils::getMonospaceFont());
ui->label_amount->setFont(Utils::getMonospaceFont());
ui->label_fee->setFont(Utils::getMonospaceFont());
ui->label_total->setFont(Utils::getMonospaceFont());
ui->label_amount->setText(QString("%1 (%2 %3)").arg(amounts[0], amounts_fiat[0], preferredCur));
ui->label_fee->setText(QString("%1 (%2 %3)").arg(amounts[1], amounts_fiat[1], preferredCur));
@@ -57,8 +57,8 @@ TxConfDialog::TxConfDialog(Wallet *wallet, PendingTransaction *tx, const QString
auto subaddressIndex = m_wallet->subaddressIndex(address);
QString addressExtra;
ui->label_address->setText(ModelUtils::displayAddress(address, 2));
ui->label_address->setFont(ModelUtils::getMonospaceFont());
ui->label_address->setText(Utils::displayAddress(address, 2));
ui->label_address->setFont(Utils::getMonospaceFont());
ui->label_address->setToolTip(address);
if (subaddressIndex.isValid()) {
+1 -2
View File
@@ -14,9 +14,8 @@
#include "libwalletqt/TransactionHistory.h"
#include "libwalletqt/Transfer.h"
#include "libwalletqt/WalletManager.h"
#include "model/ModelUtils.h"
#include "Utils.h"
#include "utils/Icons.h"
#include "utils/Utils.h"
TxInfoDialog::TxInfoDialog(Wallet *wallet, TransactionInfo *txInfo, QWidget *parent)
: QDialog(parent)
+1 -2
View File
@@ -7,7 +7,6 @@
#include <QMessageBox>
#include "libwalletqt/WalletManager.h"
#include "model/ModelUtils.h"
#include "utils/Utils.h"
VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent)
@@ -58,7 +57,7 @@ VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent)
connect(m_wallet, &Wallet::transactionProofVerified, this, &VerifyProofDialog::onTxProofVerified);
connect(m_wallet, &Wallet::spendProofVerified, this, &VerifyProofDialog::onSpendProofVerified);
ui->input_formattedProof->setFont(ModelUtils::getMonospaceFont());
ui->input_formattedProof->setFont(Utils::getMonospaceFont());
}
void VerifyProofDialog::checkProof() {
+2 -2
View File
@@ -6,7 +6,7 @@
#include <QRadioButton>
#include "model/ModelUtils.h"
#include "utils/Utils.h"
WalletCacheDebugDialog::WalletCacheDebugDialog(Wallet *wallet, QWidget *parent)
: WindowModalDialog(parent)
@@ -15,7 +15,7 @@ WalletCacheDebugDialog::WalletCacheDebugDialog(Wallet *wallet, QWidget *parent)
{
ui->setupUi(this);
ui->output->setFont(ModelUtils::getMonospaceFont());
ui->output->setFont(Utils::getMonospaceFont());
connect(ui->m_blockchain, &QRadioButton::pressed, [this]{
this->setOutput(m_wallet->printBlockchain());