diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 7572b8c..65d0aeb 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1307,7 +1307,7 @@ void MainWindow::onDeviceButtonRequest(quint64 code) { } m_splashDialog->setMessage("Confirm action on device to proceed"); - m_splashDialog->setIcon(QPixmap(":/assets/images/confirmed.png")); + m_splashDialog->setIcon(QPixmap(":/assets/images/confirmed.svg")); m_splashDialog->show(); m_splashDialog->setEnabled(true); break; diff --git a/src/assets.qrc b/src/assets.qrc index 97bcc93..7565b20 100644 --- a/src/assets.qrc +++ b/src/assets.qrc @@ -13,10 +13,7 @@ assets/images/appicons/128x128.png assets/images/appicons/256x256.png assets/images/arrow.svg - assets/images/banners/1.png - assets/images/banners/2.png assets/images/banners/3.png - assets/images/bitcoin.png assets/images/camera_dark.png assets/images/camera_white.png assets/images/change_account.png @@ -29,21 +26,16 @@ assets/images/coins.png assets/images/coldcard.png assets/images/coldcard_unpaired.png - assets/images/confirmed.png - assets/images/confirmed_icon.png assets/images/confirmed.svg assets/images/connect.svg assets/images/copy.png - assets/images/cutexmrfox.png assets/images/edit.png assets/images/external-link.svg assets/images/exchange.png assets/images/exchange_white.png assets/images/expired.png - assets/images/expired_icon.png assets/images/eye1.png assets/images/eye_blind.png - assets/images/feather.png assets/images/file.png assets/images/file_manager_32px.png assets/images/gnome-calc.png @@ -64,8 +56,6 @@ assets/images/localMonero_sell_white.svg assets/images/localMonero_logo.png assets/images/localMonero_register.svg - assets/images/lock.png - assets/images/lock_icon.png assets/images/lock.svg assets/images/microphone.png assets/images/mining.png @@ -73,7 +63,6 @@ assets/images/nw_32px.png assets/images/offline_tx.png assets/images/person.svg - assets/images/preferences.png assets/images/preferences.svg assets/images/qrcode.png assets/images/qrcode_white.png @@ -89,19 +78,11 @@ assets/images/seed.png assets/images/settings_disabled_32px.png assets/images/speaker.png - assets/images/status_connected_fork.png - assets/images/status_connected.png - assets/images/status_connected_proxy_fork.png - assets/images/status_connected_proxy.png assets/images/status_connected_proxy.svg assets/images/status_connected.svg - assets/images/status_disconnected.png assets/images/status_disconnected.svg - assets/images/status_lagging_fork.png - assets/images/status_lagging.png assets/images/status_lagging.svg assets/images/status_offline.svg - assets/images/status_waiting.png assets/images/status_waiting.svg assets/images/tab_addresses.png assets/images/tab_coins.png @@ -120,13 +101,11 @@ assets/images/trezor_unpaired.png assets/images/trezor_unpaired_white.png assets/images/unconfirmed.png - assets/images/unlock.png assets/images/unlock.svg assets/images/unpaid.png assets/images/update.png assets/images/warning.png assets/images/vrdp_32px.png - assets/images/xmrig.ico assets/images/xmrig.svg assets/images/zoom.png assets/restore_heights_monero_mainnet.txt diff --git a/src/assets/images/banners/1.png b/src/assets/images/banners/1.png deleted file mode 100644 index c3d5e19..0000000 Binary files a/src/assets/images/banners/1.png and /dev/null differ diff --git a/src/assets/images/banners/2.png b/src/assets/images/banners/2.png deleted file mode 100644 index 6c67db7..0000000 Binary files a/src/assets/images/banners/2.png and /dev/null differ diff --git a/src/assets/images/bitcoin.png b/src/assets/images/bitcoin.png deleted file mode 100644 index a597e86..0000000 Binary files a/src/assets/images/bitcoin.png and /dev/null differ diff --git a/src/assets/images/confirmed.png b/src/assets/images/confirmed.png deleted file mode 100644 index 2023abd..0000000 Binary files a/src/assets/images/confirmed.png and /dev/null differ diff --git a/src/assets/images/confirmed_icon.png b/src/assets/images/confirmed_icon.png deleted file mode 100644 index 4759816..0000000 Binary files a/src/assets/images/confirmed_icon.png and /dev/null differ diff --git a/src/assets/images/cutexmrfox.png b/src/assets/images/cutexmrfox.png deleted file mode 100644 index 08d3d50..0000000 Binary files a/src/assets/images/cutexmrfox.png and /dev/null differ diff --git a/src/assets/images/expired_icon.png b/src/assets/images/expired_icon.png deleted file mode 100644 index e0d43f8..0000000 Binary files a/src/assets/images/expired_icon.png and /dev/null differ diff --git a/src/assets/images/feather.png b/src/assets/images/feather.png deleted file mode 100644 index 62af0e9..0000000 Binary files a/src/assets/images/feather.png and /dev/null differ diff --git a/src/assets/images/lock.png b/src/assets/images/lock.png deleted file mode 100644 index a190964..0000000 Binary files a/src/assets/images/lock.png and /dev/null differ diff --git a/src/assets/images/lock_icon.png b/src/assets/images/lock_icon.png deleted file mode 100644 index 1116e48..0000000 Binary files a/src/assets/images/lock_icon.png and /dev/null differ diff --git a/src/assets/images/preferences.png b/src/assets/images/preferences.png deleted file mode 100644 index b10ba6e..0000000 Binary files a/src/assets/images/preferences.png and /dev/null differ diff --git a/src/assets/images/status_connected.png b/src/assets/images/status_connected.png deleted file mode 100644 index 1fe3dac..0000000 Binary files a/src/assets/images/status_connected.png and /dev/null differ diff --git a/src/assets/images/status_connected_fork.png b/src/assets/images/status_connected_fork.png deleted file mode 100644 index a65c2a8..0000000 Binary files a/src/assets/images/status_connected_fork.png and /dev/null differ diff --git a/src/assets/images/status_connected_proxy.png b/src/assets/images/status_connected_proxy.png deleted file mode 100644 index ff553d9..0000000 Binary files a/src/assets/images/status_connected_proxy.png and /dev/null differ diff --git a/src/assets/images/status_connected_proxy_fork.png b/src/assets/images/status_connected_proxy_fork.png deleted file mode 100644 index f6b4541..0000000 Binary files a/src/assets/images/status_connected_proxy_fork.png and /dev/null differ diff --git a/src/assets/images/status_disconnected.png b/src/assets/images/status_disconnected.png deleted file mode 100644 index cb5ac1b..0000000 Binary files a/src/assets/images/status_disconnected.png and /dev/null differ diff --git a/src/assets/images/status_lagging.png b/src/assets/images/status_lagging.png deleted file mode 100644 index b558791..0000000 Binary files a/src/assets/images/status_lagging.png and /dev/null differ diff --git a/src/assets/images/status_lagging_fork.png b/src/assets/images/status_lagging_fork.png deleted file mode 100644 index 8282672..0000000 Binary files a/src/assets/images/status_lagging_fork.png and /dev/null differ diff --git a/src/assets/images/status_waiting.png b/src/assets/images/status_waiting.png deleted file mode 100644 index d551383..0000000 Binary files a/src/assets/images/status_waiting.png and /dev/null differ diff --git a/src/assets/images/tab_settings.png b/src/assets/images/tab_settings.png deleted file mode 100644 index 27fa530..0000000 Binary files a/src/assets/images/tab_settings.png and /dev/null differ diff --git a/src/assets/images/unlock.png b/src/assets/images/unlock.png deleted file mode 100644 index 869e4de..0000000 Binary files a/src/assets/images/unlock.png and /dev/null differ diff --git a/src/assets/images/xmrig.ico b/src/assets/images/xmrig.ico deleted file mode 100644 index ab79afd..0000000 Binary files a/src/assets/images/xmrig.ico and /dev/null differ diff --git a/src/assets/images/xmrto.png b/src/assets/images/xmrto.png deleted file mode 100644 index b06c771..0000000 Binary files a/src/assets/images/xmrto.png and /dev/null differ diff --git a/src/assets/images/xmrto_big.png b/src/assets/images/xmrto_big.png deleted file mode 100644 index 3d2e063..0000000 Binary files a/src/assets/images/xmrto_big.png and /dev/null differ diff --git a/src/dialog/PasswordChangeDialog.cpp b/src/dialog/PasswordChangeDialog.cpp index a2cf526..31ba9fa 100644 --- a/src/dialog/PasswordChangeDialog.cpp +++ b/src/dialog/PasswordChangeDialog.cpp @@ -18,7 +18,7 @@ PasswordChangeDialog::PasswordChangeDialog(QWidget *parent, Wallet *wallet) "Your wallet is password protected and encrypted. Use this dialog to change your password."; ui->label_warning->setText(warning_str); - QPixmap pixmap = noPassword ? QPixmap(":/assets/images/unlock.png") : QPixmap(":/assets/images/lock.png"); + QPixmap pixmap = noPassword ? QPixmap(":/assets/images/unlock.svg") : QPixmap(":/assets/images/lock.svg"); ui->icon->setPixmap(pixmap.scaledToWidth(32, Qt::SmoothTransformation)); if (noPassword) { diff --git a/src/dialog/TorInfoDialog.cpp b/src/dialog/TorInfoDialog.cpp index 569bb78..0972576 100644 --- a/src/dialog/TorInfoDialog.cpp +++ b/src/dialog/TorInfoDialog.cpp @@ -34,11 +34,11 @@ void TorInfoDialog::onConnectionStatusChanged(bool connected) { ui->label_testConnectionStatus->setText("Not running"); } else if (connected) { - ui->icon_connectionStatus->setPixmap(QPixmap(":/assets/images/status_connected.png").scaledToWidth(16, Qt::SmoothTransformation)); + ui->icon_connectionStatus->setPixmap(QPixmap(":/assets/images/status_connected.svg").scaledToWidth(16, Qt::SmoothTransformation)); ui->label_testConnectionStatus->setText("Connected"); } else { - ui->icon_connectionStatus->setPixmap(QPixmap(":/assets/images/status_disconnected.png").scaledToWidth(16, Qt::SmoothTransformation)); + ui->icon_connectionStatus->setPixmap(QPixmap(":/assets/images/status_disconnected.svg").scaledToWidth(16, Qt::SmoothTransformation)); ui->label_testConnectionStatus->setText("Disconnected"); } } diff --git a/src/dialog/VerifyProofDialog.cpp b/src/dialog/VerifyProofDialog.cpp index 8b3f65f..db2d0ca 100644 --- a/src/dialog/VerifyProofDialog.cpp +++ b/src/dialog/VerifyProofDialog.cpp @@ -16,7 +16,7 @@ VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent) { ui->setupUi(this); - m_success = QPixmap(":/assets/images/confirmed.png").scaled(32, 32, Qt::KeepAspectRatio, Qt::SmoothTransformation); + m_success = QPixmap(":/assets/images/confirmed.svg").scaled(32, 32, Qt::KeepAspectRatio, Qt::SmoothTransformation); m_failure = QPixmap(":/assets/images/expired.png").scaled(32, 32, Qt::KeepAspectRatio, Qt::SmoothTransformation); ui->frame_status->hide(); diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index 1a5a381..a7e055b 100644 --- a/src/model/TransactionHistoryModel.cpp +++ b/src/model/TransactionHistoryModel.cpp @@ -95,7 +95,7 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const else if (tInfo.confirmations() < tInfo.confirmationsRequired()) result = QVariant(icons()->icon("clock5.png")); else if (tInfo.confirmations()) - result = QVariant(icons()->icon("confirmed.png")); + result = QVariant(icons()->icon("confirmed.svg")); } } } diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index ade768e..53c670a 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -280,7 +280,7 @@ bool xdgDesktopEntryRegister() { return false; #endif - QPixmap appIcon(":assets/images/feather.png"); + QPixmap appIcon(":assets/images/appicons/64x64.png"); QString pathIcon = QString("%1/.local/share/icons/feather.png").arg(QDir::homePath()); if (!fileExists(pathIcon)) { pixmapWrite(pathIcon, appIcon); diff --git a/src/wizard/PageSetPassword.cpp b/src/wizard/PageSetPassword.cpp index 28c9e3a..2d8a110 100644 --- a/src/wizard/PageSetPassword.cpp +++ b/src/wizard/PageSetPassword.cpp @@ -13,7 +13,7 @@ PageSetPassword::PageSetPassword(WizardFields *fields, QWidget *parent) ui->setupUi(this); this->setFinalPage(true); - QPixmap pixmap = QPixmap(":/assets/images/lock.png"); + QPixmap pixmap = QPixmap(":/assets/images/lock.svg"); ui->icon->setPixmap(pixmap.scaledToWidth(32, Qt::SmoothTransformation)); connect(ui->line_password, &QLineEdit::textChanged, [this]{