summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2007-08-01 22:55:22 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2007-08-01 22:55:22 +0000
commitb1c61b95dfddccf3a1e2a94f61ca2ca079d51437 (patch)
tree4a4f7d1c4223596cdffec15b6b433e57e66af9e1
parentcb896cdd04ae04cbf9cb59990c920e579ea6887a (diff)
downloadrockbox-b1c61b95dfddccf3a1e2a94f61ca2ca079d51437.tar.gz
rockbox-b1c61b95dfddccf3a1e2a94f61ca2ca079d51437.zip
Add some more icons to a few dialogs and fix visual glitches.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14132 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--rbutil/rbutilqt/installbootloaderfrm.ui126
-rw-r--r--rbutil/rbutilqt/installfrm.ui77
-rw-r--r--rbutil/rbutilqt/installzipfrm.ui91
3 files changed, 198 insertions, 96 deletions
diff --git a/rbutil/rbutilqt/installbootloaderfrm.ui b/rbutil/rbutilqt/installbootloaderfrm.ui
index ebca708cc6..b34b664d43 100644
--- a/rbutil/rbutilqt/installbootloaderfrm.ui
+++ b/rbutil/rbutilqt/installbootloaderfrm.ui
@@ -8,15 +8,15 @@
8 <rect> 8 <rect>
9 <x>0</x> 9 <x>0</x>
10 <y>0</y> 10 <y>0</y>
11 <width>665</width> 11 <width>600</width>
12 <height>499</height> 12 <height>450</height>
13 </rect> 13 </rect>
14 </property> 14 </property>
15 <property name="windowTitle" > 15 <property name="windowTitle" >
16 <string>Install Bootloader</string> 16 <string>Install Bootloader</string>
17 </property> 17 </property>
18 <layout class="QGridLayout" > 18 <layout class="QGridLayout" >
19 <item rowspan="8" row="0" column="0" > 19 <item rowspan="6" row="0" column="0" >
20 <widget class="QLabel" name="label" > 20 <widget class="QLabel" name="label" >
21 <property name="text" > 21 <property name="text" >
22 <string/> 22 <string/>
@@ -24,6 +24,9 @@
24 <property name="pixmap" > 24 <property name="pixmap" >
25 <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap> 25 <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
26 </property> 26 </property>
27 <property name="alignment" >
28 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
29 </property>
27 </widget> 30 </widget>
28 </item> 31 </item>
29 <item row="0" column="1" colspan="3" > 32 <item row="0" column="1" colspan="3" >
@@ -37,36 +40,23 @@
37 <widget class="QLineEdit" name="lineMountPoint" /> 40 <widget class="QLineEdit" name="lineMountPoint" />
38 </item> 41 </item>
39 <item row="1" column="3" > 42 <item row="1" column="3" >
40 <widget class="QToolButton" name="buttonBrowse" > 43 <widget class="QPushButton" name="buttonBrowse" >
41 <property name="text" > 44 <property name="text" >
42 <string>&amp;Browse</string> 45 <string>&amp;Browse</string>
43 </property> 46 </property>
44 </widget> 47 <property name="icon" >
45 </item> 48 <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
46 <item row="9" column="2" colspan="2" >
47 <widget class="QDialogButtonBox" name="buttonBox" >
48 <property name="orientation" >
49 <enum>Qt::Horizontal</enum>
50 </property>
51 <property name="standardButtons" >
52 <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
53 </property> 49 </property>
54 </widget> 50 </widget>
55 </item> 51 </item>
56 <item rowspan="4" row="4" column="1" colspan="3" > 52 <item row="2" column="1" colspan="3" >
57 <spacer> 53 <widget class="QLabel" name="label_3" >
58 <property name="orientation" > 54 <property name="text" >
59 <enum>Qt::Vertical</enum> 55 <string>Download and select an original Firmware</string>
60 </property>
61 <property name="sizeHint" >
62 <size>
63 <width>20</width>
64 <height>40</height>
65 </size>
66 </property> 56 </property>
67 </spacer> 57 </widget>
68 </item> 58 </item>
69 <item row="3" column="1" > 59 <item row="3" column="1" colspan="2" >
70 <widget class="QLineEdit" name="lineOriginalFirmware" > 60 <widget class="QLineEdit" name="lineOriginalFirmware" >
71 <property name="sizePolicy" > 61 <property name="sizePolicy" >
72 <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > 62 <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -82,19 +72,65 @@
82 </property> 72 </property>
83 </widget> 73 </widget>
84 </item> 74 </item>
85 <item row="2" column="1" > 75 <item row="3" column="3" >
86 <widget class="QLabel" name="label_3" > 76 <widget class="QPushButton" name="buttonBrowseOF" >
87 <property name="text" > 77 <property name="text" >
88 <string>Download and select an original Firmware</string> 78 <string>&amp;Browse</string>
79 </property>
80 <property name="icon" >
81 <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
89 </property> 82 </property>
90 </widget> 83 </widget>
91 </item> 84 </item>
92 <item row="3" column="2" > 85 <item row="4" column="2" >
93 <widget class="QToolButton" name="buttonBrowseOF" > 86 <spacer>
94 <property name="text" > 87 <property name="orientation" >
95 <string>Browse</string> 88 <enum>Qt::Vertical</enum>
96 </property> 89 </property>
97 </widget> 90 <property name="sizeHint" >
91 <size>
92 <width>20</width>
93 <height>40</height>
94 </size>
95 </property>
96 </spacer>
97 </item>
98 <item row="5" column="1" >
99 <spacer>
100 <property name="orientation" >
101 <enum>Qt::Horizontal</enum>
102 </property>
103 <property name="sizeHint" >
104 <size>
105 <width>40</width>
106 <height>20</height>
107 </size>
108 </property>
109 </spacer>
110 </item>
111 <item row="5" column="2" colspan="2" >
112 <layout class="QHBoxLayout" >
113 <item>
114 <widget class="QPushButton" name="buttonOk_2" >
115 <property name="text" >
116 <string>&amp;Ok</string>
117 </property>
118 <property name="icon" >
119 <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
120 </property>
121 </widget>
122 </item>
123 <item>
124 <widget class="QPushButton" name="buttonCancel_2" >
125 <property name="text" >
126 <string>&amp;Cancel</string>
127 </property>
128 <property name="icon" >
129 <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
130 </property>
131 </widget>
132 </item>
133 </layout>
98 </item> 134 </item>
99 </layout> 135 </layout>
100 </widget> 136 </widget>
@@ -103,34 +139,34 @@
103 </resources> 139 </resources>
104 <connections> 140 <connections>
105 <connection> 141 <connection>
106 <sender>buttonBox</sender> 142 <sender>buttonOk_2</sender>
107 <signal>accepted()</signal> 143 <signal>clicked()</signal>
108 <receiver>InstallBootloaderFrm</receiver> 144 <receiver>InstallBootloaderFrm</receiver>
109 <slot>accept()</slot> 145 <slot>accept()</slot>
110 <hints> 146 <hints>
111 <hint type="sourcelabel" > 147 <hint type="sourcelabel" >
112 <x>248</x> 148 <x>476</x>
113 <y>254</y> 149 <y>425</y>
114 </hint> 150 </hint>
115 <hint type="destinationlabel" > 151 <hint type="destinationlabel" >
116 <x>157</x> 152 <x>531</x>
117 <y>274</y> 153 <y>317</y>
118 </hint> 154 </hint>
119 </hints> 155 </hints>
120 </connection> 156 </connection>
121 <connection> 157 <connection>
122 <sender>buttonBox</sender> 158 <sender>buttonCancel_2</sender>
123 <signal>rejected()</signal> 159 <signal>clicked()</signal>
124 <receiver>InstallBootloaderFrm</receiver> 160 <receiver>InstallBootloaderFrm</receiver>
125 <slot>reject()</slot> 161 <slot>reject()</slot>
126 <hints> 162 <hints>
127 <hint type="sourcelabel" > 163 <hint type="sourcelabel" >
128 <x>316</x> 164 <x>556</x>
129 <y>260</y> 165 <y>428</y>
130 </hint> 166 </hint>
131 <hint type="destinationlabel" > 167 <hint type="destinationlabel" >
132 <x>286</x> 168 <x>599</x>
133 <y>274</y> 169 <y>325</y>
134 </hint> 170 </hint>
135 </hints> 171 </hints>
136 </connection> 172 </connection>
diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui
index a3ec2a92d1..5edb5bb09c 100644
--- a/rbutil/rbutilqt/installfrm.ui
+++ b/rbutil/rbutilqt/installfrm.ui
@@ -8,7 +8,7 @@
8 <rect> 8 <rect>
9 <x>0</x> 9 <x>0</x>
10 <y>0</y> 10 <y>0</y>
11 <width>702</width> 11 <width>700</width>
12 <height>450</height> 12 <height>450</height>
13 </rect> 13 </rect>
14 </property> 14 </property>
@@ -24,6 +24,9 @@
24 <property name="pixmap" > 24 <property name="pixmap" >
25 <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap> 25 <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
26 </property> 26 </property>
27 <property name="alignment" >
28 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
29 </property>
27 </widget> 30 </widget>
28 </item> 31 </item>
29 <item row="0" column="1" colspan="3" > 32 <item row="0" column="1" colspan="3" >
@@ -37,10 +40,13 @@
37 <widget class="QLineEdit" name="lineMountPoint" /> 40 <widget class="QLineEdit" name="lineMountPoint" />
38 </item> 41 </item>
39 <item row="1" column="3" > 42 <item row="1" column="3" >
40 <widget class="QToolButton" name="buttonBrowse" > 43 <widget class="QPushButton" name="buttonBrowse" >
41 <property name="text" > 44 <property name="text" >
42 <string>&amp;Browse</string> 45 <string>&amp;Browse</string>
43 </property> 46 </property>
47 <property name="icon" >
48 <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
49 </property>
44 </widget> 50 </widget>
45 </item> 51 </item>
46 <item row="2" column="1" colspan="3" > 52 <item row="2" column="1" colspan="3" >
@@ -122,28 +128,55 @@
122 </property> 128 </property>
123 </widget> 129 </widget>
124 </item> 130 </item>
125 <item row="6" column="2" > 131 <item row="6" column="2" colspan="2" >
126 <spacer> 132 <spacer>
127 <property name="orientation" > 133 <property name="orientation" >
128 <enum>Qt::Vertical</enum> 134 <enum>Qt::Vertical</enum>
129 </property> 135 </property>
130 <property name="sizeHint" > 136 <property name="sizeHint" >
131 <size> 137 <size>
132 <width>185</width> 138 <width>131</width>
133 <height>31</height> 139 <height>41</height>
134 </size> 140 </size>
135 </property> 141 </property>
136 </spacer> 142 </spacer>
137 </item> 143 </item>
138 <item row="7" column="2" colspan="2" > 144 <item row="7" column="1" >
139 <widget class="QDialogButtonBox" name="buttonBox" > 145 <spacer>
140 <property name="orientation" > 146 <property name="orientation" >
141 <enum>Qt::Horizontal</enum> 147 <enum>Qt::Horizontal</enum>
142 </property> 148 </property>
143 <property name="standardButtons" > 149 <property name="sizeHint" >
144 <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> 150 <size>
151 <width>291</width>
152 <height>20</height>
153 </size>
145 </property> 154 </property>
146 </widget> 155 </spacer>
156 </item>
157 <item row="7" column="2" colspan="2" >
158 <layout class="QHBoxLayout" >
159 <item>
160 <widget class="QPushButton" name="buttonOk" >
161 <property name="text" >
162 <string>&amp;Ok</string>
163 </property>
164 <property name="icon" >
165 <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
166 </property>
167 </widget>
168 </item>
169 <item>
170 <widget class="QPushButton" name="buttonCancel" >
171 <property name="text" >
172 <string>&amp;Cancel</string>
173 </property>
174 <property name="icon" >
175 <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
176 </property>
177 </widget>
178 </item>
179 </layout>
147 </item> 180 </item>
148 </layout> 181 </layout>
149 </widget> 182 </widget>
@@ -152,34 +185,34 @@
152 </resources> 185 </resources>
153 <connections> 186 <connections>
154 <connection> 187 <connection>
155 <sender>buttonBox</sender> 188 <sender>buttonOk</sender>
156 <signal>accepted()</signal> 189 <signal>clicked()</signal>
157 <receiver>InstallFrm</receiver> 190 <receiver>InstallFrm</receiver>
158 <slot>accept()</slot> 191 <slot>accept()</slot>
159 <hints> 192 <hints>
160 <hint type="sourcelabel" > 193 <hint type="sourcelabel" >
161 <x>248</x> 194 <x>562</x>
162 <y>254</y> 195 <y>420</y>
163 </hint> 196 </hint>
164 <hint type="destinationlabel" > 197 <hint type="destinationlabel" >
165 <x>157</x> 198 <x>500</x>
166 <y>274</y> 199 <y>352</y>
167 </hint> 200 </hint>
168 </hints> 201 </hints>
169 </connection> 202 </connection>
170 <connection> 203 <connection>
171 <sender>buttonBox</sender> 204 <sender>buttonCancel</sender>
172 <signal>rejected()</signal> 205 <signal>clicked()</signal>
173 <receiver>InstallFrm</receiver> 206 <receiver>InstallFrm</receiver>
174 <slot>reject()</slot> 207 <slot>reject()</slot>
175 <hints> 208 <hints>
176 <hint type="sourcelabel" > 209 <hint type="sourcelabel" >
177 <x>316</x> 210 <x>658</x>
178 <y>260</y> 211 <y>429</y>
179 </hint> 212 </hint>
180 <hint type="destinationlabel" > 213 <hint type="destinationlabel" >
181 <x>286</x> 214 <x>611</x>
182 <y>274</y> 215 <y>360</y>
183 </hint> 216 </hint>
184 </hints> 217 </hints>
185 </connection> 218 </connection>
diff --git a/rbutil/rbutilqt/installzipfrm.ui b/rbutil/rbutilqt/installzipfrm.ui
index fe88e024f4..4a107ce189 100644
--- a/rbutil/rbutilqt/installzipfrm.ui
+++ b/rbutil/rbutilqt/installzipfrm.ui
@@ -8,15 +8,15 @@
8 <rect> 8 <rect>
9 <x>0</x> 9 <x>0</x>
10 <y>0</y> 10 <y>0</y>
11 <width>665</width> 11 <width>600</width>
12 <height>499</height> 12 <height>450</height>
13 </rect> 13 </rect>
14 </property> 14 </property>
15 <property name="windowTitle" > 15 <property name="windowTitle" >
16 <string>Install Zip</string> 16 <string>Install Zip</string>
17 </property> 17 </property>
18 <layout class="QGridLayout" > 18 <layout class="QGridLayout" >
19 <item rowspan="8" row="0" column="0" > 19 <item rowspan="4" row="0" column="0" >
20 <widget class="QLabel" name="label" > 20 <widget class="QLabel" name="label" >
21 <property name="text" > 21 <property name="text" >
22 <string/> 22 <string/>
@@ -24,36 +24,32 @@
24 <property name="pixmap" > 24 <property name="pixmap" >
25 <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap> 25 <pixmap resource="rbutilqt.qrc" >:/icons/icons/wizard.xpm</pixmap>
26 </property> 26 </property>
27 <property name="alignment" >
28 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
29 </property>
27 </widget> 30 </widget>
28 </item> 31 </item>
29 <item row="0" column="1" colspan="3" > 32 <item row="0" column="1" colspan="4" >
30 <widget class="QLabel" name="label_2" > 33 <widget class="QLabel" name="label_2" >
31 <property name="text" > 34 <property name="text" >
32 <string>Select your device in the filesystem</string> 35 <string>Select your device in the filesystem</string>
33 </property> 36 </property>
34 </widget> 37 </widget>
35 </item> 38 </item>
36 <item row="1" column="1" colspan="2" > 39 <item row="1" column="1" colspan="3" >
37 <widget class="QLineEdit" name="lineMountPoint" /> 40 <widget class="QLineEdit" name="lineMountPoint" />
38 </item> 41 </item>
39 <item row="1" column="3" > 42 <item row="1" column="4" >
40 <widget class="QToolButton" name="buttonBrowse" > 43 <widget class="QPushButton" name="buttonBrowse" >
41 <property name="text" > 44 <property name="text" >
42 <string>&amp;Browse</string> 45 <string>&amp;Browse</string>
43 </property> 46 </property>
44 </widget> 47 <property name="icon" >
45 </item> 48 <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
46 <item row="9" column="2" colspan="2" >
47 <widget class="QDialogButtonBox" name="buttonBox" >
48 <property name="orientation" >
49 <enum>Qt::Horizontal</enum>
50 </property>
51 <property name="standardButtons" >
52 <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
53 </property> 49 </property>
54 </widget> 50 </widget>
55 </item> 51 </item>
56 <item rowspan="4" row="4" column="1" colspan="3" > 52 <item row="2" column="2" >
57 <spacer> 53 <spacer>
58 <property name="orientation" > 54 <property name="orientation" >
59 <enum>Qt::Vertical</enum> 55 <enum>Qt::Vertical</enum>
@@ -66,6 +62,43 @@
66 </property> 62 </property>
67 </spacer> 63 </spacer>
68 </item> 64 </item>
65 <item row="3" column="1" >
66 <spacer>
67 <property name="orientation" >
68 <enum>Qt::Horizontal</enum>
69 </property>
70 <property name="sizeHint" >
71 <size>
72 <width>40</width>
73 <height>20</height>
74 </size>
75 </property>
76 </spacer>
77 </item>
78 <item row="3" column="3" colspan="2" >
79 <layout class="QHBoxLayout" >
80 <item>
81 <widget class="QPushButton" name="buttonOk" >
82 <property name="text" >
83 <string>&amp;Ok</string>
84 </property>
85 <property name="icon" >
86 <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
87 </property>
88 </widget>
89 </item>
90 <item>
91 <widget class="QPushButton" name="buttonCancel" >
92 <property name="text" >
93 <string>&amp;Cancel</string>
94 </property>
95 <property name="icon" >
96 <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
97 </property>
98 </widget>
99 </item>
100 </layout>
101 </item>
69 </layout> 102 </layout>
70 </widget> 103 </widget>
71 <resources> 104 <resources>
@@ -73,34 +106,34 @@
73 </resources> 106 </resources>
74 <connections> 107 <connections>
75 <connection> 108 <connection>
76 <sender>buttonBox</sender> 109 <sender>buttonOk</sender>
77 <signal>accepted()</signal> 110 <signal>clicked()</signal>
78 <receiver>InstallZipFrm</receiver> 111 <receiver>InstallZipFrm</receiver>
79 <slot>accept()</slot> 112 <slot>accept()</slot>
80 <hints> 113 <hints>
81 <hint type="sourcelabel" > 114 <hint type="sourcelabel" >
82 <x>248</x> 115 <x>472</x>
83 <y>254</y> 116 <y>418</y>
84 </hint> 117 </hint>
85 <hint type="destinationlabel" > 118 <hint type="destinationlabel" >
86 <x>157</x> 119 <x>382</x>
87 <y>274</y> 120 <y>328</y>
88 </hint> 121 </hint>
89 </hints> 122 </hints>
90 </connection> 123 </connection>
91 <connection> 124 <connection>
92 <sender>buttonBox</sender> 125 <sender>buttonCancel</sender>
93 <signal>rejected()</signal> 126 <signal>clicked()</signal>
94 <receiver>InstallZipFrm</receiver> 127 <receiver>InstallZipFrm</receiver>
95 <slot>reject()</slot> 128 <slot>reject()</slot>
96 <hints> 129 <hints>
97 <hint type="sourcelabel" > 130 <hint type="sourcelabel" >
98 <x>316</x> 131 <x>561</x>
99 <y>260</y> 132 <y>428</y>
100 </hint> 133 </hint>
101 <hint type="destinationlabel" > 134 <hint type="destinationlabel" >
102 <x>286</x> 135 <x>522</x>
103 <y>274</y> 136 <y>332</y>
104 </hint> 137 </hint>
105 </hints> 138 </hints>
106 </connection> 139 </connection>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-29 23:30:35 +0000