assets: remove unused icons

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 7572b8c6711d12ff640d916aa22cd6ced68d3d0b..65d0aeb5e7bf2c1492538421dbefe729618de027 100644 (file)
--- 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 97bcc93a01cddd09eb5cb9802abdf401d734a8df..7565b20c1ca74c4ae2b7fb392544dd94987a20c0 100644 (file)
--- a/src/assets.qrc
+++ b/src/assets.qrc
@@ -13,10 +13,7 @@
     <file>assets/images/appicons/128x128.png</file>
     <file>assets/images/appicons/256x256.png</file>
     <file>assets/images/arrow.svg</file>
-    <file>assets/images/banners/1.png</file>
-    <file>assets/images/banners/2.png</file>
     <file>assets/images/banners/3.png</file>
-    <file>assets/images/bitcoin.png</file>
     <file>assets/images/camera_dark.png</file>
     <file>assets/images/camera_white.png</file>
     <file>assets/images/change_account.png</file>
@@ -29,21 +26,16 @@
     <file>assets/images/coins.png</file>
     <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>
-    <file>assets/images/cutexmrfox.png</file>
     <file>assets/images/edit.png</file>
     <file>assets/images/external-link.svg</file>
     <file>assets/images/exchange.png</file>
     <file>assets/images/exchange_white.png</file>
     <file>assets/images/expired.png</file>
-    <file>assets/images/expired_icon.png</file>
     <file>assets/images/eye1.png</file>
     <file>assets/images/eye_blind.png</file>
-    <file>assets/images/feather.png</file>
     <file>assets/images/file.png</file>
     <file>assets/images/file_manager_32px.png</file>
     <file>assets/images/gnome-calc.png</file>
@@ -64,8 +56,6 @@
     <file>assets/images/localMonero_sell_white.svg</file>
     <file>assets/images/localMonero_logo.png</file>
     <file>assets/images/localMonero_register.svg</file>
-    <file>assets/images/lock.png</file>
-    <file>assets/images/lock_icon.png</file>
     <file>assets/images/lock.svg</file>
     <file>assets/images/microphone.png</file>
     <file>assets/images/mining.png</file>
@@ -73,7 +63,6 @@
     <file>assets/images/nw_32px.png</file>
     <file>assets/images/offline_tx.png</file>
     <file>assets/images/person.svg</file>
-    <file>assets/images/preferences.png</file>
     <file>assets/images/preferences.svg</file>
     <file>assets/images/qrcode.png</file>
     <file>assets/images/qrcode_white.png</file>
@@ -89,19 +78,11 @@
     <file>assets/images/seed.png</file>
     <file>assets/images/settings_disabled_32px.png</file>
     <file>assets/images/speaker.png</file>
-    <file>assets/images/status_connected_fork.png</file>
-    <file>assets/images/status_connected.png</file>
-    <file>assets/images/status_connected_proxy_fork.png</file>
-    <file>assets/images/status_connected_proxy.png</file>
     <file>assets/images/status_connected_proxy.svg</file>
     <file>assets/images/status_connected.svg</file>
-    <file>assets/images/status_disconnected.png</file>
     <file>assets/images/status_disconnected.svg</file>
-    <file>assets/images/status_lagging_fork.png</file>
-    <file>assets/images/status_lagging.png</file>
     <file>assets/images/status_lagging.svg</file>
     <file>assets/images/status_offline.svg</file>
-    <file>assets/images/status_waiting.png</file>
     <file>assets/images/status_waiting.svg</file>
     <file>assets/images/tab_addresses.png</file>
     <file>assets/images/tab_coins.png</file>
@@ -120,13 +101,11 @@
     <file>assets/images/trezor_unpaired.png</file>
     <file>assets/images/trezor_unpaired_white.png</file>
     <file>assets/images/unconfirmed.png</file>
-    <file>assets/images/unlock.png</file>
     <file>assets/images/unlock.svg</file>
     <file>assets/images/unpaid.png</file>
     <file>assets/images/update.png</file>
     <file>assets/images/warning.png</file>
     <file>assets/images/vrdp_32px.png</file>
-    <file>assets/images/xmrig.ico</file>
     <file>assets/images/xmrig.svg</file>
     <file>assets/images/zoom.png</file>
     <file>assets/restore_heights_monero_mainnet.txt</file>

diff --git a/src/assets/images/banners/1.png b/src/assets/images/banners/1.png
deleted file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 a2cf5265ce210868350e786ea991c211f6d3090c..31ba9fa945d630f777561d9d3be60d303f6455b2 100644 (file)
--- 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 569bb7835ad070967a47c9352e8b27d2b74ad488..09725768dfd16a0b7670c457f2b91c4566132eff 100644 (file)
--- 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 8b3f65ff93b340b218c8904bef5749824f139f9a..db2d0ca19c1dedf396e63bb96e7745b9983e4d5f 100644 (file)
--- 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 1a5a381af13db5afc21df4a257a77578909a4d8e..a7e055b1d6dcb1f380158cc2bb2d90b77d192ace 100644 (file)
--- 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 ade768e1deb60b69146f0c3b59c450b53115a108..53c670a60f2fe6fbea446e6282c999c7d3481bd6 100644 (file)
--- 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 28c9e3a0bfad8cba9d8223e4e3afb2e7c22fb7e3..2d8a110152df2061bc38bac78511e8a184d9ad27 100644 (file)
--- 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]{