diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-08-16 19:46:41 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-08-16 19:46:41 +0000 |
commit | 9db05403bd67aa91008bedd492251d897057a9a1 (patch) | |
tree | 6a1e209bab276246e60e56a8a4b45870c9c8ba58 | |
parent | 576793a637bb924a6f2c2bacf684a82a93fd438f (diff) | |
download | rockbox-9db05403bd67aa91008bedd492251d897057a9a1.tar.gz rockbox-9db05403bd67aa91008bedd492251d897057a9a1.zip |
Add Save icon and add a note to the about dialog about the origin of the icons. Should have been there much earlier ...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22353 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/aboutbox.ui | 48 | ||||
-rw-r--r-- | rbutil/rbutilqt/icons/document-save.png | bin | 0 -> 911 bytes | |||
-rw-r--r-- | rbutil/rbutilqt/progressloggerfrm.ui | 69 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.qrc | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/systracefrm.ui | 6 |
6 files changed, 57 insertions, 68 deletions
diff --git a/rbutil/rbutilqt/aboutbox.ui b/rbutil/rbutilqt/aboutbox.ui index b11d813337..bec898afcd 100644 --- a/rbutil/rbutilqt/aboutbox.ui +++ b/rbutil/rbutilqt/aboutbox.ui | |||
@@ -5,17 +5,18 @@ | |||
5 | <rect> | 5 | <rect> |
6 | <x>0</x> | 6 | <x>0</x> |
7 | <y>0</y> | 7 | <y>0</y> |
8 | <width>443</width> | 8 | <width>500</width> |
9 | <height>482</height> | 9 | <height>500</height> |
10 | </rect> | 10 | </rect> |
11 | </property> | 11 | </property> |
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" > | 15 | <property name="windowIcon" > |
16 | <iconset resource="rbutilqt.qrc" >:/icons/rockbox-1.png</iconset> | 16 | <iconset resource="rbutilqt.qrc" > |
17 | <normaloff>:/icons/rockbox-1.png</normaloff>:/icons/rockbox-1.png</iconset> | ||
17 | </property> | 18 | </property> |
18 | <layout class="QGridLayout" > | 19 | <layout class="QGridLayout" name="gridLayout" > |
19 | <item row="0" column="0" colspan="3" > | 20 | <item row="0" column="0" colspan="3" > |
20 | <layout class="QHBoxLayout" > | 21 | <layout class="QHBoxLayout" > |
21 | <item> | 22 | <item> |
@@ -40,7 +41,7 @@ | |||
40 | <property name="orientation" > | 41 | <property name="orientation" > |
41 | <enum>Qt::Horizontal</enum> | 42 | <enum>Qt::Horizontal</enum> |
42 | </property> | 43 | </property> |
43 | <property name="sizeHint" > | 44 | <property name="sizeHint" stdset="0" > |
44 | <size> | 45 | <size> |
45 | <width>40</width> | 46 | <width>40</width> |
46 | <height>20</height> | 47 | <height>20</height> |
@@ -53,10 +54,10 @@ | |||
53 | <item row="1" column="0" colspan="3" > | 54 | <item row="1" column="0" colspan="3" > |
54 | <widget class="QLabel" name="labelText" > | 55 | <widget class="QLabel" name="labelText" > |
55 | <property name="text" > | 56 | <property name="text" > |
56 | <string>Installer and housekeeping utility for the Rockbox open source digital audio player firmware. | 57 | <string>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.<br/>© 2005 - 2009 The Rockbox Team.<br/>Released under the GNU General Public License v2.<br/>Uses icons by the <a href="http://tango.freedesktop.org/">Tango Project</a>.<br/><center><a href="http://www.rockbox.org">http://www.rockbox.org</a></center></string> |
57 | 58 | </property> | |
58 | © 2005 - 2009 The Rockbox Team. | 59 | <property name="textFormat" > |
59 | Released under the GNU General Public License v2.</string> | 60 | <enum>Qt::RichText</enum> |
60 | </property> | 61 | </property> |
61 | <property name="wordWrap" > | 62 | <property name="wordWrap" > |
62 | <bool>true</bool> | 63 | <bool>true</bool> |
@@ -67,25 +68,6 @@ Released under the GNU General Public License v2.</string> | |||
67 | </widget> | 68 | </widget> |
68 | </item> | 69 | </item> |
69 | <item row="2" column="0" colspan="3" > | 70 | <item row="2" column="0" colspan="3" > |
70 | <widget class="QLabel" name="labelHomepage" > | ||
71 | <property name="text" > | ||
72 | <string>http://www.rockbox.org</string> | ||
73 | </property> | ||
74 | <property name="textFormat" > | ||
75 | <enum>Qt::AutoText</enum> | ||
76 | </property> | ||
77 | <property name="alignment" > | ||
78 | <set>Qt::AlignCenter</set> | ||
79 | </property> | ||
80 | <property name="openExternalLinks" > | ||
81 | <bool>true</bool> | ||
82 | </property> | ||
83 | <property name="textInteractionFlags" > | ||
84 | <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set> | ||
85 | </property> | ||
86 | </widget> | ||
87 | </item> | ||
88 | <item row="3" column="0" colspan="3" > | ||
89 | <widget class="QTabWidget" name="tabWidget" > | 71 | <widget class="QTabWidget" name="tabWidget" > |
90 | <property name="currentIndex" > | 72 | <property name="currentIndex" > |
91 | <number>0</number> | 73 | <number>0</number> |
@@ -150,12 +132,12 @@ Released under the GNU General Public License v2.</string> | |||
150 | </widget> | 132 | </widget> |
151 | </widget> | 133 | </widget> |
152 | </item> | 134 | </item> |
153 | <item row="4" column="0" > | 135 | <item row="3" column="0" > |
154 | <spacer> | 136 | <spacer> |
155 | <property name="orientation" > | 137 | <property name="orientation" > |
156 | <enum>Qt::Horizontal</enum> | 138 | <enum>Qt::Horizontal</enum> |
157 | </property> | 139 | </property> |
158 | <property name="sizeHint" > | 140 | <property name="sizeHint" stdset="0" > |
159 | <size> | 141 | <size> |
160 | <width>40</width> | 142 | <width>40</width> |
161 | <height>20</height> | 143 | <height>20</height> |
@@ -163,19 +145,19 @@ Released under the GNU General Public License v2.</string> | |||
163 | </property> | 145 | </property> |
164 | </spacer> | 146 | </spacer> |
165 | </item> | 147 | </item> |
166 | <item row="4" column="1" > | 148 | <item row="3" column="1" > |
167 | <widget class="QPushButton" name="okButton" > | 149 | <widget class="QPushButton" name="okButton" > |
168 | <property name="text" > | 150 | <property name="text" > |
169 | <string>&Ok</string> | 151 | <string>&Ok</string> |
170 | </property> | 152 | </property> |
171 | </widget> | 153 | </widget> |
172 | </item> | 154 | </item> |
173 | <item row="4" column="2" > | 155 | <item row="3" column="2" > |
174 | <spacer> | 156 | <spacer> |
175 | <property name="orientation" > | 157 | <property name="orientation" > |
176 | <enum>Qt::Horizontal</enum> | 158 | <enum>Qt::Horizontal</enum> |
177 | </property> | 159 | </property> |
178 | <property name="sizeHint" > | 160 | <property name="sizeHint" stdset="0" > |
179 | <size> | 161 | <size> |
180 | <width>40</width> | 162 | <width>40</width> |
181 | <height>20</height> | 163 | <height>20</height> |
diff --git a/rbutil/rbutilqt/icons/document-save.png b/rbutil/rbutilqt/icons/document-save.png new file mode 100644 index 0000000000..22ff495710 --- /dev/null +++ b/rbutil/rbutilqt/icons/document-save.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/progressloggerfrm.ui b/rbutil/rbutilqt/progressloggerfrm.ui index a46e537a18..c10e26a4af 100644 --- a/rbutil/rbutilqt/progressloggerfrm.ui +++ b/rbutil/rbutilqt/progressloggerfrm.ui | |||
@@ -1,8 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <ui version="4.0" > |
2 | <ui version="4.0"> | ||
3 | <class>ProgressLoggerFrm</class> | 2 | <class>ProgressLoggerFrm</class> |
4 | <widget class="QDialog" name="ProgressLoggerFrm"> | 3 | <widget class="QDialog" name="ProgressLoggerFrm" > |
5 | <property name="geometry"> | 4 | <property name="geometry" > |
6 | <rect> | 5 | <rect> |
7 | <x>0</x> | 6 | <x>0</x> |
8 | <y>0</y> | 7 | <y>0</y> |
@@ -10,62 +9,66 @@ | |||
10 | <height>302</height> | 9 | <height>302</height> |
11 | </rect> | 10 | </rect> |
12 | </property> | 11 | </property> |
13 | <property name="windowTitle"> | 12 | <property name="windowTitle" > |
14 | <string>Progress</string> | 13 | <string>Progress</string> |
15 | </property> | 14 | </property> |
16 | <layout class="QGridLayout" name="gridLayout"> | 15 | <layout class="QGridLayout" name="gridLayout" > |
17 | <item row="0" column="0"> | 16 | <item row="0" column="0" > |
18 | <widget class="QLabel" name="labelHeader"> | 17 | <widget class="QLabel" name="labelHeader" > |
19 | <property name="text"> | 18 | <property name="text" > |
20 | <string>Progress</string> | 19 | <string>Progress</string> |
21 | </property> | 20 | </property> |
22 | <property name="wordWrap"> | 21 | <property name="wordWrap" > |
23 | <bool>true</bool> | 22 | <bool>true</bool> |
24 | </property> | 23 | </property> |
25 | </widget> | 24 | </widget> |
26 | </item> | 25 | </item> |
27 | <item row="1" column="0" colspan="3"> | 26 | <item row="1" column="0" colspan="3" > |
28 | <widget class="QListWidget" name="listProgress"> | 27 | <widget class="QListWidget" name="listProgress" > |
29 | <property name="focusPolicy"> | 28 | <property name="focusPolicy" > |
30 | <enum>Qt::TabFocus</enum> | 29 | <enum>Qt::TabFocus</enum> |
31 | </property> | 30 | </property> |
32 | <property name="accessibleName"> | 31 | <property name="accessibleName" > |
33 | <string>progresswindow</string> | 32 | <string>progresswindow</string> |
34 | </property> | 33 | </property> |
35 | <property name="tabKeyNavigation"> | 34 | <property name="tabKeyNavigation" > |
36 | <bool>true</bool> | 35 | <bool>true</bool> |
37 | </property> | 36 | </property> |
38 | <property name="selectionBehavior"> | 37 | <property name="selectionBehavior" > |
39 | <enum>QAbstractItemView::SelectRows</enum> | 38 | <enum>QAbstractItemView::SelectRows</enum> |
40 | </property> | 39 | </property> |
41 | <property name="wordWrap"> | 40 | <property name="wordWrap" > |
42 | <bool>true</bool> | 41 | <bool>true</bool> |
43 | </property> | 42 | </property> |
44 | </widget> | 43 | </widget> |
45 | </item> | 44 | </item> |
46 | <item row="2" column="0" colspan="3"> | 45 | <item row="2" column="0" colspan="3" > |
47 | <widget class="QProgressBar" name="progressBar"> | 46 | <widget class="QProgressBar" name="progressBar" > |
48 | <property name="value"> | 47 | <property name="value" > |
49 | <number>0</number> | 48 | <number>0</number> |
50 | </property> | 49 | </property> |
51 | </widget> | 50 | </widget> |
52 | </item> | 51 | </item> |
53 | <item row="3" column="0"> | 52 | <item row="3" column="0" > |
54 | <widget class="QPushButton" name="saveLog"> | 53 | <widget class="QPushButton" name="saveLog" > |
55 | <property name="enabled"> | 54 | <property name="enabled" > |
56 | <bool>true</bool> | 55 | <bool>true</bool> |
57 | </property> | 56 | </property> |
58 | <property name="text"> | 57 | <property name="text" > |
59 | <string>Save Log</string> | 58 | <string>Save Log</string> |
60 | </property> | 59 | </property> |
60 | <property name="icon" > | ||
61 | <iconset resource="rbutilqt.qrc" > | ||
62 | <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset> | ||
63 | </property> | ||
61 | </widget> | 64 | </widget> |
62 | </item> | 65 | </item> |
63 | <item row="3" column="1"> | 66 | <item row="3" column="1" > |
64 | <spacer> | 67 | <spacer> |
65 | <property name="orientation"> | 68 | <property name="orientation" > |
66 | <enum>Qt::Horizontal</enum> | 69 | <enum>Qt::Horizontal</enum> |
67 | </property> | 70 | </property> |
68 | <property name="sizeHint" stdset="0"> | 71 | <property name="sizeHint" stdset="0" > |
69 | <size> | 72 | <size> |
70 | <width>40</width> | 73 | <width>40</width> |
71 | <height>20</height> | 74 | <height>20</height> |
@@ -73,13 +76,13 @@ | |||
73 | </property> | 76 | </property> |
74 | </spacer> | 77 | </spacer> |
75 | </item> | 78 | </item> |
76 | <item row="3" column="2"> | 79 | <item row="3" column="2" > |
77 | <widget class="QPushButton" name="buttonAbort"> | 80 | <widget class="QPushButton" name="buttonAbort" > |
78 | <property name="text"> | 81 | <property name="text" > |
79 | <string>&Abort</string> | 82 | <string>&Abort</string> |
80 | </property> | 83 | </property> |
81 | <property name="icon"> | 84 | <property name="icon" > |
82 | <iconset resource="rbutilqt.qrc"> | 85 | <iconset resource="rbutilqt.qrc" > |
83 | <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset> | 86 | <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset> |
84 | </property> | 87 | </property> |
85 | </widget> | 88 | </widget> |
@@ -87,7 +90,7 @@ | |||
87 | </layout> | 90 | </layout> |
88 | </widget> | 91 | </widget> |
89 | <resources> | 92 | <resources> |
90 | <include location="rbutilqt.qrc"/> | 93 | <include location="rbutilqt.qrc" /> |
91 | </resources> | 94 | </resources> |
92 | <connections/> | 95 | <connections/> |
93 | </ui> | 96 | </ui> |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index f2630e41ff..b0684f7ef7 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -289,7 +289,6 @@ void RbUtilQt::about() | |||
289 | about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); | 289 | about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); |
290 | QString title = QString("<b>The Rockbox Utility</b><br/>Version %1").arg(FULLVERSION); | 290 | QString title = QString("<b>The Rockbox Utility</b><br/>Version %1").arg(FULLVERSION); |
291 | about.labelTitle->setText(title); | 291 | about.labelTitle->setText(title); |
292 | about.labelHomepage->setText("<a href='http://www.rockbox.org'>http://www.rockbox.org</a>"); | ||
293 | 292 | ||
294 | window->show(); | 293 | window->show(); |
295 | 294 | ||
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index f598769d43..c5926a63e3 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc | |||
@@ -12,6 +12,7 @@ | |||
12 | <file>icons/dialog-error.png</file> | 12 | <file>icons/dialog-error.png</file> |
13 | <file>icons/dialog-information.png</file> | 13 | <file>icons/dialog-information.png</file> |
14 | <file>icons/dialog-warning.png</file> | 14 | <file>icons/dialog-warning.png</file> |
15 | <file>icons/document-save.png</file> | ||
15 | <file>icons/doom_btn.png</file> | 16 | <file>icons/doom_btn.png</file> |
16 | <file>icons/edit-find.png</file> | 17 | <file>icons/edit-find.png</file> |
17 | <file>icons/font_btn.png</file> | 18 | <file>icons/font_btn.png</file> |
diff --git a/rbutil/rbutilqt/systracefrm.ui b/rbutil/rbutilqt/systracefrm.ui index 450ab993e1..7a83eecb80 100644 --- a/rbutil/rbutilqt/systracefrm.ui +++ b/rbutil/rbutilqt/systracefrm.ui | |||
@@ -13,7 +13,7 @@ | |||
13 | <string>System Trace</string> | 13 | <string>System Trace</string> |
14 | </property> | 14 | </property> |
15 | <layout class="QGridLayout" name="gridLayout" > | 15 | <layout class="QGridLayout" name="gridLayout" > |
16 | <item row="0" column="1" colspan="4" > | 16 | <item row="0" column="0" colspan="5" > |
17 | <widget class="QLabel" name="label" > | 17 | <widget class="QLabel" name="label" > |
18 | <property name="text" > | 18 | <property name="text" > |
19 | <string>System State trace</string> | 19 | <string>System State trace</string> |
@@ -55,6 +55,10 @@ | |||
55 | <property name="text" > | 55 | <property name="text" > |
56 | <string>&Save</string> | 56 | <string>&Save</string> |
57 | </property> | 57 | </property> |
58 | <property name="icon" > | ||
59 | <iconset resource="rbutilqt.qrc" > | ||
60 | <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset> | ||
61 | </property> | ||
58 | </widget> | 62 | </widget> |
59 | </item> | 63 | </item> |
60 | <item row="2" column="0" > | 64 | <item row="2" column="0" > |