diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-10-02 08:57:10 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-10-02 08:57:10 +0000 |
commit | e86423a97fc96c54657355d31f197657cfae8274 (patch) | |
tree | eb665eb3fd1f0d75b5d71aeb31de6f27436712a5 | |
parent | 981af6d3e17b531fa8dbfd8733ff2b00787e9465 (diff) | |
download | rockbox-e86423a97fc96c54657355d31f197657cfae8274.tar.gz rockbox-e86423a97fc96c54657355d31f197657cfae8274.zip |
Rockbox Utility: add some more icon sizes to the window icon on Windows.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30631 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/aboutbox.ui | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-128.png | bin | 0 -> 6549 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-16.png (renamed from rbutil/rbutilqt/icons/rockbox-1.png) | bin | 473 -> 473 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-256.png | bin | 0 -> 13625 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-32.png | bin | 0 -> 985 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-48.png | bin | 0 -> 1554 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-5.png | bin | 2119 -> 0 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/icons/rockbox-64.png | bin | 0 -> 2925 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.qrc | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqtfrm.ui | 2 |
11 files changed, 13 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/aboutbox.ui b/rbutil/rbutilqt/aboutbox.ui index b511547a17..8689b844ed 100644 --- a/rbutil/rbutilqt/aboutbox.ui +++ b/rbutil/rbutilqt/aboutbox.ui | |||
@@ -12,10 +12,6 @@ | |||
12 | <property name="windowTitle" > | 12 | <property name="windowTitle" > |
13 | <string>About Rockbox Utility</string> | 13 | <string>About Rockbox Utility</string> |
14 | </property> | 14 | </property> |
15 | <property name="windowIcon" > | ||
16 | <iconset resource="rbutilqt.qrc" > | ||
17 | <normaloff>:/icons/rockbox-1.png</normaloff>:/icons/rockbox-1.png</iconset> | ||
18 | </property> | ||
19 | <layout class="QGridLayout" name="gridLayout" > | 15 | <layout class="QGridLayout" name="gridLayout" > |
20 | <item row="0" column="0" colspan="3" > | 16 | <item row="0" column="0" colspan="3" > |
21 | <layout class="QHBoxLayout" > | 17 | <layout class="QHBoxLayout" > |
diff --git a/rbutil/rbutilqt/icons/rockbox-128.png b/rbutil/rbutilqt/icons/rockbox-128.png new file mode 100644 index 0000000000..d11c33557f --- /dev/null +++ b/rbutil/rbutilqt/icons/rockbox-128.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/rockbox-1.png b/rbutil/rbutilqt/icons/rockbox-16.png index 8f477304a8..8f477304a8 100644 --- a/rbutil/rbutilqt/icons/rockbox-1.png +++ b/rbutil/rbutilqt/icons/rockbox-16.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/rockbox-256.png b/rbutil/rbutilqt/icons/rockbox-256.png new file mode 100644 index 0000000000..63abbc5427 --- /dev/null +++ b/rbutil/rbutilqt/icons/rockbox-256.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/rockbox-32.png b/rbutil/rbutilqt/icons/rockbox-32.png new file mode 100644 index 0000000000..68d324bbf0 --- /dev/null +++ b/rbutil/rbutilqt/icons/rockbox-32.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/rockbox-48.png b/rbutil/rbutilqt/icons/rockbox-48.png new file mode 100644 index 0000000000..1f6f1a98a7 --- /dev/null +++ b/rbutil/rbutilqt/icons/rockbox-48.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/rockbox-5.png b/rbutil/rbutilqt/icons/rockbox-5.png deleted file mode 100644 index 48ff8c5585..0000000000 --- a/rbutil/rbutilqt/icons/rockbox-5.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/rockbox-64.png b/rbutil/rbutilqt/icons/rockbox-64.png new file mode 100644 index 0000000000..5505833ded --- /dev/null +++ b/rbutil/rbutilqt/icons/rockbox-64.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 2238136d20..b8ae77b91a 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -77,8 +77,12 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
77 | #endif | 77 | #endif |
78 | #if defined(Q_OS_WIN32) | 78 | #if defined(Q_OS_WIN32) |
79 | QIcon windowIcon = QIcon(); | 79 | QIcon windowIcon = QIcon(); |
80 | windowIcon.addFile(":/icons/rockbox-1.png"); | 80 | windowIcon.addFile(":/icons/rockbox-16.png"); |
81 | windowIcon.addFile(":/icons/rockbox-5.png"); | 81 | windowIcon.addFile(":/icons/rockbox-32.png"); |
82 | windowIcon.addFile(":/icons/rockbox-48.png"); | ||
83 | windowIcon.addFile(":/icons/rockbox-64.png"); | ||
84 | windowIcon.addFile(":/icons/rockbox-128.png"); | ||
85 | windowIcon.addFile(":/icons/rockbox-256.png"); | ||
82 | this->setWindowIcon(windowIcon); | 86 | this->setWindowIcon(windowIcon); |
83 | #endif | 87 | #endif |
84 | #if defined(Q_OS_MACX) | 88 | #if defined(Q_OS_MACX) |
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 28ab8fa370..5a361c3cb3 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc | |||
@@ -27,8 +27,12 @@ | |||
27 | <file>icons/rbutil.png</file> | 27 | <file>icons/rbutil.png</file> |
28 | <file>icons/rembootloader_btn.png</file> | 28 | <file>icons/rembootloader_btn.png</file> |
29 | <file>icons/remrb_btn.png</file> | 29 | <file>icons/remrb_btn.png</file> |
30 | <file>icons/rockbox-1.png</file> | 30 | <file>icons/rockbox-16.png</file> |
31 | <file>icons/rockbox-5.png</file> | 31 | <file>icons/rockbox-32.png</file> |
32 | <file>icons/rockbox-48.png</file> | ||
33 | <file>icons/rockbox-64.png</file> | ||
34 | <file>icons/rockbox-128.png</file> | ||
35 | <file>icons/rockbox-256.png</file> | ||
32 | <file>icons/system-search.png</file> | 36 | <file>icons/system-search.png</file> |
33 | <file>icons/talkfile_btn.png</file> | 37 | <file>icons/talkfile_btn.png</file> |
34 | <file>icons/themes_btn.png</file> | 38 | <file>icons/themes_btn.png</file> |
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui index 125d21342c..5233022061 100644 --- a/rbutil/rbutilqt/rbutilqtfrm.ui +++ b/rbutil/rbutilqt/rbutilqtfrm.ui | |||
@@ -15,7 +15,7 @@ | |||
15 | </property> | 15 | </property> |
16 | <property name="windowIcon"> | 16 | <property name="windowIcon"> |
17 | <iconset resource="rbutilqt.qrc"> | 17 | <iconset resource="rbutilqt.qrc"> |
18 | <normaloff>:/icons/rockbox-1.png</normaloff>:/icons/rockbox-1.png</iconset> | 18 | <normaloff>:/icons/rockbox-32.png</normaloff>:/icons/rockbox-32.png</iconset> |
19 | </property> | 19 | </property> |
20 | <widget class="QWidget" name="centralwidget"> | 20 | <widget class="QWidget" name="centralwidget"> |
21 | <layout class="QGridLayout"> | 21 | <layout class="QGridLayout"> |