From 2b00166a00666fab890f40fc633fe079e30ed20e Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Mon, 14 Dec 2020 18:30:07 +0100 Subject: 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 --- rbutil/rbutilqt/icons/rockbox-128.png | Bin 6549 -> 0 bytes rbutil/rbutilqt/icons/rockbox-16.png | Bin 473 -> 0 bytes rbutil/rbutilqt/icons/rockbox-256.png | Bin 13625 -> 0 bytes rbutil/rbutilqt/icons/rockbox-32.png | Bin 985 -> 0 bytes rbutil/rbutilqt/icons/rockbox-48.png | Bin 1554 -> 0 bytes rbutil/rbutilqt/icons/rockbox-64.png | Bin 2925 -> 0 bytes rbutil/rbutilqt/rbutilqt.cpp | 12 ------------ rbutil/rbutilqt/rbutilqt.qrc | 7 ------- 8 files changed, 19 deletions(-) delete mode 100644 rbutil/rbutilqt/icons/rockbox-128.png delete mode 100644 rbutil/rbutilqt/icons/rockbox-16.png delete mode 100644 rbutil/rbutilqt/icons/rockbox-256.png delete mode 100644 rbutil/rbutilqt/icons/rockbox-32.png delete mode 100644 rbutil/rbutilqt/icons/rockbox-48.png delete mode 100644 rbutil/rbutilqt/icons/rockbox-64.png diff --git a/rbutil/rbutilqt/icons/rockbox-128.png b/rbutil/rbutilqt/icons/rockbox-128.png deleted file mode 100644 index d11c33557f..0000000000 Binary files a/rbutil/rbutilqt/icons/rockbox-128.png and /dev/null differ diff --git a/rbutil/rbutilqt/icons/rockbox-16.png b/rbutil/rbutilqt/icons/rockbox-16.png deleted file mode 100644 index 8f477304a8..0000000000 Binary files a/rbutil/rbutilqt/icons/rockbox-16.png and /dev/null differ diff --git a/rbutil/rbutilqt/icons/rockbox-256.png b/rbutil/rbutilqt/icons/rockbox-256.png deleted file mode 100644 index 63abbc5427..0000000000 Binary files a/rbutil/rbutilqt/icons/rockbox-256.png and /dev/null differ diff --git a/rbutil/rbutilqt/icons/rockbox-32.png b/rbutil/rbutilqt/icons/rockbox-32.png deleted file mode 100644 index 68d324bbf0..0000000000 Binary files a/rbutil/rbutilqt/icons/rockbox-32.png and /dev/null differ diff --git a/rbutil/rbutilqt/icons/rockbox-48.png b/rbutil/rbutilqt/icons/rockbox-48.png deleted file mode 100644 index 1f6f1a98a7..0000000000 Binary files a/rbutil/rbutilqt/icons/rockbox-48.png and /dev/null differ diff --git a/rbutil/rbutilqt/icons/rockbox-64.png b/rbutil/rbutilqt/icons/rockbox-64.png deleted file mode 100644 index 5505833ded..0000000000 Binary files a/rbutil/rbutilqt/icons/rockbox-64.png and /dev/null 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 @@ icons/preferences-desktop-locale.svg icons/preferences-system.svg icons/process-stop.svg - icons/rblogo.png - icons/rockbox-16.png - icons/rockbox-32.png - icons/rockbox-48.png - icons/rockbox-64.png - icons/rockbox-128.png - icons/rockbox-256.png icons/system-search.svg icons/user-trash-full.svg icons/view-refresh.svg -- cgit v1.2.2