Merge lp:~nataliabidart/ubuntu-sso-client/all-ui-from-code into lp:ubuntu-sso-client
- all-ui-from-code
- Merge into trunk
Proposed by
Natalia Bidart
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 883 |
Merged at revision: | 883 |
Proposed branch: | lp:~nataliabidart/ubuntu-sso-client/all-ui-from-code |
Merge into: | lp:ubuntu-sso-client |
Diff against target: |
4246 lines (+1955/-1959) 18 files modified
data/qt/choose_sign_in.ui (+163/-165) data/qt/current_user_sign_in.ui (+181/-184) data/qt/email_verification.ui (+113/-116) data/qt/error_message.ui (+28/-31) data/qt/forgotten_password.ui (+185/-188) data/qt/loadingoverlay.ui (+3/-6) data/qt/network_detection.ui (+139/-142) data/qt/proxy_credentials_dialog.ui (+12/-15) data/qt/reset_password.ui (+354/-357) data/qt/setup_account.ui (+697/-700) data/qt/success_message.ui (+32/-35) ubuntu_sso/qt/email_verification_page.py (+4/-0) ubuntu_sso/qt/loadingoverlay.py (+3/-0) ubuntu_sso/qt/network_detection_page.py (+5/-1) ubuntu_sso/qt/proxy_dialog.py (+1/-1) ubuntu_sso/qt/setup_account_page.py (+14/-6) ubuntu_sso/qt/tests/test_network_detection.py (+3/-1) ubuntu_sso/utils/ui.py (+18/-11) |
To merge this branch: | bzr merge lp:~nataliabidart/ubuntu-sso-client/all-ui-from-code |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+94228@code.launchpad.net |
Commit message
- No more strings coming up from the Designer ui files (LP: #938626).
Description of the change
To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote : | # |
+1 tedious work, thx for doing it.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/qt/choose_sign_in.ui' |
2 | --- data/qt/choose_sign_in.ui 2012-02-09 18:28:40 +0000 |
3 | +++ data/qt/choose_sign_in.ui 2012-02-22 17:10:00 +0000 |
4 | @@ -1,165 +1,163 @@ |
5 | -<?xml version="1.0" encoding="UTF-8"?> |
6 | -<ui version="4.0"> |
7 | - <class>ChooseSignInPage</class> |
8 | - <widget class="QWizardPage" name="ChooseSignInPage"> |
9 | - <property name="geometry"> |
10 | - <rect> |
11 | - <x>0</x> |
12 | - <y>0</y> |
13 | - <width>432</width> |
14 | - <height>387</height> |
15 | - </rect> |
16 | - </property> |
17 | - <property name="windowTitle"> |
18 | - <string>WizardPage</string> |
19 | - </property> |
20 | - <layout class="QVBoxLayout" name="verticalLayout_2"> |
21 | - <property name="leftMargin"> |
22 | - <number>0</number> |
23 | - </property> |
24 | - <property name="topMargin"> |
25 | - <number>0</number> |
26 | - </property> |
27 | - <property name="rightMargin"> |
28 | - <number>0</number> |
29 | - </property> |
30 | - <item> |
31 | - <layout class="QHBoxLayout" name="horizontalLayout_2"> |
32 | - <item> |
33 | - <widget class="QLabel" name="image_label"> |
34 | - <property name="sizePolicy"> |
35 | - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
36 | - <horstretch>0</horstretch> |
37 | - <verstretch>0</verstretch> |
38 | - </sizepolicy> |
39 | - </property> |
40 | - <property name="minimumSize"> |
41 | - <size> |
42 | - <width>400</width> |
43 | - <height>150</height> |
44 | - </size> |
45 | - </property> |
46 | - <property name="text"> |
47 | - <string/> |
48 | - </property> |
49 | - <property name="textFormat"> |
50 | - <enum>Qt::PlainText</enum> |
51 | - </property> |
52 | - <property name="alignment"> |
53 | - <set>Qt::AlignCenter</set> |
54 | - </property> |
55 | - <property name="wordWrap"> |
56 | - <bool>true</bool> |
57 | - </property> |
58 | - </widget> |
59 | - </item> |
60 | - </layout> |
61 | - </item> |
62 | - <item> |
63 | - <widget class="QLabel" name="message_label"> |
64 | - <property name="font"> |
65 | - <font> |
66 | - <pointsize>11</pointsize> |
67 | - <weight>50</weight> |
68 | - <bold>false</bold> |
69 | - </font> |
70 | - </property> |
71 | - <property name="text"> |
72 | - <string>Congratulations, app_name is installed!</string> |
73 | - </property> |
74 | - <property name="alignment"> |
75 | - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> |
76 | - </property> |
77 | - </widget> |
78 | - </item> |
79 | - <item> |
80 | - <spacer name="verticalSpacer_3"> |
81 | - <property name="orientation"> |
82 | - <enum>Qt::Vertical</enum> |
83 | - </property> |
84 | - <property name="sizeType"> |
85 | - <enum>QSizePolicy::Fixed</enum> |
86 | - </property> |
87 | - <property name="sizeHint" stdset="0"> |
88 | - <size> |
89 | - <width>20</width> |
90 | - <height>30</height> |
91 | - </size> |
92 | - </property> |
93 | - </spacer> |
94 | - </item> |
95 | - <item> |
96 | - <layout class="QHBoxLayout" name="horizontalLayout"> |
97 | - <item> |
98 | - <spacer name="horizontalSpacer_2"> |
99 | - <property name="orientation"> |
100 | - <enum>Qt::Horizontal</enum> |
101 | - </property> |
102 | - <property name="sizeHint" stdset="0"> |
103 | - <size> |
104 | - <width>20</width> |
105 | - <height>20</height> |
106 | - </size> |
107 | - </property> |
108 | - </spacer> |
109 | - </item> |
110 | - <item> |
111 | - <layout class="QVBoxLayout" name="verticalLayout"> |
112 | - <item> |
113 | - <widget class="QPushButton" name="existing_account_button"> |
114 | - <property name="text"> |
115 | - <string/> |
116 | - </property> |
117 | - </widget> |
118 | - </item> |
119 | - <item> |
120 | - <widget class="QPushButton" name="setup_account_button"> |
121 | - <property name="text"> |
122 | - <string/> |
123 | - </property> |
124 | - </widget> |
125 | - </item> |
126 | - <item> |
127 | - <widget class="QPushButton" name="cancel_button"> |
128 | - <property name="text"> |
129 | - <string/> |
130 | - </property> |
131 | - </widget> |
132 | - </item> |
133 | - </layout> |
134 | - </item> |
135 | - <item> |
136 | - <spacer name="horizontalSpacer"> |
137 | - <property name="orientation"> |
138 | - <enum>Qt::Horizontal</enum> |
139 | - </property> |
140 | - <property name="sizeType"> |
141 | - <enum>QSizePolicy::Expanding</enum> |
142 | - </property> |
143 | - <property name="sizeHint" stdset="0"> |
144 | - <size> |
145 | - <width>20</width> |
146 | - <height>20</height> |
147 | - </size> |
148 | - </property> |
149 | - </spacer> |
150 | - </item> |
151 | - </layout> |
152 | - </item> |
153 | - <item> |
154 | - <spacer name="verticalSpacer_2"> |
155 | - <property name="orientation"> |
156 | - <enum>Qt::Vertical</enum> |
157 | - </property> |
158 | - <property name="sizeHint" stdset="0"> |
159 | - <size> |
160 | - <width>20</width> |
161 | - <height>50</height> |
162 | - </size> |
163 | - </property> |
164 | - </spacer> |
165 | - </item> |
166 | - </layout> |
167 | - </widget> |
168 | - <connections/> |
169 | -</ui> |
170 | +<?xml version="1.0" encoding="UTF-8"?> |
171 | +<ui version="4.0"> |
172 | + <class>ChooseSignInPage</class> |
173 | + <widget class="QWizardPage" name="ChooseSignInPage"> |
174 | + <property name="geometry"> |
175 | + <rect> |
176 | + <x>0</x> |
177 | + <y>0</y> |
178 | + <width>432</width> |
179 | + <height>387</height> |
180 | + </rect> |
181 | + </property> |
182 | + <layout class="QVBoxLayout" name="verticalLayout_2"> |
183 | + <property name="leftMargin"> |
184 | + <number>0</number> |
185 | + </property> |
186 | + <property name="topMargin"> |
187 | + <number>0</number> |
188 | + </property> |
189 | + <property name="rightMargin"> |
190 | + <number>0</number> |
191 | + </property> |
192 | + <item> |
193 | + <layout class="QHBoxLayout" name="horizontalLayout_2"> |
194 | + <item> |
195 | + <widget class="QLabel" name="image_label"> |
196 | + <property name="sizePolicy"> |
197 | + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
198 | + <horstretch>0</horstretch> |
199 | + <verstretch>0</verstretch> |
200 | + </sizepolicy> |
201 | + </property> |
202 | + <property name="minimumSize"> |
203 | + <size> |
204 | + <width>400</width> |
205 | + <height>150</height> |
206 | + </size> |
207 | + </property> |
208 | + <property name="text"> |
209 | + <string/> |
210 | + </property> |
211 | + <property name="textFormat"> |
212 | + <enum>Qt::PlainText</enum> |
213 | + </property> |
214 | + <property name="alignment"> |
215 | + <set>Qt::AlignCenter</set> |
216 | + </property> |
217 | + <property name="wordWrap"> |
218 | + <bool>true</bool> |
219 | + </property> |
220 | + </widget> |
221 | + </item> |
222 | + </layout> |
223 | + </item> |
224 | + <item> |
225 | + <widget class="QLabel" name="message_label"> |
226 | + <property name="font"> |
227 | + <font> |
228 | + <pointsize>11</pointsize> |
229 | + <weight>50</weight> |
230 | + <bold>false</bold> |
231 | + </font> |
232 | + </property> |
233 | + <property name="text"> |
234 | + <string notr="true">Congratulations, app_name is installed!</string> |
235 | + </property> |
236 | + <property name="alignment"> |
237 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> |
238 | + </property> |
239 | + </widget> |
240 | + </item> |
241 | + <item> |
242 | + <spacer name="verticalSpacer_3"> |
243 | + <property name="orientation"> |
244 | + <enum>Qt::Vertical</enum> |
245 | + </property> |
246 | + <property name="sizeType"> |
247 | + <enum>QSizePolicy::Fixed</enum> |
248 | + </property> |
249 | + <property name="sizeHint" stdset="0"> |
250 | + <size> |
251 | + <width>20</width> |
252 | + <height>30</height> |
253 | + </size> |
254 | + </property> |
255 | + </spacer> |
256 | + </item> |
257 | + <item> |
258 | + <layout class="QHBoxLayout" name="horizontalLayout"> |
259 | + <item> |
260 | + <spacer name="horizontalSpacer_2"> |
261 | + <property name="orientation"> |
262 | + <enum>Qt::Horizontal</enum> |
263 | + </property> |
264 | + <property name="sizeHint" stdset="0"> |
265 | + <size> |
266 | + <width>20</width> |
267 | + <height>20</height> |
268 | + </size> |
269 | + </property> |
270 | + </spacer> |
271 | + </item> |
272 | + <item> |
273 | + <layout class="QVBoxLayout" name="verticalLayout"> |
274 | + <item> |
275 | + <widget class="QPushButton" name="existing_account_button"> |
276 | + <property name="text"> |
277 | + <string notr="true"/> |
278 | + </property> |
279 | + </widget> |
280 | + </item> |
281 | + <item> |
282 | + <widget class="QPushButton" name="setup_account_button"> |
283 | + <property name="text"> |
284 | + <string notr="true"/> |
285 | + </property> |
286 | + </widget> |
287 | + </item> |
288 | + <item> |
289 | + <widget class="QPushButton" name="cancel_button"> |
290 | + <property name="text"> |
291 | + <string notr="true"/> |
292 | + </property> |
293 | + </widget> |
294 | + </item> |
295 | + </layout> |
296 | + </item> |
297 | + <item> |
298 | + <spacer name="horizontalSpacer"> |
299 | + <property name="orientation"> |
300 | + <enum>Qt::Horizontal</enum> |
301 | + </property> |
302 | + <property name="sizeType"> |
303 | + <enum>QSizePolicy::Expanding</enum> |
304 | + </property> |
305 | + <property name="sizeHint" stdset="0"> |
306 | + <size> |
307 | + <width>20</width> |
308 | + <height>20</height> |
309 | + </size> |
310 | + </property> |
311 | + </spacer> |
312 | + </item> |
313 | + </layout> |
314 | + </item> |
315 | + <item> |
316 | + <spacer name="verticalSpacer_2"> |
317 | + <property name="orientation"> |
318 | + <enum>Qt::Vertical</enum> |
319 | + </property> |
320 | + <property name="sizeHint" stdset="0"> |
321 | + <size> |
322 | + <width>20</width> |
323 | + <height>50</height> |
324 | + </size> |
325 | + </property> |
326 | + </spacer> |
327 | + </item> |
328 | + </layout> |
329 | + </widget> |
330 | + <resources/> |
331 | + <connections/> |
332 | +</ui> |
333 | |
334 | === modified file 'data/qt/current_user_sign_in.ui' |
335 | --- data/qt/current_user_sign_in.ui 2011-09-08 16:43:39 +0000 |
336 | +++ data/qt/current_user_sign_in.ui 2012-02-22 17:10:00 +0000 |
337 | @@ -1,184 +1,181 @@ |
338 | -<?xml version="1.0" encoding="UTF-8"?> |
339 | -<ui version="4.0"> |
340 | - <class>CurrentUserSignInPage</class> |
341 | - <widget class="QWizardPage" name="CurrentUserSignInPage"> |
342 | - <property name="geometry"> |
343 | - <rect> |
344 | - <x>0</x> |
345 | - <y>0</y> |
346 | - <width>399</width> |
347 | - <height>309</height> |
348 | - </rect> |
349 | - </property> |
350 | - <property name="windowTitle"> |
351 | - <string>WizardPage</string> |
352 | - </property> |
353 | - <layout class="QVBoxLayout" name="verticalLayout_4"> |
354 | - <property name="topMargin"> |
355 | - <number>0</number> |
356 | - </property> |
357 | - <item> |
358 | - <layout class="QHBoxLayout" name="horizontalLayout_3"> |
359 | - <item> |
360 | - <layout class="QVBoxLayout" name="verticalLayout"> |
361 | - <item> |
362 | - <spacer name="verticalSpacer_3"> |
363 | - <property name="orientation"> |
364 | - <enum>Qt::Vertical</enum> |
365 | - </property> |
366 | - <property name="sizeHint" stdset="0"> |
367 | - <size> |
368 | - <width>20</width> |
369 | - <height>40</height> |
370 | - </size> |
371 | - </property> |
372 | - </spacer> |
373 | - </item> |
374 | - <item> |
375 | - <widget class="QFrame" name="_signInFrame"> |
376 | - <property name="frameShape"> |
377 | - <enum>QFrame::NoFrame</enum> |
378 | - </property> |
379 | - <layout class="QVBoxLayout" name="verticalLayout_3"> |
380 | - <item> |
381 | - <layout class="QVBoxLayout" name="verticalLayout_2"> |
382 | - <item> |
383 | - <widget class="QLabel" name="email_label"> |
384 | - <property name="text"> |
385 | - <string>&Email</string> |
386 | - </property> |
387 | - <property name="buddy"> |
388 | - <cstring>email_edit</cstring> |
389 | - </property> |
390 | - </widget> |
391 | - </item> |
392 | - <item> |
393 | - <widget class="QLineEdit" name="email_edit"> |
394 | - <property name="placeholderText"> |
395 | - <string/> |
396 | - </property> |
397 | - </widget> |
398 | - </item> |
399 | - <item> |
400 | - <widget class="QLabel" name="password_label"> |
401 | - <property name="text"> |
402 | - <string>&Password</string> |
403 | - </property> |
404 | - <property name="buddy"> |
405 | - <cstring>password_edit</cstring> |
406 | - </property> |
407 | - </widget> |
408 | - </item> |
409 | - <item> |
410 | - <widget class="QLineEdit" name="password_edit"> |
411 | - <property name="echoMode"> |
412 | - <enum>QLineEdit::Password</enum> |
413 | - </property> |
414 | - <property name="placeholderText"> |
415 | - <string/> |
416 | - </property> |
417 | - </widget> |
418 | - </item> |
419 | - <item> |
420 | - <widget class="QLabel" name="forgot_password_label"> |
421 | - <property name="sizePolicy"> |
422 | - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
423 | - <horstretch>0</horstretch> |
424 | - <verstretch>0</verstretch> |
425 | - </sizepolicy> |
426 | - </property> |
427 | - <property name="text"> |
428 | - <string>Forgot password?</string> |
429 | - </property> |
430 | - </widget> |
431 | - </item> |
432 | - <item> |
433 | - <layout class="QHBoxLayout" name="horizontalLayout_4"> |
434 | - <item> |
435 | - <spacer name="horizontalSpacer_3"> |
436 | - <property name="orientation"> |
437 | - <enum>Qt::Horizontal</enum> |
438 | - </property> |
439 | - <property name="sizeHint" stdset="0"> |
440 | - <size> |
441 | - <width>40</width> |
442 | - <height>20</height> |
443 | - </size> |
444 | - </property> |
445 | - </spacer> |
446 | - </item> |
447 | - <item> |
448 | - <widget class="QPushButton" name="sign_in_button"> |
449 | - <property name="enabled"> |
450 | - <bool>false</bool> |
451 | - </property> |
452 | - <property name="text"> |
453 | - <string>Sign In</string> |
454 | - </property> |
455 | - <property name="default"> |
456 | - <bool>true</bool> |
457 | - </property> |
458 | - </widget> |
459 | - </item> |
460 | - </layout> |
461 | - </item> |
462 | - </layout> |
463 | - </item> |
464 | - </layout> |
465 | - </widget> |
466 | - </item> |
467 | - <item> |
468 | - <spacer name="verticalSpacer_2"> |
469 | - <property name="orientation"> |
470 | - <enum>Qt::Vertical</enum> |
471 | - </property> |
472 | - <property name="sizeHint" stdset="0"> |
473 | - <size> |
474 | - <width>20</width> |
475 | - <height>40</height> |
476 | - </size> |
477 | - </property> |
478 | - </spacer> |
479 | - </item> |
480 | - </layout> |
481 | - </item> |
482 | - <item> |
483 | - <spacer name="horizontalSpacer"> |
484 | - <property name="orientation"> |
485 | - <enum>Qt::Horizontal</enum> |
486 | - </property> |
487 | - <property name="sizeType"> |
488 | - <enum>QSizePolicy::Fixed</enum> |
489 | - </property> |
490 | - <property name="sizeHint" stdset="0"> |
491 | - <size> |
492 | - <width>40</width> |
493 | - <height>20</height> |
494 | - </size> |
495 | - </property> |
496 | - </spacer> |
497 | - </item> |
498 | - </layout> |
499 | - </item> |
500 | - </layout> |
501 | - </widget> |
502 | - <resources/> |
503 | - <connections> |
504 | - <connection> |
505 | - <sender>password_edit</sender> |
506 | - <signal>returnPressed()</signal> |
507 | - <receiver>sign_in_button</receiver> |
508 | - <slot>click()</slot> |
509 | - <hints> |
510 | - <hint type="sourcelabel"> |
511 | - <x>199</x> |
512 | - <y>160</y> |
513 | - </hint> |
514 | - <hint type="destinationlabel"> |
515 | - <x>288</x> |
516 | - <y>217</y> |
517 | - </hint> |
518 | - </hints> |
519 | - </connection> |
520 | - </connections> |
521 | -</ui> |
522 | +<?xml version="1.0" encoding="UTF-8"?> |
523 | +<ui version="4.0"> |
524 | + <class>CurrentUserSignInPage</class> |
525 | + <widget class="QWizardPage" name="CurrentUserSignInPage"> |
526 | + <property name="geometry"> |
527 | + <rect> |
528 | + <x>0</x> |
529 | + <y>0</y> |
530 | + <width>399</width> |
531 | + <height>309</height> |
532 | + </rect> |
533 | + </property> |
534 | + <layout class="QVBoxLayout" name="verticalLayout_4"> |
535 | + <property name="topMargin"> |
536 | + <number>0</number> |
537 | + </property> |
538 | + <item> |
539 | + <layout class="QHBoxLayout" name="horizontalLayout_3"> |
540 | + <item> |
541 | + <layout class="QVBoxLayout" name="verticalLayout"> |
542 | + <item> |
543 | + <spacer name="verticalSpacer_3"> |
544 | + <property name="orientation"> |
545 | + <enum>Qt::Vertical</enum> |
546 | + </property> |
547 | + <property name="sizeHint" stdset="0"> |
548 | + <size> |
549 | + <width>20</width> |
550 | + <height>40</height> |
551 | + </size> |
552 | + </property> |
553 | + </spacer> |
554 | + </item> |
555 | + <item> |
556 | + <widget class="QFrame" name="_signInFrame"> |
557 | + <property name="frameShape"> |
558 | + <enum>QFrame::NoFrame</enum> |
559 | + </property> |
560 | + <layout class="QVBoxLayout" name="verticalLayout_3"> |
561 | + <item> |
562 | + <layout class="QVBoxLayout" name="verticalLayout_2"> |
563 | + <item> |
564 | + <widget class="QLabel" name="email_label"> |
565 | + <property name="text"> |
566 | + <string notr="true">&Email</string> |
567 | + </property> |
568 | + <property name="buddy"> |
569 | + <cstring>email_edit</cstring> |
570 | + </property> |
571 | + </widget> |
572 | + </item> |
573 | + <item> |
574 | + <widget class="QLineEdit" name="email_edit"> |
575 | + <property name="placeholderText"> |
576 | + <string/> |
577 | + </property> |
578 | + </widget> |
579 | + </item> |
580 | + <item> |
581 | + <widget class="QLabel" name="password_label"> |
582 | + <property name="text"> |
583 | + <string notr="true">&Password</string> |
584 | + </property> |
585 | + <property name="buddy"> |
586 | + <cstring>password_edit</cstring> |
587 | + </property> |
588 | + </widget> |
589 | + </item> |
590 | + <item> |
591 | + <widget class="QLineEdit" name="password_edit"> |
592 | + <property name="echoMode"> |
593 | + <enum>QLineEdit::Password</enum> |
594 | + </property> |
595 | + <property name="placeholderText"> |
596 | + <string/> |
597 | + </property> |
598 | + </widget> |
599 | + </item> |
600 | + <item> |
601 | + <widget class="QLabel" name="forgot_password_label"> |
602 | + <property name="sizePolicy"> |
603 | + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
604 | + <horstretch>0</horstretch> |
605 | + <verstretch>0</verstretch> |
606 | + </sizepolicy> |
607 | + </property> |
608 | + <property name="text"> |
609 | + <string notr="true">Forgot password?</string> |
610 | + </property> |
611 | + </widget> |
612 | + </item> |
613 | + <item> |
614 | + <layout class="QHBoxLayout" name="horizontalLayout_4"> |
615 | + <item> |
616 | + <spacer name="horizontalSpacer_3"> |
617 | + <property name="orientation"> |
618 | + <enum>Qt::Horizontal</enum> |
619 | + </property> |
620 | + <property name="sizeHint" stdset="0"> |
621 | + <size> |
622 | + <width>40</width> |
623 | + <height>20</height> |
624 | + </size> |
625 | + </property> |
626 | + </spacer> |
627 | + </item> |
628 | + <item> |
629 | + <widget class="QPushButton" name="sign_in_button"> |
630 | + <property name="enabled"> |
631 | + <bool>false</bool> |
632 | + </property> |
633 | + <property name="text"> |
634 | + <string notr="true">Sign In</string> |
635 | + </property> |
636 | + <property name="default"> |
637 | + <bool>true</bool> |
638 | + </property> |
639 | + </widget> |
640 | + </item> |
641 | + </layout> |
642 | + </item> |
643 | + </layout> |
644 | + </item> |
645 | + </layout> |
646 | + </widget> |
647 | + </item> |
648 | + <item> |
649 | + <spacer name="verticalSpacer_2"> |
650 | + <property name="orientation"> |
651 | + <enum>Qt::Vertical</enum> |
652 | + </property> |
653 | + <property name="sizeHint" stdset="0"> |
654 | + <size> |
655 | + <width>20</width> |
656 | + <height>40</height> |
657 | + </size> |
658 | + </property> |
659 | + </spacer> |
660 | + </item> |
661 | + </layout> |
662 | + </item> |
663 | + <item> |
664 | + <spacer name="horizontalSpacer"> |
665 | + <property name="orientation"> |
666 | + <enum>Qt::Horizontal</enum> |
667 | + </property> |
668 | + <property name="sizeType"> |
669 | + <enum>QSizePolicy::Fixed</enum> |
670 | + </property> |
671 | + <property name="sizeHint" stdset="0"> |
672 | + <size> |
673 | + <width>40</width> |
674 | + <height>20</height> |
675 | + </size> |
676 | + </property> |
677 | + </spacer> |
678 | + </item> |
679 | + </layout> |
680 | + </item> |
681 | + </layout> |
682 | + </widget> |
683 | + <resources/> |
684 | + <connections> |
685 | + <connection> |
686 | + <sender>password_edit</sender> |
687 | + <signal>returnPressed()</signal> |
688 | + <receiver>sign_in_button</receiver> |
689 | + <slot>click()</slot> |
690 | + <hints> |
691 | + <hint type="sourcelabel"> |
692 | + <x>199</x> |
693 | + <y>160</y> |
694 | + </hint> |
695 | + <hint type="destinationlabel"> |
696 | + <x>288</x> |
697 | + <y>217</y> |
698 | + </hint> |
699 | + </hints> |
700 | + </connection> |
701 | + </connections> |
702 | +</ui> |
703 | |
704 | === modified file 'data/qt/email_verification.ui' |
705 | --- data/qt/email_verification.ui 2011-09-08 16:43:39 +0000 |
706 | +++ data/qt/email_verification.ui 2012-02-22 17:10:00 +0000 |
707 | @@ -1,116 +1,113 @@ |
708 | -<?xml version="1.0" encoding="UTF-8"?> |
709 | -<ui version="4.0"> |
710 | - <class>EmailVerificationPage</class> |
711 | - <widget class="QWizardPage" name="EmailVerificationPage"> |
712 | - <property name="geometry"> |
713 | - <rect> |
714 | - <x>0</x> |
715 | - <y>0</y> |
716 | - <width>400</width> |
717 | - <height>300</height> |
718 | - </rect> |
719 | - </property> |
720 | - <property name="windowTitle"> |
721 | - <string>WizardPage</string> |
722 | - </property> |
723 | - <layout class="QVBoxLayout" name="verticalLayout_2"> |
724 | - <property name="topMargin"> |
725 | - <number>0</number> |
726 | - </property> |
727 | - <item> |
728 | - <layout class="QHBoxLayout" name="horizontalLayout_3"> |
729 | - <item> |
730 | - <layout class="QVBoxLayout" name="verticalLayout"> |
731 | - <item> |
732 | - <widget class="QLabel" name="label"> |
733 | - <property name="text"> |
734 | - <string>Verification code</string> |
735 | - </property> |
736 | - </widget> |
737 | - </item> |
738 | - <item> |
739 | - <widget class="QLineEdit" name="verification_code_edit"> |
740 | - <property name="placeholderText"> |
741 | - <string/> |
742 | - </property> |
743 | - </widget> |
744 | - </item> |
745 | - <item> |
746 | - <layout class="QHBoxLayout" name="horizontalLayout_2"> |
747 | - <item> |
748 | - <spacer name="horizontalSpacer_3"> |
749 | - <property name="orientation"> |
750 | - <enum>Qt::Horizontal</enum> |
751 | - </property> |
752 | - <property name="sizeHint" stdset="0"> |
753 | - <size> |
754 | - <width>40</width> |
755 | - <height>20</height> |
756 | - </size> |
757 | - </property> |
758 | - </spacer> |
759 | - </item> |
760 | - <item> |
761 | - <widget class="QPushButton" name="next_button"> |
762 | - <property name="text"> |
763 | - <string>Next</string> |
764 | - </property> |
765 | - </widget> |
766 | - </item> |
767 | - </layout> |
768 | - </item> |
769 | - <item> |
770 | - <spacer name="verticalSpacer_2"> |
771 | - <property name="orientation"> |
772 | - <enum>Qt::Vertical</enum> |
773 | - </property> |
774 | - <property name="sizeHint" stdset="0"> |
775 | - <size> |
776 | - <width>20</width> |
777 | - <height>40</height> |
778 | - </size> |
779 | - </property> |
780 | - </spacer> |
781 | - </item> |
782 | - </layout> |
783 | - </item> |
784 | - <item> |
785 | - <spacer name="horizontalSpacer"> |
786 | - <property name="orientation"> |
787 | - <enum>Qt::Horizontal</enum> |
788 | - </property> |
789 | - <property name="sizeType"> |
790 | - <enum>QSizePolicy::Fixed</enum> |
791 | - </property> |
792 | - <property name="sizeHint" stdset="0"> |
793 | - <size> |
794 | - <width>40</width> |
795 | - <height>20</height> |
796 | - </size> |
797 | - </property> |
798 | - </spacer> |
799 | - </item> |
800 | - </layout> |
801 | - </item> |
802 | - </layout> |
803 | - </widget> |
804 | - <resources/> |
805 | - <connections> |
806 | - <connection> |
807 | - <sender>verification_code_edit</sender> |
808 | - <signal>returnPressed()</signal> |
809 | - <receiver>next_button</receiver> |
810 | - <slot>click()</slot> |
811 | - <hints> |
812 | - <hint type="sourcelabel"> |
813 | - <x>199</x> |
814 | - <y>15</y> |
815 | - </hint> |
816 | - <hint type="destinationlabel"> |
817 | - <x>299</x> |
818 | - <y>49</y> |
819 | - </hint> |
820 | - </hints> |
821 | - </connection> |
822 | - </connections> |
823 | -</ui> |
824 | +<?xml version="1.0" encoding="UTF-8"?> |
825 | +<ui version="4.0"> |
826 | + <class>EmailVerificationPage</class> |
827 | + <widget class="QWizardPage" name="EmailVerificationPage"> |
828 | + <property name="geometry"> |
829 | + <rect> |
830 | + <x>0</x> |
831 | + <y>0</y> |
832 | + <width>400</width> |
833 | + <height>300</height> |
834 | + </rect> |
835 | + </property> |
836 | + <layout class="QVBoxLayout" name="verticalLayout_2"> |
837 | + <property name="topMargin"> |
838 | + <number>0</number> |
839 | + </property> |
840 | + <item> |
841 | + <layout class="QHBoxLayout" name="horizontalLayout_3"> |
842 | + <item> |
843 | + <layout class="QVBoxLayout" name="verticalLayout"> |
844 | + <item> |
845 | + <widget class="QLabel" name="label"> |
846 | + <property name="text"> |
847 | + <string notr="true">Verification code</string> |
848 | + </property> |
849 | + </widget> |
850 | + </item> |
851 | + <item> |
852 | + <widget class="QLineEdit" name="verification_code_edit"> |
853 | + <property name="placeholderText"> |
854 | + <string/> |
855 | + </property> |
856 | + </widget> |
857 | + </item> |
858 | + <item> |
859 | + <layout class="QHBoxLayout" name="horizontalLayout_2"> |
860 | + <item> |
861 | + <spacer name="horizontalSpacer_3"> |
862 | + <property name="orientation"> |
863 | + <enum>Qt::Horizontal</enum> |
864 | + </property> |
865 | + <property name="sizeHint" stdset="0"> |
866 | + <size> |
867 | + <width>40</width> |
868 | + <height>20</height> |
869 | + </size> |
870 | + </property> |
871 | + </spacer> |
872 | + </item> |
873 | + <item> |
874 | + <widget class="QPushButton" name="next_button"> |
875 | + <property name="text"> |
876 | + <string notr="true">Next</string> |
877 | + </property> |
878 | + </widget> |
879 | + </item> |
880 | + </layout> |
881 | + </item> |
882 | + <item> |
883 | + <spacer name="verticalSpacer_2"> |
884 | + <property name="orientation"> |
885 | + <enum>Qt::Vertical</enum> |
886 | + </property> |
887 | + <property name="sizeHint" stdset="0"> |
888 | + <size> |
889 | + <width>20</width> |
890 | + <height>40</height> |
891 | + </size> |
892 | + </property> |
893 | + </spacer> |
894 | + </item> |
895 | + </layout> |
896 | + </item> |
897 | + <item> |
898 | + <spacer name="horizontalSpacer"> |
899 | + <property name="orientation"> |
900 | + <enum>Qt::Horizontal</enum> |
901 | + </property> |
902 | + <property name="sizeType"> |
903 | + <enum>QSizePolicy::Fixed</enum> |
904 | + </property> |
905 | + <property name="sizeHint" stdset="0"> |
906 | + <size> |
907 | + <width>40</width> |
908 | + <height>20</height> |
909 | + </size> |
910 | + </property> |
911 | + </spacer> |
912 | + </item> |
913 | + </layout> |
914 | + </item> |
915 | + </layout> |
916 | + </widget> |
917 | + <resources/> |
918 | + <connections> |
919 | + <connection> |
920 | + <sender>verification_code_edit</sender> |
921 | + <signal>returnPressed()</signal> |
922 | + <receiver>next_button</receiver> |
923 | + <slot>click()</slot> |
924 | + <hints> |
925 | + <hint type="sourcelabel"> |
926 | + <x>199</x> |
927 | + <y>15</y> |
928 | + </hint> |
929 | + <hint type="destinationlabel"> |
930 | + <x>299</x> |
931 | + <y>49</y> |
932 | + </hint> |
933 | + </hints> |
934 | + </connection> |
935 | + </connections> |
936 | +</ui> |
937 | |
938 | === modified file 'data/qt/error_message.ui' |
939 | --- data/qt/error_message.ui 2011-08-04 15:25:42 +0000 |
940 | +++ data/qt/error_message.ui 2012-02-22 17:10:00 +0000 |
941 | @@ -1,31 +1,28 @@ |
942 | -<?xml version="1.0" encoding="UTF-8"?> |
943 | -<ui version="4.0"> |
944 | - <class>ErrorPage</class> |
945 | - <widget class="QWizardPage" name="ErrorPage"> |
946 | - <property name="geometry"> |
947 | - <rect> |
948 | - <x>0</x> |
949 | - <y>0</y> |
950 | - <width>400</width> |
951 | - <height>300</height> |
952 | - </rect> |
953 | - </property> |
954 | - <property name="windowTitle"> |
955 | - <string>WizardPage</string> |
956 | - </property> |
957 | - <layout class="QVBoxLayout" name="verticalLayout"> |
958 | - <item> |
959 | - <widget class="QLabel" name="error_message_label"> |
960 | - <property name="text"> |
961 | - <string>TextLabel</string> |
962 | - </property> |
963 | - <property name="alignment"> |
964 | - <set>Qt::AlignCenter</set> |
965 | - </property> |
966 | - </widget> |
967 | - </item> |
968 | - </layout> |
969 | - </widget> |
970 | - <resources/> |
971 | - <connections/> |
972 | -</ui> |
973 | +<?xml version="1.0" encoding="UTF-8"?> |
974 | +<ui version="4.0"> |
975 | + <class>ErrorPage</class> |
976 | + <widget class="QWizardPage" name="ErrorPage"> |
977 | + <property name="geometry"> |
978 | + <rect> |
979 | + <x>0</x> |
980 | + <y>0</y> |
981 | + <width>400</width> |
982 | + <height>300</height> |
983 | + </rect> |
984 | + </property> |
985 | + <layout class="QVBoxLayout" name="verticalLayout"> |
986 | + <item> |
987 | + <widget class="QLabel" name="error_message_label"> |
988 | + <property name="text"> |
989 | + <string notr="true">TextLabel</string> |
990 | + </property> |
991 | + <property name="alignment"> |
992 | + <set>Qt::AlignCenter</set> |
993 | + </property> |
994 | + </widget> |
995 | + </item> |
996 | + </layout> |
997 | + </widget> |
998 | + <resources/> |
999 | + <connections/> |
1000 | +</ui> |
1001 | |
1002 | === modified file 'data/qt/forgotten_password.ui' |
1003 | --- data/qt/forgotten_password.ui 2011-09-21 16:59:40 +0000 |
1004 | +++ data/qt/forgotten_password.ui 2012-02-22 17:10:00 +0000 |
1005 | @@ -1,188 +1,185 @@ |
1006 | -<?xml version="1.0" encoding="UTF-8"?> |
1007 | -<ui version="4.0"> |
1008 | - <class>ForgottenPasswordPage</class> |
1009 | - <widget class="QWizardPage" name="ForgottenPasswordPage"> |
1010 | - <property name="geometry"> |
1011 | - <rect> |
1012 | - <x>0</x> |
1013 | - <y>0</y> |
1014 | - <width>446</width> |
1015 | - <height>317</height> |
1016 | - </rect> |
1017 | - </property> |
1018 | - <property name="windowTitle"> |
1019 | - <string>WizardPage</string> |
1020 | - </property> |
1021 | - <layout class="QVBoxLayout" name="verticalLayout_2"> |
1022 | - <property name="topMargin"> |
1023 | - <number>0</number> |
1024 | - </property> |
1025 | - <item> |
1026 | - <widget class="QLabel" name="forgotted_password_intro_label"> |
1027 | - <property name="text"> |
1028 | - <string/> |
1029 | - </property> |
1030 | - <property name="wordWrap"> |
1031 | - <bool>true</bool> |
1032 | - </property> |
1033 | - </widget> |
1034 | - </item> |
1035 | - <item> |
1036 | - <widget class="QWidget" name="email_widget" native="true"> |
1037 | - <layout class="QHBoxLayout" name="horizontalLayout_2"> |
1038 | - <item> |
1039 | - <layout class="QVBoxLayout" name="verticalLayout"> |
1040 | - <item> |
1041 | - <widget class="QLabel" name="email_address_label"> |
1042 | - <property name="sizePolicy"> |
1043 | - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
1044 | - <horstretch>0</horstretch> |
1045 | - <verstretch>0</verstretch> |
1046 | - </sizepolicy> |
1047 | - </property> |
1048 | - <property name="text"> |
1049 | - <string/> |
1050 | - </property> |
1051 | - </widget> |
1052 | - </item> |
1053 | - <item> |
1054 | - <widget class="QLineEdit" name="email_line_edit"/> |
1055 | - </item> |
1056 | - </layout> |
1057 | - </item> |
1058 | - <item> |
1059 | - <spacer name="horizontalSpacer_3"> |
1060 | - <property name="orientation"> |
1061 | - <enum>Qt::Horizontal</enum> |
1062 | - </property> |
1063 | - <property name="sizeType"> |
1064 | - <enum>QSizePolicy::Fixed</enum> |
1065 | - </property> |
1066 | - <property name="sizeHint" stdset="0"> |
1067 | - <size> |
1068 | - <width>40</width> |
1069 | - <height>20</height> |
1070 | - </size> |
1071 | - </property> |
1072 | - </spacer> |
1073 | - </item> |
1074 | - </layout> |
1075 | - </widget> |
1076 | - </item> |
1077 | - <item> |
1078 | - <layout class="QHBoxLayout" name="horizontalLayout"> |
1079 | - <item> |
1080 | - <spacer name="horizontalSpacer"> |
1081 | - <property name="orientation"> |
1082 | - <enum>Qt::Horizontal</enum> |
1083 | - </property> |
1084 | - <property name="sizeHint" stdset="0"> |
1085 | - <size> |
1086 | - <width>40</width> |
1087 | - <height>20</height> |
1088 | - </size> |
1089 | - </property> |
1090 | - </spacer> |
1091 | - </item> |
1092 | - <item> |
1093 | - <widget class="QPushButton" name="send_button"> |
1094 | - <property name="enabled"> |
1095 | - <bool>false</bool> |
1096 | - </property> |
1097 | - <property name="text"> |
1098 | - <string/> |
1099 | - </property> |
1100 | - </widget> |
1101 | - </item> |
1102 | - <item> |
1103 | - <spacer name="horizontalSpacer_4"> |
1104 | - <property name="orientation"> |
1105 | - <enum>Qt::Horizontal</enum> |
1106 | - </property> |
1107 | - <property name="sizeType"> |
1108 | - <enum>QSizePolicy::Fixed</enum> |
1109 | - </property> |
1110 | - <property name="sizeHint" stdset="0"> |
1111 | - <size> |
1112 | - <width>40</width> |
1113 | - <height>20</height> |
1114 | - </size> |
1115 | - </property> |
1116 | - </spacer> |
1117 | - </item> |
1118 | - </layout> |
1119 | - </item> |
1120 | - <item> |
1121 | - <widget class="QWidget" name="try_again_widget" native="true"> |
1122 | - <layout class="QHBoxLayout" name="horizontalLayout_3"> |
1123 | - <item> |
1124 | - <spacer name="horizontalSpacer_5"> |
1125 | - <property name="orientation"> |
1126 | - <enum>Qt::Horizontal</enum> |
1127 | - </property> |
1128 | - <property name="sizeHint" stdset="0"> |
1129 | - <size> |
1130 | - <width>40</width> |
1131 | - <height>20</height> |
1132 | - </size> |
1133 | - </property> |
1134 | - </spacer> |
1135 | - </item> |
1136 | - <item> |
1137 | - <widget class="QPushButton" name="try_again_button"> |
1138 | - <property name="text"> |
1139 | - <string/> |
1140 | - </property> |
1141 | - </widget> |
1142 | - </item> |
1143 | - <item> |
1144 | - <spacer name="horizontalSpacer_6"> |
1145 | - <property name="orientation"> |
1146 | - <enum>Qt::Horizontal</enum> |
1147 | - </property> |
1148 | - <property name="sizeHint" stdset="0"> |
1149 | - <size> |
1150 | - <width>40</width> |
1151 | - <height>20</height> |
1152 | - </size> |
1153 | - </property> |
1154 | - </spacer> |
1155 | - </item> |
1156 | - </layout> |
1157 | - </widget> |
1158 | - </item> |
1159 | - <item> |
1160 | - <spacer name="verticalSpacer"> |
1161 | - <property name="orientation"> |
1162 | - <enum>Qt::Vertical</enum> |
1163 | - </property> |
1164 | - <property name="sizeHint" stdset="0"> |
1165 | - <size> |
1166 | - <width>20</width> |
1167 | - <height>40</height> |
1168 | - </size> |
1169 | - </property> |
1170 | - </spacer> |
1171 | - </item> |
1172 | - </layout> |
1173 | - </widget> |
1174 | - <resources/> |
1175 | - <connections> |
1176 | - <connection> |
1177 | - <sender>email_line_edit</sender> |
1178 | - <signal>returnPressed()</signal> |
1179 | - <receiver>send_button</receiver> |
1180 | - <slot>click()</slot> |
1181 | - <hints> |
1182 | - <hint type="sourcelabel"> |
1183 | - <x>222</x> |
1184 | - <y>92</y> |
1185 | - </hint> |
1186 | - <hint type="destinationlabel"> |
1187 | - <x>362</x> |
1188 | - <y>136</y> |
1189 | - </hint> |
1190 | - </hints> |
1191 | - </connection> |
1192 | - </connections> |
1193 | -</ui> |
1194 | +<?xml version="1.0" encoding="UTF-8"?> |
1195 | +<ui version="4.0"> |
1196 | + <class>ForgottenPasswordPage</class> |
1197 | + <widget class="QWizardPage" name="ForgottenPasswordPage"> |
1198 | + <property name="geometry"> |
1199 | + <rect> |
1200 | + <x>0</x> |
1201 | + <y>0</y> |
1202 | + <width>230</width> |
1203 | + <height>234</height> |
1204 | + </rect> |
1205 | + </property> |
1206 | + <layout class="QVBoxLayout" name="verticalLayout_2"> |
1207 | + <property name="topMargin"> |
1208 | + <number>0</number> |
1209 | + </property> |
1210 | + <item> |
1211 | + <widget class="QLabel" name="forgotted_password_intro_label"> |
1212 | + <property name="text"> |
1213 | + <string notr="true"/> |
1214 | + </property> |
1215 | + <property name="wordWrap"> |
1216 | + <bool>true</bool> |
1217 | + </property> |
1218 | + </widget> |
1219 | + </item> |
1220 | + <item> |
1221 | + <widget class="QWidget" name="email_widget" native="true"> |
1222 | + <layout class="QHBoxLayout" name="horizontalLayout_2"> |
1223 | + <item> |
1224 | + <layout class="QVBoxLayout" name="verticalLayout"> |
1225 | + <item> |
1226 | + <widget class="QLabel" name="email_address_label"> |
1227 | + <property name="sizePolicy"> |
1228 | + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
1229 | + <horstretch>0</horstretch> |
1230 | + <verstretch>0</verstretch> |
1231 | + </sizepolicy> |
1232 | + </property> |
1233 | + <property name="text"> |
1234 | + <string notr="true"/> |
1235 | + </property> |
1236 | + </widget> |
1237 | + </item> |
1238 | + <item> |
1239 | + <widget class="QLineEdit" name="email_line_edit"/> |
1240 | + </item> |
1241 | + </layout> |
1242 | + </item> |
1243 | + <item> |
1244 | + <spacer name="horizontalSpacer_3"> |
1245 | + <property name="orientation"> |
1246 | + <enum>Qt::Horizontal</enum> |
1247 | + </property> |
1248 | + <property name="sizeType"> |
1249 | + <enum>QSizePolicy::Fixed</enum> |
1250 | + </property> |
1251 | + <property name="sizeHint" stdset="0"> |
1252 | + <size> |
1253 | + <width>40</width> |
1254 | + <height>20</height> |
1255 | + </size> |
1256 | + </property> |
1257 | + </spacer> |
1258 | + </item> |
1259 | + </layout> |
1260 | + </widget> |
1261 | + </item> |
1262 | + <item> |
1263 | + <layout class="QHBoxLayout" name="horizontalLayout"> |
1264 | + <item> |
1265 | + <spacer name="horizontalSpacer"> |
1266 | + <property name="orientation"> |
1267 | + <enum>Qt::Horizontal</enum> |
1268 | + </property> |
1269 | + <property name="sizeHint" stdset="0"> |
1270 | + <size> |
1271 | + <width>40</width> |
1272 | + <height>20</height> |
1273 | + </size> |
1274 | + </property> |
1275 | + </spacer> |
1276 | + </item> |
1277 | + <item> |
1278 | + <widget class="QPushButton" name="send_button"> |
1279 | + <property name="enabled"> |
1280 | + <bool>false</bool> |
1281 | + </property> |
1282 | + <property name="text"> |
1283 | + <string notr="true"/> |
1284 | + </property> |
1285 | + </widget> |
1286 | + </item> |
1287 | + <item> |
1288 | + <spacer name="horizontalSpacer_4"> |
1289 | + <property name="orientation"> |
1290 | + <enum>Qt::Horizontal</enum> |
1291 | + </property> |
1292 | + <property name="sizeType"> |
1293 | + <enum>QSizePolicy::Fixed</enum> |
1294 | + </property> |
1295 | + <property name="sizeHint" stdset="0"> |
1296 | + <size> |
1297 | + <width>40</width> |
1298 | + <height>20</height> |
1299 | + </size> |
1300 | + </property> |
1301 | + </spacer> |
1302 | + </item> |
1303 | + </layout> |
1304 | + </item> |
1305 | + <item> |
1306 | + <widget class="QWidget" name="try_again_widget" native="true"> |
1307 | + <layout class="QHBoxLayout" name="horizontalLayout_3"> |
1308 | + <item> |
1309 | + <spacer name="horizontalSpacer_5"> |
1310 | + <property name="orientation"> |
1311 | + <enum>Qt::Horizontal</enum> |
1312 | + </property> |
1313 | + <property name="sizeHint" stdset="0"> |
1314 | + <size> |
1315 | + <width>40</width> |
1316 | + <height>20</height> |
1317 | + </size> |
1318 | + </property> |
1319 | + </spacer> |
1320 | + </item> |
1321 | + <item> |
1322 | + <widget class="QPushButton" name="try_again_button"> |
1323 | + <property name="text"> |
1324 | + <string notr="true"/> |
1325 | + </property> |
1326 | + </widget> |
1327 | + </item> |
1328 | + <item> |
1329 | + <spacer name="horizontalSpacer_6"> |
1330 | + <property name="orientation"> |
1331 | + <enum>Qt::Horizontal</enum> |
1332 | + </property> |
1333 | + <property name="sizeHint" stdset="0"> |
1334 | + <size> |
1335 | + <width>40</width> |
1336 | + <height>20</height> |
1337 | + </size> |
1338 | + </property> |
1339 | + </spacer> |
1340 | + </item> |
1341 | + </layout> |
1342 | + </widget> |
1343 | + </item> |
1344 | + <item> |
1345 | + <spacer name="verticalSpacer"> |
1346 | + <property name="orientation"> |
1347 | + <enum>Qt::Vertical</enum> |
1348 | + </property> |
1349 | + <property name="sizeHint" stdset="0"> |
1350 | + <size> |
1351 | + <width>20</width> |
1352 | + <height>40</height> |
1353 | + </size> |
1354 | + </property> |
1355 | + </spacer> |
1356 | + </item> |
1357 | + </layout> |
1358 | + </widget> |
1359 | + <resources/> |
1360 | + <connections> |
1361 | + <connection> |
1362 | + <sender>email_line_edit</sender> |
1363 | + <signal>returnPressed()</signal> |
1364 | + <receiver>send_button</receiver> |
1365 | + <slot>click()</slot> |
1366 | + <hints> |
1367 | + <hint type="sourcelabel"> |
1368 | + <x>222</x> |
1369 | + <y>92</y> |
1370 | + </hint> |
1371 | + <hint type="destinationlabel"> |
1372 | + <x>362</x> |
1373 | + <y>136</y> |
1374 | + </hint> |
1375 | + </hints> |
1376 | + </connection> |
1377 | + </connections> |
1378 | +</ui> |
1379 | |
1380 | === modified file 'data/qt/loadingoverlay.ui' |
1381 | --- data/qt/loadingoverlay.ui 2012-02-03 13:54:29 +0000 |
1382 | +++ data/qt/loadingoverlay.ui 2012-02-22 17:10:00 +0000 |
1383 | @@ -6,13 +6,10 @@ |
1384 | <rect> |
1385 | <x>0</x> |
1386 | <y>0</y> |
1387 | - <width>702</width> |
1388 | - <height>230</height> |
1389 | + <width>433</width> |
1390 | + <height>169</height> |
1391 | </rect> |
1392 | </property> |
1393 | - <property name="windowTitle"> |
1394 | - <string>Frame</string> |
1395 | - </property> |
1396 | <layout class="QVBoxLayout" name="verticalLayout"> |
1397 | <property name="topMargin"> |
1398 | <number>30</number> |
1399 | @@ -61,7 +58,7 @@ |
1400 | </font> |
1401 | </property> |
1402 | <property name="text"> |
1403 | - <string>Getting information, please wait...</string> |
1404 | + <string notr="true">Getting information, please wait...</string> |
1405 | </property> |
1406 | </widget> |
1407 | </item> |
1408 | |
1409 | === modified file 'data/qt/network_detection.ui' |
1410 | --- data/qt/network_detection.ui 2012-02-13 20:27:48 +0000 |
1411 | +++ data/qt/network_detection.ui 2012-02-22 17:10:00 +0000 |
1412 | @@ -1,142 +1,139 @@ |
1413 | -<?xml version="1.0" encoding="UTF-8"?> |
1414 | -<ui version="4.0"> |
1415 | - <class>Form</class> |
1416 | - <widget class="QWizardPage" name="Form"> |
1417 | - <property name="geometry"> |
1418 | - <rect> |
1419 | - <x>0</x> |
1420 | - <y>0</y> |
1421 | - <width>541</width> |
1422 | - <height>365</height> |
1423 | - </rect> |
1424 | - </property> |
1425 | - <property name="windowTitle"> |
1426 | - <string>WizardPage</string> |
1427 | - </property> |
1428 | - <layout class="QVBoxLayout" name="verticalLayout"> |
1429 | - <item> |
1430 | - <layout class="QHBoxLayout" name="horizontalLayout_2"> |
1431 | - <item> |
1432 | - <spacer name="horizontalSpacer_3"> |
1433 | - <property name="orientation"> |
1434 | - <enum>Qt::Horizontal</enum> |
1435 | - </property> |
1436 | - <property name="sizeHint" stdset="0"> |
1437 | - <size> |
1438 | - <width>40</width> |
1439 | - <height>20</height> |
1440 | - </size> |
1441 | - </property> |
1442 | - </spacer> |
1443 | - </item> |
1444 | - <item> |
1445 | - <widget class="QLabel" name="image_label"> |
1446 | - <property name="sizePolicy"> |
1447 | - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
1448 | - <horstretch>0</horstretch> |
1449 | - <verstretch>0</verstretch> |
1450 | - </sizepolicy> |
1451 | - </property> |
1452 | - <property name="minimumSize"> |
1453 | - <size> |
1454 | - <width>400</width> |
1455 | - <height>150</height> |
1456 | - </size> |
1457 | - </property> |
1458 | - <property name="text"> |
1459 | - <string/> |
1460 | - </property> |
1461 | - <property name="textFormat"> |
1462 | - <enum>Qt::PlainText</enum> |
1463 | - </property> |
1464 | - <property name="alignment"> |
1465 | - <set>Qt::AlignCenter</set> |
1466 | - </property> |
1467 | - <property name="wordWrap"> |
1468 | - <bool>true</bool> |
1469 | - </property> |
1470 | - </widget> |
1471 | - </item> |
1472 | - <item> |
1473 | - <spacer name="horizontalSpacer_4"> |
1474 | - <property name="orientation"> |
1475 | - <enum>Qt::Horizontal</enum> |
1476 | - </property> |
1477 | - <property name="sizeHint" stdset="0"> |
1478 | - <size> |
1479 | - <width>40</width> |
1480 | - <height>20</height> |
1481 | - </size> |
1482 | - </property> |
1483 | - </spacer> |
1484 | - </item> |
1485 | - </layout> |
1486 | - </item> |
1487 | - <item> |
1488 | - <widget class="QLabel" name="message_label"> |
1489 | - <property name="alignment"> |
1490 | - <set>Qt::AlignCenter</set> |
1491 | - </property> |
1492 | - </widget> |
1493 | - </item> |
1494 | - <item> |
1495 | - <layout class="QHBoxLayout" name="horizontalLayout"> |
1496 | - <item> |
1497 | - <spacer name="horizontalSpacer"> |
1498 | - <property name="orientation"> |
1499 | - <enum>Qt::Horizontal</enum> |
1500 | - </property> |
1501 | - <property name="sizeHint" stdset="0"> |
1502 | - <size> |
1503 | - <width>40</width> |
1504 | - <height>20</height> |
1505 | - </size> |
1506 | - </property> |
1507 | - </spacer> |
1508 | - </item> |
1509 | - <item> |
1510 | - <widget class="QLabel" name="label"> |
1511 | - <property name="text"> |
1512 | - <string>Are you online? We can't detect an internet connection - you will need to be connected to set up Ubuntu Single Sign On</string> |
1513 | - </property> |
1514 | - <property name="textFormat"> |
1515 | - <enum>Qt::PlainText</enum> |
1516 | - </property> |
1517 | - <property name="wordWrap"> |
1518 | - <bool>true</bool> |
1519 | - </property> |
1520 | - </widget> |
1521 | - </item> |
1522 | - <item> |
1523 | - <spacer name="horizontalSpacer_2"> |
1524 | - <property name="orientation"> |
1525 | - <enum>Qt::Horizontal</enum> |
1526 | - </property> |
1527 | - <property name="sizeHint" stdset="0"> |
1528 | - <size> |
1529 | - <width>40</width> |
1530 | - <height>20</height> |
1531 | - </size> |
1532 | - </property> |
1533 | - </spacer> |
1534 | - </item> |
1535 | - </layout> |
1536 | - </item> |
1537 | - <item> |
1538 | - <spacer name="verticalSpacer"> |
1539 | - <property name="orientation"> |
1540 | - <enum>Qt::Vertical</enum> |
1541 | - </property> |
1542 | - <property name="sizeHint" stdset="0"> |
1543 | - <size> |
1544 | - <width>20</width> |
1545 | - <height>76</height> |
1546 | - </size> |
1547 | - </property> |
1548 | - </spacer> |
1549 | - </item> |
1550 | - </layout> |
1551 | - </widget> |
1552 | - <resources/> |
1553 | - <connections/> |
1554 | -</ui> |
1555 | +<?xml version="1.0" encoding="UTF-8"?> |
1556 | +<ui version="4.0"> |
1557 | + <class>Form</class> |
1558 | + <widget class="QWizardPage" name="Form"> |
1559 | + <property name="geometry"> |
1560 | + <rect> |
1561 | + <x>0</x> |
1562 | + <y>0</y> |
1563 | + <width>512</width> |
1564 | + <height>334</height> |
1565 | + </rect> |
1566 | + </property> |
1567 | + <layout class="QVBoxLayout" name="verticalLayout"> |
1568 | + <item> |
1569 | + <layout class="QHBoxLayout" name="horizontalLayout_2"> |
1570 | + <item> |
1571 | + <spacer name="horizontalSpacer_3"> |
1572 | + <property name="orientation"> |
1573 | + <enum>Qt::Horizontal</enum> |
1574 | + </property> |
1575 | + <property name="sizeHint" stdset="0"> |
1576 | + <size> |
1577 | + <width>40</width> |
1578 | + <height>20</height> |
1579 | + </size> |
1580 | + </property> |
1581 | + </spacer> |
1582 | + </item> |
1583 | + <item> |
1584 | + <widget class="QLabel" name="image_label"> |
1585 | + <property name="sizePolicy"> |
1586 | + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
1587 | + <horstretch>0</horstretch> |
1588 | + <verstretch>0</verstretch> |
1589 | + </sizepolicy> |
1590 | + </property> |
1591 | + <property name="minimumSize"> |
1592 | + <size> |
1593 | + <width>400</width> |
1594 | + <height>150</height> |
1595 | + </size> |
1596 | + </property> |
1597 | + <property name="text"> |
1598 | + <string/> |
1599 | + </property> |
1600 | + <property name="textFormat"> |
1601 | + <enum>Qt::PlainText</enum> |
1602 | + </property> |
1603 | + <property name="alignment"> |
1604 | + <set>Qt::AlignCenter</set> |
1605 | + </property> |
1606 | + <property name="wordWrap"> |
1607 | + <bool>true</bool> |
1608 | + </property> |
1609 | + </widget> |
1610 | + </item> |
1611 | + <item> |
1612 | + <spacer name="horizontalSpacer_4"> |
1613 | + <property name="orientation"> |
1614 | + <enum>Qt::Horizontal</enum> |
1615 | + </property> |
1616 | + <property name="sizeHint" stdset="0"> |
1617 | + <size> |
1618 | + <width>40</width> |
1619 | + <height>20</height> |
1620 | + </size> |
1621 | + </property> |
1622 | + </spacer> |
1623 | + </item> |
1624 | + </layout> |
1625 | + </item> |
1626 | + <item> |
1627 | + <widget class="QLabel" name="message_label"> |
1628 | + <property name="alignment"> |
1629 | + <set>Qt::AlignCenter</set> |
1630 | + </property> |
1631 | + </widget> |
1632 | + </item> |
1633 | + <item> |
1634 | + <layout class="QHBoxLayout" name="horizontalLayout"> |
1635 | + <item> |
1636 | + <spacer name="horizontalSpacer"> |
1637 | + <property name="orientation"> |
1638 | + <enum>Qt::Horizontal</enum> |
1639 | + </property> |
1640 | + <property name="sizeHint" stdset="0"> |
1641 | + <size> |
1642 | + <width>40</width> |
1643 | + <height>20</height> |
1644 | + </size> |
1645 | + </property> |
1646 | + </spacer> |
1647 | + </item> |
1648 | + <item> |
1649 | + <widget class="QLabel" name="label"> |
1650 | + <property name="text"> |
1651 | + <string notr="true">Are you online? We can't detect an internet connection - you will need to be connected to set up Ubuntu Single Sign On</string> |
1652 | + </property> |
1653 | + <property name="textFormat"> |
1654 | + <enum>Qt::PlainText</enum> |
1655 | + </property> |
1656 | + <property name="wordWrap"> |
1657 | + <bool>true</bool> |
1658 | + </property> |
1659 | + </widget> |
1660 | + </item> |
1661 | + <item> |
1662 | + <spacer name="horizontalSpacer_2"> |
1663 | + <property name="orientation"> |
1664 | + <enum>Qt::Horizontal</enum> |
1665 | + </property> |
1666 | + <property name="sizeHint" stdset="0"> |
1667 | + <size> |
1668 | + <width>40</width> |
1669 | + <height>20</height> |
1670 | + </size> |
1671 | + </property> |
1672 | + </spacer> |
1673 | + </item> |
1674 | + </layout> |
1675 | + </item> |
1676 | + <item> |
1677 | + <spacer name="verticalSpacer"> |
1678 | + <property name="orientation"> |
1679 | + <enum>Qt::Vertical</enum> |
1680 | + </property> |
1681 | + <property name="sizeHint" stdset="0"> |
1682 | + <size> |
1683 | + <width>20</width> |
1684 | + <height>76</height> |
1685 | + </size> |
1686 | + </property> |
1687 | + </spacer> |
1688 | + </item> |
1689 | + </layout> |
1690 | + </widget> |
1691 | + <resources/> |
1692 | + <connections/> |
1693 | +</ui> |
1694 | |
1695 | === modified file 'data/qt/proxy_credentials_dialog.ui' |
1696 | --- data/qt/proxy_credentials_dialog.ui 2012-02-08 20:28:04 +0000 |
1697 | +++ data/qt/proxy_credentials_dialog.ui 2012-02-22 17:10:00 +0000 |
1698 | @@ -9,8 +9,8 @@ |
1699 | <rect> |
1700 | <x>0</x> |
1701 | <y>0</y> |
1702 | - <width>550</width> |
1703 | - <height>364</height> |
1704 | + <width>502</width> |
1705 | + <height>373</height> |
1706 | </rect> |
1707 | </property> |
1708 | <property name="sizePolicy"> |
1709 | @@ -25,9 +25,6 @@ |
1710 | <height>0</height> |
1711 | </size> |
1712 | </property> |
1713 | - <property name="windowTitle"> |
1714 | - <string>Add proxy settings</string> |
1715 | - </property> |
1716 | <property name="sizeGripEnabled"> |
1717 | <bool>false</bool> |
1718 | </property> |
1719 | @@ -74,7 +71,7 @@ |
1720 | </size> |
1721 | </property> |
1722 | <property name="text"> |
1723 | - <string>TextLabel</string> |
1724 | + <string notr="true">TextLabel</string> |
1725 | </property> |
1726 | </widget> |
1727 | </item> |
1728 | @@ -122,7 +119,7 @@ |
1729 | </font> |
1730 | </property> |
1731 | <property name="text"> |
1732 | - <string>You are connection through a proxy.</string> |
1733 | + <string notr="true">You are connection through a proxy.</string> |
1734 | </property> |
1735 | <property name="wordWrap"> |
1736 | <bool>true</bool> |
1737 | @@ -132,7 +129,7 @@ |
1738 | <item> |
1739 | <widget class="QLabel" name="explanation_label"> |
1740 | <property name="text"> |
1741 | - <string>Please provide the login details below, or check your system settings</string> |
1742 | + <string notr="true">Please provide the login details below, or check your system settings</string> |
1743 | </property> |
1744 | <property name="wordWrap"> |
1745 | <bool>true</bool> |
1746 | @@ -162,7 +159,7 @@ |
1747 | </sizepolicy> |
1748 | </property> |
1749 | <property name="text"> |
1750 | - <string>Connecting to:</string> |
1751 | + <string notr="true">Connecting to:</string> |
1752 | </property> |
1753 | <property name="alignment"> |
1754 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
1755 | @@ -179,7 +176,7 @@ |
1756 | <item row="4" column="0"> |
1757 | <widget class="QLabel" name="username_label"> |
1758 | <property name="text"> |
1759 | - <string>Proxy username:</string> |
1760 | + <string notr="true">Proxy username:</string> |
1761 | </property> |
1762 | <property name="alignment"> |
1763 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
1764 | @@ -196,7 +193,7 @@ |
1765 | <item row="5" column="0"> |
1766 | <widget class="QLabel" name="password_label"> |
1767 | <property name="text"> |
1768 | - <string>Proxy password:</string> |
1769 | + <string notr="true">Proxy password:</string> |
1770 | </property> |
1771 | <property name="alignment"> |
1772 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
1773 | @@ -229,7 +226,7 @@ |
1774 | <item row="2" column="0" colspan="2"> |
1775 | <widget class="QLabel" name="error_label"> |
1776 | <property name="text"> |
1777 | - <string>TextLabel</string> |
1778 | + <string notr="true">TextLabel</string> |
1779 | </property> |
1780 | <property name="wordWrap"> |
1781 | <bool>false</bool> |
1782 | @@ -264,7 +261,7 @@ |
1783 | <item> |
1784 | <widget class="QPushButton" name="help_button"> |
1785 | <property name="text"> |
1786 | - <string>Get Help With Proxies</string> |
1787 | + <string notr="true">Get Help With Proxies</string> |
1788 | </property> |
1789 | </widget> |
1790 | </item> |
1791 | @@ -284,14 +281,14 @@ |
1792 | <item> |
1793 | <widget class="QPushButton" name="cancel_button"> |
1794 | <property name="text"> |
1795 | - <string>Cancel and Close</string> |
1796 | + <string notr="true">Cancel and Close</string> |
1797 | </property> |
1798 | </widget> |
1799 | </item> |
1800 | <item> |
1801 | <widget class="QPushButton" name="save_button"> |
1802 | <property name="text"> |
1803 | - <string>Save</string> |
1804 | + <string notr="true">Save</string> |
1805 | </property> |
1806 | <property name="default"> |
1807 | <bool>true</bool> |
1808 | |
1809 | === modified file 'data/qt/reset_password.ui' |
1810 | --- data/qt/reset_password.ui 2011-09-08 20:30:39 +0000 |
1811 | +++ data/qt/reset_password.ui 2012-02-22 17:10:00 +0000 |
1812 | @@ -1,357 +1,354 @@ |
1813 | -<?xml version="1.0" encoding="UTF-8"?> |
1814 | -<ui version="4.0"> |
1815 | - <class>ResetPasswordPage</class> |
1816 | - <widget class="QWizardPage" name="ResetPasswordPage"> |
1817 | - <property name="geometry"> |
1818 | - <rect> |
1819 | - <x>0</x> |
1820 | - <y>0</y> |
1821 | - <width>543</width> |
1822 | - <height>262</height> |
1823 | - </rect> |
1824 | - </property> |
1825 | - <property name="windowTitle"> |
1826 | - <string>WizardPage</string> |
1827 | - </property> |
1828 | - <property name="layoutDirection"> |
1829 | - <enum>Qt::LeftToRight</enum> |
1830 | - </property> |
1831 | - <layout class="QVBoxLayout" name="verticalLayout"> |
1832 | - <property name="spacing"> |
1833 | - <number>6</number> |
1834 | - </property> |
1835 | - <property name="margin"> |
1836 | - <number>0</number> |
1837 | - </property> |
1838 | - <item> |
1839 | - <layout class="QHBoxLayout" name="horizontalLayout"> |
1840 | - <item> |
1841 | - <layout class="QVBoxLayout" name="verticalLayout_2"> |
1842 | - <item> |
1843 | - <widget class="QLabel" name="reset_code"> |
1844 | - <property name="sizePolicy"> |
1845 | - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
1846 | - <horstretch>0</horstretch> |
1847 | - <verstretch>0</verstretch> |
1848 | - </sizepolicy> |
1849 | - </property> |
1850 | - <property name="minimumSize"> |
1851 | - <size> |
1852 | - <width>310</width> |
1853 | - <height>0</height> |
1854 | - </size> |
1855 | - </property> |
1856 | - <property name="maximumSize"> |
1857 | - <size> |
1858 | - <width>16777215</width> |
1859 | - <height>16777215</height> |
1860 | - </size> |
1861 | - </property> |
1862 | - <property name="font"> |
1863 | - <font> |
1864 | - <weight>75</weight> |
1865 | - <bold>true</bold> |
1866 | - </font> |
1867 | - </property> |
1868 | - <property name="text"> |
1869 | - <string>reset_code</string> |
1870 | - </property> |
1871 | - </widget> |
1872 | - </item> |
1873 | - <item> |
1874 | - <widget class="QLineEdit" name="reset_code_line_edit"> |
1875 | - <property name="sizePolicy"> |
1876 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
1877 | - <horstretch>0</horstretch> |
1878 | - <verstretch>0</verstretch> |
1879 | - </sizepolicy> |
1880 | - </property> |
1881 | - <property name="minimumSize"> |
1882 | - <size> |
1883 | - <width>300</width> |
1884 | - <height>0</height> |
1885 | - </size> |
1886 | - </property> |
1887 | - <property name="maximumSize"> |
1888 | - <size> |
1889 | - <width>300</width> |
1890 | - <height>16777215</height> |
1891 | - </size> |
1892 | - </property> |
1893 | - </widget> |
1894 | - </item> |
1895 | - <item> |
1896 | - <widget class="QLabel" name="password_label"> |
1897 | - <property name="sizePolicy"> |
1898 | - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
1899 | - <horstretch>0</horstretch> |
1900 | - <verstretch>0</verstretch> |
1901 | - </sizepolicy> |
1902 | - </property> |
1903 | - <property name="minimumSize"> |
1904 | - <size> |
1905 | - <width>310</width> |
1906 | - <height>0</height> |
1907 | - </size> |
1908 | - </property> |
1909 | - <property name="maximumSize"> |
1910 | - <size> |
1911 | - <width>16777215</width> |
1912 | - <height>16777215</height> |
1913 | - </size> |
1914 | - </property> |
1915 | - <property name="font"> |
1916 | - <font> |
1917 | - <weight>75</weight> |
1918 | - <bold>true</bold> |
1919 | - </font> |
1920 | - </property> |
1921 | - <property name="text"> |
1922 | - <string>password_label</string> |
1923 | - </property> |
1924 | - </widget> |
1925 | - </item> |
1926 | - <item> |
1927 | - <widget class="QLineEdit" name="password_line_edit"> |
1928 | - <property name="sizePolicy"> |
1929 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
1930 | - <horstretch>0</horstretch> |
1931 | - <verstretch>0</verstretch> |
1932 | - </sizepolicy> |
1933 | - </property> |
1934 | - <property name="minimumSize"> |
1935 | - <size> |
1936 | - <width>300</width> |
1937 | - <height>0</height> |
1938 | - </size> |
1939 | - </property> |
1940 | - <property name="maximumSize"> |
1941 | - <size> |
1942 | - <width>300</width> |
1943 | - <height>16777215</height> |
1944 | - </size> |
1945 | - </property> |
1946 | - <property name="echoMode"> |
1947 | - <enum>QLineEdit::Password</enum> |
1948 | - </property> |
1949 | - </widget> |
1950 | - </item> |
1951 | - <item> |
1952 | - <widget class="QLabel" name="confirm_password_label"> |
1953 | - <property name="sizePolicy"> |
1954 | - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
1955 | - <horstretch>0</horstretch> |
1956 | - <verstretch>0</verstretch> |
1957 | - </sizepolicy> |
1958 | - </property> |
1959 | - <property name="minimumSize"> |
1960 | - <size> |
1961 | - <width>310</width> |
1962 | - <height>0</height> |
1963 | - </size> |
1964 | - </property> |
1965 | - <property name="font"> |
1966 | - <font> |
1967 | - <weight>75</weight> |
1968 | - <bold>true</bold> |
1969 | - </font> |
1970 | - </property> |
1971 | - <property name="text"> |
1972 | - <string>confirm_password_label</string> |
1973 | - </property> |
1974 | - </widget> |
1975 | - </item> |
1976 | - <item> |
1977 | - <widget class="QLineEdit" name="confirm_password_line_edit"> |
1978 | - <property name="sizePolicy"> |
1979 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
1980 | - <horstretch>0</horstretch> |
1981 | - <verstretch>0</verstretch> |
1982 | - </sizepolicy> |
1983 | - </property> |
1984 | - <property name="minimumSize"> |
1985 | - <size> |
1986 | - <width>300</width> |
1987 | - <height>0</height> |
1988 | - </size> |
1989 | - </property> |
1990 | - <property name="maximumSize"> |
1991 | - <size> |
1992 | - <width>300</width> |
1993 | - <height>16777215</height> |
1994 | - </size> |
1995 | - </property> |
1996 | - <property name="echoMode"> |
1997 | - <enum>QLineEdit::Password</enum> |
1998 | - </property> |
1999 | - </widget> |
2000 | - </item> |
2001 | - <item> |
2002 | - <spacer name="verticalSpacer"> |
2003 | - <property name="orientation"> |
2004 | - <enum>Qt::Vertical</enum> |
2005 | - </property> |
2006 | - <property name="sizeHint" stdset="0"> |
2007 | - <size> |
2008 | - <width>300</width> |
2009 | - <height>222</height> |
2010 | - </size> |
2011 | - </property> |
2012 | - </spacer> |
2013 | - </item> |
2014 | - <item> |
2015 | - <spacer name="horizontalSpacer_2"> |
2016 | - <property name="orientation"> |
2017 | - <enum>Qt::Horizontal</enum> |
2018 | - </property> |
2019 | - <property name="sizeType"> |
2020 | - <enum>QSizePolicy::Fixed</enum> |
2021 | - </property> |
2022 | - <property name="sizeHint" stdset="0"> |
2023 | - <size> |
2024 | - <width>300</width> |
2025 | - <height>0</height> |
2026 | - </size> |
2027 | - </property> |
2028 | - </spacer> |
2029 | - </item> |
2030 | - </layout> |
2031 | - </item> |
2032 | - <item> |
2033 | - <layout class="QVBoxLayout" name="verticalLayout_3"> |
2034 | - <item> |
2035 | - <spacer name="verticalSpacer_3"> |
2036 | - <property name="orientation"> |
2037 | - <enum>Qt::Vertical</enum> |
2038 | - </property> |
2039 | - <property name="sizeType"> |
2040 | - <enum>QSizePolicy::Fixed</enum> |
2041 | - </property> |
2042 | - <property name="sizeHint" stdset="0"> |
2043 | - <size> |
2044 | - <width>20</width> |
2045 | - <height>55</height> |
2046 | - </size> |
2047 | - </property> |
2048 | - </spacer> |
2049 | - </item> |
2050 | - <item> |
2051 | - <widget class="QLabel" name="password_assistance"> |
2052 | - <property name="sizePolicy"> |
2053 | - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
2054 | - <horstretch>0</horstretch> |
2055 | - <verstretch>0</verstretch> |
2056 | - </sizepolicy> |
2057 | - </property> |
2058 | - <property name="minimumSize"> |
2059 | - <size> |
2060 | - <width>220</width> |
2061 | - <height>100</height> |
2062 | - </size> |
2063 | - </property> |
2064 | - <property name="maximumSize"> |
2065 | - <size> |
2066 | - <width>220</width> |
2067 | - <height>16777215</height> |
2068 | - </size> |
2069 | - </property> |
2070 | - <property name="text"> |
2071 | - <string>password_assistance</string> |
2072 | - </property> |
2073 | - <property name="indent"> |
2074 | - <number>20</number> |
2075 | - </property> |
2076 | - </widget> |
2077 | - </item> |
2078 | - <item> |
2079 | - <spacer name="verticalSpacer_2"> |
2080 | - <property name="orientation"> |
2081 | - <enum>Qt::Vertical</enum> |
2082 | - </property> |
2083 | - <property name="sizeHint" stdset="0"> |
2084 | - <size> |
2085 | - <width>20</width> |
2086 | - <height>40</height> |
2087 | - </size> |
2088 | - </property> |
2089 | - </spacer> |
2090 | - </item> |
2091 | - <item> |
2092 | - <spacer name="horizontalSpacer"> |
2093 | - <property name="orientation"> |
2094 | - <enum>Qt::Horizontal</enum> |
2095 | - </property> |
2096 | - <property name="sizeType"> |
2097 | - <enum>QSizePolicy::Ignored</enum> |
2098 | - </property> |
2099 | - <property name="sizeHint" stdset="0"> |
2100 | - <size> |
2101 | - <width>220</width> |
2102 | - <height>0</height> |
2103 | - </size> |
2104 | - </property> |
2105 | - </spacer> |
2106 | - </item> |
2107 | - </layout> |
2108 | - </item> |
2109 | - </layout> |
2110 | - </item> |
2111 | - <item> |
2112 | - <layout class="QHBoxLayout" name="horizontalLayout_2"> |
2113 | - <item> |
2114 | - <layout class="QHBoxLayout" name="horizontalLayout_3"> |
2115 | - <property name="rightMargin"> |
2116 | - <number>0</number> |
2117 | - </property> |
2118 | - <item> |
2119 | - <spacer name="horizontalSpacer_4"> |
2120 | - <property name="orientation"> |
2121 | - <enum>Qt::Horizontal</enum> |
2122 | - </property> |
2123 | - <property name="sizeType"> |
2124 | - <enum>QSizePolicy::Expanding</enum> |
2125 | - </property> |
2126 | - <property name="sizeHint" stdset="0"> |
2127 | - <size> |
2128 | - <width>40</width> |
2129 | - <height>20</height> |
2130 | - </size> |
2131 | - </property> |
2132 | - </spacer> |
2133 | - </item> |
2134 | - <item> |
2135 | - <widget class="QPushButton" name="reset_password_button"> |
2136 | - <property name="enabled"> |
2137 | - <bool>false</bool> |
2138 | - </property> |
2139 | - <property name="text"> |
2140 | - <string/> |
2141 | - </property> |
2142 | - </widget> |
2143 | - </item> |
2144 | - </layout> |
2145 | - </item> |
2146 | - </layout> |
2147 | - </item> |
2148 | - </layout> |
2149 | - </widget> |
2150 | - <resources/> |
2151 | - <connections> |
2152 | - <connection> |
2153 | - <sender>confirm_password_line_edit</sender> |
2154 | - <signal>returnPressed()</signal> |
2155 | - <receiver>reset_password_button</receiver> |
2156 | - <slot>click()</slot> |
2157 | - <hints> |
2158 | - <hint type="sourcelabel"> |
2159 | - <x>160</x> |
2160 | - <y>81</y> |
2161 | - </hint> |
2162 | - <hint type="destinationlabel"> |
2163 | - <x>541</x> |
2164 | - <y>237</y> |
2165 | - </hint> |
2166 | - </hints> |
2167 | - </connection> |
2168 | - </connections> |
2169 | -</ui> |
2170 | +<?xml version="1.0" encoding="UTF-8"?> |
2171 | +<ui version="4.0"> |
2172 | + <class>ResetPasswordPage</class> |
2173 | + <widget class="QWizardPage" name="ResetPasswordPage"> |
2174 | + <property name="geometry"> |
2175 | + <rect> |
2176 | + <x>0</x> |
2177 | + <y>0</y> |
2178 | + <width>542</width> |
2179 | + <height>437</height> |
2180 | + </rect> |
2181 | + </property> |
2182 | + <property name="layoutDirection"> |
2183 | + <enum>Qt::LeftToRight</enum> |
2184 | + </property> |
2185 | + <layout class="QVBoxLayout" name="verticalLayout"> |
2186 | + <property name="spacing"> |
2187 | + <number>6</number> |
2188 | + </property> |
2189 | + <property name="margin"> |
2190 | + <number>0</number> |
2191 | + </property> |
2192 | + <item> |
2193 | + <layout class="QHBoxLayout" name="horizontalLayout"> |
2194 | + <item> |
2195 | + <layout class="QVBoxLayout" name="verticalLayout_2"> |
2196 | + <item> |
2197 | + <widget class="QLabel" name="reset_code"> |
2198 | + <property name="sizePolicy"> |
2199 | + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
2200 | + <horstretch>0</horstretch> |
2201 | + <verstretch>0</verstretch> |
2202 | + </sizepolicy> |
2203 | + </property> |
2204 | + <property name="minimumSize"> |
2205 | + <size> |
2206 | + <width>310</width> |
2207 | + <height>0</height> |
2208 | + </size> |
2209 | + </property> |
2210 | + <property name="maximumSize"> |
2211 | + <size> |
2212 | + <width>16777215</width> |
2213 | + <height>16777215</height> |
2214 | + </size> |
2215 | + </property> |
2216 | + <property name="font"> |
2217 | + <font> |
2218 | + <weight>75</weight> |
2219 | + <bold>true</bold> |
2220 | + </font> |
2221 | + </property> |
2222 | + <property name="text"> |
2223 | + <string notr="true">reset_code</string> |
2224 | + </property> |
2225 | + </widget> |
2226 | + </item> |
2227 | + <item> |
2228 | + <widget class="QLineEdit" name="reset_code_line_edit"> |
2229 | + <property name="sizePolicy"> |
2230 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2231 | + <horstretch>0</horstretch> |
2232 | + <verstretch>0</verstretch> |
2233 | + </sizepolicy> |
2234 | + </property> |
2235 | + <property name="minimumSize"> |
2236 | + <size> |
2237 | + <width>300</width> |
2238 | + <height>0</height> |
2239 | + </size> |
2240 | + </property> |
2241 | + <property name="maximumSize"> |
2242 | + <size> |
2243 | + <width>300</width> |
2244 | + <height>16777215</height> |
2245 | + </size> |
2246 | + </property> |
2247 | + </widget> |
2248 | + </item> |
2249 | + <item> |
2250 | + <widget class="QLabel" name="password_label"> |
2251 | + <property name="sizePolicy"> |
2252 | + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
2253 | + <horstretch>0</horstretch> |
2254 | + <verstretch>0</verstretch> |
2255 | + </sizepolicy> |
2256 | + </property> |
2257 | + <property name="minimumSize"> |
2258 | + <size> |
2259 | + <width>310</width> |
2260 | + <height>0</height> |
2261 | + </size> |
2262 | + </property> |
2263 | + <property name="maximumSize"> |
2264 | + <size> |
2265 | + <width>16777215</width> |
2266 | + <height>16777215</height> |
2267 | + </size> |
2268 | + </property> |
2269 | + <property name="font"> |
2270 | + <font> |
2271 | + <weight>75</weight> |
2272 | + <bold>true</bold> |
2273 | + </font> |
2274 | + </property> |
2275 | + <property name="text"> |
2276 | + <string notr="true">password_label</string> |
2277 | + </property> |
2278 | + </widget> |
2279 | + </item> |
2280 | + <item> |
2281 | + <widget class="QLineEdit" name="password_line_edit"> |
2282 | + <property name="sizePolicy"> |
2283 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2284 | + <horstretch>0</horstretch> |
2285 | + <verstretch>0</verstretch> |
2286 | + </sizepolicy> |
2287 | + </property> |
2288 | + <property name="minimumSize"> |
2289 | + <size> |
2290 | + <width>300</width> |
2291 | + <height>0</height> |
2292 | + </size> |
2293 | + </property> |
2294 | + <property name="maximumSize"> |
2295 | + <size> |
2296 | + <width>300</width> |
2297 | + <height>16777215</height> |
2298 | + </size> |
2299 | + </property> |
2300 | + <property name="echoMode"> |
2301 | + <enum>QLineEdit::Password</enum> |
2302 | + </property> |
2303 | + </widget> |
2304 | + </item> |
2305 | + <item> |
2306 | + <widget class="QLabel" name="confirm_password_label"> |
2307 | + <property name="sizePolicy"> |
2308 | + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
2309 | + <horstretch>0</horstretch> |
2310 | + <verstretch>0</verstretch> |
2311 | + </sizepolicy> |
2312 | + </property> |
2313 | + <property name="minimumSize"> |
2314 | + <size> |
2315 | + <width>310</width> |
2316 | + <height>0</height> |
2317 | + </size> |
2318 | + </property> |
2319 | + <property name="font"> |
2320 | + <font> |
2321 | + <weight>75</weight> |
2322 | + <bold>true</bold> |
2323 | + </font> |
2324 | + </property> |
2325 | + <property name="text"> |
2326 | + <string notr="true">confirm_password_label</string> |
2327 | + </property> |
2328 | + </widget> |
2329 | + </item> |
2330 | + <item> |
2331 | + <widget class="QLineEdit" name="confirm_password_line_edit"> |
2332 | + <property name="sizePolicy"> |
2333 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2334 | + <horstretch>0</horstretch> |
2335 | + <verstretch>0</verstretch> |
2336 | + </sizepolicy> |
2337 | + </property> |
2338 | + <property name="minimumSize"> |
2339 | + <size> |
2340 | + <width>300</width> |
2341 | + <height>0</height> |
2342 | + </size> |
2343 | + </property> |
2344 | + <property name="maximumSize"> |
2345 | + <size> |
2346 | + <width>300</width> |
2347 | + <height>16777215</height> |
2348 | + </size> |
2349 | + </property> |
2350 | + <property name="echoMode"> |
2351 | + <enum>QLineEdit::Password</enum> |
2352 | + </property> |
2353 | + </widget> |
2354 | + </item> |
2355 | + <item> |
2356 | + <spacer name="verticalSpacer"> |
2357 | + <property name="orientation"> |
2358 | + <enum>Qt::Vertical</enum> |
2359 | + </property> |
2360 | + <property name="sizeHint" stdset="0"> |
2361 | + <size> |
2362 | + <width>300</width> |
2363 | + <height>222</height> |
2364 | + </size> |
2365 | + </property> |
2366 | + </spacer> |
2367 | + </item> |
2368 | + <item> |
2369 | + <spacer name="horizontalSpacer_2"> |
2370 | + <property name="orientation"> |
2371 | + <enum>Qt::Horizontal</enum> |
2372 | + </property> |
2373 | + <property name="sizeType"> |
2374 | + <enum>QSizePolicy::Fixed</enum> |
2375 | + </property> |
2376 | + <property name="sizeHint" stdset="0"> |
2377 | + <size> |
2378 | + <width>300</width> |
2379 | + <height>0</height> |
2380 | + </size> |
2381 | + </property> |
2382 | + </spacer> |
2383 | + </item> |
2384 | + </layout> |
2385 | + </item> |
2386 | + <item> |
2387 | + <layout class="QVBoxLayout" name="verticalLayout_3"> |
2388 | + <item> |
2389 | + <spacer name="verticalSpacer_3"> |
2390 | + <property name="orientation"> |
2391 | + <enum>Qt::Vertical</enum> |
2392 | + </property> |
2393 | + <property name="sizeType"> |
2394 | + <enum>QSizePolicy::Fixed</enum> |
2395 | + </property> |
2396 | + <property name="sizeHint" stdset="0"> |
2397 | + <size> |
2398 | + <width>20</width> |
2399 | + <height>55</height> |
2400 | + </size> |
2401 | + </property> |
2402 | + </spacer> |
2403 | + </item> |
2404 | + <item> |
2405 | + <widget class="QLabel" name="password_assistance"> |
2406 | + <property name="sizePolicy"> |
2407 | + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
2408 | + <horstretch>0</horstretch> |
2409 | + <verstretch>0</verstretch> |
2410 | + </sizepolicy> |
2411 | + </property> |
2412 | + <property name="minimumSize"> |
2413 | + <size> |
2414 | + <width>220</width> |
2415 | + <height>100</height> |
2416 | + </size> |
2417 | + </property> |
2418 | + <property name="maximumSize"> |
2419 | + <size> |
2420 | + <width>220</width> |
2421 | + <height>16777215</height> |
2422 | + </size> |
2423 | + </property> |
2424 | + <property name="text"> |
2425 | + <string notr="true">password_assistance</string> |
2426 | + </property> |
2427 | + <property name="indent"> |
2428 | + <number>20</number> |
2429 | + </property> |
2430 | + </widget> |
2431 | + </item> |
2432 | + <item> |
2433 | + <spacer name="verticalSpacer_2"> |
2434 | + <property name="orientation"> |
2435 | + <enum>Qt::Vertical</enum> |
2436 | + </property> |
2437 | + <property name="sizeHint" stdset="0"> |
2438 | + <size> |
2439 | + <width>20</width> |
2440 | + <height>40</height> |
2441 | + </size> |
2442 | + </property> |
2443 | + </spacer> |
2444 | + </item> |
2445 | + <item> |
2446 | + <spacer name="horizontalSpacer"> |
2447 | + <property name="orientation"> |
2448 | + <enum>Qt::Horizontal</enum> |
2449 | + </property> |
2450 | + <property name="sizeType"> |
2451 | + <enum>QSizePolicy::Ignored</enum> |
2452 | + </property> |
2453 | + <property name="sizeHint" stdset="0"> |
2454 | + <size> |
2455 | + <width>220</width> |
2456 | + <height>0</height> |
2457 | + </size> |
2458 | + </property> |
2459 | + </spacer> |
2460 | + </item> |
2461 | + </layout> |
2462 | + </item> |
2463 | + </layout> |
2464 | + </item> |
2465 | + <item> |
2466 | + <layout class="QHBoxLayout" name="horizontalLayout_2"> |
2467 | + <item> |
2468 | + <layout class="QHBoxLayout" name="horizontalLayout_3"> |
2469 | + <property name="rightMargin"> |
2470 | + <number>0</number> |
2471 | + </property> |
2472 | + <item> |
2473 | + <spacer name="horizontalSpacer_4"> |
2474 | + <property name="orientation"> |
2475 | + <enum>Qt::Horizontal</enum> |
2476 | + </property> |
2477 | + <property name="sizeType"> |
2478 | + <enum>QSizePolicy::Expanding</enum> |
2479 | + </property> |
2480 | + <property name="sizeHint" stdset="0"> |
2481 | + <size> |
2482 | + <width>40</width> |
2483 | + <height>20</height> |
2484 | + </size> |
2485 | + </property> |
2486 | + </spacer> |
2487 | + </item> |
2488 | + <item> |
2489 | + <widget class="QPushButton" name="reset_password_button"> |
2490 | + <property name="enabled"> |
2491 | + <bool>false</bool> |
2492 | + </property> |
2493 | + <property name="text"> |
2494 | + <string notr="true"/> |
2495 | + </property> |
2496 | + </widget> |
2497 | + </item> |
2498 | + </layout> |
2499 | + </item> |
2500 | + </layout> |
2501 | + </item> |
2502 | + </layout> |
2503 | + </widget> |
2504 | + <resources/> |
2505 | + <connections> |
2506 | + <connection> |
2507 | + <sender>confirm_password_line_edit</sender> |
2508 | + <signal>returnPressed()</signal> |
2509 | + <receiver>reset_password_button</receiver> |
2510 | + <slot>click()</slot> |
2511 | + <hints> |
2512 | + <hint type="sourcelabel"> |
2513 | + <x>160</x> |
2514 | + <y>81</y> |
2515 | + </hint> |
2516 | + <hint type="destinationlabel"> |
2517 | + <x>541</x> |
2518 | + <y>237</y> |
2519 | + </hint> |
2520 | + </hints> |
2521 | + </connection> |
2522 | + </connections> |
2523 | +</ui> |
2524 | |
2525 | === modified file 'data/qt/setup_account.ui' |
2526 | --- data/qt/setup_account.ui 2012-02-17 21:16:38 +0000 |
2527 | +++ data/qt/setup_account.ui 2012-02-22 17:10:00 +0000 |
2528 | @@ -1,700 +1,697 @@ |
2529 | -<?xml version="1.0" encoding="UTF-8"?> |
2530 | -<ui version="4.0"> |
2531 | - <class>SetUpAccountPage</class> |
2532 | - <widget class="QWizardPage" name="SetUpAccountPage"> |
2533 | - <property name="geometry"> |
2534 | - <rect> |
2535 | - <x>0</x> |
2536 | - <y>0</y> |
2537 | - <width>543</width> |
2538 | - <height>523</height> |
2539 | - </rect> |
2540 | - </property> |
2541 | - <property name="sizePolicy"> |
2542 | - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> |
2543 | - <horstretch>0</horstretch> |
2544 | - <verstretch>0</verstretch> |
2545 | - </sizepolicy> |
2546 | - </property> |
2547 | - <property name="maximumSize"> |
2548 | - <size> |
2549 | - <width>16777215</width> |
2550 | - <height>16777215</height> |
2551 | - </size> |
2552 | - </property> |
2553 | - <property name="windowTitle"> |
2554 | - <string>WizardPage</string> |
2555 | - </property> |
2556 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2557 | - <property name="spacing"> |
2558 | - <number>0</number> |
2559 | - </property> |
2560 | - <property name="leftMargin"> |
2561 | - <number>0</number> |
2562 | - </property> |
2563 | - <property name="topMargin"> |
2564 | - <number>0</number> |
2565 | - </property> |
2566 | - <property name="rightMargin"> |
2567 | - <number>3</number> |
2568 | - </property> |
2569 | - <property name="bottomMargin"> |
2570 | - <number>0</number> |
2571 | - </property> |
2572 | - <item> |
2573 | - <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,220"> |
2574 | - <item row="0" column="0"> |
2575 | - <widget class="QLabel" name="password_info_label"> |
2576 | - <property name="sizePolicy"> |
2577 | - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
2578 | - <horstretch>0</horstretch> |
2579 | - <verstretch>0</verstretch> |
2580 | - </sizepolicy> |
2581 | - </property> |
2582 | - <property name="text"> |
2583 | - <string>If you can't read this then <a href="example.com"><span style=" text-decoration: underline; color:#dd4814;">refresh</span></a> this page</span></string> |
2584 | - </property> |
2585 | - <property name="wordWrap"> |
2586 | - <bool>true</bool> |
2587 | - </property> |
2588 | - </widget> |
2589 | - </item> |
2590 | - <item row="1" column="0"> |
2591 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2592 | - <property name="spacing"> |
2593 | - <number>3</number> |
2594 | - </property> |
2595 | - <item> |
2596 | - <widget class="QLabel" name="name_label"> |
2597 | - <property name="font"> |
2598 | - <font> |
2599 | - <weight>75</weight> |
2600 | - <bold>true</bold> |
2601 | - </font> |
2602 | - </property> |
2603 | - <property name="text"> |
2604 | - <string>name_label</string> |
2605 | - </property> |
2606 | - </widget> |
2607 | - </item> |
2608 | - <item> |
2609 | - <widget class="QLineEdit" name="name_edit"> |
2610 | - <property name="sizePolicy"> |
2611 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2612 | - <horstretch>0</horstretch> |
2613 | - <verstretch>0</verstretch> |
2614 | - </sizepolicy> |
2615 | - </property> |
2616 | - <property name="minimumSize"> |
2617 | - <size> |
2618 | - <width>300</width> |
2619 | - <height>0</height> |
2620 | - </size> |
2621 | - </property> |
2622 | - <property name="maximumSize"> |
2623 | - <size> |
2624 | - <width>300</width> |
2625 | - <height>16777215</height> |
2626 | - </size> |
2627 | - </property> |
2628 | - <property name="font"> |
2629 | - <font> |
2630 | - <pointsize>11</pointsize> |
2631 | - </font> |
2632 | - </property> |
2633 | - <property name="formError" stdset="0"> |
2634 | - <bool>false</bool> |
2635 | - </property> |
2636 | - </widget> |
2637 | - </item> |
2638 | - </layout> |
2639 | - </item> |
2640 | - <item row="3" column="0"> |
2641 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2642 | - <property name="spacing"> |
2643 | - <number>3</number> |
2644 | - </property> |
2645 | - <item> |
2646 | - <widget class="QLabel" name="email_label"> |
2647 | - <property name="font"> |
2648 | - <font> |
2649 | - <weight>75</weight> |
2650 | - <bold>true</bold> |
2651 | - </font> |
2652 | - </property> |
2653 | - <property name="text"> |
2654 | - <string>email_label</string> |
2655 | - </property> |
2656 | - </widget> |
2657 | - </item> |
2658 | - <item> |
2659 | - <widget class="QLineEdit" name="email_edit"> |
2660 | - <property name="sizePolicy"> |
2661 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2662 | - <horstretch>0</horstretch> |
2663 | - <verstretch>0</verstretch> |
2664 | - </sizepolicy> |
2665 | - </property> |
2666 | - <property name="minimumSize"> |
2667 | - <size> |
2668 | - <width>300</width> |
2669 | - <height>0</height> |
2670 | - </size> |
2671 | - </property> |
2672 | - <property name="maximumSize"> |
2673 | - <size> |
2674 | - <width>300</width> |
2675 | - <height>16777215</height> |
2676 | - </size> |
2677 | - </property> |
2678 | - <property name="font"> |
2679 | - <font> |
2680 | - <pointsize>11</pointsize> |
2681 | - </font> |
2682 | - </property> |
2683 | - <property name="placeholderText"> |
2684 | - <string/> |
2685 | - </property> |
2686 | - <property name="formError" stdset="0"> |
2687 | - <bool>false</bool> |
2688 | - </property> |
2689 | - </widget> |
2690 | - </item> |
2691 | - </layout> |
2692 | - </item> |
2693 | - <item row="4" column="0"> |
2694 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2695 | - <property name="spacing"> |
2696 | - <number>3</number> |
2697 | - </property> |
2698 | - <item> |
2699 | - <widget class="QLabel" name="confirm_email_label"> |
2700 | - <property name="font"> |
2701 | - <font> |
2702 | - <weight>75</weight> |
2703 | - <bold>true</bold> |
2704 | - </font> |
2705 | - </property> |
2706 | - <property name="text"> |
2707 | - <string>confirm_email_label</string> |
2708 | - </property> |
2709 | - </widget> |
2710 | - </item> |
2711 | - <item> |
2712 | - <widget class="QLineEdit" name="confirm_email_edit"> |
2713 | - <property name="sizePolicy"> |
2714 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2715 | - <horstretch>0</horstretch> |
2716 | - <verstretch>0</verstretch> |
2717 | - </sizepolicy> |
2718 | - </property> |
2719 | - <property name="minimumSize"> |
2720 | - <size> |
2721 | - <width>300</width> |
2722 | - <height>0</height> |
2723 | - </size> |
2724 | - </property> |
2725 | - <property name="maximumSize"> |
2726 | - <size> |
2727 | - <width>300</width> |
2728 | - <height>16777215</height> |
2729 | - </size> |
2730 | - </property> |
2731 | - <property name="font"> |
2732 | - <font> |
2733 | - <pointsize>11</pointsize> |
2734 | - </font> |
2735 | - </property> |
2736 | - <property name="placeholderText"> |
2737 | - <string/> |
2738 | - </property> |
2739 | - <property name="formError" stdset="0"> |
2740 | - <bool>false</bool> |
2741 | - </property> |
2742 | - </widget> |
2743 | - </item> |
2744 | - </layout> |
2745 | - </item> |
2746 | - <item row="6" column="0"> |
2747 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2748 | - <property name="spacing"> |
2749 | - <number>3</number> |
2750 | - </property> |
2751 | - <item> |
2752 | - <spacer name="verticalSpacer_4"> |
2753 | - <property name="orientation"> |
2754 | - <enum>Qt::Vertical</enum> |
2755 | - </property> |
2756 | - <property name="sizeType"> |
2757 | - <enum>QSizePolicy::Fixed</enum> |
2758 | - </property> |
2759 | - <property name="sizeHint" stdset="0"> |
2760 | - <size> |
2761 | - <width>20</width> |
2762 | - <height>10</height> |
2763 | - </size> |
2764 | - </property> |
2765 | - </spacer> |
2766 | - </item> |
2767 | - <item> |
2768 | - <widget class="QLabel" name="password_label"> |
2769 | - <property name="font"> |
2770 | - <font> |
2771 | - <weight>75</weight> |
2772 | - <bold>true</bold> |
2773 | - </font> |
2774 | - </property> |
2775 | - <property name="text"> |
2776 | - <string>password_label</string> |
2777 | - </property> |
2778 | - </widget> |
2779 | - </item> |
2780 | - <item> |
2781 | - <widget class="QLineEdit" name="password_edit"> |
2782 | - <property name="sizePolicy"> |
2783 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2784 | - <horstretch>0</horstretch> |
2785 | - <verstretch>0</verstretch> |
2786 | - </sizepolicy> |
2787 | - </property> |
2788 | - <property name="minimumSize"> |
2789 | - <size> |
2790 | - <width>300</width> |
2791 | - <height>0</height> |
2792 | - </size> |
2793 | - </property> |
2794 | - <property name="maximumSize"> |
2795 | - <size> |
2796 | - <width>300</width> |
2797 | - <height>16777215</height> |
2798 | - </size> |
2799 | - </property> |
2800 | - <property name="font"> |
2801 | - <font> |
2802 | - <pointsize>11</pointsize> |
2803 | - </font> |
2804 | - </property> |
2805 | - <property name="toolTip"> |
2806 | - <string>Your password must be at least 8 characters long and at least contain one number and one upper later.</string> |
2807 | - </property> |
2808 | - <property name="statusTip"> |
2809 | - <string/> |
2810 | - </property> |
2811 | - <property name="echoMode"> |
2812 | - <enum>QLineEdit::Password</enum> |
2813 | - </property> |
2814 | - <property name="placeholderText"> |
2815 | - <string/> |
2816 | - </property> |
2817 | - <property name="formError" stdset="0"> |
2818 | - <bool>false</bool> |
2819 | - </property> |
2820 | - </widget> |
2821 | - </item> |
2822 | - </layout> |
2823 | - </item> |
2824 | - <item row="7" column="0"> |
2825 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2826 | - <property name="spacing"> |
2827 | - <number>3</number> |
2828 | - </property> |
2829 | - <item> |
2830 | - <spacer name="verticalSpacer_5"> |
2831 | - <property name="orientation"> |
2832 | - <enum>Qt::Vertical</enum> |
2833 | - </property> |
2834 | - <property name="sizeType"> |
2835 | - <enum>QSizePolicy::Fixed</enum> |
2836 | - </property> |
2837 | - <property name="sizeHint" stdset="0"> |
2838 | - <size> |
2839 | - <width>20</width> |
2840 | - <height>10</height> |
2841 | - </size> |
2842 | - </property> |
2843 | - </spacer> |
2844 | - </item> |
2845 | - <item> |
2846 | - <widget class="QLabel" name="confirm_password_label"> |
2847 | - <property name="font"> |
2848 | - <font> |
2849 | - <weight>75</weight> |
2850 | - <bold>true</bold> |
2851 | - </font> |
2852 | - </property> |
2853 | - <property name="text"> |
2854 | - <string>confirm_password_label</string> |
2855 | - </property> |
2856 | - </widget> |
2857 | - </item> |
2858 | - <item> |
2859 | - <widget class="QLineEdit" name="confirm_password_edit"> |
2860 | - <property name="sizePolicy"> |
2861 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2862 | - <horstretch>0</horstretch> |
2863 | - <verstretch>0</verstretch> |
2864 | - </sizepolicy> |
2865 | - </property> |
2866 | - <property name="minimumSize"> |
2867 | - <size> |
2868 | - <width>300</width> |
2869 | - <height>0</height> |
2870 | - </size> |
2871 | - </property> |
2872 | - <property name="maximumSize"> |
2873 | - <size> |
2874 | - <width>300</width> |
2875 | - <height>16777215</height> |
2876 | - </size> |
2877 | - </property> |
2878 | - <property name="font"> |
2879 | - <font> |
2880 | - <pointsize>11</pointsize> |
2881 | - </font> |
2882 | - </property> |
2883 | - <property name="echoMode"> |
2884 | - <enum>QLineEdit::Password</enum> |
2885 | - </property> |
2886 | - <property name="placeholderText"> |
2887 | - <string/> |
2888 | - </property> |
2889 | - <property name="formError" stdset="0"> |
2890 | - <bool>false</bool> |
2891 | - </property> |
2892 | - </widget> |
2893 | - </item> |
2894 | - </layout> |
2895 | - </item> |
2896 | - <item row="9" column="0"> |
2897 | - <layout class="QVBoxLayout" name="verticalLayout"> |
2898 | - <property name="spacing"> |
2899 | - <number>3</number> |
2900 | - </property> |
2901 | - <item> |
2902 | - <widget class="QLabel" name="captcha_view"> |
2903 | - <property name="sizePolicy"> |
2904 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2905 | - <horstretch>0</horstretch> |
2906 | - <verstretch>0</verstretch> |
2907 | - </sizepolicy> |
2908 | - </property> |
2909 | - <property name="minimumSize"> |
2910 | - <size> |
2911 | - <width>300</width> |
2912 | - <height>57</height> |
2913 | - </size> |
2914 | - </property> |
2915 | - <property name="maximumSize"> |
2916 | - <size> |
2917 | - <width>300</width> |
2918 | - <height>16777215</height> |
2919 | - </size> |
2920 | - </property> |
2921 | - <property name="styleSheet"> |
2922 | - <string notr="true">background-color: white</string> |
2923 | - </property> |
2924 | - <property name="frameShape"> |
2925 | - <enum>QFrame::Box</enum> |
2926 | - </property> |
2927 | - <property name="text"> |
2928 | - <string>If you can't read this then <a href="example.com"><span style=" text-decoration: underline; color:#dd4814;">refresh</span></a> this page</span></string> |
2929 | - </property> |
2930 | - </widget> |
2931 | - </item> |
2932 | - <item> |
2933 | - <widget class="QLineEdit" name="captcha_solution_edit"> |
2934 | - <property name="sizePolicy"> |
2935 | - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
2936 | - <horstretch>0</horstretch> |
2937 | - <verstretch>0</verstretch> |
2938 | - </sizepolicy> |
2939 | - </property> |
2940 | - <property name="minimumSize"> |
2941 | - <size> |
2942 | - <width>300</width> |
2943 | - <height>0</height> |
2944 | - </size> |
2945 | - </property> |
2946 | - <property name="maximumSize"> |
2947 | - <size> |
2948 | - <width>300</width> |
2949 | - <height>16777215</height> |
2950 | - </size> |
2951 | - </property> |
2952 | - <property name="font"> |
2953 | - <font> |
2954 | - <pointsize>11</pointsize> |
2955 | - </font> |
2956 | - </property> |
2957 | - <property name="locale"> |
2958 | - <locale language="English" country="UnitedStates"/> |
2959 | - </property> |
2960 | - <property name="inputMask"> |
2961 | - <string/> |
2962 | - </property> |
2963 | - <property name="text"> |
2964 | - <string/> |
2965 | - </property> |
2966 | - <property name="placeholderText"> |
2967 | - <string/> |
2968 | - </property> |
2969 | - <property name="formError" stdset="0"> |
2970 | - <bool>false</bool> |
2971 | - </property> |
2972 | - </widget> |
2973 | - </item> |
2974 | - </layout> |
2975 | - </item> |
2976 | - <item row="9" column="1"> |
2977 | - <widget class="QLabel" name="refresh_label"> |
2978 | - <property name="sizePolicy"> |
2979 | - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
2980 | - <horstretch>0</horstretch> |
2981 | - <verstretch>0</verstretch> |
2982 | - </sizepolicy> |
2983 | - </property> |
2984 | - <property name="minimumSize"> |
2985 | - <size> |
2986 | - <width>220</width> |
2987 | - <height>0</height> |
2988 | - </size> |
2989 | - </property> |
2990 | - <property name="maximumSize"> |
2991 | - <size> |
2992 | - <width>220</width> |
2993 | - <height>16777215</height> |
2994 | - </size> |
2995 | - </property> |
2996 | - <property name="locale"> |
2997 | - <locale language="English" country="UnitedStates"/> |
2998 | - </property> |
2999 | - <property name="text"> |
3000 | - <string>If you can't read this then <a href="example.com"><span style=" text-decoration: underline; color:#dd4814;">refresh</span></a> this page</span></string> |
3001 | - </property> |
3002 | - <property name="wordWrap"> |
3003 | - <bool>true</bool> |
3004 | - </property> |
3005 | - <property name="indent"> |
3006 | - <number>0</number> |
3007 | - </property> |
3008 | - </widget> |
3009 | - </item> |
3010 | - <item row="1" column="1"> |
3011 | - <layout class="QVBoxLayout" name="verticalLayout_7"> |
3012 | - <property name="spacing"> |
3013 | - <number>0</number> |
3014 | - </property> |
3015 | - <property name="leftMargin"> |
3016 | - <number>0</number> |
3017 | - </property> |
3018 | - <item> |
3019 | - <widget class="QLabel" name="name_assistance"> |
3020 | - <property name="sizePolicy"> |
3021 | - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3022 | - <horstretch>0</horstretch> |
3023 | - <verstretch>0</verstretch> |
3024 | - </sizepolicy> |
3025 | - </property> |
3026 | - <property name="minimumSize"> |
3027 | - <size> |
3028 | - <width>220</width> |
3029 | - <height>0</height> |
3030 | - </size> |
3031 | - </property> |
3032 | - <property name="maximumSize"> |
3033 | - <size> |
3034 | - <width>220</width> |
3035 | - <height>16777215</height> |
3036 | - </size> |
3037 | - </property> |
3038 | - <property name="text"> |
3039 | - <string>name_assistance</string> |
3040 | - </property> |
3041 | - <property name="alignment"> |
3042 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> |
3043 | - </property> |
3044 | - <property name="wordWrap"> |
3045 | - <bool>true</bool> |
3046 | - </property> |
3047 | - </widget> |
3048 | - </item> |
3049 | - </layout> |
3050 | - </item> |
3051 | - <item row="3" column="1"> |
3052 | - <layout class="QVBoxLayout" name="verticalLayout_8"> |
3053 | - <property name="spacing"> |
3054 | - <number>0</number> |
3055 | - </property> |
3056 | - <property name="leftMargin"> |
3057 | - <number>0</number> |
3058 | - </property> |
3059 | - <item> |
3060 | - <widget class="QLabel" name="email_assistance"> |
3061 | - <property name="sizePolicy"> |
3062 | - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3063 | - <horstretch>0</horstretch> |
3064 | - <verstretch>0</verstretch> |
3065 | - </sizepolicy> |
3066 | - </property> |
3067 | - <property name="minimumSize"> |
3068 | - <size> |
3069 | - <width>220</width> |
3070 | - <height>0</height> |
3071 | - </size> |
3072 | - </property> |
3073 | - <property name="maximumSize"> |
3074 | - <size> |
3075 | - <width>220</width> |
3076 | - <height>16777215</height> |
3077 | - </size> |
3078 | - </property> |
3079 | - <property name="text"> |
3080 | - <string>email_assistance</string> |
3081 | - </property> |
3082 | - <property name="alignment"> |
3083 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> |
3084 | - </property> |
3085 | - <property name="wordWrap"> |
3086 | - <bool>true</bool> |
3087 | - </property> |
3088 | - </widget> |
3089 | - </item> |
3090 | - </layout> |
3091 | - </item> |
3092 | - <item row="4" column="1"> |
3093 | - <layout class="QVBoxLayout" name="verticalLayout_9"> |
3094 | - <property name="spacing"> |
3095 | - <number>0</number> |
3096 | - </property> |
3097 | - <property name="leftMargin"> |
3098 | - <number>0</number> |
3099 | - </property> |
3100 | - <item> |
3101 | - <widget class="QLabel" name="confirm_email_assistance"> |
3102 | - <property name="sizePolicy"> |
3103 | - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3104 | - <horstretch>0</horstretch> |
3105 | - <verstretch>0</verstretch> |
3106 | - </sizepolicy> |
3107 | - </property> |
3108 | - <property name="minimumSize"> |
3109 | - <size> |
3110 | - <width>220</width> |
3111 | - <height>0</height> |
3112 | - </size> |
3113 | - </property> |
3114 | - <property name="maximumSize"> |
3115 | - <size> |
3116 | - <width>220</width> |
3117 | - <height>16777215</height> |
3118 | - </size> |
3119 | - </property> |
3120 | - <property name="text"> |
3121 | - <string>confirm_email_assistance</string> |
3122 | - </property> |
3123 | - <property name="alignment"> |
3124 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> |
3125 | - </property> |
3126 | - <property name="wordWrap"> |
3127 | - <bool>true</bool> |
3128 | - </property> |
3129 | - <property name="indent"> |
3130 | - <number>0</number> |
3131 | - </property> |
3132 | - </widget> |
3133 | - </item> |
3134 | - </layout> |
3135 | - </item> |
3136 | - <item row="6" column="1" rowspan="2"> |
3137 | - <widget class="QLabel" name="password_assistance"> |
3138 | - <property name="sizePolicy"> |
3139 | - <sizepolicy hsizetype="Maximum" vsizetype="Minimum"> |
3140 | - <horstretch>0</horstretch> |
3141 | - <verstretch>0</verstretch> |
3142 | - </sizepolicy> |
3143 | - </property> |
3144 | - <property name="minimumSize"> |
3145 | - <size> |
3146 | - <width>220</width> |
3147 | - <height>100</height> |
3148 | - </size> |
3149 | - </property> |
3150 | - <property name="maximumSize"> |
3151 | - <size> |
3152 | - <width>220</width> |
3153 | - <height>16777215</height> |
3154 | - </size> |
3155 | - </property> |
3156 | - <property name="text"> |
3157 | - <string>password_assistance</string> |
3158 | - </property> |
3159 | - <property name="wordWrap"> |
3160 | - <bool>true</bool> |
3161 | - </property> |
3162 | - <property name="indent"> |
3163 | - <number>17</number> |
3164 | - </property> |
3165 | - </widget> |
3166 | - </item> |
3167 | - <item row="2" column="1"> |
3168 | - <spacer name="verticalSpacer"> |
3169 | - <property name="orientation"> |
3170 | - <enum>Qt::Vertical</enum> |
3171 | - </property> |
3172 | - <property name="sizeType"> |
3173 | - <enum>QSizePolicy::Fixed</enum> |
3174 | - </property> |
3175 | - <property name="sizeHint" stdset="0"> |
3176 | - <size> |
3177 | - <width>20</width> |
3178 | - <height>15</height> |
3179 | - </size> |
3180 | - </property> |
3181 | - </spacer> |
3182 | - </item> |
3183 | - <item row="5" column="1"> |
3184 | - <spacer name="verticalSpacer_2"> |
3185 | - <property name="orientation"> |
3186 | - <enum>Qt::Vertical</enum> |
3187 | - </property> |
3188 | - <property name="sizeType"> |
3189 | - <enum>QSizePolicy::Fixed</enum> |
3190 | - </property> |
3191 | - <property name="sizeHint" stdset="0"> |
3192 | - <size> |
3193 | - <width>20</width> |
3194 | - <height>15</height> |
3195 | - </size> |
3196 | - </property> |
3197 | - </spacer> |
3198 | - </item> |
3199 | - <item row="8" column="1"> |
3200 | - <spacer name="verticalSpacer_3"> |
3201 | - <property name="orientation"> |
3202 | - <enum>Qt::Vertical</enum> |
3203 | - </property> |
3204 | - <property name="sizeType"> |
3205 | - <enum>QSizePolicy::Fixed</enum> |
3206 | - </property> |
3207 | - <property name="sizeHint" stdset="0"> |
3208 | - <size> |
3209 | - <width>20</width> |
3210 | - <height>15</height> |
3211 | - </size> |
3212 | - </property> |
3213 | - </spacer> |
3214 | - </item> |
3215 | - </layout> |
3216 | - </item> |
3217 | - <item> |
3218 | - <layout class="QHBoxLayout" name="hlayout_check"> |
3219 | - <property name="spacing"> |
3220 | - <number>0</number> |
3221 | - </property> |
3222 | - </layout> |
3223 | - </item> |
3224 | - </layout> |
3225 | - </widget> |
3226 | - <resources/> |
3227 | - <connections/> |
3228 | -</ui> |
3229 | +<?xml version="1.0" encoding="UTF-8"?> |
3230 | +<ui version="4.0"> |
3231 | + <class>SetUpAccountPage</class> |
3232 | + <widget class="QWizardPage" name="SetUpAccountPage"> |
3233 | + <property name="geometry"> |
3234 | + <rect> |
3235 | + <x>0</x> |
3236 | + <y>0</y> |
3237 | + <width>543</width> |
3238 | + <height>514</height> |
3239 | + </rect> |
3240 | + </property> |
3241 | + <property name="sizePolicy"> |
3242 | + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> |
3243 | + <horstretch>0</horstretch> |
3244 | + <verstretch>0</verstretch> |
3245 | + </sizepolicy> |
3246 | + </property> |
3247 | + <property name="maximumSize"> |
3248 | + <size> |
3249 | + <width>16777215</width> |
3250 | + <height>16777215</height> |
3251 | + </size> |
3252 | + </property> |
3253 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3254 | + <property name="spacing"> |
3255 | + <number>0</number> |
3256 | + </property> |
3257 | + <property name="leftMargin"> |
3258 | + <number>0</number> |
3259 | + </property> |
3260 | + <property name="topMargin"> |
3261 | + <number>0</number> |
3262 | + </property> |
3263 | + <property name="rightMargin"> |
3264 | + <number>3</number> |
3265 | + </property> |
3266 | + <property name="bottomMargin"> |
3267 | + <number>0</number> |
3268 | + </property> |
3269 | + <item> |
3270 | + <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,220"> |
3271 | + <item row="0" column="0"> |
3272 | + <widget class="QLabel" name="password_info_label"> |
3273 | + <property name="sizePolicy"> |
3274 | + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
3275 | + <horstretch>0</horstretch> |
3276 | + <verstretch>0</verstretch> |
3277 | + </sizepolicy> |
3278 | + </property> |
3279 | + <property name="text"> |
3280 | + <string notr="true">password_info_label</string> |
3281 | + </property> |
3282 | + <property name="wordWrap"> |
3283 | + <bool>true</bool> |
3284 | + </property> |
3285 | + </widget> |
3286 | + </item> |
3287 | + <item row="1" column="0"> |
3288 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3289 | + <property name="spacing"> |
3290 | + <number>3</number> |
3291 | + </property> |
3292 | + <item> |
3293 | + <widget class="QLabel" name="name_label"> |
3294 | + <property name="font"> |
3295 | + <font> |
3296 | + <weight>75</weight> |
3297 | + <bold>true</bold> |
3298 | + </font> |
3299 | + </property> |
3300 | + <property name="text"> |
3301 | + <string notr="true">name_label</string> |
3302 | + </property> |
3303 | + </widget> |
3304 | + </item> |
3305 | + <item> |
3306 | + <widget class="QLineEdit" name="name_edit"> |
3307 | + <property name="sizePolicy"> |
3308 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3309 | + <horstretch>0</horstretch> |
3310 | + <verstretch>0</verstretch> |
3311 | + </sizepolicy> |
3312 | + </property> |
3313 | + <property name="minimumSize"> |
3314 | + <size> |
3315 | + <width>300</width> |
3316 | + <height>0</height> |
3317 | + </size> |
3318 | + </property> |
3319 | + <property name="maximumSize"> |
3320 | + <size> |
3321 | + <width>300</width> |
3322 | + <height>16777215</height> |
3323 | + </size> |
3324 | + </property> |
3325 | + <property name="font"> |
3326 | + <font> |
3327 | + <pointsize>11</pointsize> |
3328 | + </font> |
3329 | + </property> |
3330 | + <property name="formError" stdset="0"> |
3331 | + <bool>false</bool> |
3332 | + </property> |
3333 | + </widget> |
3334 | + </item> |
3335 | + </layout> |
3336 | + </item> |
3337 | + <item row="3" column="0"> |
3338 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3339 | + <property name="spacing"> |
3340 | + <number>3</number> |
3341 | + </property> |
3342 | + <item> |
3343 | + <widget class="QLabel" name="email_label"> |
3344 | + <property name="font"> |
3345 | + <font> |
3346 | + <weight>75</weight> |
3347 | + <bold>true</bold> |
3348 | + </font> |
3349 | + </property> |
3350 | + <property name="text"> |
3351 | + <string notr="true">email_label</string> |
3352 | + </property> |
3353 | + </widget> |
3354 | + </item> |
3355 | + <item> |
3356 | + <widget class="QLineEdit" name="email_edit"> |
3357 | + <property name="sizePolicy"> |
3358 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3359 | + <horstretch>0</horstretch> |
3360 | + <verstretch>0</verstretch> |
3361 | + </sizepolicy> |
3362 | + </property> |
3363 | + <property name="minimumSize"> |
3364 | + <size> |
3365 | + <width>300</width> |
3366 | + <height>0</height> |
3367 | + </size> |
3368 | + </property> |
3369 | + <property name="maximumSize"> |
3370 | + <size> |
3371 | + <width>300</width> |
3372 | + <height>16777215</height> |
3373 | + </size> |
3374 | + </property> |
3375 | + <property name="font"> |
3376 | + <font> |
3377 | + <pointsize>11</pointsize> |
3378 | + </font> |
3379 | + </property> |
3380 | + <property name="placeholderText"> |
3381 | + <string/> |
3382 | + </property> |
3383 | + <property name="formError" stdset="0"> |
3384 | + <bool>false</bool> |
3385 | + </property> |
3386 | + </widget> |
3387 | + </item> |
3388 | + </layout> |
3389 | + </item> |
3390 | + <item row="4" column="0"> |
3391 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3392 | + <property name="spacing"> |
3393 | + <number>3</number> |
3394 | + </property> |
3395 | + <item> |
3396 | + <widget class="QLabel" name="confirm_email_label"> |
3397 | + <property name="font"> |
3398 | + <font> |
3399 | + <weight>75</weight> |
3400 | + <bold>true</bold> |
3401 | + </font> |
3402 | + </property> |
3403 | + <property name="text"> |
3404 | + <string notr="true">confirm_email_label</string> |
3405 | + </property> |
3406 | + </widget> |
3407 | + </item> |
3408 | + <item> |
3409 | + <widget class="QLineEdit" name="confirm_email_edit"> |
3410 | + <property name="sizePolicy"> |
3411 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3412 | + <horstretch>0</horstretch> |
3413 | + <verstretch>0</verstretch> |
3414 | + </sizepolicy> |
3415 | + </property> |
3416 | + <property name="minimumSize"> |
3417 | + <size> |
3418 | + <width>300</width> |
3419 | + <height>0</height> |
3420 | + </size> |
3421 | + </property> |
3422 | + <property name="maximumSize"> |
3423 | + <size> |
3424 | + <width>300</width> |
3425 | + <height>16777215</height> |
3426 | + </size> |
3427 | + </property> |
3428 | + <property name="font"> |
3429 | + <font> |
3430 | + <pointsize>11</pointsize> |
3431 | + </font> |
3432 | + </property> |
3433 | + <property name="placeholderText"> |
3434 | + <string/> |
3435 | + </property> |
3436 | + <property name="formError" stdset="0"> |
3437 | + <bool>false</bool> |
3438 | + </property> |
3439 | + </widget> |
3440 | + </item> |
3441 | + </layout> |
3442 | + </item> |
3443 | + <item row="6" column="0"> |
3444 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3445 | + <property name="spacing"> |
3446 | + <number>3</number> |
3447 | + </property> |
3448 | + <item> |
3449 | + <spacer name="verticalSpacer_4"> |
3450 | + <property name="orientation"> |
3451 | + <enum>Qt::Vertical</enum> |
3452 | + </property> |
3453 | + <property name="sizeType"> |
3454 | + <enum>QSizePolicy::Fixed</enum> |
3455 | + </property> |
3456 | + <property name="sizeHint" stdset="0"> |
3457 | + <size> |
3458 | + <width>20</width> |
3459 | + <height>10</height> |
3460 | + </size> |
3461 | + </property> |
3462 | + </spacer> |
3463 | + </item> |
3464 | + <item> |
3465 | + <widget class="QLabel" name="password_label"> |
3466 | + <property name="font"> |
3467 | + <font> |
3468 | + <weight>75</weight> |
3469 | + <bold>true</bold> |
3470 | + </font> |
3471 | + </property> |
3472 | + <property name="text"> |
3473 | + <string notr="true">password_label</string> |
3474 | + </property> |
3475 | + </widget> |
3476 | + </item> |
3477 | + <item> |
3478 | + <widget class="QLineEdit" name="password_edit"> |
3479 | + <property name="sizePolicy"> |
3480 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3481 | + <horstretch>0</horstretch> |
3482 | + <verstretch>0</verstretch> |
3483 | + </sizepolicy> |
3484 | + </property> |
3485 | + <property name="minimumSize"> |
3486 | + <size> |
3487 | + <width>300</width> |
3488 | + <height>0</height> |
3489 | + </size> |
3490 | + </property> |
3491 | + <property name="maximumSize"> |
3492 | + <size> |
3493 | + <width>300</width> |
3494 | + <height>16777215</height> |
3495 | + </size> |
3496 | + </property> |
3497 | + <property name="font"> |
3498 | + <font> |
3499 | + <pointsize>11</pointsize> |
3500 | + </font> |
3501 | + </property> |
3502 | + <property name="toolTip"> |
3503 | + <string notr="true">Your password must be at least 8 characters long and at least contain one number and one upper later.</string> |
3504 | + </property> |
3505 | + <property name="statusTip"> |
3506 | + <string/> |
3507 | + </property> |
3508 | + <property name="echoMode"> |
3509 | + <enum>QLineEdit::Password</enum> |
3510 | + </property> |
3511 | + <property name="placeholderText"> |
3512 | + <string/> |
3513 | + </property> |
3514 | + <property name="formError" stdset="0"> |
3515 | + <bool>false</bool> |
3516 | + </property> |
3517 | + </widget> |
3518 | + </item> |
3519 | + </layout> |
3520 | + </item> |
3521 | + <item row="7" column="0"> |
3522 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3523 | + <property name="spacing"> |
3524 | + <number>3</number> |
3525 | + </property> |
3526 | + <item> |
3527 | + <spacer name="verticalSpacer_5"> |
3528 | + <property name="orientation"> |
3529 | + <enum>Qt::Vertical</enum> |
3530 | + </property> |
3531 | + <property name="sizeType"> |
3532 | + <enum>QSizePolicy::Fixed</enum> |
3533 | + </property> |
3534 | + <property name="sizeHint" stdset="0"> |
3535 | + <size> |
3536 | + <width>20</width> |
3537 | + <height>10</height> |
3538 | + </size> |
3539 | + </property> |
3540 | + </spacer> |
3541 | + </item> |
3542 | + <item> |
3543 | + <widget class="QLabel" name="confirm_password_label"> |
3544 | + <property name="font"> |
3545 | + <font> |
3546 | + <weight>75</weight> |
3547 | + <bold>true</bold> |
3548 | + </font> |
3549 | + </property> |
3550 | + <property name="text"> |
3551 | + <string notr="true">confirm_password_label</string> |
3552 | + </property> |
3553 | + </widget> |
3554 | + </item> |
3555 | + <item> |
3556 | + <widget class="QLineEdit" name="confirm_password_edit"> |
3557 | + <property name="sizePolicy"> |
3558 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3559 | + <horstretch>0</horstretch> |
3560 | + <verstretch>0</verstretch> |
3561 | + </sizepolicy> |
3562 | + </property> |
3563 | + <property name="minimumSize"> |
3564 | + <size> |
3565 | + <width>300</width> |
3566 | + <height>0</height> |
3567 | + </size> |
3568 | + </property> |
3569 | + <property name="maximumSize"> |
3570 | + <size> |
3571 | + <width>300</width> |
3572 | + <height>16777215</height> |
3573 | + </size> |
3574 | + </property> |
3575 | + <property name="font"> |
3576 | + <font> |
3577 | + <pointsize>11</pointsize> |
3578 | + </font> |
3579 | + </property> |
3580 | + <property name="echoMode"> |
3581 | + <enum>QLineEdit::Password</enum> |
3582 | + </property> |
3583 | + <property name="placeholderText"> |
3584 | + <string/> |
3585 | + </property> |
3586 | + <property name="formError" stdset="0"> |
3587 | + <bool>false</bool> |
3588 | + </property> |
3589 | + </widget> |
3590 | + </item> |
3591 | + </layout> |
3592 | + </item> |
3593 | + <item row="9" column="0"> |
3594 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3595 | + <property name="spacing"> |
3596 | + <number>3</number> |
3597 | + </property> |
3598 | + <item> |
3599 | + <widget class="QLabel" name="captcha_view"> |
3600 | + <property name="sizePolicy"> |
3601 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3602 | + <horstretch>0</horstretch> |
3603 | + <verstretch>0</verstretch> |
3604 | + </sizepolicy> |
3605 | + </property> |
3606 | + <property name="minimumSize"> |
3607 | + <size> |
3608 | + <width>300</width> |
3609 | + <height>57</height> |
3610 | + </size> |
3611 | + </property> |
3612 | + <property name="maximumSize"> |
3613 | + <size> |
3614 | + <width>300</width> |
3615 | + <height>16777215</height> |
3616 | + </size> |
3617 | + </property> |
3618 | + <property name="styleSheet"> |
3619 | + <string notr="true">background-color: white</string> |
3620 | + </property> |
3621 | + <property name="frameShape"> |
3622 | + <enum>QFrame::Box</enum> |
3623 | + </property> |
3624 | + <property name="text"> |
3625 | + <string notr="true"/> |
3626 | + </property> |
3627 | + </widget> |
3628 | + </item> |
3629 | + <item> |
3630 | + <widget class="QLineEdit" name="captcha_solution_edit"> |
3631 | + <property name="sizePolicy"> |
3632 | + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
3633 | + <horstretch>0</horstretch> |
3634 | + <verstretch>0</verstretch> |
3635 | + </sizepolicy> |
3636 | + </property> |
3637 | + <property name="minimumSize"> |
3638 | + <size> |
3639 | + <width>300</width> |
3640 | + <height>0</height> |
3641 | + </size> |
3642 | + </property> |
3643 | + <property name="maximumSize"> |
3644 | + <size> |
3645 | + <width>300</width> |
3646 | + <height>16777215</height> |
3647 | + </size> |
3648 | + </property> |
3649 | + <property name="font"> |
3650 | + <font> |
3651 | + <pointsize>11</pointsize> |
3652 | + </font> |
3653 | + </property> |
3654 | + <property name="locale"> |
3655 | + <locale language="English" country="UnitedStates"/> |
3656 | + </property> |
3657 | + <property name="inputMask"> |
3658 | + <string/> |
3659 | + </property> |
3660 | + <property name="text"> |
3661 | + <string/> |
3662 | + </property> |
3663 | + <property name="placeholderText"> |
3664 | + <string/> |
3665 | + </property> |
3666 | + <property name="formError" stdset="0"> |
3667 | + <bool>false</bool> |
3668 | + </property> |
3669 | + </widget> |
3670 | + </item> |
3671 | + </layout> |
3672 | + </item> |
3673 | + <item row="9" column="1"> |
3674 | + <widget class="QLabel" name="refresh_label"> |
3675 | + <property name="sizePolicy"> |
3676 | + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3677 | + <horstretch>0</horstretch> |
3678 | + <verstretch>0</verstretch> |
3679 | + </sizepolicy> |
3680 | + </property> |
3681 | + <property name="minimumSize"> |
3682 | + <size> |
3683 | + <width>220</width> |
3684 | + <height>0</height> |
3685 | + </size> |
3686 | + </property> |
3687 | + <property name="maximumSize"> |
3688 | + <size> |
3689 | + <width>220</width> |
3690 | + <height>16777215</height> |
3691 | + </size> |
3692 | + </property> |
3693 | + <property name="locale"> |
3694 | + <locale language="English" country="UnitedStates"/> |
3695 | + </property> |
3696 | + <property name="text"> |
3697 | + <string notr="true">If you can't read this then <a href="example.com"><span style=" text-decoration: underline; color:#dd4814;">refresh</span></a> this page</span></string> |
3698 | + </property> |
3699 | + <property name="wordWrap"> |
3700 | + <bool>true</bool> |
3701 | + </property> |
3702 | + <property name="indent"> |
3703 | + <number>0</number> |
3704 | + </property> |
3705 | + </widget> |
3706 | + </item> |
3707 | + <item row="1" column="1"> |
3708 | + <layout class="QVBoxLayout" name="verticalLayout_7"> |
3709 | + <property name="spacing"> |
3710 | + <number>0</number> |
3711 | + </property> |
3712 | + <property name="leftMargin"> |
3713 | + <number>0</number> |
3714 | + </property> |
3715 | + <item> |
3716 | + <widget class="QLabel" name="name_assistance"> |
3717 | + <property name="sizePolicy"> |
3718 | + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3719 | + <horstretch>0</horstretch> |
3720 | + <verstretch>0</verstretch> |
3721 | + </sizepolicy> |
3722 | + </property> |
3723 | + <property name="minimumSize"> |
3724 | + <size> |
3725 | + <width>220</width> |
3726 | + <height>0</height> |
3727 | + </size> |
3728 | + </property> |
3729 | + <property name="maximumSize"> |
3730 | + <size> |
3731 | + <width>220</width> |
3732 | + <height>16777215</height> |
3733 | + </size> |
3734 | + </property> |
3735 | + <property name="text"> |
3736 | + <string notr="true">name_assistance</string> |
3737 | + </property> |
3738 | + <property name="alignment"> |
3739 | + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> |
3740 | + </property> |
3741 | + <property name="wordWrap"> |
3742 | + <bool>true</bool> |
3743 | + </property> |
3744 | + </widget> |
3745 | + </item> |
3746 | + </layout> |
3747 | + </item> |
3748 | + <item row="3" column="1"> |
3749 | + <layout class="QVBoxLayout" name="verticalLayout_8"> |
3750 | + <property name="spacing"> |
3751 | + <number>0</number> |
3752 | + </property> |
3753 | + <property name="leftMargin"> |
3754 | + <number>0</number> |
3755 | + </property> |
3756 | + <item> |
3757 | + <widget class="QLabel" name="email_assistance"> |
3758 | + <property name="sizePolicy"> |
3759 | + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3760 | + <horstretch>0</horstretch> |
3761 | + <verstretch>0</verstretch> |
3762 | + </sizepolicy> |
3763 | + </property> |
3764 | + <property name="minimumSize"> |
3765 | + <size> |
3766 | + <width>220</width> |
3767 | + <height>0</height> |
3768 | + </size> |
3769 | + </property> |
3770 | + <property name="maximumSize"> |
3771 | + <size> |
3772 | + <width>220</width> |
3773 | + <height>16777215</height> |
3774 | + </size> |
3775 | + </property> |
3776 | + <property name="text"> |
3777 | + <string notr="true">email_assistance</string> |
3778 | + </property> |
3779 | + <property name="alignment"> |
3780 | + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> |
3781 | + </property> |
3782 | + <property name="wordWrap"> |
3783 | + <bool>true</bool> |
3784 | + </property> |
3785 | + </widget> |
3786 | + </item> |
3787 | + </layout> |
3788 | + </item> |
3789 | + <item row="4" column="1"> |
3790 | + <layout class="QVBoxLayout" name="verticalLayout_9"> |
3791 | + <property name="spacing"> |
3792 | + <number>0</number> |
3793 | + </property> |
3794 | + <property name="leftMargin"> |
3795 | + <number>0</number> |
3796 | + </property> |
3797 | + <item> |
3798 | + <widget class="QLabel" name="confirm_email_assistance"> |
3799 | + <property name="sizePolicy"> |
3800 | + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
3801 | + <horstretch>0</horstretch> |
3802 | + <verstretch>0</verstretch> |
3803 | + </sizepolicy> |
3804 | + </property> |
3805 | + <property name="minimumSize"> |
3806 | + <size> |
3807 | + <width>220</width> |
3808 | + <height>0</height> |
3809 | + </size> |
3810 | + </property> |
3811 | + <property name="maximumSize"> |
3812 | + <size> |
3813 | + <width>220</width> |
3814 | + <height>16777215</height> |
3815 | + </size> |
3816 | + </property> |
3817 | + <property name="text"> |
3818 | + <string notr="true">confirm_email_assistance</string> |
3819 | + </property> |
3820 | + <property name="alignment"> |
3821 | + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> |
3822 | + </property> |
3823 | + <property name="wordWrap"> |
3824 | + <bool>true</bool> |
3825 | + </property> |
3826 | + <property name="indent"> |
3827 | + <number>0</number> |
3828 | + </property> |
3829 | + </widget> |
3830 | + </item> |
3831 | + </layout> |
3832 | + </item> |
3833 | + <item row="6" column="1" rowspan="2"> |
3834 | + <widget class="QLabel" name="password_assistance"> |
3835 | + <property name="sizePolicy"> |
3836 | + <sizepolicy hsizetype="Maximum" vsizetype="Minimum"> |
3837 | + <horstretch>0</horstretch> |
3838 | + <verstretch>0</verstretch> |
3839 | + </sizepolicy> |
3840 | + </property> |
3841 | + <property name="minimumSize"> |
3842 | + <size> |
3843 | + <width>220</width> |
3844 | + <height>100</height> |
3845 | + </size> |
3846 | + </property> |
3847 | + <property name="maximumSize"> |
3848 | + <size> |
3849 | + <width>220</width> |
3850 | + <height>16777215</height> |
3851 | + </size> |
3852 | + </property> |
3853 | + <property name="text"> |
3854 | + <string notr="true">password_assistance</string> |
3855 | + </property> |
3856 | + <property name="wordWrap"> |
3857 | + <bool>true</bool> |
3858 | + </property> |
3859 | + <property name="indent"> |
3860 | + <number>17</number> |
3861 | + </property> |
3862 | + </widget> |
3863 | + </item> |
3864 | + <item row="2" column="1"> |
3865 | + <spacer name="verticalSpacer"> |
3866 | + <property name="orientation"> |
3867 | + <enum>Qt::Vertical</enum> |
3868 | + </property> |
3869 | + <property name="sizeType"> |
3870 | + <enum>QSizePolicy::Fixed</enum> |
3871 | + </property> |
3872 | + <property name="sizeHint" stdset="0"> |
3873 | + <size> |
3874 | + <width>20</width> |
3875 | + <height>15</height> |
3876 | + </size> |
3877 | + </property> |
3878 | + </spacer> |
3879 | + </item> |
3880 | + <item row="5" column="1"> |
3881 | + <spacer name="verticalSpacer_2"> |
3882 | + <property name="orientation"> |
3883 | + <enum>Qt::Vertical</enum> |
3884 | + </property> |
3885 | + <property name="sizeType"> |
3886 | + <enum>QSizePolicy::Fixed</enum> |
3887 | + </property> |
3888 | + <property name="sizeHint" stdset="0"> |
3889 | + <size> |
3890 | + <width>20</width> |
3891 | + <height>15</height> |
3892 | + </size> |
3893 | + </property> |
3894 | + </spacer> |
3895 | + </item> |
3896 | + <item row="8" column="1"> |
3897 | + <spacer name="verticalSpacer_3"> |
3898 | + <property name="orientation"> |
3899 | + <enum>Qt::Vertical</enum> |
3900 | + </property> |
3901 | + <property name="sizeType"> |
3902 | + <enum>QSizePolicy::Fixed</enum> |
3903 | + </property> |
3904 | + <property name="sizeHint" stdset="0"> |
3905 | + <size> |
3906 | + <width>20</width> |
3907 | + <height>15</height> |
3908 | + </size> |
3909 | + </property> |
3910 | + </spacer> |
3911 | + </item> |
3912 | + </layout> |
3913 | + </item> |
3914 | + <item> |
3915 | + <layout class="QHBoxLayout" name="hlayout_check"> |
3916 | + <property name="spacing"> |
3917 | + <number>0</number> |
3918 | + </property> |
3919 | + </layout> |
3920 | + </item> |
3921 | + </layout> |
3922 | + </widget> |
3923 | + <resources/> |
3924 | + <connections/> |
3925 | +</ui> |
3926 | |
3927 | === modified file 'data/qt/success_message.ui' |
3928 | --- data/qt/success_message.ui 2011-11-14 12:16:13 +0000 |
3929 | +++ data/qt/success_message.ui 2012-02-22 17:10:00 +0000 |
3930 | @@ -1,35 +1,32 @@ |
3931 | -<?xml version="1.0" encoding="UTF-8"?> |
3932 | -<ui version="4.0"> |
3933 | - <class>SuccessPage</class> |
3934 | - <widget class="QWizardPage" name="SuccessPage"> |
3935 | - <property name="geometry"> |
3936 | - <rect> |
3937 | - <x>0</x> |
3938 | - <y>0</y> |
3939 | - <width>400</width> |
3940 | - <height>300</height> |
3941 | - </rect> |
3942 | - </property> |
3943 | - <property name="windowTitle"> |
3944 | - <string>WizardPage</string> |
3945 | - </property> |
3946 | - <layout class="QVBoxLayout" name="verticalLayout"> |
3947 | - <item> |
3948 | - <widget class="QLabel" name="image_label"> |
3949 | - <property name="text"> |
3950 | - <string>TextLabel</string> |
3951 | - </property> |
3952 | - </widget> |
3953 | - </item> |
3954 | - <item> |
3955 | - <widget class="QLabel" name="success_message_body"> |
3956 | - <property name="text"> |
3957 | - <string>TextLabel</string> |
3958 | - </property> |
3959 | - </widget> |
3960 | - </item> |
3961 | - </layout> |
3962 | - </widget> |
3963 | - <resources/> |
3964 | - <connections/> |
3965 | -</ui> |
3966 | +<?xml version="1.0" encoding="UTF-8"?> |
3967 | +<ui version="4.0"> |
3968 | + <class>SuccessPage</class> |
3969 | + <widget class="QWizardPage" name="SuccessPage"> |
3970 | + <property name="geometry"> |
3971 | + <rect> |
3972 | + <x>0</x> |
3973 | + <y>0</y> |
3974 | + <width>94</width> |
3975 | + <height>58</height> |
3976 | + </rect> |
3977 | + </property> |
3978 | + <layout class="QVBoxLayout" name="verticalLayout"> |
3979 | + <item> |
3980 | + <widget class="QLabel" name="image_label"> |
3981 | + <property name="text"> |
3982 | + <string notr="true">TextLabel</string> |
3983 | + </property> |
3984 | + </widget> |
3985 | + </item> |
3986 | + <item> |
3987 | + <widget class="QLabel" name="success_message_body"> |
3988 | + <property name="text"> |
3989 | + <string notr="true">TextLabel</string> |
3990 | + </property> |
3991 | + </widget> |
3992 | + </item> |
3993 | + </layout> |
3994 | + </widget> |
3995 | + <resources/> |
3996 | + <connections/> |
3997 | +</ui> |
3998 | |
3999 | === modified file 'ubuntu_sso/qt/email_verification_page.py' |
4000 | --- ubuntu_sso/qt/email_verification_page.py 2012-02-14 14:38:23 +0000 |
4001 | +++ ubuntu_sso/qt/email_verification_page.py 2012-02-22 17:10:00 +0000 |
4002 | @@ -26,6 +26,8 @@ |
4003 | from ubuntu_sso.qt.gui import SSOWizardPage |
4004 | from ubuntu_sso.logger import setup_logging |
4005 | from ubuntu_sso.utils.ui import ( |
4006 | + NEXT, |
4007 | + VERIFICATION_CODE, |
4008 | VERIFY_EMAIL_TITLE, |
4009 | VERIFY_EMAIL_CONTENT, |
4010 | ) |
4011 | @@ -95,6 +97,8 @@ |
4012 | "app_name": self.app_name, |
4013 | "email": self.email, |
4014 | }) |
4015 | + self.ui.label.setText(VERIFICATION_CODE) |
4016 | + self.ui.next_button.setText(NEXT) |
4017 | |
4018 | def set_titles(self, email): |
4019 | """This class needs to have a public set_titles. |
4020 | |
4021 | === modified file 'ubuntu_sso/qt/loadingoverlay.py' |
4022 | --- ubuntu_sso/qt/loadingoverlay.py 2012-02-03 13:54:29 +0000 |
4023 | +++ ubuntu_sso/qt/loadingoverlay.py 2012-02-22 17:10:00 +0000 |
4024 | @@ -19,6 +19,7 @@ |
4025 | from PyQt4 import QtGui, QtCore |
4026 | |
4027 | from ubuntu_sso.qt.ui import loadingoverlay_ui |
4028 | +from ubuntu_sso.utils.ui import LOADING_OVERLAY |
4029 | |
4030 | |
4031 | class LoadingOverlay(QtGui.QFrame): |
4032 | @@ -42,6 +43,8 @@ |
4033 | self.counter = 0 |
4034 | self.orientation = False |
4035 | |
4036 | + self.ui.label.setText(LOADING_OVERLAY) |
4037 | + |
4038 | # Invalid name "paintEvent" |
4039 | # pylint: disable=C0103 |
4040 | |
4041 | |
4042 | === modified file 'ubuntu_sso/qt/network_detection_page.py' |
4043 | --- ubuntu_sso/qt/network_detection_page.py 2012-02-17 18:43:17 +0000 |
4044 | +++ ubuntu_sso/qt/network_detection_page.py 2012-02-22 17:10:00 +0000 |
4045 | @@ -25,6 +25,7 @@ |
4046 | from ubuntu_sso.utils.ui import ( |
4047 | CLOSE_AND_SETUP_LATER, |
4048 | NETWORK_DETECTION_TITLE, |
4049 | + NETWORK_DETECTION_WARNING, |
4050 | TRY_AGAIN_BUTTON, |
4051 | ) |
4052 | |
4053 | @@ -33,8 +34,9 @@ |
4054 | |
4055 | """Widget to show if we don't detect a network connection.""" |
4056 | |
4057 | - def __init__(self, banner_pixmap=None, parent=None): |
4058 | + def __init__(self, app_name, banner_pixmap=None, parent=None): |
4059 | super(NetworkDetectionPage, self).__init__(parent) |
4060 | + self.app_name = app_name |
4061 | self.setTitle(NETWORK_DETECTION_TITLE) |
4062 | self.ui = network_detection_ui.Ui_Form() |
4063 | self.ui.setupUi(self) |
4064 | @@ -61,6 +63,8 @@ |
4065 | except TypeError: |
4066 | pass |
4067 | |
4068 | + self.ui.label.setText(NETWORK_DETECTION_WARNING % |
4069 | + {'app_name': self.app_name}) |
4070 | self.btn_try_again = self.wizard().button(QtGui.QWizard.CustomButton1) |
4071 | self.btn_try_again.setDefault(True) |
4072 | self.btn_try_again.style().unpolish(self.btn_try_again) |
4073 | |
4074 | === modified file 'ubuntu_sso/qt/proxy_dialog.py' |
4075 | --- ubuntu_sso/qt/proxy_dialog.py 2012-02-13 16:16:03 +0000 |
4076 | +++ ubuntu_sso/qt/proxy_dialog.py 2012-02-22 17:10:00 +0000 |
4077 | @@ -45,7 +45,7 @@ |
4078 | |
4079 | |
4080 | class ProxyCredsDialog(QDialog): |
4081 | - """"Dialog used to require the proxy credentials.""" |
4082 | + """Dialog used to require the proxy credentials.""" |
4083 | |
4084 | def __init__(self, retry=False, domain=None): |
4085 | """Create a new instance.""" |
4086 | |
4087 | === modified file 'ubuntu_sso/qt/setup_account_page.py' |
4088 | --- ubuntu_sso/qt/setup_account_page.py 2012-02-18 15:12:09 +0000 |
4089 | +++ ubuntu_sso/qt/setup_account_page.py 2012-02-22 17:10:00 +0000 |
4090 | @@ -36,12 +36,13 @@ |
4091 | from ubuntu_sso.qt import common |
4092 | from ubuntu_sso.qt.gui import SSOWizardEnhancedEditPage |
4093 | from ubuntu_sso.qt import enhanced_check_box |
4094 | -from ubuntu_sso.utils.ui import SET_UP_ACCOUNT_BUTTON |
4095 | from ubuntu_sso.utils.ui import ( |
4096 | AGREE_TO_PRIVACY_POLICY, |
4097 | AGREE_TO_TERMS, |
4098 | AGREE_TO_TERMS_AND_PRIVACY_POLICY, |
4099 | CAPTCHA_LOAD_ERROR, |
4100 | + CAPTCHA_RELOAD_MESSAGE, |
4101 | + CAPTCHA_RELOAD_TEXT, |
4102 | CAPTCHA_REQUIRED_ERROR, |
4103 | CAPTCHA_SOLUTION_ENTRY, |
4104 | EMAIL, |
4105 | @@ -58,6 +59,7 @@ |
4106 | NAME_ENTRY, |
4107 | NAME_INVALID, |
4108 | PASSWORD, |
4109 | + PASSWORD_HELP, |
4110 | PASSWORD1_ENTRY, |
4111 | PASSWORD2_ENTRY, |
4112 | PASSWORD_HELP, |
4113 | @@ -66,6 +68,7 @@ |
4114 | PRIVACY_POLICY_TEXT, |
4115 | RETYPE_EMAIL, |
4116 | RETYPE_PASSWORD, |
4117 | + SET_UP_ACCOUNT_BUTTON, |
4118 | TERMS_TEXT, |
4119 | TITLE, |
4120 | ) |
4121 | @@ -79,11 +82,12 @@ |
4122 | TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>" |
4123 | |
4124 | ERROR_EMAIL = 'email' |
4125 | -TERMS_LINK = ("<a href='{toc_link}'>" |
4126 | - "<span style='color:#df2d1f;'>{terms_text}</span></a>") |
4127 | -PRIVACY_POLICY_LINK = ("<a href='{policy_link}'>" |
4128 | - "<span style='color:#df2d1f;'>{privacy_policy_text}" |
4129 | - "</span></a></font>") |
4130 | +CAPTCHA_RELOAD_LINK = ('<a href="#">' |
4131 | + '<span style="color:#df2d1f;">%(reload_text)s</span></a>') |
4132 | +TERMS_LINK = ('<a href="{toc_link}">' |
4133 | + '<span style="color:#df2d1f;">{terms_text}</span></a>') |
4134 | +PRIVACY_POLICY_LINK = ('<a href="{policy_link}">' |
4135 | + '<span style="color:#df2d1f;">{privacy_policy_text}</span></a>') |
4136 | |
4137 | |
4138 | class SetupAccountPage(SSOWizardEnhancedEditPage): |
4139 | @@ -207,9 +211,13 @@ |
4140 | self.ui.confirm_email_label.setText(EMAIL2_ENTRY) |
4141 | self.ui.password_label.setText(PASSWORD1_ENTRY) |
4142 | self.ui.confirm_password_label.setText(PASSWORD2_ENTRY) |
4143 | + self.ui.password_edit.setToolTip(PASSWORD_HELP) |
4144 | self.ui.password_info_label.setText(PASSWORD_HELP) |
4145 | self.ui.captcha_solution_edit.setPlaceholderText( |
4146 | CAPTCHA_SOLUTION_ENTRY) |
4147 | + link = CAPTCHA_RELOAD_LINK % {'reload_text': CAPTCHA_RELOAD_TEXT} |
4148 | + self.ui.refresh_label.setText(CAPTCHA_RELOAD_MESSAGE % |
4149 | + {'reload_link': link}) |
4150 | |
4151 | def _set_line_edits_validations(self): |
4152 | """Set the validations to be performed on the edits.""" |
4153 | |
4154 | === modified file 'ubuntu_sso/qt/tests/test_network_detection.py' |
4155 | --- ubuntu_sso/qt/tests/test_network_detection.py 2012-02-15 17:33:40 +0000 |
4156 | +++ ubuntu_sso/qt/tests/test_network_detection.py 2012-02-22 17:10:00 +0000 |
4157 | @@ -20,6 +20,7 @@ |
4158 | |
4159 | from PyQt4 import QtGui |
4160 | |
4161 | +from ubuntu_sso.tests import APP_NAME |
4162 | from ubuntu_sso.qt import network_detection_page |
4163 | from ubuntu_sso.qt.tests import ( |
4164 | BaseTestCase, |
4165 | @@ -36,7 +37,8 @@ |
4166 | """Initialize this test instance.""" |
4167 | yield super(NetworkDetectionTestCase, self).setUp() |
4168 | self.wizard = FakeWizardButtonStyle() |
4169 | - self.network_detection = network_detection_page.NetworkDetectionPage() |
4170 | + self.network_detection = network_detection_page.NetworkDetectionPage( |
4171 | + app_name=APP_NAME) |
4172 | self.patch(self.network_detection, 'wizard', self._get_wizard) |
4173 | |
4174 | def _get_wizard(self): |
4175 | |
4176 | === modified file 'ubuntu_sso/utils/ui.py' |
4177 | --- ubuntu_sso/utils/ui.py 2012-02-17 18:43:17 +0000 |
4178 | +++ ubuntu_sso/utils/ui.py 2012-02-22 17:10:00 +0000 |
4179 | @@ -38,21 +38,13 @@ |
4180 | CAPTCHA_SOLUTION_ENTRY = _('Type the characters above') |
4181 | CAPTCHA_LOAD_ERROR = _('There was a problem getting the captcha, ' |
4182 | 'reloading...') |
4183 | +CAPTCHA_RELOAD_MESSAGE = _('If you can\'t read this then %(reload_link)s ' |
4184 | + 'this page') |
4185 | +CAPTCHA_RELOAD_TEXT = _('refresh') |
4186 | CAPTCHA_RELOAD_TOOLTIP = _('Reload') |
4187 | CAPTCHA_REQUIRED_ERROR = _('The captcha is a required field') |
4188 | CLOSE_AND_SETUP_LATER = _('Close window and setup later') |
4189 | CONGRATULATIONS = _("Congratulations, {app_name} is installed!") |
4190 | -PROXY_CREDS_DIALOG_TITLE = _('Add proxy settings') |
4191 | -PROXY_CREDS_HEADER = _('You are connecting through a proxy.') |
4192 | -PROXY_CREDS_EXPLANATION = _('Please provide login details below, ' \ |
4193 | - 'or check your system settings.') |
4194 | -PROXY_CREDS_CONNECTION = _('Connecting to:') |
4195 | -PROXY_CREDS_ERROR = _('These credentials are incorrect; please try again.') |
4196 | -PROXY_CREDS_USER_LABEL = _('Proxy username:') |
4197 | -PROXY_CREDS_PSWD_LABEL = _('Proxy password:') |
4198 | -PROXY_CREDS_HELP_BUTTON = _('Get Help With Proxies') |
4199 | -PROXY_CREDS_CANCEL_BUTTON = _('Cancel And Close') |
4200 | -PROXY_CREDS_SAVE_BUTTON = _('Save') |
4201 | CONNECT_HELP_LABEL = _('To connect this computer to %(app_name)s ' \ |
4202 | 'enter your details below.') |
4203 | EMAIL_LABEL = EMAIL1_ENTRY = _('Email address') |
4204 | @@ -74,6 +66,7 @@ |
4205 | ' Sign On backend.') |
4206 | JOIN_HEADER_LABEL = _('Create %(app_name)s account') |
4207 | LOADING = _('Loading...') |
4208 | +LOADING_OVERLAY = _('Getting information, please wait...') |
4209 | LOGIN_BUTTON_LABEL = _('Already have an account? Click here to sign in') |
4210 | LOGIN_EMAIL_ENTRY = _('Email address') |
4211 | LOGIN_HEADER_LABEL = _('Connect to %(app_name)s') |
4212 | @@ -83,6 +76,8 @@ |
4213 | NAME_INVALID = _('The name must not be empty.') |
4214 | NEXT = _('Next') |
4215 | NETWORK_DETECTION_TITLE = _('Network detection') |
4216 | +NETWORK_DETECTION_WARNING = _('Are you online? We can\'t detect an internet ' |
4217 | + 'connection - you will need to be connected to set up %(app_name)s') |
4218 | ONE_MOMENT_PLEASE = _('One moment please...') |
4219 | PASSWORD = _("Create a password") |
4220 | PASSWORD_CHANGED = _('Your password was successfully changed.') |
4221 | @@ -99,6 +94,17 @@ |
4222 | PASSWORD_TOO_WEAK = _('The password is too weak.') |
4223 | PASSWORD_UPPER = _("At least one uppercase letter") |
4224 | PRIVACY_POLICY_TEXT = _("Privacy Policy") |
4225 | +PROXY_CREDS_CANCEL_BUTTON = _('Cancel and Close') |
4226 | +PROXY_CREDS_CONNECTION = _('Connecting to:') |
4227 | +PROXY_CREDS_DIALOG_TITLE = _('Add proxy settings') |
4228 | +PROXY_CREDS_EXPLANATION = _('Please provide login details below, ' |
4229 | + 'or check your system settings.') |
4230 | +PROXY_CREDS_ERROR = _('These credentials are incorrect; please try again.') |
4231 | +PROXY_CREDS_HEADER = _('You are connecting through a proxy.') |
4232 | +PROXY_CREDS_HELP_BUTTON = _('Get Help With Proxies') |
4233 | +PROXY_CREDS_PSWD_LABEL = _('Proxy password:') |
4234 | +PROXY_CREDS_SAVE_BUTTON = _('Save') |
4235 | +PROXY_CREDS_USER_LABEL = _('Proxy username:') |
4236 | RESET_TITLE = _("Reset password") |
4237 | RESET_SUBTITLE = _("A password reset code has been sent to your e-mail." |
4238 | "Please enter the code below along with your new password.") |
4239 | @@ -132,6 +138,7 @@ |
4240 | TRY_AGAIN_BUTTON = _('Try again') |
4241 | UNKNOWN_ERROR = _('There was an error when trying to complete the ' \ |
4242 | 'process. Please check the information and try again.') |
4243 | +VERIFICATION_CODE = _('Verification code') |
4244 | VERIFY_EMAIL_CONTENT = _('Check %(email)s for an email from' |
4245 | ' Ubuntu Single Sign On.' |
4246 | ' This message contains a verification code.' |
+1