diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-01 14:09:41 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-01 14:09:41 +0000 |
commit | 2e75182b844f36730373822e0bd436262e4638aa (patch) | |
tree | 5175aca19bc3b12357aa3fce379d01730a294dcb | |
parent | 754293aa6c0c68e1fb82bfd30c67f2fa48bc8ffe (diff) | |
download | rockbox-2e75182b844f36730373822e0bd436262e4638aa.tar.gz rockbox-2e75182b844f36730373822e0bd436262e4638aa.zip |
Update configuration dialog and disable unimplemented items. Add some nice icons and replace logger icons with tango ones.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14119 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/configurefrm.ui | 183 | ||||
-rw-r--r-- | rbutil/rbutilqt/progressloggergui.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.qrc | 10 |
4 files changed, 198 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 6d52fd0f2b..e92234527b 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -60,6 +60,15 @@ Config::Config(QWidget *parent) : QDialog(parent) | |||
60 | connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(abort())); | 60 | connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(abort())); |
61 | connect(ui.radioNoProxy, SIGNAL(toggled(bool)), this, SLOT(setNoProxy(bool))); | 61 | connect(ui.radioNoProxy, SIGNAL(toggled(bool)), this, SLOT(setNoProxy(bool))); |
62 | connect(ui.radioSystemProxy, SIGNAL(toggled(bool)), this, SLOT(setSystemProxy(bool))); | 62 | connect(ui.radioSystemProxy, SIGNAL(toggled(bool)), this, SLOT(setSystemProxy(bool))); |
63 | |||
64 | // disable unimplemented stuff | ||
65 | ui.buttonCacheBrowse->setEnabled(false); | ||
66 | ui.cacheDisable->setEnabled(false); | ||
67 | ui.cacheOfflineMode->setEnabled(false); | ||
68 | ui.buttonCacheClear->setEnabled(false); | ||
69 | ui.scrobblerUser->setEnabled(false); | ||
70 | ui.scrobblerPass->setEnabled(false); | ||
71 | ui.scrobblerTimezone->setEnabled(false); | ||
63 | } | 72 | } |
64 | 73 | ||
65 | 74 | ||
diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui index 4c0a3a3e2f..8310c71ae7 100644 --- a/rbutil/rbutilqt/configurefrm.ui +++ b/rbutil/rbutilqt/configurefrm.ui | |||
@@ -38,6 +38,9 @@ | |||
38 | <property name="text" > | 38 | <property name="text" > |
39 | <string>&Ok</string> | 39 | <string>&Ok</string> |
40 | </property> | 40 | </property> |
41 | <property name="icon" > | ||
42 | <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset> | ||
43 | </property> | ||
41 | </widget> | 44 | </widget> |
42 | </item> | 45 | </item> |
43 | <item row="2" column="2" > | 46 | <item row="2" column="2" > |
@@ -45,6 +48,9 @@ | |||
45 | <property name="text" > | 48 | <property name="text" > |
46 | <string>&Cancel</string> | 49 | <string>&Cancel</string> |
47 | </property> | 50 | </property> |
51 | <property name="icon" > | ||
52 | <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset> | ||
53 | </property> | ||
48 | </widget> | 54 | </widget> |
49 | </item> | 55 | </item> |
50 | <item row="1" column="0" colspan="3" > | 56 | <item row="1" column="0" colspan="3" > |
@@ -70,7 +76,7 @@ | |||
70 | <item row="1" column="0" > | 76 | <item row="1" column="0" > |
71 | <widget class="QRadioButton" name="radioSystemProxy" > | 77 | <widget class="QRadioButton" name="radioSystemProxy" > |
72 | <property name="text" > | 78 | <property name="text" > |
73 | <string>Use &System values</string> | 79 | <string>Use S&ystem values</string> |
74 | </property> | 80 | </property> |
75 | </widget> | 81 | </widget> |
76 | </item> | 82 | </item> |
@@ -121,7 +127,11 @@ | |||
121 | <widget class="QLineEdit" name="proxyUser" /> | 127 | <widget class="QLineEdit" name="proxyUser" /> |
122 | </item> | 128 | </item> |
123 | <item row="3" column="1" > | 129 | <item row="3" column="1" > |
124 | <widget class="QLineEdit" name="proxyPass" /> | 130 | <widget class="QLineEdit" name="proxyPass" > |
131 | <property name="echoMode" > | ||
132 | <enum>QLineEdit::Password</enum> | ||
133 | </property> | ||
134 | </widget> | ||
125 | </item> | 135 | </item> |
126 | <item row="2" column="0" > | 136 | <item row="2" column="0" > |
127 | <widget class="QLabel" name="label_3" > | 137 | <widget class="QLabel" name="label_3" > |
@@ -136,7 +146,7 @@ | |||
136 | <item row="3" column="0" > | 146 | <item row="3" column="0" > |
137 | <widget class="QLabel" name="label_4" > | 147 | <widget class="QLabel" name="label_4" > |
138 | <property name="text" > | 148 | <property name="text" > |
139 | <string>P&assword</string> | 149 | <string>Pass&word</string> |
140 | </property> | 150 | </property> |
141 | <property name="buddy" > | 151 | <property name="buddy" > |
142 | <cstring>proxyPass</cstring> | 152 | <cstring>proxyPass</cstring> |
@@ -171,15 +181,180 @@ | |||
171 | </item> | 181 | </item> |
172 | </layout> | 182 | </layout> |
173 | </widget> | 183 | </widget> |
184 | <widget class="QWidget" name="tabCache" > | ||
185 | <attribute name="title" > | ||
186 | <string>C&ache</string> | ||
187 | </attribute> | ||
188 | <attribute name="toolTip" > | ||
189 | <string>Download cache settings</string> | ||
190 | </attribute> | ||
191 | <layout class="QGridLayout" > | ||
192 | <item row="0" column="0" colspan="2" > | ||
193 | <widget class="QLabel" name="cacheDescription" > | ||
194 | <property name="text" > | ||
195 | <string>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</string> | ||
196 | </property> | ||
197 | <property name="wordWrap" > | ||
198 | <bool>true</bool> | ||
199 | </property> | ||
200 | </widget> | ||
201 | </item> | ||
202 | <item row="1" column="0" > | ||
203 | <widget class="QLabel" name="cacheSize" > | ||
204 | <property name="text" > | ||
205 | <string>Current cache size is %1</string> | ||
206 | </property> | ||
207 | </widget> | ||
208 | </item> | ||
209 | <item row="2" column="0" colspan="2" > | ||
210 | <layout class="QHBoxLayout" > | ||
211 | <item> | ||
212 | <widget class="QLabel" name="label_5" > | ||
213 | <property name="text" > | ||
214 | <string>P&ath</string> | ||
215 | </property> | ||
216 | <property name="buddy" > | ||
217 | <cstring>cachePath</cstring> | ||
218 | </property> | ||
219 | </widget> | ||
220 | </item> | ||
221 | <item> | ||
222 | <widget class="QLineEdit" name="cachePath" /> | ||
223 | </item> | ||
224 | <item> | ||
225 | <widget class="QPushButton" name="buttonCacheBrowse" > | ||
226 | <property name="text" > | ||
227 | <string>&Browse</string> | ||
228 | </property> | ||
229 | <property name="icon" > | ||
230 | <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset> | ||
231 | </property> | ||
232 | </widget> | ||
233 | </item> | ||
234 | </layout> | ||
235 | </item> | ||
236 | <item row="3" column="0" colspan="2" > | ||
237 | <layout class="QVBoxLayout" > | ||
238 | <item> | ||
239 | <widget class="QCheckBox" name="cacheDisable" > | ||
240 | <property name="text" > | ||
241 | <string>Disable local &download cache</string> | ||
242 | </property> | ||
243 | </widget> | ||
244 | </item> | ||
245 | <item> | ||
246 | <widget class="QCheckBox" name="cacheOfflineMode" > | ||
247 | <property name="text" > | ||
248 | <string>O&ffline mode</string> | ||
249 | </property> | ||
250 | </widget> | ||
251 | </item> | ||
252 | </layout> | ||
253 | </item> | ||
254 | <item row="4" column="1" > | ||
255 | <spacer> | ||
256 | <property name="orientation" > | ||
257 | <enum>Qt::Vertical</enum> | ||
258 | </property> | ||
259 | <property name="sizeHint" > | ||
260 | <size> | ||
261 | <width>20</width> | ||
262 | <height>61</height> | ||
263 | </size> | ||
264 | </property> | ||
265 | </spacer> | ||
266 | </item> | ||
267 | <item row="5" column="0" > | ||
268 | <spacer> | ||
269 | <property name="orientation" > | ||
270 | <enum>Qt::Horizontal</enum> | ||
271 | </property> | ||
272 | <property name="sizeHint" > | ||
273 | <size> | ||
274 | <width>40</width> | ||
275 | <height>20</height> | ||
276 | </size> | ||
277 | </property> | ||
278 | </spacer> | ||
279 | </item> | ||
280 | <item row="5" column="1" > | ||
281 | <widget class="QPushButton" name="buttonCacheClear" > | ||
282 | <property name="text" > | ||
283 | <string>Clean cache &now</string> | ||
284 | </property> | ||
285 | </widget> | ||
286 | </item> | ||
287 | </layout> | ||
288 | </widget> | ||
174 | <widget class="QWidget" name="tabScrobbler" > | 289 | <widget class="QWidget" name="tabScrobbler" > |
175 | <attribute name="title" > | 290 | <attribute name="title" > |
176 | <string>&Scrobbler</string> | 291 | <string>&Scrobbler</string> |
177 | </attribute> | 292 | </attribute> |
293 | <layout class="QGridLayout" > | ||
294 | <item row="0" column="0" > | ||
295 | <widget class="QLabel" name="label_8" > | ||
296 | <property name="text" > | ||
297 | <string>&Username</string> | ||
298 | </property> | ||
299 | <property name="buddy" > | ||
300 | <cstring>scrobblerUser</cstring> | ||
301 | </property> | ||
302 | </widget> | ||
303 | </item> | ||
304 | <item row="0" column="1" > | ||
305 | <widget class="QLineEdit" name="scrobblerUser" /> | ||
306 | </item> | ||
307 | <item row="1" column="0" > | ||
308 | <widget class="QLabel" name="label_9" > | ||
309 | <property name="text" > | ||
310 | <string>P&assword</string> | ||
311 | </property> | ||
312 | <property name="buddy" > | ||
313 | <cstring>scrobblerPass</cstring> | ||
314 | </property> | ||
315 | </widget> | ||
316 | </item> | ||
317 | <item row="1" column="1" > | ||
318 | <widget class="QLineEdit" name="scrobblerPass" > | ||
319 | <property name="echoMode" > | ||
320 | <enum>QLineEdit::Password</enum> | ||
321 | </property> | ||
322 | </widget> | ||
323 | </item> | ||
324 | <item row="2" column="0" > | ||
325 | <widget class="QLabel" name="label_10" > | ||
326 | <property name="text" > | ||
327 | <string>&Timezone</string> | ||
328 | </property> | ||
329 | <property name="buddy" > | ||
330 | <cstring>scrobblerTimezone</cstring> | ||
331 | </property> | ||
332 | </widget> | ||
333 | </item> | ||
334 | <item row="2" column="1" > | ||
335 | <widget class="QComboBox" name="scrobblerTimezone" /> | ||
336 | </item> | ||
337 | <item row="4" column="1" > | ||
338 | <spacer> | ||
339 | <property name="orientation" > | ||
340 | <enum>Qt::Vertical</enum> | ||
341 | </property> | ||
342 | <property name="sizeHint" > | ||
343 | <size> | ||
344 | <width>20</width> | ||
345 | <height>40</height> | ||
346 | </size> | ||
347 | </property> | ||
348 | </spacer> | ||
349 | </item> | ||
350 | </layout> | ||
178 | </widget> | 351 | </widget> |
179 | </widget> | 352 | </widget> |
180 | </item> | 353 | </item> |
181 | </layout> | 354 | </layout> |
182 | </widget> | 355 | </widget> |
183 | <resources/> | 356 | <resources> |
357 | <include location="rbutilqt.qrc" /> | ||
358 | </resources> | ||
184 | <connections/> | 359 | <connections/> |
185 | </ui> | 360 | </ui> |
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp index 8dc3e71844..932c18dfce 100644 --- a/rbutil/rbutilqt/progressloggergui.cpp +++ b/rbutil/rbutilqt/progressloggergui.cpp | |||
@@ -40,16 +40,16 @@ void ProgressLoggerGui::addItem(QString text,int flag) | |||
40 | switch(flag) | 40 | switch(flag) |
41 | { | 41 | { |
42 | case LOGOK: | 42 | case LOGOK: |
43 | item->setIcon(QIcon(":/icons/icons/log-ok.png")); | 43 | item->setIcon(QIcon(":/icons/icons/go-next.png")); |
44 | break; | 44 | break; |
45 | case LOGINFO: | 45 | case LOGINFO: |
46 | item->setIcon(QIcon(":/icons/icons/log-info.png")); | 46 | item->setIcon(QIcon(":/icons/icons/dialog-information.png")); |
47 | break; | 47 | break; |
48 | case LOGWARNING: | 48 | case LOGWARNING: |
49 | item->setIcon(QIcon(":/icons/icons/log-warning.png")); | 49 | item->setIcon(QIcon(":/icons/icons/dialog-warning.png")); |
50 | break; | 50 | break; |
51 | case LOGERROR: | 51 | case LOGERROR: |
52 | item->setIcon(QIcon(":/icons/icons/log-error.png")); | 52 | item->setIcon(QIcon(":/icons/icons/dialog-error.png")); |
53 | break; | 53 | break; |
54 | } | 54 | } |
55 | 55 | ||
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 913d600897..862d7df20c 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc | |||
@@ -5,17 +5,19 @@ | |||
5 | </qresource> | 5 | </qresource> |
6 | <qresource prefix="/icons" > | 6 | <qresource prefix="/icons" > |
7 | <file>icons/bootloader_btn.png</file> | 7 | <file>icons/bootloader_btn.png</file> |
8 | <file>icons/dialog-error.png</file> | ||
9 | <file>icons/dialog-information.png</file> | ||
10 | <file>icons/dialog-warning.png</file> | ||
8 | <file>icons/doom_btn.png</file> | 11 | <file>icons/doom_btn.png</file> |
9 | <file>icons/font_btn.png</file> | 12 | <file>icons/font_btn.png</file> |
10 | <file>icons/log-error.png</file> | 13 | <file>icons/go-next.png</file> |
11 | <file>icons/log-info.png</file> | 14 | <file>icons/process-stop.png</file> |
12 | <file>icons/log-ok.png</file> | ||
13 | <file>icons/log-warning.png</file> | ||
14 | <file>icons/rbinstall_btn.png</file> | 15 | <file>icons/rbinstall_btn.png</file> |
15 | <file>icons/rblogo.xpm</file> | 16 | <file>icons/rblogo.xpm</file> |
16 | <file>icons/rbutil.xpm</file> | 17 | <file>icons/rbutil.xpm</file> |
17 | <file>icons/rembootloader_btn.png</file> | 18 | <file>icons/rembootloader_btn.png</file> |
18 | <file>icons/remrb_btn.png</file> | 19 | <file>icons/remrb_btn.png</file> |
20 | <file>icons/system-search.png</file> | ||
19 | <file>icons/themes_btn.png</file> | 21 | <file>icons/themes_btn.png</file> |
20 | <file>icons/wizard.xpm</file> | 22 | <file>icons/wizard.xpm</file> |
21 | </qresource> | 23 | </qresource> |