summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-08-16 19:46:41 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-08-16 19:46:41 +0000
commit9db05403bd67aa91008bedd492251d897057a9a1 (patch)
tree6a1e209bab276246e60e56a8a4b45870c9c8ba58
parent576793a637bb924a6f2c2bacf684a82a93fd438f (diff)
downloadrockbox-9db05403bd67aa91008bedd492251d897057a9a1.tar.gz
rockbox-9db05403bd67aa91008bedd492251d897057a9a1.tar.bz2
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.ui48
-rw-r--r--rbutil/rbutilqt/icons/document-save.pngbin0 -> 911 bytes
-rw-r--r--rbutil/rbutilqt/progressloggerfrm.ui69
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp1
-rw-r--r--rbutil/rbutilqt/rbutilqt.qrc1
-rw-r--r--rbutil/rbutilqt/systracefrm.ui6
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 @@
<rect>
<x>0</x>
<y>0</y>
- <width>443</width>
- <height>482</height>
+ <width>500</width>
+ <height>500</height>
</rect>
</property>
<property name="windowTitle" >
<string>About Rockbox Utility</string>
</property>
<property name="windowIcon" >
- <iconset resource="rbutilqt.qrc" >:/icons/rockbox-1.png</iconset>
+ <iconset resource="rbutilqt.qrc" >
+ <normaloff>:/icons/rockbox-1.png</normaloff>:/icons/rockbox-1.png</iconset>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" colspan="3" >
<layout class="QHBoxLayout" >
<item>
@@ -40,7 +41,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -53,10 +54,10 @@
<item row="1" column="0" colspan="3" >
<widget class="QLabel" name="labelText" >
<property name="text" >
- <string>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.
-
-© 2005 - 2009 The Rockbox Team.
-Released under the GNU General Public License v2.</string>
+ <string>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/>© 2005 - 2009 The Rockbox Team.&lt;br/>Released under the GNU General Public License v2.&lt;br/>Uses icons by the &lt;a href="http://tango.freedesktop.org/">Tango Project&lt;/a>.&lt;br/>&lt;center>&lt;a href="http://www.rockbox.org">http://www.rockbox.org&lt;/a>&lt;/center></string>
+ </property>
+ <property name="textFormat" >
+ <enum>Qt::RichText</enum>
</property>
<property name="wordWrap" >
<bool>true</bool>
@@ -67,25 +68,6 @@ Released under the GNU General Public License v2.</string>
</widget>
</item>
<item row="2" column="0" colspan="3" >
- <widget class="QLabel" name="labelHomepage" >
- <property name="text" >
- <string>http://www.rockbox.org</string>
- </property>
- <property name="textFormat" >
- <enum>Qt::AutoText</enum>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- <property name="openExternalLinks" >
- <bool>true</bool>
- </property>
- <property name="textInteractionFlags" >
- <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="3" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
@@ -150,12 +132,12 @@ Released under the GNU General Public License v2.</string>
</widget>
</widget>
</item>
- <item row="4" column="0" >
+ <item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -163,19 +145,19 @@ Released under the GNU General Public License v2.</string>
</property>
</spacer>
</item>
- <item row="4" column="1" >
+ <item row="3" column="1" >
<widget class="QPushButton" name="okButton" >
<property name="text" >
<string>&amp;Ok</string>
</property>
</widget>
</item>
- <item row="4" column="2" >
+ <item row="3" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
<class>ProgressLoggerFrm</class>
- <widget class="QDialog" name="ProgressLoggerFrm">
- <property name="geometry">
+ <widget class="QDialog" name="ProgressLoggerFrm" >
+ <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
@@ -10,62 +9,66 @@
<height>302</height>
</rect>
</property>
- <property name="windowTitle">
+ <property name="windowTitle" >
<string>Progress</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="labelHeader">
- <property name="text">
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="labelHeader" >
+ <property name="text" >
<string>Progress</string>
</property>
- <property name="wordWrap">
+ <property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="3">
- <widget class="QListWidget" name="listProgress">
- <property name="focusPolicy">
+ <item row="1" column="0" colspan="3" >
+ <widget class="QListWidget" name="listProgress" >
+ <property name="focusPolicy" >
<enum>Qt::TabFocus</enum>
</property>
- <property name="accessibleName">
+ <property name="accessibleName" >
<string>progresswindow</string>
</property>
- <property name="tabKeyNavigation">
+ <property name="tabKeyNavigation" >
<bool>true</bool>
</property>
- <property name="selectionBehavior">
+ <property name="selectionBehavior" >
<enum>QAbstractItemView::SelectRows</enum>
</property>
- <property name="wordWrap">
+ <property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
- <widget class="QProgressBar" name="progressBar">
- <property name="value">
+ <item row="2" column="0" colspan="3" >
+ <widget class="QProgressBar" name="progressBar" >
+ <property name="value" >
<number>0</number>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QPushButton" name="saveLog">
- <property name="enabled">
+ <item row="3" column="0" >
+ <widget class="QPushButton" name="saveLog" >
+ <property name="enabled" >
<bool>true</bool>
</property>
- <property name="text">
+ <property name="text" >
<string>Save Log</string>
</property>
+ <property name="icon" >
+ <iconset resource="rbutilqt.qrc" >
+ <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
+ </property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="3" column="1" >
<spacer>
- <property name="orientation">
+ <property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -73,13 +76,13 @@
</property>
</spacer>
</item>
- <item row="3" column="2">
- <widget class="QPushButton" name="buttonAbort">
- <property name="text">
+ <item row="3" column="2" >
+ <widget class="QPushButton" name="buttonAbort" >
+ <property name="text" >
<string>&amp;Abort</string>
</property>
- <property name="icon">
- <iconset resource="rbutilqt.qrc">
+ <property name="icon" >
+ <iconset resource="rbutilqt.qrc" >
<normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
</property>
</widget>
@@ -87,7 +90,7 @@
</layout>
</widget>
<resources>
- <include location="rbutilqt.qrc"/>
+ <include location="rbutilqt.qrc" />
</resources>
<connections/>
</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()
about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
QString title = QString("<b>The Rockbox Utility</b><br/>Version %1").arg(FULLVERSION);
about.labelTitle->setText(title);
- about.labelHomepage->setText("<a href='http://www.rockbox.org'>http://www.rockbox.org</a>");
window->show();
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 @@
<file>icons/dialog-error.png</file>
<file>icons/dialog-information.png</file>
<file>icons/dialog-warning.png</file>
+ <file>icons/document-save.png</file>
<file>icons/doom_btn.png</file>
<file>icons/edit-find.png</file>
<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 @@
<string>System Trace</string>
</property>
<layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="1" colspan="4" >
+ <item row="0" column="0" colspan="5" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>System State trace</string>
@@ -55,6 +55,10 @@
<property name="text" >
<string>&amp;Save</string>
</property>
+ <property name="icon" >
+ <iconset resource="rbutilqt.qrc" >
+ <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
+ </property>
</widget>
</item>
<item row="2" column="0" >