summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-12-14 18:30:07 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-12-14 20:18:52 +0100
commit2b00166a00666fab890f40fc633fe079e30ed20e (patch)
treefa79a2a2afbe084732c541d9753c931bd2989afa
parent7ae98845f05e8d8245635f8bc5f64940d44d06cf (diff)
downloadrockbox-2b00166a00666fab890f40fc633fe079e30ed20e.tar.gz
rockbox-2b00166a00666fab890f40fc633fe079e30ed20e.tar.bz2
rockbox-2b00166a00666fab890f40fc633fe079e30ed20e.zip
rbutil: Always use svg icon for Window icon.
Since we now have svg support enabled (and used) for all platforms we can simply use the svg one, and bring it in line with the rest of the icon. Change-Id: If99f1be0205de1a87eb727c33400811620d9876d
-rw-r--r--rbutil/rbutilqt/icons/rockbox-128.pngbin6549 -> 0 bytes
-rw-r--r--rbutil/rbutilqt/icons/rockbox-16.pngbin473 -> 0 bytes
-rw-r--r--rbutil/rbutilqt/icons/rockbox-256.pngbin13625 -> 0 bytes
-rw-r--r--rbutil/rbutilqt/icons/rockbox-32.pngbin985 -> 0 bytes
-rw-r--r--rbutil/rbutilqt/icons/rockbox-48.pngbin1554 -> 0 bytes
-rw-r--r--rbutil/rbutilqt/icons/rockbox-64.pngbin2925 -> 0 bytes
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp12
-rw-r--r--rbutil/rbutilqt/rbutilqt.qrc7
8 files changed, 0 insertions, 19 deletions
diff --git a/rbutil/rbutilqt/icons/rockbox-128.png b/rbutil/rbutilqt/icons/rockbox-128.png
deleted file mode 100644
index d11c33557f..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-128.png
+++ /dev/null
Binary files differ
diff --git a/rbutil/rbutilqt/icons/rockbox-16.png b/rbutil/rbutilqt/icons/rockbox-16.png
deleted file mode 100644
index 8f477304a8..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-16.png
+++ /dev/null
Binary files differ
diff --git a/rbutil/rbutilqt/icons/rockbox-256.png b/rbutil/rbutilqt/icons/rockbox-256.png
deleted file mode 100644
index 63abbc5427..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-256.png
+++ /dev/null
Binary files differ
diff --git a/rbutil/rbutilqt/icons/rockbox-32.png b/rbutil/rbutilqt/icons/rockbox-32.png
deleted file mode 100644
index 68d324bbf0..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-32.png
+++ /dev/null
Binary files differ
diff --git a/rbutil/rbutilqt/icons/rockbox-48.png b/rbutil/rbutilqt/icons/rockbox-48.png
deleted file mode 100644
index 1f6f1a98a7..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-48.png
+++ /dev/null
Binary files differ
diff --git a/rbutil/rbutilqt/icons/rockbox-64.png b/rbutil/rbutilqt/icons/rockbox-64.png
deleted file mode 100644
index 5505833ded..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-64.png
+++ /dev/null
Binary files differ
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 76ef67f799..16735dc83a 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -88,20 +88,8 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
HttpGet::setGlobalProxy(proxy());
// init startup & autodetection
ui.setupUi(this);
-#if defined(Q_OS_LINUX)
QIcon windowIcon(":/icons/rockbox-clef.svg");
this->setWindowIcon(windowIcon);
-#endif
-#if defined(Q_OS_WIN32)
- QIcon windowIcon = QIcon();
- windowIcon.addFile(":/icons/rockbox-16.png");
- windowIcon.addFile(":/icons/rockbox-32.png");
- windowIcon.addFile(":/icons/rockbox-48.png");
- windowIcon.addFile(":/icons/rockbox-64.png");
- windowIcon.addFile(":/icons/rockbox-128.png");
- windowIcon.addFile(":/icons/rockbox-256.png");
- this->setWindowIcon(windowIcon);
-#endif
#if defined(Q_OS_MACX)
// don't translate menu entries that are handled specially on OS X
// (Configure, Quit). Qt handles them for us if they use english string.
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index b1427b118f..7ea638c54b 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -33,13 +33,6 @@
<file>icons/preferences-desktop-locale.svg</file>
<file>icons/preferences-system.svg</file>
<file>icons/process-stop.svg</file>
- <file>icons/rblogo.png</file>
- <file>icons/rockbox-16.png</file>
- <file>icons/rockbox-32.png</file>
- <file>icons/rockbox-48.png</file>
- <file>icons/rockbox-64.png</file>
- <file>icons/rockbox-128.png</file>
- <file>icons/rockbox-256.png</file>
<file>icons/system-search.svg</file>
<file>icons/user-trash-full.svg</file>
<file>icons/view-refresh.svg</file>