From 2d50405fa4c2f58ec52fc522996b42dc6f5cbe21 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Sun, 7 Apr 2019 20:24:21 +0200 Subject: [PATCH] Moved icons into subfolder --- failed.png => icons/failed.png | Bin loading.gif => icons/loading.gif | Bin succeeded.png => icons/succeeded.png | Bin models/progressmodel.h | 6 +++--- resources.qrc | 6 +++--- wizard/importprogresspage.h | 6 +++--- wizard/remoteimportscanpage.h | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) rename failed.png => icons/failed.png (100%) rename loading.gif => icons/loading.gif (100%) rename succeeded.png => icons/succeeded.png (100%) diff --git a/failed.png b/icons/failed.png similarity index 100% rename from failed.png rename to icons/failed.png diff --git a/loading.gif b/icons/loading.gif similarity index 100% rename from loading.gif rename to icons/loading.gif diff --git a/succeeded.png b/icons/succeeded.png similarity index 100% rename from succeeded.png rename to icons/succeeded.png diff --git a/models/progressmodel.h b/models/progressmodel.h index 0a86940..b472011 100644 --- a/models/progressmodel.h +++ b/models/progressmodel.h @@ -48,12 +48,12 @@ private: QVector m_items; - const QPixmap m_pixmapSucceeded { ":/loganalyzer/succeeded.png" }; - const QPixmap m_pixmapFailed { ":/loganalyzer/failed.png" }; + const QPixmap m_pixmapSucceeded { ":/loganalyzer/icons/succeeded.png" }; + const QPixmap m_pixmapFailed { ":/loganalyzer/icons/failed.png" }; const QPixmap m_pixmapEmpty { [this](){ QPixmap pixmap(m_pixmapSucceeded.size()); pixmap.fill(); return pixmap; }() }; - QMovie m_movieLoading { ":/loganalyzer/loading.gif" }; + QMovie m_movieLoading { ":/loganalyzer/icons/loading.gif" }; }; diff --git a/resources.qrc b/resources.qrc index 872bcc9..461b2e9 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,7 +1,7 @@ - loading.gif - failed.png - succeeded.png + icons/loading.gif + icons/failed.png + icons/succeeded.png diff --git a/wizard/importprogresspage.h b/wizard/importprogresspage.h index 3c52fb0..e458cd0 100644 --- a/wizard/importprogresspage.h +++ b/wizard/importprogresspage.h @@ -16,9 +16,9 @@ class ImportProgressPage : public QWizardPage { Q_OBJECT - const QPixmap m_pixmapSucceeded { ":/loganalyzer/succeeded.png" }; - const QPixmap m_pixmapFailed { ":/loganalyzer/failed.png" }; - QMovie m_movieLoading { ":/loganalyzer/loading.gif" }; + const QPixmap m_pixmapSucceeded { ":/loganalyzer/icons/succeeded.png" }; + const QPixmap m_pixmapFailed { ":/loganalyzer/icons/failed.png" }; + QMovie m_movieLoading { ":/loganalyzer/icons/loading.gif" }; public: explicit ImportProgressPage(QWidget *parent = nullptr); diff --git a/wizard/remoteimportscanpage.h b/wizard/remoteimportscanpage.h index b3f06a6..14875fd 100644 --- a/wizard/remoteimportscanpage.h +++ b/wizard/remoteimportscanpage.h @@ -17,9 +17,9 @@ class RemoteImportScanPage : public QWizardPage { Q_OBJECT - const QPixmap m_pixmapSucceeded { ":/loganalyzer/succeeded.png" }; - const QPixmap m_pixmapFailed { ":/loganalyzer/failed.png" }; - QMovie m_movieLoading { ":/loganalyzer/loading.gif" }; + const QPixmap m_pixmapSucceeded { ":/loganalyzer/icons/succeeded.png" }; + const QPixmap m_pixmapFailed { ":/loganalyzer/icons/failed.png" }; + QMovie m_movieLoading { ":/loganalyzer/icons/loading.gif" }; public: explicit RemoteImportScanPage(QWidget *parent = nullptr);