1
=== modified file 'bin/ubuntu-sso-proxy-creds-qt'
2
--- bin/ubuntu-sso-proxy-creds-qt	2012-02-14 10:09:40 +0000
3
+++ bin/ubuntu-sso-proxy-creds-qt	2012-03-06 15:41:36 +0000
4
@@ -19,10 +19,6 @@
5
19
19
6
20
# Invalid name, pylint: disable=C0103
20
# Invalid name, pylint: disable=C0103
7
21
21
8
22
import os
9
23
# HACK: At the moment we need to do that until sso is refactored
10
24
os.environ['USE_QT_MAINLOOP'] = '1'
11
25
12
26
# set the dbus main loop to be used
22
# set the dbus main loop to be used
13
27
from dbus.mainloop.qt import DBusQtMainLoop
23
from dbus.mainloop.qt import DBusQtMainLoop
14
28
DBusQtMainLoop(set_as_default=True)
24
DBusQtMainLoop(set_as_default=True)
15
29
25
16
=== added file 'bin/ubuntu-sso-ssl-certificate-qt'
17
--- bin/ubuntu-sso-ssl-certificate-qt	1970-01-01 00:00:00 +0000
18
+++ bin/ubuntu-sso-ssl-certificate-qt	2012-03-06 15:41:36 +0000
19
@@ -0,0 +1,25 @@
20
1
#!/usr/bin/env python
21
2
# -*- coding: utf-8 -*-
22
3
#
23
4
# Copyright 2012 Canonical Ltd.
24
5
#
25
6
# This program is free software: you can redistribute it and/or modify it
26
7
# under the terms of the GNU General Public License version 3, as published
27
8
# by the Free Software Foundation.
28
9
#
29
10
# This program is distributed in the hope that it will be useful, but
30
11
# WITHOUT ANY WARRANTY; without even the implied warranties of
31
12
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
32
13
# PURPOSE.  See the GNU General Public License for more details.
33
14
#
34
15
# You should have received a copy of the GNU General Public License along
35
16
# with this program.  If not, see <http://www.gnu.org/licenses/>.
36
17
37
18
"""Start the QT proxy creds dialog."""
38
19
39
20
# Invalid name, pylint: disable=C0103
40
21
41
22
from ubuntu_sso.qt.ssl_dialog import main
42
23
43
24
if __name__ == "__main__":
44
25
    main()
45
0
26
46
=== removed file 'data/qt/choose_sign_in.ui'
47
--- data/qt/choose_sign_in.ui	2012-02-09 18:28:40 +0000
48
+++ data/qt/choose_sign_in.ui	1970-01-01 00:00:00 +0000
49
@@ -1,165 +0,0 @@
50
1
<?xml version="1.0" encoding="UTF-8"?>
51
2
<ui version="4.0">
52
3
 <class>ChooseSignInPage</class>
53
4
 <widget class="QWizardPage" name="ChooseSignInPage">
54
5
  <property name="geometry">
55
6
   <rect>
56
7
    <x>0</x>
57
8
    <y>0</y>
58
9
    <width>432</width>
59
10
    <height>387</height>
60
11
   </rect>
61
12
  </property>
62
13
  <property name="windowTitle">
63
14
   <string>WizardPage</string>
64
15
  </property>
65
16
  <layout class="QVBoxLayout" name="verticalLayout_2">
66
17
   <property name="leftMargin">
67
18
    <number>0</number>
68
19
   </property>
69
20
   <property name="topMargin">
70
21
    <number>0</number>
71
22
   </property>
72
23
   <property name="rightMargin">
73
24
    <number>0</number>
74
25
   </property>
75
26
   <item>
76
27
    <layout class="QHBoxLayout" name="horizontalLayout_2">
77
28
     <item>
78
29
      <widget class="QLabel" name="image_label">
79
30
       <property name="sizePolicy">
80
31
        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
81
32
         <horstretch>0</horstretch>
82
33
         <verstretch>0</verstretch>
83
34
        </sizepolicy>
84
35
       </property>
85
36
       <property name="minimumSize">
86
37
        <size>
87
38
         <width>400</width>
88
39
         <height>150</height>
89
40
        </size>
90
41
       </property>
91
42
       <property name="text">
92
43
        <string/>
93
44
       </property>
94
45
       <property name="textFormat">
95
46
        <enum>Qt::PlainText</enum>
96
47
       </property>
97
48
       <property name="alignment">
98
49
        <set>Qt::AlignCenter</set>
99
50
       </property>
100
51
       <property name="wordWrap">
101
52
        <bool>true</bool>
102
53
       </property>
103
54
      </widget>
104
55
     </item>
105
56
    </layout>
106
57
   </item>
107
58
   <item>
108
59
    <widget class="QLabel" name="message_label">
109
60
     <property name="font">
110
61
      <font>
111
62
       <pointsize>11</pointsize>
112
63
       <weight>50</weight>
113
64
       <bold>false</bold>
114
65
      </font>
115
66
     </property>
116
67
     <property name="text">
117
68
      <string>Congratulations, app_name is installed!</string>
118
69
     </property>
119
70
     <property name="alignment">
120
71
      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
121
72
     </property>
122
73
    </widget>
123
74
   </item>
124
75
   <item>
125
76
    <spacer name="verticalSpacer_3">
126
77
     <property name="orientation">
127
78
      <enum>Qt::Vertical</enum>
128
79
     </property>
129
80
     <property name="sizeType">
130
81
      <enum>QSizePolicy::Fixed</enum>
131
82
     </property>
132
83
     <property name="sizeHint" stdset="0">
133
84
      <size>
134
85
       <width>20</width>
135
86
       <height>30</height>
136
87
      </size>
137
88
     </property>
138
89
    </spacer>
139
90
   </item>
140
91
   <item>
141
92
    <layout class="QHBoxLayout" name="horizontalLayout">
142
93
     <item>
143
94
      <spacer name="horizontalSpacer_2">
144
95
       <property name="orientation">
145
96
        <enum>Qt::Horizontal</enum>
146
97
       </property>
147
98
       <property name="sizeHint" stdset="0">
148
99
        <size>
149
100
         <width>20</width>
150
101
         <height>20</height>
151
102
        </size>
152
103
       </property>
153
104
      </spacer>
154
105
     </item>
155
106
     <item>
156
107
      <layout class="QVBoxLayout" name="verticalLayout">
157
108
       <item>
158
109
        <widget class="QPushButton" name="existing_account_button">
159
110
         <property name="text">
160
111
          <string/>
161
112
         </property>
162
113
        </widget>
163
114
       </item>
164
115
       <item>
165
116
        <widget class="QPushButton" name="setup_account_button">
166
117
         <property name="text">
167
118
          <string/>
168
119
         </property>
169
120
        </widget>
170
121
       </item>
171
122
       <item>
172
123
        <widget class="QPushButton" name="cancel_button">
173
124
         <property name="text">
174
125
          <string/>
175
126
         </property>
176
127
        </widget>
177
128
       </item>
178
129
      </layout>
179
130
     </item>
180
131
     <item>
181
132
      <spacer name="horizontalSpacer">
182
133
       <property name="orientation">
183
134
        <enum>Qt::Horizontal</enum>
184
135
       </property>
185
136
       <property name="sizeType">
186
137
        <enum>QSizePolicy::Expanding</enum>
187
138
       </property>
188
139
       <property name="sizeHint" stdset="0">
189
140
        <size>
190
141
         <width>20</width>
191
142
         <height>20</height>
192
143
        </size>
193
144
       </property>
194
145
      </spacer>
195
146
     </item>
196
147
    </layout>
197
148
   </item>
198
149
   <item>
199
150
    <spacer name="verticalSpacer_2">
200
151
     <property name="orientation">
201
152
      <enum>Qt::Vertical</enum>
202
153
     </property>
203
154
     <property name="sizeHint" stdset="0">
204
155
      <size>
205
156
       <width>20</width>
206
157
       <height>50</height>
207
158
      </size>
208
159
     </property>
209
160
    </spacer>
210
161
   </item>
211
162
  </layout>
212
163
 </widget>
213
164
 <connections/>
214
165
</ui>
215
166
0
216
=== modified file 'data/qt/current_user_sign_in.ui'
217
--- data/qt/current_user_sign_in.ui	2011-09-08 16:43:39 +0000
218
+++ data/qt/current_user_sign_in.ui	2012-03-06 15:41:36 +0000
219
@@ -1,184 +1,163 @@
404
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
405
2
<ui version="4.0">
2
<ui version="4.0">
406
3
 <class>CurrentUserSignInPage</class>
3
 <class>CurrentUserSignInPage</class>
407
4
 <widget class="QWizardPage" name="CurrentUserSignInPage">
4
 <widget class="QWizardPage" name="CurrentUserSignInPage">
408
5
  <property name="geometry">
5
  <property name="geometry">
409
6
   <rect>
6
   <rect>
410
7
    <x>0</x>
7
    <x>0</x>
411
8
    <y>0</y>
8
    <y>0</y>
412
9
    <width>399</width>
9
    <width>302</width>
413
10
    <height>309</height>
10
    <height>244</height>
414
11
   </rect>
11
   </rect>
415
12
  </property>
12
  </property>
416
13
  <property name="windowTitle">
13
  <layout class="QVBoxLayout" name="verticalLayout_2">
417
14
   <string>WizardPage</string>
14
   <property name="spacing">
418
15
  </property>
15
    <number>15</number>
419
16
  <layout class="QVBoxLayout" name="verticalLayout_4">
16
   </property>
420
17
   <property name="topMargin">
17
   <property name="margin">
421
18
    <number>0</number>
18
    <number>0</number>
422
19
   </property>
19
   </property>
423
20
   <item>
20
   <item>
424
21
    <layout class="QHBoxLayout" name="horizontalLayout_3">
21
    <layout class="QVBoxLayout" name="verticalLayout">
425
22
     <item>
22
     <property name="spacing">
426
23
      <layout class="QVBoxLayout" name="verticalLayout">
23
      <number>3</number>
427
24
       <item>
24
     </property>
428
25
        <spacer name="verticalSpacer_3">
25
     <item>
429
26
         <property name="orientation">
26
      <widget class="QLabel" name="email_label">
430
27
          <enum>Qt::Vertical</enum>
27
       <property name="text">
431
28
         </property>
28
        <string notr="true">&amp;Email</string>
432
29
         <property name="sizeHint" stdset="0">
29
       </property>
433
30
          <size>
30
       <property name="buddy">
434
31
           <width>20</width>
31
        <cstring>email_edit</cstring>
435
32
           <height>40</height>
32
       </property>
436
33
          </size>
33
      </widget>
437
34
         </property>
34
     </item>
438
35
        </spacer>
35
     <item>
439
36
       </item>
36
      <widget class="QLineEdit" name="email_edit">
440
37
       <item>
37
       <property name="minimumSize">
441
38
        <widget class="QFrame" name="_signInFrame">
38
        <size>
442
39
         <property name="frameShape">
39
         <width>300</width>
443
40
          <enum>QFrame::NoFrame</enum>
40
         <height>0</height>
444
41
         </property>
41
        </size>
445
42
         <layout class="QVBoxLayout" name="verticalLayout_3">
42
       </property>
446
43
          <item>
43
       <property name="placeholderText">
447
44
           <layout class="QVBoxLayout" name="verticalLayout_2">
44
        <string/>
448
45
            <item>
45
       </property>
449
46
             <widget class="QLabel" name="email_label">
46
      </widget>
450
47
              <property name="text">
47
     </item>
451
48
               <string>&amp;Email</string>
48
    </layout>
452
49
              </property>
49
   </item>
453
50
              <property name="buddy">
50
   <item>
454
51
               <cstring>email_edit</cstring>
51
    <layout class="QVBoxLayout" name="verticalLayout_3">
455
52
              </property>
52
     <property name="spacing">
456
53
             </widget>
53
      <number>3</number>
457
54
            </item>
54
     </property>
458
55
            <item>
55
     <item>
459
56
             <widget class="QLineEdit" name="email_edit">
56
      <widget class="QLabel" name="password_label">
460
57
              <property name="placeholderText">
57
       <property name="text">
461
58
               <string/>
58
        <string notr="true">&amp;Password</string>
462
59
              </property>
59
       </property>
463
60
             </widget>
60
       <property name="buddy">
464
61
            </item>
61
        <cstring>password_edit</cstring>
465
62
            <item>
62
       </property>
466
63
             <widget class="QLabel" name="password_label">
63
      </widget>
467
64
              <property name="text">
64
     </item>
468
65
               <string>&amp;Password</string>
65
     <item>
469
66
              </property>
66
      <widget class="QLineEdit" name="password_edit">
470
67
              <property name="buddy">
67
       <property name="minimumSize">
471
68
               <cstring>password_edit</cstring>
68
        <size>
472
69
              </property>
69
         <width>300</width>
473
70
             </widget>
70
         <height>0</height>
474
71
            </item>
71
        </size>
475
72
            <item>
72
       </property>
476
73
             <widget class="QLineEdit" name="password_edit">
73
       <property name="echoMode">
477
74
              <property name="echoMode">
74
        <enum>QLineEdit::Password</enum>
478
75
               <enum>QLineEdit::Password</enum>
75
       </property>
479
76
              </property>
76
       <property name="placeholderText">
480
77
              <property name="placeholderText">
77
        <string/>
481
78
               <string/>
78
       </property>
482
79
              </property>
79
      </widget>
483
80
             </widget>
80
     </item>
484
81
            </item>
81
    </layout>
485
82
            <item>
82
   </item>
486
83
             <widget class="QLabel" name="forgot_password_label">
83
   <item>
487
84
              <property name="sizePolicy">
84
    <widget class="QLabel" name="forgot_password_label">
488
85
               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
85
     <property name="sizePolicy">
489
86
                <horstretch>0</horstretch>
86
      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
490
87
                <verstretch>0</verstretch>
87
       <horstretch>0</horstretch>
491
88
               </sizepolicy>
88
       <verstretch>0</verstretch>
492
89
              </property>
89
      </sizepolicy>
493
90
              <property name="text">
90
     </property>
494
91
               <string>Forgot password?</string>
91
     <property name="text">
495
92
              </property>
92
      <string notr="true">Forgot password?</string>
496
93
             </widget>
93
     </property>
497
94
            </item>
94
    </widget>
498
95
            <item>
95
   </item>
499
96
             <layout class="QHBoxLayout" name="horizontalLayout_4">
96
   <item>
500
97
              <item>
97
    <layout class="QHBoxLayout" name="horizontalLayout_4">
501
98
               <spacer name="horizontalSpacer_3">
98
     <item>
502
99
                <property name="orientation">
99
      <spacer name="horizontalSpacer_3">
503
100
                 <enum>Qt::Horizontal</enum>
100
       <property name="orientation">
504
101
                </property>
101
        <enum>Qt::Horizontal</enum>
505
102
                <property name="sizeHint" stdset="0">
102
       </property>
506
103
                 <size>
103
       <property name="sizeHint" stdset="0">
507
104
                  <width>40</width>
104
        <size>
508
105
                  <height>20</height>
105
         <width>40</width>
509
106
                 </size>
106
         <height>20</height>
510
107
                </property>
107
        </size>
511
108
               </spacer>
108
       </property>
512
109
              </item>
109
      </spacer>
513
110
              <item>
110
     </item>
514
111
               <widget class="QPushButton" name="sign_in_button">
111
     <item>
515
112
                <property name="enabled">
112
      <widget class="QPushButton" name="sign_in_button">
516
113
                 <bool>false</bool>
113
       <property name="enabled">
517
114
                </property>
114
        <bool>false</bool>
518
115
                <property name="text">
115
       </property>
519
116
                 <string>Sign In</string>
116
       <property name="text">
520
117
                </property>
117
        <string notr="true">Sign In</string>
521
118
                <property name="default">
118
       </property>
522
119
                 <bool>true</bool>
119
       <property name="default">
523
120
                </property>
120
        <bool>true</bool>
524
121
               </widget>
121
       </property>
525
122
              </item>
122
      </widget>
526
123
             </layout>
123
     </item>
527
124
            </item>
124
    </layout>
528
125
           </layout>
125
   </item>
529
126
          </item>
126
   <item>
530
127
         </layout>
127
    <spacer name="verticalSpacer">
531
128
        </widget>
128
     <property name="orientation">
532
129
       </item>
129
      <enum>Qt::Vertical</enum>
533
130
       <item>
130
     </property>
534
131
        <spacer name="verticalSpacer_2">
131
     <property name="sizeHint" stdset="0">
535
132
         <property name="orientation">
132
      <size>
536
133
          <enum>Qt::Vertical</enum>
133
       <width>20</width>
537
134
         </property>
134
       <height>40</height>
538
135
         <property name="sizeHint" stdset="0">
135
      </size>
539
136
          <size>
136
     </property>
540
137
           <width>20</width>
137
    </spacer>
541
138
           <height>40</height>
138
   </item>
542
139
          </size>
139
  </layout>
543
140
         </property>
140
  <zorder>verticalSpacer</zorder>
544
141
        </spacer>
141
  <zorder>forgot_password_label</zorder>
545
142
       </item>
142
  <zorder></zorder>
546
143
      </layout>
143
 </widget>
547
144
     </item>
144
 <resources/>
548
145
     <item>
145
 <connections>
549
146
      <spacer name="horizontalSpacer">
146
  <connection>
550
147
       <property name="orientation">
147
   <sender>password_edit</sender>
551
148
        <enum>Qt::Horizontal</enum>
148
   <signal>returnPressed()</signal>
552
149
       </property>
149
   <receiver>sign_in_button</receiver>
553
150
       <property name="sizeType">
150
   <slot>click()</slot>
554
151
        <enum>QSizePolicy::Fixed</enum>
151
   <hints>
555
152
       </property>
152
    <hint type="sourcelabel">
556
153
       <property name="sizeHint" stdset="0">
153
     <x>199</x>
557
154
        <size>
154
     <y>160</y>
558
155
         <width>40</width>
155
    </hint>
559
156
         <height>20</height>
156
    <hint type="destinationlabel">
560
157
        </size>
157
     <x>288</x>
561
158
       </property>
158
     <y>217</y>
562
159
      </spacer>
159
    </hint>
563
160
     </item>
160
   </hints>
564
161
    </layout>
161
  </connection>
565
162
   </item>
162
 </connections>
566
163
  </layout>
163
</ui>
383
164
 </widget>
384
165
 <resources/>
385
166
 <connections>
386
167
  <connection>
387
168
   <sender>password_edit</sender>
388
169
   <signal>returnPressed()</signal>
389
170
   <receiver>sign_in_button</receiver>
390
171
   <slot>click()</slot>
391
172
   <hints>
392
173
    <hint type="sourcelabel">
393
174
     <x>199</x>
394
175
     <y>160</y>
395
176
    </hint>
396
177
    <hint type="destinationlabel">
397
178
     <x>288</x>
398
179
     <y>217</y>
399
180
    </hint>
400
181
   </hints>
401
182
  </connection>
402
183
 </connections>
403
184
</ui>
567
185
164
568
=== modified file 'data/qt/email_verification.ui'
569
--- data/qt/email_verification.ui	2011-09-08 16:43:39 +0000
570
+++ data/qt/email_verification.ui	2012-03-06 15:41:36 +0000
571
@@ -1,116 +1,105 @@
688
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
689
2
<ui version="4.0">
2
<ui version="4.0">
690
3
 <class>EmailVerificationPage</class>
3
 <class>EmailVerificationPage</class>
691
4
 <widget class="QWizardPage" name="EmailVerificationPage">
4
 <widget class="QWizardPage" name="EmailVerificationPage">
692
5
  <property name="geometry">
5
  <property name="geometry">
693
6
   <rect>
6
   <rect>
694
7
    <x>0</x>
7
    <x>0</x>
695
8
    <y>0</y>
8
    <y>0</y>
696
9
    <width>400</width>
9
    <width>300</width>
697
10
    <height>300</height>
10
    <height>148</height>
698
11
   </rect>
11
   </rect>
699
12
  </property>
12
  </property>
700
13
  <property name="windowTitle">
13
  <property name="minimumSize">
701
14
   <string>WizardPage</string>
14
   <size>
702
15
  </property>
15
    <width>300</width>
703
16
  <layout class="QVBoxLayout" name="verticalLayout_2">
16
    <height>0</height>
704
17
   <property name="topMargin">
17
   </size>
705
18
    <number>0</number>
18
  </property>
706
19
   </property>
19
  <layout class="QVBoxLayout" name="verticalLayout_2">
707
20
   <item>
20
   <property name="spacing">
708
21
    <layout class="QHBoxLayout" name="horizontalLayout_3">
21
    <number>15</number>
709
22
     <item>
22
   </property>
710
23
      <layout class="QVBoxLayout" name="verticalLayout">
23
   <property name="margin">
711
24
       <item>
24
    <number>0</number>
712
25
        <widget class="QLabel" name="label">
25
   </property>
713
26
         <property name="text">
26
   <item>
714
27
          <string>Verification code</string>
27
    <layout class="QVBoxLayout" name="verticalLayout">
715
28
         </property>
28
     <property name="spacing">
716
29
        </widget>
29
      <number>3</number>
717
30
       </item>
30
     </property>
718
31
       <item>
31
     <item>
719
32
        <widget class="QLineEdit" name="verification_code_edit">
32
      <widget class="QLabel" name="label">
720
33
         <property name="placeholderText">
33
       <property name="text">
721
34
          <string/>
34
        <string notr="true">Verification code</string>
722
35
         </property>
35
       </property>
723
36
        </widget>
36
      </widget>
724
37
       </item>
37
     </item>
725
38
       <item>
38
     <item>
726
39
        <layout class="QHBoxLayout" name="horizontalLayout_2">
39
      <widget class="QLineEdit" name="verification_code_edit">
727
40
         <item>
40
       <property name="placeholderText">
728
41
          <spacer name="horizontalSpacer_3">
41
        <string/>
729
42
           <property name="orientation">
42
       </property>
730
43
            <enum>Qt::Horizontal</enum>
43
      </widget>
731
44
           </property>
44
     </item>
732
45
           <property name="sizeHint" stdset="0">
45
    </layout>
733
46
            <size>
46
   </item>
734
47
             <width>40</width>
47
   <item>
735
48
             <height>20</height>
48
    <layout class="QHBoxLayout" name="horizontalLayout_2">
736
49
            </size>
49
     <item>
737
50
           </property>
50
      <spacer name="horizontalSpacer_3">
738
51
          </spacer>
51
       <property name="orientation">
739
52
         </item>
52
        <enum>Qt::Horizontal</enum>
740
53
         <item>
53
       </property>
741
54
          <widget class="QPushButton" name="next_button">
54
       <property name="sizeHint" stdset="0">
742
55
           <property name="text">
55
        <size>
743
56
            <string>Next</string>
56
         <width>40</width>
744
57
           </property>
57
         <height>20</height>
745
58
          </widget>
58
        </size>
746
59
         </item>
59
       </property>
747
60
        </layout>
60
      </spacer>
748
61
       </item>
61
     </item>
749
62
       <item>
62
     <item>
750
63
        <spacer name="verticalSpacer_2">
63
      <widget class="QPushButton" name="next_button">
751
64
         <property name="orientation">
64
       <property name="text">
752
65
          <enum>Qt::Vertical</enum>
65
        <string notr="true">Next</string>
753
66
         </property>
66
       </property>
754
67
         <property name="sizeHint" stdset="0">
67
      </widget>
755
68
          <size>
68
     </item>
756
69
           <width>20</width>
69
    </layout>
757
70
           <height>40</height>
70
   </item>
758
71
          </size>
71
   <item>
759
72
         </property>
72
    <spacer name="verticalSpacer_2">
760
73
        </spacer>
73
     <property name="orientation">
761
74
       </item>
74
      <enum>Qt::Vertical</enum>
762
75
      </layout>
75
     </property>
763
76
     </item>
76
     <property name="sizeHint" stdset="0">
764
77
     <item>
77
      <size>
765
78
      <spacer name="horizontalSpacer">
78
       <width>20</width>
766
79
       <property name="orientation">
79
       <height>40</height>
767
80
        <enum>Qt::Horizontal</enum>
80
      </size>
768
81
       </property>
81
     </property>
769
82
       <property name="sizeType">
82
    </spacer>
770
83
        <enum>QSizePolicy::Fixed</enum>
83
   </item>
771
84
       </property>
84
  </layout>
772
85
       <property name="sizeHint" stdset="0">
85
 </widget>
773
86
        <size>
86
 <resources/>
774
87
         <width>40</width>
87
 <connections>
775
88
         <height>20</height>
88
  <connection>
776
89
        </size>
89
   <sender>verification_code_edit</sender>
777
90
       </property>
90
   <signal>returnPressed()</signal>
778
91
      </spacer>
91
   <receiver>next_button</receiver>
779
92
     </item>
92
   <slot>click()</slot>
780
93
    </layout>
93
   <hints>
781
94
   </item>
94
    <hint type="sourcelabel">
782
95
  </layout>
95
     <x>199</x>
783
96
 </widget>
96
     <y>15</y>
784
97
 <resources/>
97
    </hint>
785
98
 <connections>
98
    <hint type="destinationlabel">
786
99
  <connection>
99
     <x>299</x>
787
100
   <sender>verification_code_edit</sender>
100
     <y>49</y>
788
101
   <signal>returnPressed()</signal>
101
    </hint>
789
102
   <receiver>next_button</receiver>
102
   </hints>
790
103
   <slot>click()</slot>
103
  </connection>
791
104
   <hints>
104
 </connections>
792
105
    <hint type="sourcelabel">
105
</ui>
677
106
     <x>199</x>
678
107
     <y>15</y>
679
108
    </hint>
680
109
    <hint type="destinationlabel">
681
110
     <x>299</x>
682
111
     <y>49</y>
683
112
    </hint>
684
113
   </hints>
685
114
  </connection>
686
115
 </connections>
687
116
</ui>
793
117
106
794
=== modified file 'data/qt/error_message.ui'
795
--- data/qt/error_message.ui	2011-08-04 15:25:42 +0000
796
+++ data/qt/error_message.ui	2012-03-06 15:41:36 +0000
797
@@ -1,31 +1,28 @@
829
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
830
2
<ui version="4.0">
2
<ui version="4.0">
831
3
 <class>ErrorPage</class>
3
 <class>ErrorPage</class>
832
4
 <widget class="QWizardPage" name="ErrorPage">
4
 <widget class="QWizardPage" name="ErrorPage">
833
5
  <property name="geometry">
5
  <property name="geometry">
834
6
   <rect>
6
   <rect>
835
7
    <x>0</x>
7
    <x>0</x>
836
8
    <y>0</y>
8
    <y>0</y>
837
9
    <width>400</width>
9
    <width>400</width>
838
10
    <height>300</height>
10
    <height>300</height>
839
11
   </rect>
11
   </rect>
840
12
  </property>
12
  </property>
841
13
  <property name="windowTitle">
13
  <layout class="QVBoxLayout" name="verticalLayout">
842
14
   <string>WizardPage</string>
14
   <item>
843
15
  </property>
15
    <widget class="QLabel" name="error_message_label">
844
16
  <layout class="QVBoxLayout" name="verticalLayout">
16
     <property name="text">
845
17
   <item>
17
      <string notr="true">TextLabel</string>
846
18
    <widget class="QLabel" name="error_message_label">
18
     </property>
847
19
     <property name="text">
19
     <property name="alignment">
848
20
      <string>TextLabel</string>
20
      <set>Qt::AlignCenter</set>
849
21
     </property>
21
     </property>
850
22
     <property name="alignment">
22
    </widget>
851
23
      <set>Qt::AlignCenter</set>
23
   </item>
852
24
     </property>
24
  </layout>
853
25
    </widget>
25
 </widget>
854
26
   </item>
26
 <resources/>
855
27
  </layout>
27
 <connections/>
856
28
 </widget>
28
</ui>
826
29
 <resources/>
827
30
 <connections/>
828
31
</ui>
857
32
29
858
=== modified file 'data/qt/forgotten_password.ui'
859
--- data/qt/forgotten_password.ui	2011-09-21 16:59:40 +0000
860
+++ data/qt/forgotten_password.ui	2012-03-06 15:41:36 +0000
861
@@ -1,188 +1,111 @@
1050
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
1051
2
<ui version="4.0">
2
<ui version="4.0">
1052
3
 <class>ForgottenPasswordPage</class>
3
 <class>ForgottenPasswordPage</class>
1053
4
 <widget class="QWizardPage" name="ForgottenPasswordPage">
4
 <widget class="QWizardPage" name="ForgottenPasswordPage">
1054
5
  <property name="geometry">
5
  <property name="geometry">
1055
6
   <rect>
6
   <rect>
1056
7
    <x>0</x>
7
    <x>0</x>
1057
8
    <y>0</y>
8
    <y>0</y>
1058
9
    <width>446</width>
9
    <width>148</width>
1059
10
    <height>317</height>
10
    <height>148</height>
1060
11
   </rect>
11
   </rect>
1061
12
  </property>
12
  </property>
1062
13
  <property name="windowTitle">
13
  <layout class="QVBoxLayout" name="verticalLayout_2">
1063
14
   <string>WizardPage</string>
14
   <property name="spacing">
1064
15
  </property>
15
    <number>15</number>
1065
16
  <layout class="QVBoxLayout" name="verticalLayout_2">
16
   </property>
1066
17
   <property name="topMargin">
17
   <property name="margin">
1067
18
    <number>0</number>
18
    <number>0</number>
1068
19
   </property>
19
   </property>
1069
20
   <item>
20
   <item>
1070
21
    <widget class="QLabel" name="forgotted_password_intro_label">
21
    <layout class="QVBoxLayout" name="verticalLayout">
1071
22
     <property name="text">
22
     <property name="spacing">
1072
23
      <string/>
23
      <number>3</number>
1073
24
     </property>
24
     </property>
1074
25
     <property name="wordWrap">
25
     <item>
1075
26
      <bool>true</bool>
26
      <widget class="QLabel" name="email_address_label">
1076
27
     </property>
27
       <property name="sizePolicy">
1077
28
    </widget>
28
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1078
29
   </item>
29
         <horstretch>0</horstretch>
1079
30
   <item>
30
         <verstretch>0</verstretch>
1080
31
    <widget class="QWidget" name="email_widget" native="true">
31
        </sizepolicy>
1081
32
     <layout class="QHBoxLayout" name="horizontalLayout_2">
32
       </property>
1082
33
      <item>
33
       <property name="text">
1083
34
       <layout class="QVBoxLayout" name="verticalLayout">
34
        <string notr="true"/>
1084
35
        <item>
35
       </property>
1085
36
         <widget class="QLabel" name="email_address_label">
36
      </widget>
1086
37
          <property name="sizePolicy">
37
     </item>
1087
38
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
38
     <item>
1088
39
            <horstretch>0</horstretch>
39
      <widget class="QLineEdit" name="email_line_edit">
1089
40
            <verstretch>0</verstretch>
40
       <property name="minimumSize">
1090
41
           </sizepolicy>
41
        <size>
1091
42
          </property>
42
         <width>300</width>
1092
43
          <property name="text">
43
         <height>0</height>
1093
44
           <string/>
44
        </size>
1094
45
          </property>
45
       </property>
1095
46
         </widget>
46
      </widget>
1096
47
        </item>
47
     </item>
1097
48
        <item>
48
    </layout>
1098
49
         <widget class="QLineEdit" name="email_line_edit"/>
49
   </item>
1099
50
        </item>
50
   <item>
1100
51
       </layout>
51
    <layout class="QHBoxLayout" name="horizontalLayout">
1101
52
      </item>
52
     <item>
1102
53
      <item>
53
      <spacer name="horizontalSpacer">
1103
54
       <spacer name="horizontalSpacer_3">
54
       <property name="orientation">
1104
55
        <property name="orientation">
55
        <enum>Qt::Horizontal</enum>
1105
56
         <enum>Qt::Horizontal</enum>
56
       </property>
1106
57
        </property>
57
       <property name="sizeHint" stdset="0">
1107
58
        <property name="sizeType">
58
        <size>
1108
59
         <enum>QSizePolicy::Fixed</enum>
59
         <width>40</width>
1109
60
        </property>
60
         <height>20</height>
1110
61
        <property name="sizeHint" stdset="0">
61
        </size>
1111
62
         <size>
62
       </property>
1112
63
          <width>40</width>
63
      </spacer>
1113
64
          <height>20</height>
64
     </item>
1114
65
         </size>
65
     <item>
1115
66
        </property>
66
      <widget class="QPushButton" name="send_button">
1116
67
       </spacer>
67
       <property name="enabled">
1117
68
      </item>
68
        <bool>false</bool>
1118
69
     </layout>
69
       </property>
1119
70
    </widget>
70
       <property name="text">
1120
71
   </item>
71
        <string notr="true"/>
1121
72
   <item>
72
       </property>
1122
73
    <layout class="QHBoxLayout" name="horizontalLayout">
73
      </widget>
1123
74
     <item>
74
     </item>
1124
75
      <spacer name="horizontalSpacer">
75
    </layout>
1125
76
       <property name="orientation">
76
   </item>
1126
77
        <enum>Qt::Horizontal</enum>
77
   <item>
1127
78
       </property>
78
    <spacer name="verticalSpacer">
1128
79
       <property name="sizeHint" stdset="0">
79
     <property name="orientation">
1129
80
        <size>
80
      <enum>Qt::Vertical</enum>
1130
81
         <width>40</width>
81
     </property>
1131
82
         <height>20</height>
82
     <property name="sizeHint" stdset="0">
1132
83
        </size>
83
      <size>
1133
84
       </property>
84
       <width>20</width>
1134
85
      </spacer>
85
       <height>40</height>
1135
86
     </item>
86
      </size>
1136
87
     <item>
87
     </property>
1137
88
      <widget class="QPushButton" name="send_button">
88
    </spacer>
1138
89
       <property name="enabled">
89
   </item>
1139
90
        <bool>false</bool>
90
  </layout>
1140
91
       </property>
91
 </widget>
1141
92
       <property name="text">
92
 <resources/>
1142
93
        <string/>
93
 <connections>
1143
94
       </property>
94
  <connection>
1144
95
      </widget>
95
   <sender>email_line_edit</sender>
1145
96
     </item>
96
   <signal>returnPressed()</signal>
1146
97
     <item>
97
   <receiver>send_button</receiver>
1147
98
      <spacer name="horizontalSpacer_4">
98
   <slot>click()</slot>
1148
99
       <property name="orientation">
99
   <hints>
1149
100
        <enum>Qt::Horizontal</enum>
100
    <hint type="sourcelabel">
1150
101
       </property>
101
     <x>222</x>
1151
102
       <property name="sizeType">
102
     <y>92</y>
1152
103
        <enum>QSizePolicy::Fixed</enum>
103
    </hint>
1153
104
       </property>
104
    <hint type="destinationlabel">
1154
105
       <property name="sizeHint" stdset="0">
105
     <x>362</x>
1155
106
        <size>
106
     <y>136</y>
1156
107
         <width>40</width>
107
    </hint>
1157
108
         <height>20</height>
108
   </hints>
1158
109
        </size>
109
  </connection>
1159
110
       </property>
110
 </connections>
1160
111
      </spacer>
111
</ui>
973
112
     </item>
974
113
    </layout>
975
114
   </item>
976
115
   <item>
977
116
    <widget class="QWidget" name="try_again_widget" native="true">
978
117
     <layout class="QHBoxLayout" name="horizontalLayout_3">
979
118
      <item>
980
119
       <spacer name="horizontalSpacer_5">
981
120
        <property name="orientation">
982
121
         <enum>Qt::Horizontal</enum>
983
122
        </property>
984
123
        <property name="sizeHint" stdset="0">
985
124
         <size>
986
125
          <width>40</width>
987
126
          <height>20</height>
988
127
         </size>
989
128
        </property>
990
129
       </spacer>
991
130
      </item>
992
131
      <item>
993
132
       <widget class="QPushButton" name="try_again_button">
994
133
        <property name="text">
995
134
         <string/>
996
135
        </property>
997
136
       </widget>
998
137
      </item>
999
138
      <item>
1000
139
       <spacer name="horizontalSpacer_6">
1001
140
        <property name="orientation">
1002
141
         <enum>Qt::Horizontal</enum>
1003
142
        </property>
1004
143
        <property name="sizeHint" stdset="0">
1005
144
         <size>
1006
145
          <width>40</width>
1007
146
          <height>20</height>
1008
147
         </size>
1009
148
        </property>
1010
149
       </spacer>
1011
150
      </item>
1012
151
     </layout>
1013
152
    </widget>
1014
153
   </item>
1015
154
   <item>
1016
155
    <spacer name="verticalSpacer">
1017
156
     <property name="orientation">
1018
157
      <enum>Qt::Vertical</enum>
1019
158
     </property>
1020
159
     <property name="sizeHint" stdset="0">
1021
160
      <size>
1022
161
       <width>20</width>
1023
162
       <height>40</height>
1024
163
      </size>
1025
164
     </property>
1026
165
    </spacer>
1027
166
   </item>
1028
167
  </layout>
1029
168
 </widget>
1030
169
 <resources/>
1031
170
 <connections>
1032
171
  <connection>
1033
172
   <sender>email_line_edit</sender>
1034
173
   <signal>returnPressed()</signal>
1035
174
   <receiver>send_button</receiver>
1036
175
   <slot>click()</slot>
1037
176
   <hints>
1038
177
    <hint type="sourcelabel">
1039
178
     <x>222</x>
1040
179
     <y>92</y>
1041
180
    </hint>
1042
181
    <hint type="destinationlabel">
1043
182
     <x>362</x>
1044
183
     <y>136</y>
1045
184
    </hint>
1046
185
   </hints>
1047
186
  </connection>
1048
187
 </connections>
1049
188
</ui>
1161
189
112
1162
=== modified file 'data/qt/loadingoverlay.ui'
1163
--- data/qt/loadingoverlay.ui	2012-02-03 13:54:29 +0000
1164
+++ data/qt/loadingoverlay.ui	2012-03-06 15:41:36 +0000
1165
@@ -6,13 +6,10 @@
1166
6
   <rect>
6
   <rect>
1167
7
    <x>0</x>
7
    <x>0</x>
1168
8
    <y>0</y>
8
    <y>0</y>
1171
9
    <width>702</width>
9
    <width>433</width>
1172
10
    <height>230</height>
10
    <height>169</height>
1173
11
   </rect>
11
   </rect>
1174
12
  </property>
12
  </property>
1175
13
  <property name="windowTitle">
1176
14
   <string>Frame</string>
1177
15
  </property>
1178
16
  <layout class="QVBoxLayout" name="verticalLayout">
13
  <layout class="QVBoxLayout" name="verticalLayout">
1179
17
   <property name="topMargin">
14
   <property name="topMargin">
1180
18
    <number>30</number>
15
    <number>30</number>
1181
@@ -61,7 +58,7 @@
1182
61
           </font>
58
           </font>
1183
62
          </property>
59
          </property>
1184
63
          <property name="text">
60
          <property name="text">
1186
64
           <string>Getting information, please wait...</string>
61
           <string notr="true">Getting information, please wait...</string>
1187
65
          </property>
62
          </property>
1188
66
         </widget>
63
         </widget>
1189
67
        </item>
64
        </item>
1190
68
65
1191
=== modified file 'data/qt/network_detection.ui'
1192
--- data/qt/network_detection.ui	2012-02-13 20:27:48 +0000
1193
+++ data/qt/network_detection.ui	2012-03-06 15:41:36 +0000
1194
@@ -1,142 +1,139 @@
1337
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
1338
2
<ui version="4.0">
2
<ui version="4.0">
1339
3
 <class>Form</class>
3
 <class>Form</class>
1340
4
 <widget class="QWizardPage" name="Form">
4
 <widget class="QWizardPage" name="Form">
1341
5
  <property name="geometry">
5
  <property name="geometry">
1342
6
   <rect>
6
   <rect>
1343
7
    <x>0</x>
7
    <x>0</x>
1344
8
    <y>0</y>
8
    <y>0</y>
1345
9
    <width>541</width>
9
    <width>512</width>
1346
10
    <height>365</height>
10
    <height>334</height>
1347
11
   </rect>
11
   </rect>
1348
12
  </property>
12
  </property>
1349
13
  <property name="windowTitle">
13
  <layout class="QVBoxLayout" name="verticalLayout">
1350
14
   <string>WizardPage</string>
14
   <item>
1351
15
  </property>
15
    <layout class="QHBoxLayout" name="horizontalLayout_2">
1352
16
  <layout class="QVBoxLayout" name="verticalLayout">
16
     <item>
1353
17
   <item>
17
      <spacer name="horizontalSpacer_3">
1354
18
    <layout class="QHBoxLayout" name="horizontalLayout_2">
18
       <property name="orientation">
1355
19
     <item>
19
        <enum>Qt::Horizontal</enum>
1356
20
      <spacer name="horizontalSpacer_3">
20
       </property>
1357
21
       <property name="orientation">
21
       <property name="sizeHint" stdset="0">
1358
22
        <enum>Qt::Horizontal</enum>
22
        <size>
1359
23
       </property>
23
         <width>40</width>
1360
24
       <property name="sizeHint" stdset="0">
24
         <height>20</height>
1361
25
        <size>
25
        </size>
1362
26
         <width>40</width>
26
       </property>
1363
27
         <height>20</height>
27
      </spacer>
1364
28
        </size>
28
     </item>
1365
29
       </property>
29
     <item>
1366
30
      </spacer>
30
      <widget class="QLabel" name="image_label">
1367
31
     </item>
31
       <property name="sizePolicy">
1368
32
     <item>
32
        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
1369
33
      <widget class="QLabel" name="image_label">
33
         <horstretch>0</horstretch>
1370
34
       <property name="sizePolicy">
34
         <verstretch>0</verstretch>
1371
35
        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
35
        </sizepolicy>
1372
36
         <horstretch>0</horstretch>
36
       </property>
1373
37
         <verstretch>0</verstretch>
37
       <property name="minimumSize">
1374
38
        </sizepolicy>
38
        <size>
1375
39
       </property>
39
         <width>400</width>
1376
40
       <property name="minimumSize">
40
         <height>150</height>
1377
41
        <size>
41
        </size>
1378
42
         <width>400</width>
42
       </property>
1379
43
         <height>150</height>
43
       <property name="text">
1380
44
        </size>
44
        <string/>
1381
45
       </property>
45
       </property>
1382
46
       <property name="text">
46
       <property name="textFormat">
1383
47
        <string/>
47
        <enum>Qt::PlainText</enum>
1384
48
       </property>
48
       </property>
1385
49
       <property name="textFormat">
49
       <property name="alignment">
1386
50
        <enum>Qt::PlainText</enum>
50
        <set>Qt::AlignCenter</set>
1387
51
       </property>
51
       </property>
1388
52
       <property name="alignment">
52
       <property name="wordWrap">
1389
53
        <set>Qt::AlignCenter</set>
53
        <bool>true</bool>
1390
54
       </property>
54
       </property>
1391
55
       <property name="wordWrap">
55
      </widget>
1392
56
        <bool>true</bool>
56
     </item>
1393
57
       </property>
57
     <item>
1394
58
      </widget>
58
      <spacer name="horizontalSpacer_4">
1395
59
     </item>
59
       <property name="orientation">
1396
60
     <item>
60
        <enum>Qt::Horizontal</enum>
1397
61
      <spacer name="horizontalSpacer_4">
61
       </property>
1398
62
       <property name="orientation">
62
       <property name="sizeHint" stdset="0">
1399
63
        <enum>Qt::Horizontal</enum>
63
        <size>
1400
64
       </property>
64
         <width>40</width>
1401
65
       <property name="sizeHint" stdset="0">
65
         <height>20</height>
1402
66
        <size>
66
        </size>
1403
67
         <width>40</width>
67
       </property>
1404
68
         <height>20</height>
68
      </spacer>
1405
69
        </size>
69
     </item>
1406
70
       </property>
70
    </layout>
1407
71
      </spacer>
71
   </item>
1408
72
     </item>
72
   <item>
1409
73
    </layout>
73
    <widget class="QLabel" name="message_label">
1410
74
   </item>
74
     <property name="alignment">
1411
75
   <item>
75
      <set>Qt::AlignCenter</set>
1412
76
    <widget class="QLabel" name="message_label">
76
     </property>
1413
77
     <property name="alignment">
77
    </widget>
1414
78
      <set>Qt::AlignCenter</set>
78
   </item>
1415
79
     </property>
79
   <item>
1416
80
    </widget>
80
    <layout class="QHBoxLayout" name="horizontalLayout">
1417
81
   </item>
81
     <item>
1418
82
   <item>
82
      <spacer name="horizontalSpacer">
1419
83
    <layout class="QHBoxLayout" name="horizontalLayout">
83
       <property name="orientation">
1420
84
     <item>
84
        <enum>Qt::Horizontal</enum>
1421
85
      <spacer name="horizontalSpacer">
85
       </property>
1422
86
       <property name="orientation">
86
       <property name="sizeHint" stdset="0">
1423
87
        <enum>Qt::Horizontal</enum>
87
        <size>
1424
88
       </property>
88
         <width>40</width>
1425
89
       <property name="sizeHint" stdset="0">
89
         <height>20</height>
1426
90
        <size>
90
        </size>
1427
91
         <width>40</width>
91
       </property>
1428
92
         <height>20</height>
92
      </spacer>
1429
93
        </size>
93
     </item>
1430
94
       </property>
94
     <item>
1431
95
      </spacer>
95
      <widget class="QLabel" name="label">
1432
96
     </item>
96
       <property name="text">
1433
97
     <item>
97
        <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>
1434
98
      <widget class="QLabel" name="label">
98
       </property>
1435
99
       <property name="text">
99
       <property name="textFormat">
1436
100
        <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>
100
        <enum>Qt::PlainText</enum>
1437
101
       </property>
101
       </property>
1438
102
       <property name="textFormat">
102
       <property name="wordWrap">
1439
103
        <enum>Qt::PlainText</enum>
103
        <bool>true</bool>
1440
104
       </property>
104
       </property>
1441
105
       <property name="wordWrap">
105
      </widget>
1442
106
        <bool>true</bool>
106
     </item>
1443
107
       </property>
107
     <item>
1444
108
      </widget>
108
      <spacer name="horizontalSpacer_2">
1445
109
     </item>
109
       <property name="orientation">
1446
110
     <item>
110
        <enum>Qt::Horizontal</enum>
1447
111
      <spacer name="horizontalSpacer_2">
111
       </property>
1448
112
       <property name="orientation">
112
       <property name="sizeHint" stdset="0">
1449
113
        <enum>Qt::Horizontal</enum>
113
        <size>
1450
114
       </property>
114
         <width>40</width>
1451
115
       <property name="sizeHint" stdset="0">
115
         <height>20</height>
1452
116
        <size>
116
        </size>
1453
117
         <width>40</width>
117
       </property>
1454
118
         <height>20</height>
118
      </spacer>
1455
119
        </size>
119
     </item>
1456
120
       </property>
120
    </layout>
1457
121
      </spacer>
121
   </item>
1458
122
     </item>
122
   <item>
1459
123
    </layout>
123
    <spacer name="verticalSpacer">
1460
124
   </item>
124
     <property name="orientation">
1461
125
   <item>
125
      <enum>Qt::Vertical</enum>
1462
126
    <spacer name="verticalSpacer">
126
     </property>
1463
127
     <property name="orientation">
127
     <property name="sizeHint" stdset="0">
1464
128
      <enum>Qt::Vertical</enum>
128
      <size>
1465
129
     </property>
129
       <width>20</width>
1466
130
     <property name="sizeHint" stdset="0">
130
       <height>76</height>
1467
131
      <size>
131
      </size>
1468
132
       <width>20</width>
132
     </property>
1469
133
       <height>76</height>
133
    </spacer>
1470
134
      </size>
134
   </item>
1471
135
     </property>
135
  </layout>
1472
136
    </spacer>
136
 </widget>
1473
137
   </item>
137
 <resources/>
1474
138
  </layout>
138
 <connections/>
1475
139
 </widget>
139
</ui>
1334
140
 <resources/>
1335
141
 <connections/>
1336
142
</ui>
1476
143
140
1477
=== modified file 'data/qt/proxy_credentials_dialog.ui'
1478
--- data/qt/proxy_credentials_dialog.ui	2012-02-08 20:28:04 +0000
1479
+++ data/qt/proxy_credentials_dialog.ui	2012-03-06 15:41:36 +0000
1480
@@ -10,7 +10,7 @@
1481
10
    <x>0</x>
10
    <x>0</x>
1482
11
    <y>0</y>
11
    <y>0</y>
1483
12
    <width>550</width>
12
    <width>550</width>
1485
13
    <height>364</height>
13
    <height>373</height>
1486
14
   </rect>
14
   </rect>
1487
15
  </property>
15
  </property>
1488
16
  <property name="sizePolicy">
16
  <property name="sizePolicy">
1489
@@ -21,13 +21,10 @@
1490
21
  </property>
21
  </property>
1491
22
  <property name="minimumSize">
22
  <property name="minimumSize">
1492
23
   <size>
23
   <size>
1494
24
    <width>502</width>
24
    <width>550</width>
1495
25
    <height>0</height>
25
    <height>0</height>
1496
26
   </size>
26
   </size>
1497
27
  </property>
27
  </property>
1498
28
  <property name="windowTitle">
1499
29
   <string>Add proxy settings</string>
1500
30
  </property>
1501
31
  <property name="sizeGripEnabled">
28
  <property name="sizeGripEnabled">
1502
32
   <bool>false</bool>
29
   <bool>false</bool>
1503
33
  </property>
30
  </property>
1504
@@ -74,7 +71,7 @@
1505
74
            </size>
71
            </size>
1506
75
           </property>
72
           </property>
1507
76
           <property name="text">
73
           <property name="text">
1509
77
            <string>TextLabel</string>
74
            <string notr="true">TextLabel</string>
1510
78
           </property>
75
           </property>
1511
79
          </widget>
76
          </widget>
1512
80
         </item>
77
         </item>
1513
@@ -122,7 +119,7 @@
1514
122
              </font>
119
              </font>
1515
123
             </property>
120
             </property>
1516
124
             <property name="text">
121
             <property name="text">
1518
125
              <string>You are connection through a proxy.</string>
122
              <string notr="true">You are connection through a proxy.</string>
1519
126
             </property>
123
             </property>
1520
127
             <property name="wordWrap">
124
             <property name="wordWrap">
1521
128
              <bool>true</bool>
125
              <bool>true</bool>
1522
@@ -132,7 +129,7 @@
1523
132
           <item>
129
           <item>
1524
133
            <widget class="QLabel" name="explanation_label">
130
            <widget class="QLabel" name="explanation_label">
1525
134
             <property name="text">
131
             <property name="text">
1527
135
              <string>Please provide the login details below, or check your system settings</string>
132
              <string notr="true">Please provide the login details below, or check your system settings</string>
1528
136
             </property>
133
             </property>
1529
137
             <property name="wordWrap">
134
             <property name="wordWrap">
1530
138
              <bool>true</bool>
135
              <bool>true</bool>
1531
@@ -162,7 +159,7 @@
1532
162
               </sizepolicy>
159
               </sizepolicy>
1533
163
              </property>
160
              </property>
1534
164
              <property name="text">
161
              <property name="text">
1536
165
               <string>Connecting to:</string>
162
               <string notr="true">Connecting to:</string>
1537
166
              </property>
163
              </property>
1538
167
              <property name="alignment">
164
              <property name="alignment">
1539
168
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
165
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1540
@@ -179,7 +176,7 @@
1541
179
            <item row="4" column="0">
176
            <item row="4" column="0">
1542
180
             <widget class="QLabel" name="username_label">
177
             <widget class="QLabel" name="username_label">
1543
181
              <property name="text">
178
              <property name="text">
1545
182
               <string>Proxy username:</string>
179
               <string notr="true">Proxy username:</string>
1546
183
              </property>
180
              </property>
1547
184
              <property name="alignment">
181
              <property name="alignment">
1548
185
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
182
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1549
@@ -196,7 +193,7 @@
1550
196
            <item row="5" column="0">
193
            <item row="5" column="0">
1551
197
             <widget class="QLabel" name="password_label">
194
             <widget class="QLabel" name="password_label">
1552
198
              <property name="text">
195
              <property name="text">
1554
199
               <string>Proxy password:</string>
196
               <string notr="true">Proxy password:</string>
1555
200
              </property>
197
              </property>
1556
201
              <property name="alignment">
198
              <property name="alignment">
1557
202
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
199
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1558
@@ -229,7 +226,7 @@
1559
229
            <item row="2" column="0" colspan="2">
226
            <item row="2" column="0" colspan="2">
1560
230
             <widget class="QLabel" name="error_label">
227
             <widget class="QLabel" name="error_label">
1561
231
              <property name="text">
228
              <property name="text">
1563
232
               <string>TextLabel</string>
229
               <string notr="true">TextLabel</string>
1564
233
              </property>
230
              </property>
1565
234
              <property name="wordWrap">
231
              <property name="wordWrap">
1566
235
               <bool>false</bool>
232
               <bool>false</bool>
1567
@@ -264,7 +261,7 @@
1568
264
       <item>
261
       <item>
1569
265
        <widget class="QPushButton" name="help_button">
262
        <widget class="QPushButton" name="help_button">
1570
266
         <property name="text">
263
         <property name="text">
1572
267
          <string>Get Help With Proxies</string>
264
          <string notr="true">Get Help With Proxies</string>
1573
268
         </property>
265
         </property>
1574
269
        </widget>
266
        </widget>
1575
270
       </item>
267
       </item>
1576
@@ -284,14 +281,14 @@
1577
284
       <item>
281
       <item>
1578
285
        <widget class="QPushButton" name="cancel_button">
282
        <widget class="QPushButton" name="cancel_button">
1579
286
         <property name="text">
283
         <property name="text">
1581
287
          <string>Cancel and Close</string>
284
          <string notr="true">Cancel and Close</string>
1582
288
         </property>
285
         </property>
1583
289
        </widget>
286
        </widget>
1584
290
       </item>
287
       </item>
1585
291
       <item>
288
       <item>
1586
292
        <widget class="QPushButton" name="save_button">
289
        <widget class="QPushButton" name="save_button">
1587
293
         <property name="text">
290
         <property name="text">
1589
294
          <string>Save</string>
291
          <string notr="true">Save</string>
1590
295
         </property>
292
         </property>
1591
296
         <property name="default">
293
         <property name="default">
1592
297
          <bool>true</bool>
294
          <bool>true</bool>
1593
298
295
1594
=== modified file 'data/qt/reset_password.ui'
1595
--- data/qt/reset_password.ui	2011-09-08 20:30:39 +0000
1596
+++ data/qt/reset_password.ui	2012-03-06 15:41:36 +0000
1597
@@ -1,357 +1,348 @@
1955
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
1956
2
<ui version="4.0">
2
<ui version="4.0">
1957
3
 <class>ResetPasswordPage</class>
3
 <class>ResetPasswordPage</class>
1958
4
 <widget class="QWizardPage" name="ResetPasswordPage">
4
 <widget class="QWizardPage" name="ResetPasswordPage">
1959
5
  <property name="geometry">
5
  <property name="geometry">
1960
6
   <rect>
6
   <rect>
1961
7
    <x>0</x>
7
    <x>0</x>
1962
8
    <y>0</y>
8
    <y>0</y>
1963
9
    <width>543</width>
9
    <width>544</width>
1964
10
    <height>262</height>
10
    <height>280</height>
1965
11
   </rect>
11
   </rect>
1966
12
  </property>
12
  </property>
1967
13
  <property name="windowTitle">
13
  <property name="layoutDirection">
1968
14
   <string>WizardPage</string>
14
   <enum>Qt::LeftToRight</enum>
1969
15
  </property>
15
  </property>
1970
16
  <property name="layoutDirection">
16
  <layout class="QVBoxLayout" name="verticalLayout_6">
1971
17
   <enum>Qt::LeftToRight</enum>
17
   <property name="spacing">
1972
18
  </property>
18
    <number>15</number>
1973
19
  <layout class="QVBoxLayout" name="verticalLayout">
19
   </property>
1974
20
   <property name="spacing">
20
   <property name="margin">
1975
21
    <number>6</number>
21
    <number>0</number>
1976
22
   </property>
22
   </property>
1977
23
   <property name="margin">
23
   <item>
1978
24
    <number>0</number>
24
    <layout class="QHBoxLayout" name="horizontalLayout">
1979
25
   </property>
25
     <property name="spacing">
1980
26
   <item>
26
      <number>0</number>
1981
27
    <layout class="QHBoxLayout" name="horizontalLayout">
27
     </property>
1982
28
     <item>
28
     <item>
1983
29
      <layout class="QVBoxLayout" name="verticalLayout_2">
29
      <layout class="QVBoxLayout" name="verticalLayout_5">
1984
30
       <item>
30
       <property name="spacing">
1985
31
        <widget class="QLabel" name="reset_code">
31
        <number>15</number>
1986
32
         <property name="sizePolicy">
32
       </property>
1987
33
          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
33
       <item>
1988
34
           <horstretch>0</horstretch>
34
        <layout class="QVBoxLayout" name="verticalLayout_4">
1989
35
           <verstretch>0</verstretch>
35
         <property name="spacing">
1990
36
          </sizepolicy>
36
          <number>3</number>
1991
37
         </property>
37
         </property>
1992
38
         <property name="minimumSize">
38
         <item>
1993
39
          <size>
39
          <widget class="QLabel" name="reset_code">
1994
40
           <width>310</width>
40
           <property name="sizePolicy">
1995
41
           <height>0</height>
41
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
1996
42
          </size>
42
             <horstretch>0</horstretch>
1997
43
         </property>
43
             <verstretch>0</verstretch>
1998
44
         <property name="maximumSize">
44
            </sizepolicy>
1999
45
          <size>
45
           </property>
2000
46
           <width>16777215</width>
46
           <property name="minimumSize">
2001
47
           <height>16777215</height>
47
            <size>
2002
48
          </size>
48
             <width>310</width>
2003
49
         </property>
49
             <height>0</height>
2004
50
         <property name="font">
50
            </size>
2005
51
          <font>
51
           </property>
2006
52
           <weight>75</weight>
52
           <property name="maximumSize">
2007
53
           <bold>true</bold>
53
            <size>
2008
54
          </font>
54
             <width>16777215</width>
2009
55
         </property>
55
             <height>16777215</height>
2010
56
         <property name="text">
56
            </size>
2011
57
          <string>reset_code</string>
57
           </property>
2012
58
         </property>
58
           <property name="font">
2013
59
        </widget>
59
            <font>
2014
60
       </item>
60
             <weight>75</weight>
2015
61
       <item>
61
             <bold>true</bold>
2016
62
        <widget class="QLineEdit" name="reset_code_line_edit">
62
            </font>
2017
63
         <property name="sizePolicy">
63
           </property>
2018
64
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
64
           <property name="text">
2019
65
           <horstretch>0</horstretch>
65
            <string notr="true">reset_code</string>
2020
66
           <verstretch>0</verstretch>
66
           </property>
2021
67
          </sizepolicy>
67
          </widget>
2022
68
         </property>
68
         </item>
2023
69
         <property name="minimumSize">
69
         <item>
2024
70
          <size>
70
          <widget class="QLineEdit" name="reset_code_line_edit">
2025
71
           <width>300</width>
71
           <property name="sizePolicy">
2026
72
           <height>0</height>
72
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
2027
73
          </size>
73
             <horstretch>0</horstretch>
2028
74
         </property>
74
             <verstretch>0</verstretch>
2029
75
         <property name="maximumSize">
75
            </sizepolicy>
2030
76
          <size>
76
           </property>
2031
77
           <width>300</width>
77
           <property name="minimumSize">
2032
78
           <height>16777215</height>
78
            <size>
2033
79
          </size>
79
             <width>300</width>
2034
80
         </property>
80
             <height>0</height>
2035
81
        </widget>
81
            </size>
2036
82
       </item>
82
           </property>
2037
83
       <item>
83
           <property name="maximumSize">
2038
84
        <widget class="QLabel" name="password_label">
84
            <size>
2039
85
         <property name="sizePolicy">
85
             <width>300</width>
2040
86
          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
86
             <height>16777215</height>
2041
87
           <horstretch>0</horstretch>
87
            </size>
2042
88
           <verstretch>0</verstretch>
88
           </property>
2043
89
          </sizepolicy>
89
          </widget>
2044
90
         </property>
90
         </item>
2045
91
         <property name="minimumSize">
91
        </layout>
2046
92
          <size>
92
       </item>
2047
93
           <width>310</width>
93
       <item>
2048
94
           <height>0</height>
94
        <layout class="QVBoxLayout" name="verticalLayout">
2049
95
          </size>
95
         <property name="spacing">
2050
96
         </property>
96
          <number>3</number>
2051
97
         <property name="maximumSize">
97
         </property>
2052
98
          <size>
98
         <item>
2053
99
           <width>16777215</width>
99
          <widget class="QLabel" name="password_label">
2054
100
           <height>16777215</height>
100
           <property name="sizePolicy">
2055
101
          </size>
101
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
2056
102
         </property>
102
             <horstretch>0</horstretch>
2057
103
         <property name="font">
103
             <verstretch>0</verstretch>
2058
104
          <font>
104
            </sizepolicy>
2059
105
           <weight>75</weight>
105
           </property>
2060
106
           <bold>true</bold>
106
           <property name="minimumSize">
2061
107
          </font>
107
            <size>
2062
108
         </property>
108
             <width>310</width>
2063
109
         <property name="text">
109
             <height>0</height>
2064
110
          <string>password_label</string>
110
            </size>
2065
111
         </property>
111
           </property>
2066
112
        </widget>
112
           <property name="maximumSize">
2067
113
       </item>
113
            <size>
2068
114
       <item>
114
             <width>16777215</width>
2069
115
        <widget class="QLineEdit" name="password_line_edit">
115
             <height>16777215</height>
2070
116
         <property name="sizePolicy">
116
            </size>
2071
117
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
117
           </property>
2072
118
           <horstretch>0</horstretch>
118
           <property name="font">
2073
119
           <verstretch>0</verstretch>
119
            <font>
2074
120
          </sizepolicy>
120
             <weight>75</weight>
2075
121
         </property>
121
             <bold>true</bold>
2076
122
         <property name="minimumSize">
122
            </font>
2077
123
          <size>
123
           </property>
2078
124
           <width>300</width>
124
           <property name="text">
2079
125
           <height>0</height>
125
            <string notr="true">password_label</string>
2080
126
          </size>
126
           </property>
2081
127
         </property>
127
          </widget>
2082
128
         <property name="maximumSize">
128
         </item>
2083
129
          <size>
129
         <item>
2084
130
           <width>300</width>
130
          <widget class="QLineEdit" name="password_line_edit">
2085
131
           <height>16777215</height>
131
           <property name="sizePolicy">
2086
132
          </size>
132
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
2087
133
         </property>
133
             <horstretch>0</horstretch>
2088
134
         <property name="echoMode">
134
             <verstretch>0</verstretch>
2089
135
          <enum>QLineEdit::Password</enum>
135
            </sizepolicy>
2090
136
         </property>
136
           </property>
2091
137
        </widget>
137
           <property name="minimumSize">
2092
138
       </item>
138
            <size>
2093
139
       <item>
139
             <width>300</width>
2094
140
        <widget class="QLabel" name="confirm_password_label">
140
             <height>0</height>
2095
141
         <property name="sizePolicy">
141
            </size>
2096
142
          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
142
           </property>
2097
143
           <horstretch>0</horstretch>
143
           <property name="maximumSize">
2098
144
           <verstretch>0</verstretch>
144
            <size>
2099
145
          </sizepolicy>
145
             <width>300</width>
2100
146
         </property>
146
             <height>16777215</height>
2101
147
         <property name="minimumSize">
147
            </size>
2102
148
          <size>
148
           </property>
2103
149
           <width>310</width>
149
           <property name="echoMode">
2104
150
           <height>0</height>
150
            <enum>QLineEdit::Password</enum>
2105
151
          </size>
151
           </property>
2106
152
         </property>
152
          </widget>
2107
153
         <property name="font">
153
         </item>
2108
154
          <font>
154
        </layout>
2109
155
           <weight>75</weight>
155
       </item>
2110
156
           <bold>true</bold>
156
       <item>
2111
157
          </font>
157
        <layout class="QVBoxLayout" name="verticalLayout_2">
2112
158
         </property>
158
         <property name="spacing">
2113
159
         <property name="text">
159
          <number>3</number>
2114
160
          <string>confirm_password_label</string>
160
         </property>
2115
161
         </property>
161
         <item>
2116
162
        </widget>
162
          <widget class="QLabel" name="confirm_password_label">
2117
163
       </item>
163
           <property name="sizePolicy">
2118
164
       <item>
164
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
2119
165
        <widget class="QLineEdit" name="confirm_password_line_edit">
165
             <horstretch>0</horstretch>
2120
166
         <property name="sizePolicy">
166
             <verstretch>0</verstretch>
2121
167
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
167
            </sizepolicy>
2122
168
           <horstretch>0</horstretch>
168
           </property>
2123
169
           <verstretch>0</verstretch>
169
           <property name="minimumSize">
2124
170
          </sizepolicy>
170
            <size>
2125
171
         </property>
171
             <width>310</width>
2126
172
         <property name="minimumSize">
172
             <height>0</height>
2127
173
          <size>
173
            </size>
2128
174
           <width>300</width>
174
           </property>
2129
175
           <height>0</height>
175
           <property name="font">
2130
176
          </size>
176
            <font>
2131
177
         </property>
177
             <weight>75</weight>
2132
178
         <property name="maximumSize">
178
             <bold>true</bold>
2133
179
          <size>
179
            </font>
2134
180
           <width>300</width>
180
           </property>
2135
181
           <height>16777215</height>
181
           <property name="text">
2136
182
          </size>
182
            <string notr="true">confirm_password_label</string>
2137
183
         </property>
183
           </property>
2138
184
         <property name="echoMode">
184
          </widget>
2139
185
          <enum>QLineEdit::Password</enum>
185
         </item>
2140
186
         </property>
186
         <item>
2141
187
        </widget>
187
          <widget class="QLineEdit" name="confirm_password_line_edit">
2142
188
       </item>
188
           <property name="sizePolicy">
2143
189
       <item>
189
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
2144
190
        <spacer name="verticalSpacer">
190
             <horstretch>0</horstretch>
2145
191
         <property name="orientation">
191
             <verstretch>0</verstretch>
2146
192
          <enum>Qt::Vertical</enum>
192
            </sizepolicy>
2147
193
         </property>
193
           </property>
2148
194
         <property name="sizeHint" stdset="0">
194
           <property name="minimumSize">
2149
195
          <size>
195
            <size>
2150
196
           <width>300</width>
196
             <width>300</width>
2151
197
           <height>222</height>
197
             <height>0</height>
2152
198
          </size>
198
            </size>
2153
199
         </property>
199
           </property>
2154
200
        </spacer>
200
           <property name="maximumSize">
2155
201
       </item>
201
            <size>
2156
202
       <item>
202
             <width>300</width>
2157
203
        <spacer name="horizontalSpacer_2">
203
             <height>16777215</height>
2158
204
         <property name="orientation">
204
            </size>
2159
205
          <enum>Qt::Horizontal</enum>
205
           </property>
2160
206
         </property>
206
           <property name="echoMode">
2161
207
         <property name="sizeType">
207
            <enum>QLineEdit::Password</enum>
2162
208
          <enum>QSizePolicy::Fixed</enum>
208
           </property>
2163
209
         </property>
209
          </widget>
2164
210
         <property name="sizeHint" stdset="0">
210
         </item>
2165
211
          <size>
211
        </layout>
2166
212
           <width>300</width>
212
       </item>
2167
213
           <height>0</height>
213
      </layout>
2168
214
          </size>
214
     </item>
2169
215
         </property>
215
     <item>
2170
216
        </spacer>
216
      <layout class="QVBoxLayout" name="verticalLayout_3">
2171
217
       </item>
217
       <property name="spacing">
2172
218
      </layout>
218
        <number>0</number>
2173
219
     </item>
219
       </property>
2174
220
     <item>
220
       <item>
2175
221
      <layout class="QVBoxLayout" name="verticalLayout_3">
221
        <widget class="QLabel" name="password_assistance">
2176
222
       <item>
222
         <property name="sizePolicy">
2177
223
        <spacer name="verticalSpacer_3">
223
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
2178
224
         <property name="orientation">
224
           <horstretch>0</horstretch>
2179
225
          <enum>Qt::Vertical</enum>
225
           <verstretch>0</verstretch>
2180
226
         </property>
226
          </sizepolicy>
2181
227
         <property name="sizeType">
227
         </property>
2182
228
          <enum>QSizePolicy::Fixed</enum>
228
         <property name="minimumSize">
2183
229
         </property>
229
          <size>
2184
230
         <property name="sizeHint" stdset="0">
230
           <width>220</width>
2185
231
          <size>
231
           <height>100</height>
2186
232
           <width>20</width>
232
          </size>
2187
233
           <height>55</height>
233
         </property>
2188
234
          </size>
234
         <property name="maximumSize">
2189
235
         </property>
235
          <size>
2190
236
        </spacer>
236
           <width>220</width>
2191
237
       </item>
237
           <height>16777215</height>
2192
238
       <item>
238
          </size>
2193
239
        <widget class="QLabel" name="password_assistance">
239
         </property>
2194
240
         <property name="sizePolicy">
240
         <property name="text">
2195
241
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
241
          <string notr="true">password_assistance</string>
2196
242
           <horstretch>0</horstretch>
242
         </property>
2197
243
           <verstretch>0</verstretch>
243
         <property name="indent">
2198
244
          </sizepolicy>
244
          <number>20</number>
2199
245
         </property>
245
         </property>
2200
246
         <property name="minimumSize">
246
        </widget>
2201
247
          <size>
247
       </item>
2202
248
           <width>220</width>
248
       <item>
2203
249
           <height>100</height>
249
        <spacer name="verticalSpacer_2">
2204
250
          </size>
250
         <property name="orientation">
2205
251
         </property>
251
          <enum>Qt::Vertical</enum>
2206
252
         <property name="maximumSize">
252
         </property>
2207
253
          <size>
253
         <property name="sizeHint" stdset="0">
2208
254
           <width>220</width>
254
          <size>
2209
255
           <height>16777215</height>
255
           <width>20</width>
2210
256
          </size>
256
           <height>40</height>
2211
257
         </property>
257
          </size>
2212
258
         <property name="text">
258
         </property>
2213
259
          <string>password_assistance</string>
259
        </spacer>
2214
260
         </property>
260
       </item>
2215
261
         <property name="indent">
261
       <item>
2216
262
          <number>20</number>
262
        <spacer name="horizontalSpacer">
2217
263
         </property>
263
         <property name="orientation">
2218
264
        </widget>
264
          <enum>Qt::Horizontal</enum>
2219
265
       </item>
265
         </property>
2220
266
       <item>
266
         <property name="sizeType">
2221
267
        <spacer name="verticalSpacer_2">
267
          <enum>QSizePolicy::Ignored</enum>
2222
268
         <property name="orientation">
268
         </property>
2223
269
          <enum>Qt::Vertical</enum>
269
         <property name="sizeHint" stdset="0">
2224
270
         </property>
270
          <size>
2225
271
         <property name="sizeHint" stdset="0">
271
           <width>220</width>
2226
272
          <size>
272
           <height>0</height>
2227
273
           <width>20</width>
273
          </size>
2228
274
           <height>40</height>
274
         </property>
2229
275
          </size>
275
        </spacer>
2230
276
         </property>
276
       </item>
2231
277
        </spacer>
277
      </layout>
2232
278
       </item>
278
     </item>
2233
279
       <item>
279
    </layout>
2234
280
        <spacer name="horizontalSpacer">
280
   </item>
2235
281
         <property name="orientation">
281
   <item>
2236
282
          <enum>Qt::Horizontal</enum>
282
    <layout class="QHBoxLayout" name="horizontalLayout_3">
2237
283
         </property>
283
     <property name="rightMargin">
2238
284
         <property name="sizeType">
284
      <number>0</number>
2239
285
          <enum>QSizePolicy::Ignored</enum>
285
     </property>
2240
286
         </property>
286
     <item>
2241
287
         <property name="sizeHint" stdset="0">
287
      <spacer name="horizontalSpacer_4">
2242
288
          <size>
288
       <property name="orientation">
2243
289
           <width>220</width>
289
        <enum>Qt::Horizontal</enum>
2244
290
           <height>0</height>
290
       </property>
2245
291
          </size>
291
       <property name="sizeType">
2246
292
         </property>
292
        <enum>QSizePolicy::Expanding</enum>
2247
293
        </spacer>
293
       </property>
2248
294
       </item>
294
       <property name="sizeHint" stdset="0">
2249
295
      </layout>
295
        <size>
2250
296
     </item>
296
         <width>40</width>
2251
297
    </layout>
297
         <height>20</height>
2252
298
   </item>
298
        </size>
2253
299
   <item>
299
       </property>
2254
300
    <layout class="QHBoxLayout" name="horizontalLayout_2">
300
      </spacer>
2255
301
     <item>
301
     </item>
2256
302
      <layout class="QHBoxLayout" name="horizontalLayout_3">
302
     <item>
2257
303
       <property name="rightMargin">
303
      <widget class="QPushButton" name="reset_password_button">
2258
304
        <number>0</number>
304
       <property name="enabled">
2259
305
       </property>
305
        <bool>false</bool>
2260
306
       <item>
306
       </property>
2261
307
        <spacer name="horizontalSpacer_4">
307
       <property name="text">
2262
308
         <property name="orientation">
308
        <string notr="true"/>
2263
309
          <enum>Qt::Horizontal</enum>
309
       </property>
2264
310
         </property>
310
      </widget>
2265
311
         <property name="sizeType">
311
     </item>
2266
312
          <enum>QSizePolicy::Expanding</enum>
312
    </layout>
2267
313
         </property>
313
   </item>
2268
314
         <property name="sizeHint" stdset="0">
314
   <item>
2269
315
          <size>
315
    <spacer name="verticalSpacer">
2270
316
           <width>40</width>
316
     <property name="orientation">
2271
317
           <height>20</height>
317
      <enum>Qt::Vertical</enum>
2272
318
          </size>
318
     </property>
2273
319
         </property>
319
     <property name="sizeHint" stdset="0">
2274
320
        </spacer>
320
      <size>
2275
321
       </item>
321
       <width>20</width>
2276
322
       <item>
322
       <height>40</height>
2277
323
        <widget class="QPushButton" name="reset_password_button">
323
      </size>
2278
324
         <property name="enabled">
324
     </property>
2279
325
          <bool>false</bool>
325
    </spacer>
2280
326
         </property>
326
   </item>
2281
327
         <property name="text">
327
  </layout>
2282
328
          <string/>
328
 </widget>
2283
329
         </property>
329
 <resources/>
2284
330
        </widget>
330
 <connections>
2285
331
       </item>
331
  <connection>
2286
332
      </layout>
332
   <sender>confirm_password_line_edit</sender>
2287
333
     </item>
333
   <signal>returnPressed()</signal>
2288
334
    </layout>
334
   <receiver>reset_password_button</receiver>
2289
335
   </item>
335
   <slot>click()</slot>
2290
336
  </layout>
336
   <hints>
2291
337
 </widget>
337
    <hint type="sourcelabel">
2292
338
 <resources/>
338
     <x>160</x>
2293
339
 <connections>
339
     <y>81</y>
2294
340
  <connection>
340
    </hint>
2295
341
   <sender>confirm_password_line_edit</sender>
341
    <hint type="destinationlabel">
2296
342
   <signal>returnPressed()</signal>
342
     <x>541</x>
2297
343
   <receiver>reset_password_button</receiver>
343
     <y>237</y>
2298
344
   <slot>click()</slot>
344
    </hint>
2299
345
   <hints>
345
   </hints>
2300
346
    <hint type="sourcelabel">
346
  </connection>
2301
347
     <x>160</x>
347
 </connections>
2302
348
     <y>81</y>
348
</ui>
1946
349
    </hint>
1947
350
    <hint type="destinationlabel">
1948
351
     <x>541</x>
1949
352
     <y>237</y>
1950
353
    </hint>
1951
354
   </hints>
1952
355
  </connection>
1953
356
 </connections>
1954
357
</ui>
2303
358
349
2304
=== modified file 'data/qt/setup_account.ui'
2305
--- data/qt/setup_account.ui	2012-02-17 21:16:38 +0000
2306
+++ data/qt/setup_account.ui	2012-03-06 15:41:36 +0000
2307
@@ -1,700 +1,661 @@
3008
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
3009
2
<ui version="4.0">
2
<ui version="4.0">
3010
3
 <class>SetUpAccountPage</class>
3
 <class>SetUpAccountPage</class>
3011
4
 <widget class="QWizardPage" name="SetUpAccountPage">
4
 <widget class="QWizardPage" name="SetUpAccountPage">
3012
5
  <property name="geometry">
5
  <property name="geometry">
3013
6
   <rect>
6
   <rect>
3014
7
    <x>0</x>
7
    <x>0</x>
3015
8
    <y>0</y>
8
    <y>0</y>
3016
9
    <width>543</width>
9
    <width>532</width>
3017
10
    <height>523</height>
10
    <height>438</height>
3018
11
   </rect>
11
   </rect>
3019
12
  </property>
12
  </property>
3020
13
  <property name="sizePolicy">
13
  <property name="sizePolicy">
3021
14
   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
14
   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
3022
15
    <horstretch>0</horstretch>
15
    <horstretch>0</horstretch>
3023
16
    <verstretch>0</verstretch>
16
    <verstretch>0</verstretch>
3024
17
   </sizepolicy>
17
   </sizepolicy>
3025
18
  </property>
18
  </property>
3026
19
  <property name="maximumSize">
19
  <property name="maximumSize">
3027
20
   <size>
20
   <size>
3028
21
    <width>16777215</width>
21
    <width>16777215</width>
3029
22
    <height>16777215</height>
22
    <height>16777215</height>
3030
23
   </size>
23
   </size>
3031
24
  </property>
24
  </property>
3032
25
  <property name="windowTitle">
25
  <layout class="QVBoxLayout" name="verticalLayout">
3033
26
   <string>WizardPage</string>
26
   <property name="spacing">
3034
27
  </property>
27
    <number>0</number>
3035
28
  <layout class="QVBoxLayout" name="verticalLayout">
28
   </property>
3036
29
   <property name="spacing">
29
   <property name="margin">
3037
30
    <number>0</number>
30
    <number>0</number>
3038
31
   </property>
31
   </property>
3039
32
   <property name="leftMargin">
32
   <item>
3040
33
    <number>0</number>
33
    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,0">
3041
34
   </property>
34
     <property name="sizeConstraint">
3042
35
   <property name="topMargin">
35
      <enum>QLayout::SetDefaultConstraint</enum>
3043
36
    <number>0</number>
36
     </property>
3044
37
   </property>
37
     <property name="verticalSpacing">
3045
38
   <property name="rightMargin">
38
      <number>6</number>
3046
39
    <number>3</number>
39
     </property>
3047
40
   </property>
40
     <item row="4" column="0" colspan="2">
3048
41
   <property name="bottomMargin">
41
      <spacer name="verticalSpacer_2">
3049
42
    <number>0</number>
42
       <property name="orientation">
3050
43
   </property>
43
        <enum>Qt::Vertical</enum>
3051
44
   <item>
44
       </property>
3052
45
    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,220">
45
       <property name="sizeHint" stdset="0">
3053
46
     <item row="0" column="0">
46
        <size>
3054
47
      <widget class="QLabel" name="password_info_label">
47
         <width>20</width>
3055
48
       <property name="sizePolicy">
48
         <height>10</height>
3056
49
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
49
        </size>
3057
50
         <horstretch>0</horstretch>
50
       </property>
3058
51
         <verstretch>0</verstretch>
51
      </spacer>
3059
52
        </sizepolicy>
52
     </item>
3060
53
       </property>
53
     <item row="10" column="0" colspan="2">
3061
54
       <property name="text">
54
      <spacer name="verticalSpacer_3">
3062
55
        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
55
       <property name="orientation">
3063
56
       </property>
56
        <enum>Qt::Vertical</enum>
3064
57
       <property name="wordWrap">
57
       </property>
3065
58
        <bool>true</bool>
58
       <property name="sizeHint" stdset="0">
3066
59
       </property>
59
        <size>
3067
60
      </widget>
60
         <width>20</width>
3068
61
     </item>
61
         <height>10</height>
3069
62
     <item row="1" column="0">
62
        </size>
3070
63
      <layout class="QVBoxLayout" name="verticalLayout">
63
       </property>
3071
64
       <property name="spacing">
64
      </spacer>
3072
65
        <number>3</number>
65
     </item>
3073
66
       </property>
66
     <item row="7" column="0" colspan="2">
3074
67
       <item>
67
      <spacer name="verticalSpacer_4">
3075
68
        <widget class="QLabel" name="name_label">
68
       <property name="orientation">
3076
69
         <property name="font">
69
        <enum>Qt::Vertical</enum>
3077
70
          <font>
70
       </property>
3078
71
           <weight>75</weight>
71
       <property name="sizeHint" stdset="0">
3079
72
           <bold>true</bold>
72
        <size>
3080
73
          </font>
73
         <width>20</width>
3081
74
         </property>
74
         <height>10</height>
3082
75
         <property name="text">
75
        </size>
3083
76
          <string>name_label</string>
76
       </property>
3084
77
         </property>
77
      </spacer>
3085
78
        </widget>
78
     </item>
3086
79
       </item>
79
     <item row="0" column="0">
3087
80
       <item>
80
      <layout class="QVBoxLayout" name="verticalLayout_5">
3088
81
        <widget class="QLineEdit" name="name_edit">
81
       <property name="spacing">
3089
82
         <property name="sizePolicy">
82
        <number>3</number>
3090
83
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
83
       </property>
3091
84
           <horstretch>0</horstretch>
84
       <item>
3092
85
           <verstretch>0</verstretch>
85
        <widget class="QLabel" name="name_label">
3093
86
          </sizepolicy>
86
         <property name="font">
3094
87
         </property>
87
          <font>
3095
88
         <property name="minimumSize">
88
           <weight>75</weight>
3096
89
          <size>
89
           <bold>true</bold>
3097
90
           <width>300</width>
90
          </font>
3098
91
           <height>0</height>
91
         </property>
3099
92
          </size>
92
         <property name="text">
3100
93
         </property>
93
          <string notr="true">name_label</string>
3101
94
         <property name="maximumSize">
94
         </property>
3102
95
          <size>
95
        </widget>
3103
96
           <width>300</width>
96
       </item>
3104
97
           <height>16777215</height>
97
       <item>
3105
98
          </size>
98
        <widget class="QLineEdit" name="name_edit">
3106
99
         </property>
99
         <property name="sizePolicy">
3107
100
         <property name="font">
100
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3108
101
          <font>
101
           <horstretch>0</horstretch>
3109
102
           <pointsize>11</pointsize>
102
           <verstretch>0</verstretch>
3110
103
          </font>
103
          </sizepolicy>
3111
104
         </property>
104
         </property>
3112
105
         <property name="formError" stdset="0">
105
         <property name="minimumSize">
3113
106
          <bool>false</bool>
106
          <size>
3114
107
         </property>
107
           <width>300</width>
3115
108
        </widget>
108
           <height>0</height>
3116
109
       </item>
109
          </size>
3117
110
      </layout>
110
         </property>
3118
111
     </item>
111
         <property name="maximumSize">
3119
112
     <item row="3" column="0">
112
          <size>
3120
113
      <layout class="QVBoxLayout" name="verticalLayout">
113
           <width>300</width>
3121
114
       <property name="spacing">
114
           <height>16777215</height>
3122
115
        <number>3</number>
115
          </size>
3123
116
       </property>
116
         </property>
3124
117
       <item>
117
         <property name="font">
3125
118
        <widget class="QLabel" name="email_label">
118
          <font>
3126
119
         <property name="font">
119
           <pointsize>11</pointsize>
3127
120
          <font>
120
          </font>
3128
121
           <weight>75</weight>
121
         </property>
3129
122
           <bold>true</bold>
122
         <property name="formError" stdset="0">
3130
123
          </font>
123
          <bool>false</bool>
3131
124
         </property>
124
         </property>
3132
125
         <property name="text">
125
        </widget>
3133
126
          <string>email_label</string>
126
       </item>
3134
127
         </property>
127
      </layout>
3135
128
        </widget>
128
     </item>
3136
129
       </item>
129
     <item row="2" column="0">
3137
130
       <item>
130
      <layout class="QVBoxLayout" name="verticalLayout_6">
3138
131
        <widget class="QLineEdit" name="email_edit">
131
       <property name="spacing">
3139
132
         <property name="sizePolicy">
132
        <number>3</number>
3140
133
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
133
       </property>
3141
134
           <horstretch>0</horstretch>
134
       <item>
3142
135
           <verstretch>0</verstretch>
135
        <widget class="QLabel" name="email_label">
3143
136
          </sizepolicy>
136
         <property name="font">
3144
137
         </property>
137
          <font>
3145
138
         <property name="minimumSize">
138
           <weight>75</weight>
3146
139
          <size>
139
           <bold>true</bold>
3147
140
           <width>300</width>
140
          </font>
3148
141
           <height>0</height>
141
         </property>
3149
142
          </size>
142
         <property name="text">
3150
143
         </property>
143
          <string notr="true">email_label</string>
3151
144
         <property name="maximumSize">
144
         </property>
3152
145
          <size>
145
        </widget>
3153
146
           <width>300</width>
146
       </item>
3154
147
           <height>16777215</height>
147
       <item>
3155
148
          </size>
148
        <widget class="QLineEdit" name="email_edit">
3156
149
         </property>
149
         <property name="sizePolicy">
3157
150
         <property name="font">
150
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3158
151
          <font>
151
           <horstretch>0</horstretch>
3159
152
           <pointsize>11</pointsize>
152
           <verstretch>0</verstretch>
3160
153
          </font>
153
          </sizepolicy>
3161
154
         </property>
154
         </property>
3162
155
         <property name="placeholderText">
155
         <property name="minimumSize">
3163
156
          <string/>
156
          <size>
3164
157
         </property>
157
           <width>300</width>
3165
158
         <property name="formError" stdset="0">
158
           <height>0</height>
3166
159
          <bool>false</bool>
159
          </size>
3167
160
         </property>
160
         </property>
3168
161
        </widget>
161
         <property name="maximumSize">
3169
162
       </item>
162
          <size>
3170
163
      </layout>
163
           <width>300</width>
3171
164
     </item>
164
           <height>16777215</height>
3172
165
     <item row="4" column="0">
165
          </size>
3173
166
      <layout class="QVBoxLayout" name="verticalLayout">
166
         </property>
3174
167
       <property name="spacing">
167
         <property name="font">
3175
168
        <number>3</number>
168
          <font>
3176
169
       </property>
169
           <pointsize>11</pointsize>
3177
170
       <item>
170
          </font>
3178
171
        <widget class="QLabel" name="confirm_email_label">
171
         </property>
3179
172
         <property name="font">
172
         <property name="placeholderText">
3180
173
          <font>
173
          <string/>
3181
174
           <weight>75</weight>
174
         </property>
3182
175
           <bold>true</bold>
175
         <property name="formError" stdset="0">
3183
176
          </font>
176
          <bool>false</bool>
3184
177
         </property>
177
         </property>
3185
178
         <property name="text">
178
        </widget>
3186
179
          <string>confirm_email_label</string>
179
       </item>
3187
180
         </property>
180
      </layout>
3188
181
        </widget>
181
     </item>
3189
182
       </item>
182
     <item row="2" column="1">
3190
183
       <item>
183
      <layout class="QVBoxLayout" name="verticalLayout_8">
3191
184
        <widget class="QLineEdit" name="confirm_email_edit">
184
       <property name="spacing">
3192
185
         <property name="sizePolicy">
185
        <number>0</number>
3193
186
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
186
       </property>
3194
187
           <horstretch>0</horstretch>
187
       <property name="leftMargin">
3195
188
           <verstretch>0</verstretch>
188
        <number>0</number>
3196
189
          </sizepolicy>
189
       </property>
3197
190
         </property>
190
       <item>
3198
191
         <property name="minimumSize">
191
        <widget class="QLabel" name="email_assistance">
3199
192
          <size>
192
         <property name="sizePolicy">
3200
193
           <width>300</width>
193
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
3201
194
           <height>0</height>
194
           <horstretch>0</horstretch>
3202
195
          </size>
195
           <verstretch>0</verstretch>
3203
196
         </property>
196
          </sizepolicy>
3204
197
         <property name="maximumSize">
197
         </property>
3205
198
          <size>
198
         <property name="minimumSize">
3206
199
           <width>300</width>
199
          <size>
3207
200
           <height>16777215</height>
200
           <width>220</width>
3208
201
          </size>
201
           <height>0</height>
3209
202
         </property>
202
          </size>
3210
203
         <property name="font">
203
         </property>
3211
204
          <font>
204
         <property name="maximumSize">
3212
205
           <pointsize>11</pointsize>
205
          <size>
3213
206
          </font>
206
           <width>220</width>
3214
207
         </property>
207
           <height>16777215</height>
3215
208
         <property name="placeholderText">
208
          </size>
3216
209
          <string/>
209
         </property>
3217
210
         </property>
210
         <property name="text">
3218
211
         <property name="formError" stdset="0">
211
          <string notr="true">email_assistance</string>
3219
212
          <bool>false</bool>
212
         </property>
3220
213
         </property>
213
         <property name="alignment">
3221
214
        </widget>
214
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
3222
215
       </item>
215
         </property>
3223
216
      </layout>
216
         <property name="wordWrap">
3224
217
     </item>
217
          <bool>true</bool>
3225
218
     <item row="6" column="0">
218
         </property>
3226
219
      <layout class="QVBoxLayout" name="verticalLayout">
219
        </widget>
3227
220
       <property name="spacing">
220
       </item>
3228
221
        <number>3</number>
221
      </layout>
3229
222
       </property>
222
     </item>
3230
223
       <item>
223
     <item row="3" column="0">
3231
224
        <spacer name="verticalSpacer_4">
224
      <layout class="QVBoxLayout" name="verticalLayout_10">
3232
225
         <property name="orientation">
225
       <property name="spacing">
3233
226
          <enum>Qt::Vertical</enum>
226
        <number>3</number>
3234
227
         </property>
227
       </property>
3235
228
         <property name="sizeType">
228
       <item>
3236
229
          <enum>QSizePolicy::Fixed</enum>
229
        <widget class="QLabel" name="confirm_email_label">
3237
230
         </property>
230
         <property name="font">
3238
231
         <property name="sizeHint" stdset="0">
231
          <font>
3239
232
          <size>
232
           <weight>75</weight>
3240
233
           <width>20</width>
233
           <bold>true</bold>
3241
234
           <height>10</height>
234
          </font>
3242
235
          </size>
235
         </property>
3243
236
         </property>
236
         <property name="text">
3244
237
        </spacer>
237
          <string notr="true">confirm_email_label</string>
3245
238
       </item>
238
         </property>
3246
239
       <item>
239
        </widget>
3247
240
        <widget class="QLabel" name="password_label">
240
       </item>
3248
241
         <property name="font">
241
       <item>
3249
242
          <font>
242
        <widget class="QLineEdit" name="confirm_email_edit">
3250
243
           <weight>75</weight>
243
         <property name="sizePolicy">
3251
244
           <bold>true</bold>
244
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3252
245
          </font>
245
           <horstretch>0</horstretch>
3253
246
         </property>
246
           <verstretch>0</verstretch>
3254
247
         <property name="text">
247
          </sizepolicy>
3255
248
          <string>password_label</string>
248
         </property>
3256
249
         </property>
249
         <property name="minimumSize">
3257
250
        </widget>
250
          <size>
3258
251
       </item>
251
           <width>300</width>
3259
252
       <item>
252
           <height>0</height>
3260
253
        <widget class="QLineEdit" name="password_edit">
253
          </size>
3261
254
         <property name="sizePolicy">
254
         </property>
3262
255
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
255
         <property name="maximumSize">
3263
256
           <horstretch>0</horstretch>
256
          <size>
3264
257
           <verstretch>0</verstretch>
257
           <width>300</width>
3265
258
          </sizepolicy>
258
           <height>16777215</height>
3266
259
         </property>
259
          </size>
3267
260
         <property name="minimumSize">
260
         </property>
3268
261
          <size>
261
         <property name="font">
3269
262
           <width>300</width>
262
          <font>
3270
263
           <height>0</height>
263
           <pointsize>11</pointsize>
3271
264
          </size>
264
          </font>
3272
265
         </property>
265
         </property>
3273
266
         <property name="maximumSize">
266
         <property name="placeholderText">
3274
267
          <size>
267
          <string/>
3275
268
           <width>300</width>
268
         </property>
3276
269
           <height>16777215</height>
269
         <property name="formError" stdset="0">
3277
270
          </size>
270
          <bool>false</bool>
3278
271
         </property>
271
         </property>
3279
272
         <property name="font">
272
        </widget>
3280
273
          <font>
273
       </item>
3281
274
           <pointsize>11</pointsize>
274
      </layout>
3282
275
          </font>
275
     </item>
3283
276
         </property>
276
     <item row="3" column="1">
3284
277
         <property name="toolTip">
277
      <layout class="QVBoxLayout" name="verticalLayout_9">
3285
278
          <string>Your password must be at least 8 characters long and at least contain one number and one upper later.</string>
278
       <property name="spacing">
3286
279
         </property>
279
        <number>0</number>
3287
280
         <property name="statusTip">
280
       </property>
3288
281
          <string/>
281
       <property name="leftMargin">
3289
282
         </property>
282
        <number>0</number>
3290
283
         <property name="echoMode">
283
       </property>
3291
284
          <enum>QLineEdit::Password</enum>
284
       <item>
3292
285
         </property>
285
        <widget class="QLabel" name="confirm_email_assistance">
3293
286
         <property name="placeholderText">
286
         <property name="sizePolicy">
3294
287
          <string/>
287
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
3295
288
         </property>
288
           <horstretch>0</horstretch>
3296
289
         <property name="formError" stdset="0">
289
           <verstretch>0</verstretch>
3297
290
          <bool>false</bool>
290
          </sizepolicy>
3298
291
         </property>
291
         </property>
3299
292
        </widget>
292
         <property name="minimumSize">
3300
293
       </item>
293
          <size>
3301
294
      </layout>
294
           <width>220</width>
3302
295
     </item>
295
           <height>0</height>
3303
296
     <item row="7" column="0">
296
          </size>
3304
297
      <layout class="QVBoxLayout" name="verticalLayout">
297
         </property>
3305
298
       <property name="spacing">
298
         <property name="maximumSize">
3306
299
        <number>3</number>
299
          <size>
3307
300
       </property>
300
           <width>220</width>
3308
301
       <item>
301
           <height>16777215</height>
3309
302
        <spacer name="verticalSpacer_5">
302
          </size>
3310
303
         <property name="orientation">
303
         </property>
3311
304
          <enum>Qt::Vertical</enum>
304
         <property name="text">
3312
305
         </property>
305
          <string notr="true">confirm_email_assistance</string>
3313
306
         <property name="sizeType">
306
         </property>
3314
307
          <enum>QSizePolicy::Fixed</enum>
307
         <property name="alignment">
3315
308
         </property>
308
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
3316
309
         <property name="sizeHint" stdset="0">
309
         </property>
3317
310
          <size>
310
         <property name="wordWrap">
3318
311
           <width>20</width>
311
          <bool>true</bool>
3319
312
           <height>10</height>
312
         </property>
3320
313
          </size>
313
         <property name="indent">
3321
314
         </property>
314
          <number>0</number>
3322
315
        </spacer>
315
         </property>
3323
316
       </item>
316
        </widget>
3324
317
       <item>
317
       </item>
3325
318
        <widget class="QLabel" name="confirm_password_label">
318
      </layout>
3326
319
         <property name="font">
319
     </item>
3327
320
          <font>
320
     <item row="11" column="0" colspan="2">
3328
321
           <weight>75</weight>
321
      <layout class="QHBoxLayout" name="hlayout_check">
3329
322
           <bold>true</bold>
322
       <property name="spacing">
3330
323
          </font>
323
        <number>6</number>
3331
324
         </property>
324
       </property>
3332
325
         <property name="text">
325
       <property name="topMargin">
3333
326
          <string>confirm_password_label</string>
326
        <number>0</number>
3334
327
         </property>
327
       </property>
3335
328
        </widget>
328
      </layout>
3336
329
       </item>
329
     </item>
3337
330
       <item>
330
     <item row="0" column="1">
3338
331
        <widget class="QLineEdit" name="confirm_password_edit">
331
      <layout class="QVBoxLayout" name="verticalLayout_7">
3339
332
         <property name="sizePolicy">
332
       <property name="spacing">
3340
333
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
333
        <number>0</number>
3341
334
           <horstretch>0</horstretch>
334
       </property>
3342
335
           <verstretch>0</verstretch>
335
       <property name="leftMargin">
3343
336
          </sizepolicy>
336
        <number>0</number>
3344
337
         </property>
337
       </property>
3345
338
         <property name="minimumSize">
338
       <item>
3346
339
          <size>
339
        <widget class="QLabel" name="name_assistance">
3347
340
           <width>300</width>
340
         <property name="sizePolicy">
3348
341
           <height>0</height>
341
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
3349
342
          </size>
342
           <horstretch>0</horstretch>
3350
343
         </property>
343
           <verstretch>0</verstretch>
3351
344
         <property name="maximumSize">
344
          </sizepolicy>
3352
345
          <size>
345
         </property>
3353
346
           <width>300</width>
346
         <property name="minimumSize">
3354
347
           <height>16777215</height>
347
          <size>
3355
348
          </size>
348
           <width>220</width>
3356
349
         </property>
349
           <height>0</height>
3357
350
         <property name="font">
350
          </size>
3358
351
          <font>
351
         </property>
3359
352
           <pointsize>11</pointsize>
352
         <property name="maximumSize">
3360
353
          </font>
353
          <size>
3361
354
         </property>
354
           <width>220</width>
3362
355
         <property name="echoMode">
355
           <height>16777215</height>
3363
356
          <enum>QLineEdit::Password</enum>
356
          </size>
3364
357
         </property>
357
         </property>
3365
358
         <property name="placeholderText">
358
         <property name="text">
3366
359
          <string/>
359
          <string notr="true">name_assistance</string>
3367
360
         </property>
360
         </property>
3368
361
         <property name="formError" stdset="0">
361
         <property name="alignment">
3369
362
          <bool>false</bool>
362
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
3370
363
         </property>
363
         </property>
3371
364
        </widget>
364
         <property name="wordWrap">
3372
365
       </item>
365
          <bool>true</bool>
3373
366
      </layout>
366
         </property>
3374
367
     </item>
367
        </widget>
3375
368
     <item row="9" column="0">
368
       </item>
3376
369
      <layout class="QVBoxLayout" name="verticalLayout">
369
      </layout>
3377
370
       <property name="spacing">
370
     </item>
3378
371
        <number>3</number>
371
     <item row="5" column="0">
3379
372
       </property>
372
      <layout class="QVBoxLayout" name="verticalLayout_3">
3380
373
       <item>
373
       <property name="spacing">
3381
374
        <widget class="QLabel" name="captcha_view">
374
        <number>3</number>
3382
375
         <property name="sizePolicy">
375
       </property>
3383
376
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
376
       <item>
3384
377
           <horstretch>0</horstretch>
377
        <widget class="QLabel" name="password_label">
3385
378
           <verstretch>0</verstretch>
378
         <property name="font">
3386
379
          </sizepolicy>
379
          <font>
3387
380
         </property>
380
           <weight>75</weight>
3388
381
         <property name="minimumSize">
381
           <bold>true</bold>
3389
382
          <size>
382
          </font>
3390
383
           <width>300</width>
383
         </property>
3391
384
           <height>57</height>
384
         <property name="text">
3392
385
          </size>
385
          <string notr="true">password_label</string>
3393
386
         </property>
386
         </property>
3394
387
         <property name="maximumSize">
387
        </widget>
3395
388
          <size>
388
       </item>
3396
389
           <width>300</width>
389
       <item>
3397
390
           <height>16777215</height>
390
        <widget class="QLineEdit" name="password_edit">
3398
391
          </size>
391
         <property name="sizePolicy">
3399
392
         </property>
392
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3400
393
         <property name="styleSheet">
393
           <horstretch>0</horstretch>
3401
394
          <string notr="true">background-color: white</string>
394
           <verstretch>0</verstretch>
3402
395
         </property>
395
          </sizepolicy>
3403
396
         <property name="frameShape">
396
         </property>
3404
397
          <enum>QFrame::Box</enum>
397
         <property name="minimumSize">
3405
398
         </property>
398
          <size>
3406
399
         <property name="text">
399
           <width>300</width>
3407
400
          <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
400
           <height>0</height>
3408
401
         </property>
401
          </size>
3409
402
        </widget>
402
         </property>
3410
403
       </item>
403
         <property name="maximumSize">
3411
404
       <item>
404
          <size>
3412
405
        <widget class="QLineEdit" name="captcha_solution_edit">
405
           <width>300</width>
3413
406
         <property name="sizePolicy">
406
           <height>16777215</height>
3414
407
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
407
          </size>
3415
408
           <horstretch>0</horstretch>
408
         </property>
3416
409
           <verstretch>0</verstretch>
409
         <property name="font">
3417
410
          </sizepolicy>
410
          <font>
3418
411
         </property>
411
           <pointsize>11</pointsize>
3419
412
         <property name="minimumSize">
412
          </font>
3420
413
          <size>
413
         </property>
3421
414
           <width>300</width>
414
         <property name="toolTip">
3422
415
           <height>0</height>
415
          <string notr="true">Your password must be at least 8 characters long and at least contain one number and one upper later.</string>
3423
416
          </size>
416
         </property>
3424
417
         </property>
417
         <property name="statusTip">
3425
418
         <property name="maximumSize">
418
          <string/>
3426
419
          <size>
419
         </property>
3427
420
           <width>300</width>
420
         <property name="echoMode">
3428
421
           <height>16777215</height>
421
          <enum>QLineEdit::Password</enum>
3429
422
          </size>
422
         </property>
3430
423
         </property>
423
         <property name="placeholderText">
3431
424
         <property name="font">
424
          <string/>
3432
425
          <font>
425
         </property>
3433
426
           <pointsize>11</pointsize>
426
         <property name="formError" stdset="0">
3434
427
          </font>
427
          <bool>false</bool>
3435
428
         </property>
428
         </property>
3436
429
         <property name="locale">
429
        </widget>
3437
430
          <locale language="English" country="UnitedStates"/>
430
       </item>
3438
431
         </property>
431
      </layout>
3439
432
         <property name="inputMask">
432
     </item>
3440
433
          <string/>
433
     <item row="5" column="1" rowspan="2">
3441
434
         </property>
434
      <layout class="QHBoxLayout" name="horizontalLayout_3">
3442
435
         <property name="text">
435
       <property name="spacing">
3443
436
          <string/>
436
        <number>0</number>
3444
437
         </property>
437
       </property>
3445
438
         <property name="placeholderText">
438
       <item>
3446
439
          <string/>
439
        <widget class="QLabel" name="password_assistance">
3447
440
         </property>
440
         <property name="sizePolicy">
3448
441
         <property name="formError" stdset="0">
441
          <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
3449
442
          <bool>false</bool>
442
           <horstretch>0</horstretch>
3450
443
         </property>
443
           <verstretch>0</verstretch>
3451
444
        </widget>
444
          </sizepolicy>
3452
445
       </item>
445
         </property>
3453
446
      </layout>
446
         <property name="minimumSize">
3454
447
     </item>
447
          <size>
3455
448
     <item row="9" column="1">
448
           <width>220</width>
3456
449
      <widget class="QLabel" name="refresh_label">
449
           <height>80</height>
3457
450
       <property name="sizePolicy">
450
          </size>
3458
451
        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
451
         </property>
3459
452
         <horstretch>0</horstretch>
452
         <property name="maximumSize">
3460
453
         <verstretch>0</verstretch>
453
          <size>
3461
454
        </sizepolicy>
454
           <width>220</width>
3462
455
       </property>
455
           <height>16777215</height>
3463
456
       <property name="minimumSize">
456
          </size>
3464
457
        <size>
457
         </property>
3465
458
         <width>220</width>
458
         <property name="text">
3466
459
         <height>0</height>
459
          <string notr="true">password_assistance</string>
3467
460
        </size>
460
         </property>
3468
461
       </property>
461
         <property name="wordWrap">
3469
462
       <property name="maximumSize">
462
          <bool>true</bool>
3470
463
        <size>
463
         </property>
3471
464
         <width>220</width>
464
         <property name="indent">
3472
465
         <height>16777215</height>
465
          <number>17</number>
3473
466
        </size>
466
         </property>
3474
467
       </property>
467
        </widget>
3475
468
       <property name="locale">
468
       </item>
3476
469
        <locale language="English" country="UnitedStates"/>
469
      </layout>
3477
470
       </property>
470
     </item>
3478
471
       <property name="text">
471
     <item row="6" column="0">
3479
472
        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
472
      <layout class="QVBoxLayout" name="verticalLayout_2">
3480
473
       </property>
473
       <property name="spacing">
3481
474
       <property name="wordWrap">
474
        <number>3</number>
3482
475
        <bool>true</bool>
475
       </property>
3483
476
       </property>
476
       <item>
3484
477
       <property name="indent">
477
        <widget class="QLabel" name="confirm_password_label">
3485
478
        <number>0</number>
478
         <property name="font">
3486
479
       </property>
479
          <font>
3487
480
      </widget>
480
           <weight>75</weight>
3488
481
     </item>
481
           <bold>true</bold>
3489
482
     <item row="1" column="1">
482
          </font>
3490
483
      <layout class="QVBoxLayout" name="verticalLayout_7">
483
         </property>
3491
484
       <property name="spacing">
484
         <property name="text">
3492
485
        <number>0</number>
485
          <string notr="true">confirm_password_label</string>
3493
486
       </property>
486
         </property>
3494
487
       <property name="leftMargin">
487
        </widget>
3495
488
        <number>0</number>
488
       </item>
3496
489
       </property>
489
       <item>
3497
490
       <item>
490
        <widget class="QLineEdit" name="confirm_password_edit">
3498
491
        <widget class="QLabel" name="name_assistance">
491
         <property name="sizePolicy">
3499
492
         <property name="sizePolicy">
492
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3500
493
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
493
           <horstretch>0</horstretch>
3501
494
           <horstretch>0</horstretch>
494
           <verstretch>0</verstretch>
3502
495
           <verstretch>0</verstretch>
495
          </sizepolicy>
3503
496
          </sizepolicy>
496
         </property>
3504
497
         </property>
497
         <property name="minimumSize">
3505
498
         <property name="minimumSize">
498
          <size>
3506
499
          <size>
499
           <width>300</width>
3507
500
           <width>220</width>
500
           <height>0</height>
3508
501
           <height>0</height>
501
          </size>
3509
502
          </size>
502
         </property>
3510
503
         </property>
503
         <property name="maximumSize">
3511
504
         <property name="maximumSize">
504
          <size>
3512
505
          <size>
505
           <width>300</width>
3513
506
           <width>220</width>
506
           <height>16777215</height>
3514
507
           <height>16777215</height>
507
          </size>
3515
508
          </size>
508
         </property>
3516
509
         </property>
509
         <property name="font">
3517
510
         <property name="text">
510
          <font>
3518
511
          <string>name_assistance</string>
511
           <pointsize>11</pointsize>
3519
512
         </property>
512
          </font>
3520
513
         <property name="alignment">
513
         </property>
3521
514
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
514
         <property name="echoMode">
3522
515
         </property>
515
          <enum>QLineEdit::Password</enum>
3523
516
         <property name="wordWrap">
516
         </property>
3524
517
          <bool>true</bool>
517
         <property name="placeholderText">
3525
518
         </property>
518
          <string/>
3526
519
        </widget>
519
         </property>
3527
520
       </item>
520
         <property name="formError" stdset="0">
3528
521
      </layout>
521
          <bool>false</bool>
3529
522
     </item>
522
         </property>
3530
523
     <item row="3" column="1">
523
        </widget>
3531
524
      <layout class="QVBoxLayout" name="verticalLayout_8">
524
       </item>
3532
525
       <property name="spacing">
525
      </layout>
3533
526
        <number>0</number>
526
     </item>
3534
527
       </property>
527
     <item row="8" column="0">
3535
528
       <property name="leftMargin">
528
      <layout class="QVBoxLayout" name="verticalLayout_4">
3536
529
        <number>0</number>
529
       <property name="spacing">
3537
530
       </property>
530
        <number>3</number>
3538
531
       <item>
531
       </property>
3539
532
        <widget class="QLabel" name="email_assistance">
532
       <item>
3540
533
         <property name="sizePolicy">
533
        <widget class="QLabel" name="captcha_view">
3541
534
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
534
         <property name="sizePolicy">
3542
535
           <horstretch>0</horstretch>
535
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
3543
536
           <verstretch>0</verstretch>
536
           <horstretch>0</horstretch>
3544
537
          </sizepolicy>
537
           <verstretch>0</verstretch>
3545
538
         </property>
538
          </sizepolicy>
3546
539
         <property name="minimumSize">
539
         </property>
3547
540
          <size>
540
         <property name="minimumSize">
3548
541
           <width>220</width>
541
          <size>
3549
542
           <height>0</height>
542
           <width>300</width>
3550
543
          </size>
543
           <height>57</height>
3551
544
         </property>
544
          </size>
3552
545
         <property name="maximumSize">
545
         </property>
3553
546
          <size>
546
         <property name="maximumSize">
3554
547
           <width>220</width>
547
          <size>
3555
548
           <height>16777215</height>
548
           <width>300</width>
3556
549
          </size>
549
           <height>57</height>
3557
550
         </property>
550
          </size>
3558
551
         <property name="text">
551
         </property>
3559
552
          <string>email_assistance</string>
552
         <property name="styleSheet">
3560
553
         </property>
553
          <string notr="true">background-color: white</string>
3561
554
         <property name="alignment">
554
         </property>
3562
555
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
555
         <property name="frameShape">
3563
556
         </property>
556
          <enum>QFrame::Box</enum>
3564
557
         <property name="wordWrap">
557
         </property>
3565
558
          <bool>true</bool>
558
         <property name="text">
3566
559
         </property>
559
          <string notr="true"/>
3567
560
        </widget>
560
         </property>
3568
561
       </item>
561
        </widget>
3569
562
      </layout>
562
       </item>
3570
563
     </item>
563
       <item>
3571
564
     <item row="4" column="1">
564
        <widget class="QLineEdit" name="captcha_solution_edit">
3572
565
      <layout class="QVBoxLayout" name="verticalLayout_9">
565
         <property name="sizePolicy">
3573
566
       <property name="spacing">
566
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
3574
567
        <number>0</number>
567
           <horstretch>0</horstretch>
3575
568
       </property>
568
           <verstretch>0</verstretch>
3576
569
       <property name="leftMargin">
569
          </sizepolicy>
3577
570
        <number>0</number>
570
         </property>
3578
571
       </property>
571
         <property name="minimumSize">
3579
572
       <item>
572
          <size>
3580
573
        <widget class="QLabel" name="confirm_email_assistance">
573
           <width>300</width>
3581
574
         <property name="sizePolicy">
574
           <height>0</height>
3582
575
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
575
          </size>
3583
576
           <horstretch>0</horstretch>
576
         </property>
3584
577
           <verstretch>0</verstretch>
577
         <property name="maximumSize">
3585
578
          </sizepolicy>
578
          <size>
3586
579
         </property>
579
           <width>300</width>
3587
580
         <property name="minimumSize">
580
           <height>16777215</height>
3588
581
          <size>
581
          </size>
3589
582
           <width>220</width>
582
         </property>
3590
583
           <height>0</height>
583
         <property name="font">
3591
584
          </size>
584
          <font>
3592
585
         </property>
585
           <pointsize>11</pointsize>
3593
586
         <property name="maximumSize">
586
          </font>
3594
587
          <size>
587
         </property>
3595
588
           <width>220</width>
588
         <property name="locale">
3596
589
           <height>16777215</height>
589
          <locale language="English" country="UnitedStates"/>
3597
590
          </size>
590
         </property>
3598
591
         </property>
591
         <property name="inputMask">
3599
592
         <property name="text">
592
          <string/>
3600
593
          <string>confirm_email_assistance</string>
593
         </property>
3601
594
         </property>
594
         <property name="text">
3602
595
         <property name="alignment">
595
          <string/>
3603
596
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
596
         </property>
3604
597
         </property>
597
         <property name="placeholderText">
3605
598
         <property name="wordWrap">
598
          <string/>
3606
599
          <bool>true</bool>
599
         </property>
3607
600
         </property>
600
         <property name="formError" stdset="0">
3608
601
         <property name="indent">
601
          <bool>false</bool>
3609
602
          <number>0</number>
602
         </property>
3610
603
         </property>
603
        </widget>
3611
604
        </widget>
604
       </item>
3612
605
       </item>
605
      </layout>
3613
606
      </layout>
606
     </item>
3614
607
     </item>
607
     <item row="1" column="0" colspan="2">
3615
608
     <item row="6" column="1" rowspan="2">
608
      <spacer name="verticalSpacer">
3616
609
      <widget class="QLabel" name="password_assistance">
609
       <property name="orientation">
3617
610
       <property name="sizePolicy">
610
        <enum>Qt::Vertical</enum>
3618
611
        <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
611
       </property>
3619
612
         <horstretch>0</horstretch>
612
       <property name="sizeHint" stdset="0">
3620
613
         <verstretch>0</verstretch>
613
        <size>
3621
614
        </sizepolicy>
614
         <width>20</width>
3622
615
       </property>
615
         <height>10</height>
3623
616
       <property name="minimumSize">
616
        </size>
3624
617
        <size>
617
       </property>
3625
618
         <width>220</width>
618
      </spacer>
3626
619
         <height>100</height>
619
     </item>
3627
620
        </size>
620
     <item row="8" column="1">
3628
621
       </property>
621
      <layout class="QVBoxLayout" name="verticalLayout_13">
3629
622
       <property name="maximumSize">
622
       <property name="rightMargin">
3630
623
        <size>
623
        <number>0</number>
3631
624
         <width>220</width>
624
       </property>
3632
625
         <height>16777215</height>
625
       <item>
3633
626
        </size>
626
        <widget class="QLabel" name="refresh_label">
3634
627
       </property>
627
         <property name="minimumSize">
3635
628
       <property name="text">
628
          <size>
3636
629
        <string>password_assistance</string>
629
           <width>220</width>
3637
630
       </property>
630
           <height>0</height>
3638
631
       <property name="wordWrap">
631
          </size>
3639
632
        <bool>true</bool>
632
         </property>
3640
633
       </property>
633
         <property name="maximumSize">
3641
634
       <property name="indent">
634
          <size>
3642
635
        <number>17</number>
635
           <width>220</width>
3643
636
       </property>
636
           <height>16777215</height>
3644
637
      </widget>
637
          </size>
3645
638
     </item>
638
         </property>
3646
639
     <item row="2" column="1">
639
         <property name="locale">
3647
640
      <spacer name="verticalSpacer">
640
          <locale language="English" country="UnitedStates"/>
3648
641
       <property name="orientation">
641
         </property>
3649
642
        <enum>Qt::Vertical</enum>
642
         <property name="text">
3650
643
       </property>
643
          <string notr="true">If you can't read this then refresh this page</string>
3651
644
       <property name="sizeType">
644
         </property>
3652
645
        <enum>QSizePolicy::Fixed</enum>
645
         <property name="wordWrap">
3653
646
       </property>
646
          <bool>true</bool>
3654
647
       <property name="sizeHint" stdset="0">
647
         </property>
3655
648
        <size>
648
         <property name="indent">
3656
649
         <width>20</width>
649
          <number>0</number>
3657
650
         <height>15</height>
650
         </property>
3658
651
        </size>
651
        </widget>
3659
652
       </property>
652
       </item>
3660
653
      </spacer>
653
      </layout>
3661
654
     </item>
654
     </item>
3662
655
     <item row="5" column="1">
655
    </layout>
3663
656
      <spacer name="verticalSpacer_2">
656
   </item>
3664
657
       <property name="orientation">
657
  </layout>
3665
658
        <enum>Qt::Vertical</enum>
658
 </widget>
3666
659
       </property>
659
 <resources/>
3667
660
       <property name="sizeType">
660
 <connections/>
3668
661
        <enum>QSizePolicy::Fixed</enum>
661
</ui>
2969
662
       </property>
2970
663
       <property name="sizeHint" stdset="0">
2971
664
        <size>
2972
665
         <width>20</width>
2973
666
         <height>15</height>
2974
667
        </size>
2975
668
       </property>
2976
669
      </spacer>
2977
670
     </item>
2978
671
     <item row="8" column="1">
2979
672
      <spacer name="verticalSpacer_3">
2980
673
       <property name="orientation">
2981
674
        <enum>Qt::Vertical</enum>
2982
675
       </property>
2983
676
       <property name="sizeType">
2984
677
        <enum>QSizePolicy::Fixed</enum>
2985
678
       </property>
2986
679
       <property name="sizeHint" stdset="0">
2987
680
        <size>
2988
681
         <width>20</width>
2989
682
         <height>15</height>
2990
683
        </size>
2991
684
       </property>
2992
685
      </spacer>
2993
686
     </item>
2994
687
    </layout>
2995
688
   </item>
2996
689
   <item>
2997
690
    <layout class="QHBoxLayout" name="hlayout_check">
2998
691
     <property name="spacing">
2999
692
      <number>0</number>
3000
693
     </property>
3001
694
    </layout>
3002
695
   </item>
3003
696
  </layout>
3004
697
 </widget>
3005
698
 <resources/>
3006
699
 <connections/>
3007
700
</ui>
3669
701
662
3670
=== added file 'data/qt/ssl_dialog.ui'
3671
--- data/qt/ssl_dialog.ui	1970-01-01 00:00:00 +0000
3672
+++ data/qt/ssl_dialog.ui	2012-03-06 15:41:36 +0000
3673
@@ -0,0 +1,205 @@
3674
1
<?xml version="1.0" encoding="UTF-8"?>
3675
2
<ui version="4.0">
3676
3
 <class>SSLDialog</class>
3677
4
 <widget class="QDialog" name="SSLDialog">
3678
5
  <property name="geometry">
3679
6
   <rect>
3680
7
    <x>0</x>
3681
8
    <y>0</y>
3682
9
    <width>550</width>
3683
10
    <height>402</height>
3684
11
   </rect>
3685
12
  </property>
3686
13
  <property name="sizePolicy">
3687
14
   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
3688
15
    <horstretch>0</horstretch>
3689
16
    <verstretch>0</verstretch>
3690
17
   </sizepolicy>
3691
18
  </property>
3692
19
  <property name="minimumSize">
3693
20
   <size>
3694
21
    <width>550</width>
3695
22
    <height>0</height>
3696
23
   </size>
3697
24
  </property>
3698
25
  <property name="windowTitle">
3699
26
   <string notr="true">Dialog</string>
3700
27
  </property>
3701
28
  <layout class="QVBoxLayout" name="verticalLayout_2">
3702
29
   <property name="spacing">
3703
30
    <number>24</number>
3704
31
   </property>
3705
32
   <property name="sizeConstraint">
3706
33
    <enum>QLayout::SetFixedSize</enum>
3707
34
   </property>
3708
35
   <item>
3709
36
    <layout class="QHBoxLayout" name="horizontalLayout_3">
3710
37
     <property name="spacing">
3711
38
      <number>12</number>
3712
39
     </property>
3713
40
     <item>
3714
41
      <layout class="QVBoxLayout" name="verticalLayout_7">
3715
42
       <property name="spacing">
3716
43
        <number>0</number>
3717
44
       </property>
3718
45
       <property name="sizeConstraint">
3719
46
        <enum>QLayout::SetDefaultConstraint</enum>
3720
47
       </property>
3721
48
       <item>
3722
49
        <widget class="QLabel" name="logo_label">
3723
50
         <property name="sizePolicy">
3724
51
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
3725
52
           <horstretch>0</horstretch>
3726
53
           <verstretch>0</verstretch>
3727
54
          </sizepolicy>
3728
55
         </property>
3729
56
         <property name="minimumSize">
3730
57
          <size>
3731
58
           <width>48</width>
3732
59
           <height>48</height>
3733
60
          </size>
3734
61
         </property>
3735
62
         <property name="maximumSize">
3736
63
          <size>
3737
64
           <width>48</width>
3738
65
           <height>48</height>
3739
66
          </size>
3740
67
         </property>
3741
68
         <property name="text">
3742
69
          <string notr="true">TextLabel</string>
3743
70
         </property>
3744
71
        </widget>
3745
72
       </item>
3746
73
       <item>
3747
74
        <spacer name="verticalSpacer_4">
3748
75
         <property name="orientation">
3749
76
          <enum>Qt::Vertical</enum>
3750
77
         </property>
3751
78
         <property name="sizeType">
3752
79
          <enum>QSizePolicy::Expanding</enum>
3753
80
         </property>
3754
81
         <property name="sizeHint" stdset="0">
3755
82
          <size>
3756
83
           <width>0</width>
3757
84
           <height>20</height>
3758
85
          </size>
3759
86
         </property>
3760
87
        </spacer>
3761
88
       </item>
3762
89
      </layout>
3763
90
     </item>
3764
91
     <item>
3765
92
      <layout class="QVBoxLayout" name="expander_layout">
3766
93
       <property name="spacing">
3767
94
        <number>24</number>
3768
95
       </property>
3769
96
       <item>
3770
97
        <widget class="QLabel" name="title_label">
3771
98
         <property name="font">
3772
99
          <font>
3773
100
           <pointsize>14</pointsize>
3774
101
          </font>
3775
102
         </property>
3776
103
         <property name="text">
3777
104
          <string notr="true">Do you want to connect to this server</string>
3778
105
         </property>
3779
106
        </widget>
3780
107
       </item>
3781
108
       <item>
3782
109
        <widget class="QLabel" name="intro_label">
3783
110
         <property name="text">
3784
111
          <string notr="true">&lt;style type=&quot;text/css&quot; media=&quot;all&quot;&gt;
3785
112
ul {margin-left: -10px;}
3786
113
li {padding-top: 2px;}
3787
114
&lt;/style&gt;
3788
115
&lt;p&gt;You are trying to connect to a proxy server on 192.168.1.111. This server uses a secure connection, but the SSL certificate is not valid because:&lt;/p&gt;
3789
116
&lt;ul&gt;
3790
117
&lt;li&gt;The certificate has not been verified.&lt;/li&gt;
3791
118
&lt;li&gt;The name on the certificate isn't valid or doesn't match the name of the site.&lt;/li&gt;
3792
119
&lt;li&gt;The certificate has expired.&lt;/li&gt;
3793
120
&lt;/ul&gt;</string>
3794
121
         </property>
3795
122
         <property name="wordWrap">
3796
123
          <bool>true</bool>
3797
124
         </property>
3798
125
         <property name="indent">
3799
126
          <number>-1</number>
3800
127
         </property>
3801
128
        </widget>
3802
129
       </item>
3803
130
       <item>
3804
131
        <widget class="QLabel" name="not_sure_label">
3805
132
         <property name="text">
3806
133
          <string notr="true">&lt;p&gt;If you are not sure about this server, do not use it to connect to Ubuntu One. &lt;a href='#'&gt;Review your proxy settings.&lt;/a&gt;</string>
3807
134
         </property>
3808
135
         <property name="wordWrap">
3809
136
          <bool>true</bool>
3810
137
         </property>
3811
138
        </widget>
3812
139
       </item>
3813
140
       <item>
3814
141
        <widget class="QCheckBox" name="remember_checkbox">
3815
142
         <property name="text">
3816
143
          <string notr="true">Remember my settings for this certificate.</string>
3817
144
         </property>
3818
145
         <property name="checked">
3819
146
          <bool>false</bool>
3820
147
         </property>
3821
148
        </widget>
3822
149
       </item>
3823
150
      </layout>
3824
151
     </item>
3825
152
    </layout>
3826
153
   </item>
3827
154
   <item>
3828
155
    <layout class="QHBoxLayout" name="horizontalLayout_2">
3829
156
     <item>
3830
157
      <widget class="QPushButton" name="help_button">
3831
158
       <property name="text">
3832
159
        <string notr="true">Get Help With SSL</string>
3833
160
       </property>
3834
161
      </widget>
3835
162
     </item>
3836
163
     <item>
3837
164
      <spacer name="horizontalSpacer">
3838
165
       <property name="orientation">
3839
166
        <enum>Qt::Horizontal</enum>
3840
167
       </property>
3841
168
       <property name="sizeHint" stdset="0">
3842
169
        <size>
3843
170
         <width>40</width>
3844
171
         <height>20</height>
3845
172
        </size>
3846
173
       </property>
3847
174
      </spacer>
3848
175
     </item>
3849
176
     <item>
3850
177
      <widget class="QPushButton" name="cancel_button">
3851
178
       <property name="text">
3852
179
        <string notr="true">Cancel and Close</string>
3853
180
       </property>
3854
181
      </widget>
3855
182
     </item>
3856
183
     <item>
3857
184
      <widget class="QPushButton" name="connect_button">
3858
185
       <property name="text">
3859
186
        <string notr="true">Connect</string>
3860
187
       </property>
3861
188
       <property name="default">
3862
189
        <bool>true</bool>
3863
190
       </property>
3864
191
      </widget>
3865
192
     </item>
3866
193
    </layout>
3867
194
   </item>
3868
195
  </layout>
3869
196
 </widget>
3870
197
 <tabstops>
3871
198
  <tabstop>connect_button</tabstop>
3872
199
  <tabstop>cancel_button</tabstop>
3873
200
  <tabstop>help_button</tabstop>
3874
201
  <tabstop>remember_checkbox</tabstop>
3875
202
 </tabstops>
3876
203
 <resources/>
3877
204
 <connections/>
3878
205
</ui>
3879
0
206
3880
=== modified file 'data/qt/stylesheet.qss'
3881
--- data/qt/stylesheet.qss	2012-02-17 21:16:38 +0000
3882
+++ data/qt/stylesheet.qss	2012-03-06 15:41:36 +0000
3883
@@ -3,6 +3,12 @@
3884
3
    color: #333333;
3
    color: #333333;
3885
4
}
4
}
3886
5
5
3887
6
QFrame#ubuntussoframe {
3888
7
    background-color: white;
3889
8
    padding-left: 30px;
3890
9
    padding-right: 30px;
3891
10
}
3892
11
3893
6
QWizard,
12
QWizard,
3894
7
QDialog {
13
QDialog {
3895
8
    background-color: white;
14
    background-color: white;
3896
@@ -10,6 +16,7 @@
3897
10
16
3898
11
QLabel#password_assistance {
17
QLabel#password_assistance {
3899
12
    border-image: url(":/balloon_shape.png");
18
    border-image: url(":/balloon_shape.png");
3900
19
    font-size: 12px;
3901
13
}
20
}
3902
14
21
3903
15
QLineEdit {
22
QLineEdit {
3904
@@ -23,79 +30,57 @@
3905
23
    padding-left: 20px;
30
    padding-left: 20px;
3906
24
    padding-right: 20px;
31
    padding-right: 20px;
3907
25
    border-width: 1px;
32
    border-width: 1px;
3908
26
    height: 14px;
3909
27
}
33
}
3910
28
34
3912
29
QPushButton[default="true"] {
35
QPushButton:default:enabled {
3913
30
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
36
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3914
31
        stop: 0 #fe9e84,stop: 1.0 #dd4814);
37
        stop: 0 #fe9e84,stop: 1.0 #dd4814);
3915
32
    color: white;
38
    color: white;
3916
33
    border-color: #999999;
39
    border-color: #999999;
3917
34
}
40
}
3918
35
41
3920
36
QPushButton:hover[default="true"] {
42
QPushButton:hover:default:enabled {
3921
37
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
43
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3922
38
        stop: 0 #ffb19c,stop: 1.0 #dd4814);
44
        stop: 0 #ffb19c,stop: 1.0 #dd4814);
3923
39
    color: white;
45
    color: white;
3924
40
    border-color: #999999;
46
    border-color: #999999;
3925
41
}
47
}
3926
42
48
3928
43
QPushButton:pressed[default="true"] {
49
QPushButton:pressed:default:enabled {
3929
44
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
50
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3930
45
        stop: 0 #b93f14,stop: 1.0 #dd4814);
51
        stop: 0 #b93f14,stop: 1.0 #dd4814);
3931
46
    color: white;
52
    color: white;
3932
47
    border-color: #999999;
53
    border-color: #999999;
3933
48
}
54
}
3934
49
55
3936
50
QPushButton[default="false"] {
56
QPushButton:enabled {
3937
51
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
57
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3938
52
        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
58
        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
3939
53
    color: #333333;
59
    color: #333333;
3940
54
    border-color: #999999;
60
    border-color: #999999;
3941
55
}
61
}
3942
56
62
3944
57
QPushButton:hover[default="false"] {
63
QPushButton:hover:enabled {
3945
58
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
64
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3946
59
        stop: 0 #ffffff,stop: 1.0 #ededed);
65
        stop: 0 #ffffff,stop: 1.0 #ededed);
3947
60
    color: #333333;
66
    color: #333333;
3948
61
    border-color: #999999;
67
    border-color: #999999;
3949
62
}
68
}
3950
63
69
3952
64
QPushButton:pressed[default="false"] {
70
QPushButton:pressed:enabled {
3953
65
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
71
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3954
66
        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
72
        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
3955
67
    color: #333333;
73
    color: #333333;
3956
68
    border-color: #999999;
74
    border-color: #999999;
3957
69
}
75
}
3958
70
76
3960
71
QPushButton[DisabledState="true"] {
77
QPushButton:disabled {
3961
72
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
78
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3962
73
        stop: 0 #eaeaea, stop: 1.0 #cacaca);
79
        stop: 0 #eaeaea, stop: 1.0 #cacaca);
3963
74
    color: #595959;
80
    color: #595959;
3964
75
    border-color: #939389;
81
    border-color: #939389;
3965
76
}
82
}
3966
77
83
3967
78
QPushButton[DisabledState="false"] {
3968
79
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3969
80
        stop: 0 #fe9e84,stop: 1.0 #dd4814);
3970
81
    color: white;
3971
82
    border-color: #999999;
3972
83
}
3973
84
3974
85
QPushButton:hover[DisabledState="false"] {
3975
86
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3976
87
        stop: 0 #ffb19c,stop: 1.0 #dd4814);
3977
88
    color: white;
3978
89
    border-color: #999999;
3979
90
}
3980
91
3981
92
QPushButton:pressed[DisabledState="false"] {
3982
93
    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
3983
94
        stop: 0 #b93f14,stop: 1.0 #dd4814);
3984
95
    color: white;
3985
96
    border-color: #999999;
3986
97
}
3987
98
3988
99
QFrame#frm_box {
84
QFrame#frm_box {
3989
100
    background: #ffffff;
85
    background: #ffffff;
3990
101
    border-radius: 5px;
86
    border-radius: 5px;
3991
@@ -115,5 +100,12 @@
3992
115
}
100
}
3993
116
101
3994
117
QFrame#header {
102
QFrame#header {
3996
118
    padding: 10px;
103
    padding-top: 1px;
3997
104
    padding-bottom: 1px;
3998
105
}
3999
106
4000
107
QLabel#form_errors {
4001
108
    font: bold 14px;
4002
109
    color: #df2d1f;
4003
110
    padding-bottom: 1px;
4004
119
}
111
}
4005
120
112
4006
=== modified file 'data/qt/success_message.ui'
4007
--- data/qt/success_message.ui	2011-11-14 12:16:13 +0000
4008
+++ data/qt/success_message.ui	2012-03-06 15:41:36 +0000
4009
@@ -1,35 +1,32 @@
4045
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
4046
2
<ui version="4.0">
2
<ui version="4.0">
4047
3
 <class>SuccessPage</class>
3
 <class>SuccessPage</class>
4048
4
 <widget class="QWizardPage" name="SuccessPage">
4
 <widget class="QWizardPage" name="SuccessPage">
4049
5
  <property name="geometry">
5
  <property name="geometry">
4050
6
   <rect>
6
   <rect>
4051
7
    <x>0</x>
7
    <x>0</x>
4052
8
    <y>0</y>
8
    <y>0</y>
4053
9
    <width>400</width>
9
    <width>94</width>
4054
10
    <height>300</height>
10
    <height>58</height>
4055
11
   </rect>
11
   </rect>
4056
12
  </property>
12
  </property>
4057
13
  <property name="windowTitle">
13
  <layout class="QVBoxLayout" name="verticalLayout">
4058
14
   <string>WizardPage</string>
14
   <item>
4059
15
  </property>
15
    <widget class="QLabel" name="image_label">
4060
16
  <layout class="QVBoxLayout" name="verticalLayout">
16
     <property name="text">
4061
17
   <item>
17
      <string notr="true">TextLabel</string>
4062
18
    <widget class="QLabel" name="image_label">
18
     </property>
4063
19
     <property name="text">
19
    </widget>
4064
20
      <string>TextLabel</string>
20
   </item>
4065
21
     </property>
21
   <item>
4066
22
    </widget>
22
    <widget class="QLabel" name="success_message_body">
4067
23
   </item>
23
     <property name="text">
4068
24
   <item>
24
      <string notr="true">TextLabel</string>
4069
25
    <widget class="QLabel" name="success_message_body">
25
     </property>
4070
26
     <property name="text">
26
    </widget>
4071
27
      <string>TextLabel</string>
27
   </item>
4072
28
     </property>
28
  </layout>
4073
29
    </widget>
29
 </widget>
4074
30
   </item>
30
 <resources/>
4075
31
  </layout>
31
 <connections/>
4076
32
 </widget>
32
</ui>
4042
33
 <resources/>
4043
34
 <connections/>
4044
35
</ui>
4077
36
33
4078
=== modified file 'run-tests.bat'
4079
--- run-tests.bat	2012-01-31 19:02:36 +0000
4080
+++ run-tests.bat	2012-03-06 15:41:36 +0000
4081
@@ -99,7 +99,7 @@
4082
99
"%PYTHONEXEPATH%\python.exe" setup.py build
99
"%PYTHONEXEPATH%\python.exe" setup.py build
4083
100
ECHO Running tests
100
ECHO Running tests
4084
101
:: execute the tests with a number of ignored linux only modules
101
:: execute the tests with a number of ignored linux only modules
4086
102
"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -i "test_linux.py, test_txsecrets.py" -p "ubuntu_sso\gtk" --reactor=qt4 --gui %PARAMS% ubuntu_sso 
102
"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -i "test_linux.py, test_txsecrets.py, test_qt.py, test_glib.py" -p "ubuntu_sso\gtk" --reactor=qt4 --gui %PARAMS% ubuntu_sso 
4087
103
:: Clean the build from the setupt.py
103
:: Clean the build from the setupt.py
4088
104
ECHO Cleaning the generated code
104
ECHO Cleaning the generated code
4089
105
"%PYTHONEXEPATH%\python.exe" setup.py clean
105
"%PYTHONEXEPATH%\python.exe" setup.py clean
4090
106
106
4091
=== modified file 'setup.py'
4092
--- setup.py	2012-02-22 12:24:22 +0000
4093
+++ setup.py	2012-03-06 15:41:36 +0000
4094
@@ -277,6 +277,7 @@
4095
277
    'bin/ubuntu-sso-login-gtk',
277
    'bin/ubuntu-sso-login-gtk',
4096
278
    'bin/ubuntu-sso-login-qt',
278
    'bin/ubuntu-sso-login-qt',
4097
279
    'bin/ubuntu-sso-proxy-creds-qt',
279
    'bin/ubuntu-sso-proxy-creds-qt',
4098
280
    'bin/ubuntu-sso-ssl-certificate-qt',
4099
280
]
281
]
4100
281
282
4101
282
283
4102
283
284
4103
=== modified file 'ubuntu_sso/credentials.py'
4104
--- ubuntu_sso/credentials.py	2012-02-17 18:43:17 +0000
4105
+++ ubuntu_sso/credentials.py	2012-03-06 15:41:36 +0000
4106
@@ -142,6 +142,13 @@
4107
142
    def _show_ui(self, login_only):
142
    def _show_ui(self, login_only):
4108
143
        """Shows the UI, connect outcome signals."""
143
        """Shows the UI, connect outcome signals."""
4109
144
        ui_exe_path = os.path.join(get_bin_dir(), self.ui_executable)
144
        ui_exe_path = os.path.join(get_bin_dir(), self.ui_executable)
4110
145
        if not os.path.exists(ui_exe_path):
4111
146
            logger.debug('Falling back to the GTK+ UI since the given %r '
4112
147
                         'does not exist', ui_exe_path)
4113
148
            ui_exe_path = os.path.join(get_bin_dir(), UI_EXECUTABLE_GTK)
4114
149
4115
150
        assert os.path.exists(ui_exe_path)
4116
151
4117
145
        args = [ui_exe_path]
152
        args = [ui_exe_path]
4118
146
        for arg in ('app_name', 'help_text', 'ping_url', 'policy_url',
153
        for arg in ('app_name', 'help_text', 'ping_url', 'policy_url',
4119
147
                    'tc_url', 'window_id'):
154
                    'tc_url', 'window_id'):
4120
148
155
4121
=== modified file 'ubuntu_sso/main/glib.py'
4122
--- ubuntu_sso/main/glib.py	2012-01-26 14:54:13 +0000
4123
+++ ubuntu_sso/main/glib.py	2012-03-06 15:41:36 +0000
4124
@@ -18,6 +18,10 @@
4125
18
18
4126
19
# pylint: disable=E0611,F0401
19
# pylint: disable=E0611,F0401
4127
20
20
4128
21
# pylint: disable=W0621
4129
22
import dbus.mainloop.glib
4130
23
# pylint: enable=W0621
4131
24
4132
21
from gi.repository import GLib, Gdk, Gtk
25
from gi.repository import GLib, Gdk, Gtk
4133
22
26
4134
23
27
4135
@@ -38,8 +42,6 @@
4136
38
42
4137
39
def start_setup():
43
def start_setup():
4138
40
    """Setup the env to run the service."""
44
    """Setup the env to run the service."""
4139
41
    import dbus.mainloop.glib  # pylint: disable=W0621
4140
42
4141
43
    dbus.mainloop.glib.threads_init()
45
    dbus.mainloop.glib.threads_init()
4142
44
    Gdk.threads_init()
46
    Gdk.threads_init()
4143
45
    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
47
    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
4144
46
48
4145
=== modified file 'ubuntu_sso/main/qt.py'
4146
--- ubuntu_sso/main/qt.py	2012-02-17 19:43:31 +0000
4147
+++ ubuntu_sso/main/qt.py	2012-03-06 15:41:36 +0000
4148
@@ -20,8 +20,13 @@
4149
20
20
4150
21
import sys
21
import sys
4151
22
22
4152
23
# pylint: disable=W0621
4153
24
import dbus.mainloop.qt
4154
25
# pylint: enable=W0621
4155
26
4156
23
from PyQt4 import QtCore
27
from PyQt4 import QtCore
4157
24
28
4158
29
4159
25
TIMERS = set()
30
TIMERS = set()
4160
26
31
4161
27
32
4162
@@ -55,12 +60,9 @@
4163
55
60
4164
56
def start_setup():
61
def start_setup():
4165
57
    """Setup the env to run the service."""
62
    """Setup the env to run the service."""
4166
58
    import dbus.mainloop.qt  # pylint: disable=W0621
4167
59
4168
60
    # this has to be created before calling dbus.mainloop.qt.DBusQtMainLoop
63
    # this has to be created before calling dbus.mainloop.qt.DBusQtMainLoop
4169
61
    loop = QtCore.QCoreApplication(sys.argv)
64
    loop = QtCore.QCoreApplication(sys.argv)
4170
62
    dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
65
    dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
4171
63
4172
64
    return loop
66
    return loop
4173
65
67
4174
66
68
4175
67
69
4176
=== modified file 'ubuntu_sso/networkstate/linux.py'
4177
--- ubuntu_sso/networkstate/linux.py	2012-01-31 20:12:49 +0000
4178
+++ ubuntu_sso/networkstate/linux.py	2012-03-06 15:41:36 +0000
4179
@@ -94,7 +94,9 @@
4180
94
        if isinstance(error, self.dbus.exceptions.DBusException) and \
94
        if isinstance(error, self.dbus.exceptions.DBusException) and \
4181
95
                error.get_dbus_name() == DBUS_UNKNOWN_SERVICE:
95
                error.get_dbus_name() == DBUS_UNKNOWN_SERVICE:
4182
96
            logger.debug("Network Manager not present")
96
            logger.debug("Network Manager not present")
4184
97
            self.call_result_cb(UNKNOWN)
97
            # Assuming since Network Manager is not installed,
4185
98
            # the user has connected in some other way
4186
99
            self.call_result_cb(ONLINE)
4187
98
        else:
100
        else:
4188
99
            logger.error("Error contacting NetworkManager: %s" % \
101
            logger.error("Error contacting NetworkManager: %s" % \
4189
100
                             str(error))
102
                             str(error))
4190
101
103
4191
=== modified file 'ubuntu_sso/networkstate/tests/test_linux.py'
4192
--- ubuntu_sso/networkstate/tests/test_linux.py	2012-01-31 20:12:49 +0000
4193
+++ ubuntu_sso/networkstate/tests/test_linux.py	2012-03-06 15:41:36 +0000
4194
@@ -407,10 +407,10 @@
4195
407
        self.mocker.result(exc)
407
        self.mocker.result(exc)
4196
408
        self.mocker.replay()
408
        self.mocker.replay()
4197
409
409
4200
410
    def test_nm_not_running(self):
410
    def test_nm_not_installed(self):
4201
411
        """Check the case when NM is not running."""
411
        """Check the case when NM is not installed."""
4202
412
        self.connect_proxy(TestNmNotAvailableException)
412
        self.connect_proxy(TestNmNotAvailableException)
4204
413
        self.check_nm_error(self.assertUnknown, TestNmNotAvailableException())
413
        self.check_nm_error(self.assertOnline, TestNmNotAvailableException())
4205
414
414
4206
415
    def test_dbus_problem(self):
415
    def test_dbus_problem(self):
4207
416
        """Check the case when DBus throws some other exception."""
416
        """Check the case when DBus throws some other exception."""
4208
417
417
4209
=== modified file 'ubuntu_sso/qt/__init__.py'
4210
--- ubuntu_sso/qt/__init__.py	2012-02-17 18:43:17 +0000
4211
+++ ubuntu_sso/qt/__init__.py	2012-03-06 15:41:36 +0000
4212
@@ -19,8 +19,13 @@
4213
19
import collections
19
import collections
4214
20
20
4215
21
21
4216
22
LINK_STYLE = ('<a href="{link_url}">'
4217
23
              '<span style="color:#df2d1f;">{link_text}</span></a>')
4218
22
ERROR_ALL = '__all__'
24
ERROR_ALL = '__all__'
4219
25
ERROR_STYLE = u'<font color="#df2d1f"><b>%s</b></font>'
4220
23
ERROR_MESSAGE = 'message'
26
ERROR_MESSAGE = 'message'
4221
27
PREFERED_UI_SIZE = {'width': 550, 'height': 525}
4222
28
TITLE_STYLE = u'<span style="font-size:24px">%s</span>'
4223
24
29
4224
25
30
4225
26
# Based on the gtk implementation
31
# Based on the gtk implementation
4226
27
32
4227
=== added file 'ubuntu_sso/qt/arrow.py'
4228
--- ubuntu_sso/qt/arrow.py	1970-01-01 00:00:00 +0000
4229
+++ ubuntu_sso/qt/arrow.py	2012-03-06 15:41:36 +0000
4230
@@ -0,0 +1,68 @@
4231
1
# -*- coding: utf-8 -*-
4232
2
#
4233
3
# Copyright 2012 Canonical Ltd.
4234
4
#
4235
5
# This program is free software: you can redistribute it and/or modify it
4236
6
# under the terms of the GNU General Public License version 3, as published
4237
7
# by the Free Software Foundation.
4238
8
#
4239
9
# This program is distributed in the hope that it will be useful, but
4240
10
# WITHOUT ANY WARRANTY; without even the implied warranties of
4241
11
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4242
12
# PURPOSE.  See the GNU General Public License for more details.
4243
13
#
4244
14
# You should have received a copy of the GNU General Public License along
4245
15
# with this program.  If not, see <http://www.gnu.org/licenses/>.
4246
16
"""Widget written in Qt that works as a GtkArrow."""
4247
17
4248
18
from PyQt4.QtGui import QPainter, QStyle, QStyleOption, QWidget
4249
19
4250
20
4251
21
class QArrow(QWidget):
4252
22
    """Custom widget."""
4253
23
4254
24
    UP = 0
4255
25
    DOWN = 1
4256
26
    LEFT = 2
4257
27
    RIGHT = 3
4258
28
4259
29
    def __init__(self, direction, parent=None):
4260
30
        """Create a new instance."""
4261
31
        super(QArrow, self).__init__(parent)
4262
32
        self._set_direction(direction)
4263
33
        self.setFixedWidth(16)
4264
34
4265
35
    # pylint: disable=C0103
4266
36
    def paintEvent(self, event):
4267
37
        """Paint the widget."""
4268
38
        opt = QStyleOption()
4269
39
        opt.initFrom(self)
4270
40
        painter = QPainter(self)
4271
41
        if self._direction == QArrow.UP:
4272
42
            primitive = QStyle.PE_IndicatorArrowUp
4273
43
        elif self._direction == QArrow.DOWN:
4274
44
            primitive = QStyle.PE_IndicatorArrowDown
4275
45
        elif self._direction == QArrow.LEFT:
4276
46
            primitive = QStyle.PE_IndicatorArrowLeft
4277
47
        else:
4278
48
            primitive = QStyle.PE_IndicatorArrowRight
4279
49
        painter.translate(-5, 0)
4280
50
        painter.setViewTransformEnabled(True)
4281
51
        self.style().drawPrimitive(primitive, opt, painter, self)
4282
52
    # pylint: enable=C0103
4283
53
4284
54
    def _get_direction(self):
4285
55
        """Return the direction used."""
4286
56
        return self._direction
4287
57
4288
58
    # pylint: disable=W0201
4289
59
    def _set_direction(self, direction):
4290
60
        """Set the direction."""
4291
61
        if direction not in (QArrow.UP, QArrow.DOWN,
4292
62
                             QArrow.LEFT, QArrow.RIGHT):
4293
63
            raise ValueError('Wrong arrow direction.')
4294
64
        self._direction = direction
4295
65
        self.repaint()
4296
66
    # pylint: enable=W0201
4297
67
4298
68
    direction = property(_get_direction, _set_direction)
4299
0
69
4300
=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
4301
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-02-18 15:02:49 +0000
4302
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-03-06 15:41:36 +0000
4303
@@ -19,41 +19,39 @@
4304
19
from functools import partial
19
from functools import partial
4305
20
20
4306
21
from PyQt4 import QtGui, QtCore
21
from PyQt4 import QtGui, QtCore
4307
22
from twisted.internet import defer
4308
23
22
4309
24
from ubuntu_sso import NO_OP
23
from ubuntu_sso import NO_OP
4313
25
from ubuntu_sso.qt import build_general_error_message
24
from ubuntu_sso.logger import setup_gui_logging
4314
26
from ubuntu_sso.qt.gui import SSOWizardPage
25
from ubuntu_sso.qt import LINK_STYLE, build_general_error_message
4315
27
from ubuntu_sso.logger import setup_logging
26
from ubuntu_sso.qt.sso_wizard_page import SSOWizardPage
4316
27
from ubuntu_sso.qt.ui.current_user_sign_in_ui import Ui_CurrentUserSignInPage
4317
28
from ubuntu_sso.utils.ui import (
28
from ubuntu_sso.utils.ui import (
4318
29
    CANCEL_BUTTON,
29
    CANCEL_BUTTON,
4319
30
    EMAIL_LABEL,
30
    EMAIL_LABEL,
4320
31
    FORGOTTEN_PASSWORD_BUTTON,
31
    FORGOTTEN_PASSWORD_BUTTON,
4321
32
    is_correct_email,
32
    is_correct_email,
4322
33
    LOGIN_PASSWORD_LABEL,
33
    LOGIN_PASSWORD_LABEL,
4323
34
    LOGIN_TITLE,
4324
35
    LOGIN_SUBTITLE,
4325
34
    SIGN_IN_BUTTON,
36
    SIGN_IN_BUTTON,
4326
35
)
37
)
4327
36
38
4328
37
39
4334
38
FORGOTTEN_PASSWORD_LINK_STYLE = ('<a href="#" style="color:#dd4814;">'
40
logger = setup_gui_logging('ubuntu_sso.current_user_sign_in_page')
4330
39
                                 '{forgotten_text}</a>')
4331
40
4332
41
4333
42
logger = setup_logging('ubuntu_sso.current_user_sign_in_page')
4335
43
41
4336
44
42
4337
45
class CurrentUserSignInPage(SSOWizardPage):
43
class CurrentUserSignInPage(SSOWizardPage):
4338
46
    """Wizard Page that lets a current user Sign into Ubuntu Single Sign On."""
44
    """Wizard Page that lets a current user Sign into Ubuntu Single Sign On."""
4339
47
45
4341
48
    userLoggedIn = QtCore.pyqtSignal('QString', 'QString')
46
    ui_class = Ui_CurrentUserSignInPage
4342
47
    userLoggedIn = QtCore.pyqtSignal(unicode)
4343
49
    passwordForgotten = QtCore.pyqtSignal()
48
    passwordForgotten = QtCore.pyqtSignal()
4351
50
    userNotValidated = QtCore.pyqtSignal('QString', 'QString')
49
    userNotValidated = QtCore.pyqtSignal(unicode)
4352
51
50
4353
52
    def __init__(self, ui, ping_url, *args, **kwargs):
51
    @property
4354
53
        super(CurrentUserSignInPage, self).__init__(ui, *args, **kwargs)
52
    def _signals(self):
4355
54
        self.ping_url = ping_url
53
        """The signals to connect to the backend."""
4356
55
54
        result = {
4350
56
        self._signals = {
4357
57
            'LoggedIn':
55
            'LoggedIn':
4358
58
             self._filter_by_app_name(self.on_logged_in),
56
             self._filter_by_app_name(self.on_logged_in),
4359
59
            'LoginError':
57
            'LoginError':
4360
@@ -61,22 +59,13 @@
4361
61
             'UserNotValidated':
59
             'UserNotValidated':
4362
62
             self._filter_by_app_name(self.on_user_not_validated),
60
             self._filter_by_app_name(self.on_user_not_validated),
4363
63
         }
61
         }
4365
64
        self.setup_page()
62
        return result
4366
65
63
4368
66
    def on_user_not_validated(self, *args):
64
    def on_user_not_validated(self, app_name, email):
4369
67
        """Show the validate email page."""
65
        """Show the validate email page."""
4370
66
        self.hide_overlay()
4371
68
        email = unicode(self.ui.email_edit.text())
67
        email = unicode(self.ui.email_edit.text())
4383
69
        password = unicode(self.ui.password_edit.text())
68
        self.userNotValidated.emit(email)
4373
70
        self.userNotValidated.emit(email, password)
4374
71
4375
72
    @defer.inlineCallbacks
4376
73
    def setup_page(self):
4377
74
        """Setup the widget components."""
4378
75
        self.backend = yield self.get_backend()
4379
76
        self._set_translated_strings()
4380
77
        # lets add call backs to be execute for the calls we are interested
4381
78
        self._setup_signals()
4382
79
        self._connect_ui()
4384
80
69
4385
81
    # Invalid names of Qt-inherited methods
70
    # Invalid names of Qt-inherited methods
4386
82
    # pylint: disable=C0103
71
    # pylint: disable=C0103
4387
@@ -97,24 +86,22 @@
4388
97
        # Set sign_in_button as default when the page is shown.
86
        # Set sign_in_button as default when the page is shown.
4389
98
        self.ui.sign_in_button.setDefault(True)
87
        self.ui.sign_in_button.setDefault(True)
4390
99
        self.ui.sign_in_button.setEnabled(False)
88
        self.ui.sign_in_button.setEnabled(False)
4391
100
        self.ui.sign_in_button.setProperty("DisabledState",
4392
101
            not self.ui.sign_in_button.isEnabled())
4393
102
        self.ui.sign_in_button.style().unpolish(
4394
103
            self.ui.sign_in_button)
4395
104
        self.ui.sign_in_button.style().polish(
4396
105
            self.ui.sign_in_button)
4397
106
89
4398
107
    def cleanupPage(self):
90
    def cleanupPage(self):
4399
108
        """Reset the wizard buttons."""
91
        """Reset the wizard buttons."""
4400
92
        super(CurrentUserSignInPage, self).cleanupPage()
4401
109
        self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
93
        self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
4402
110
94
4403
111
    def _set_translated_strings(self):
95
    def _set_translated_strings(self):
4404
112
        """Set the translated strings."""
96
        """Set the translated strings."""
4405
113
        logger.debug('CurrentUserSignInPage._set_translated_strings')
97
        logger.debug('CurrentUserSignInPage._set_translated_strings')
4406
98
        self.setTitle(LOGIN_TITLE.format(app_name=self.app_name))
4407
99
        self.setSubTitle(LOGIN_SUBTITLE % {'app_name': self.app_name})
4408
100
4409
114
        self.ui.email_label.setText(EMAIL_LABEL)
101
        self.ui.email_label.setText(EMAIL_LABEL)
4410
115
        self.ui.password_label.setText(LOGIN_PASSWORD_LABEL)
102
        self.ui.password_label.setText(LOGIN_PASSWORD_LABEL)
4413
116
        forgotten_text = FORGOTTEN_PASSWORD_LINK_STYLE.format(
103
        forgotten_text = LINK_STYLE.format(link_url='#',
4414
117
            forgotten_text=FORGOTTEN_PASSWORD_BUTTON)
104
                            link_text=FORGOTTEN_PASSWORD_BUTTON)
4415
118
        self.ui.forgot_password_label.setText(forgotten_text)
105
        self.ui.forgot_password_label.setText(forgotten_text)
4416
119
        self.ui.sign_in_button.setText(SIGN_IN_BUTTON)
106
        self.ui.sign_in_button.setText(SIGN_IN_BUTTON)
4417
120
107
4418
@@ -135,10 +122,6 @@
4419
135
        if not correct_mail or not password:
122
        if not correct_mail or not password:
4420
136
            valid = False
123
            valid = False
4421
137
        self.ui.sign_in_button.setEnabled(valid)
124
        self.ui.sign_in_button.setEnabled(valid)
4422
138
        self.ui.sign_in_button.setProperty("DisabledState",
4423
139
            not self.ui.sign_in_button.isEnabled())
4424
140
        self.ui.sign_in_button.style().unpolish(self.ui.sign_in_button)
4425
141
        self.ui.sign_in_button.style().polish(self.ui.sign_in_button)
4426
142
125
4427
143
    def login(self):
126
    def login(self):
4428
144
        """Perform the login using the self.backend."""
127
        """Perform the login using the self.backend."""
4429
@@ -153,7 +136,8 @@
4430
153
        else:
136
        else:
4431
154
            f = self.backend.login
137
            f = self.backend.login
4432
155
138
4434
156
        self.overlay.show()
139
        self.hide_error()
4435
140
        self.show_overlay()
4436
157
        error_handler = partial(self._handle_error, f, self.on_login_error)
141
        error_handler = partial(self._handle_error, f, self.on_login_error)
4437
158
        f(*args, reply_handler=NO_OP, error_handler=error_handler)
142
        f(*args, reply_handler=NO_OP, error_handler=error_handler)
4438
159
143
4439
@@ -162,19 +146,18 @@
4440
162
        # let the user know
146
        # let the user know
4441
163
        logger.error('Got error when login %s, error: %s',
147
        logger.error('Got error when login %s, error: %s',
4442
164
            self.app_name, error)
148
            self.app_name, error)
4446
165
        self.overlay.hide()
149
        self.show_error(self.app_name, build_general_error_message(error))
4444
166
        self.message_box.critical(self, self.app_name,
4445
167
            build_general_error_message(error))
4447
168
150
4448
169
    def on_logged_in(self, app_name, result):
151
    def on_logged_in(self, app_name, result):
4449
170
        """We managed to log in."""
152
        """We managed to log in."""
4450
171
        logger.info('Logged in for %s', app_name)
153
        logger.info('Logged in for %s', app_name)
4452
172
        self.overlay.hide()
154
        self.hide_overlay()
4453
173
        email = unicode(self.ui.email_edit.text())
155
        email = unicode(self.ui.email_edit.text())
4455
174
        self.userLoggedIn.emit(app_name, email)
156
        self.userLoggedIn.emit(email)
4456
175
        logger.debug('Wizard.loginSuccess emitted.')
157
        logger.debug('Wizard.loginSuccess emitted.')
4457
176
158
4459
177
    def on_forgotten_password(self):
159
    def on_forgotten_password(self, link=None):
4460
178
        """Show the user the forgotten password page."""
160
        """Show the user the forgotten password page."""
4461
179
        logger.info('Forgotten password')
161
        logger.info('Forgotten password')
4462
162
        self.hide_overlay()
4463
180
        self.passwordForgotten.emit()
163
        self.passwordForgotten.emit()
4464
181
164
4465
=== modified file 'ubuntu_sso/qt/email_verification_page.py'
4466
--- ubuntu_sso/qt/email_verification_page.py	2012-02-14 14:38:23 +0000
4467
+++ ubuntu_sso/qt/email_verification_page.py	2012-03-06 15:41:36 +0000
4468
@@ -18,47 +18,46 @@
4469
18
18
4470
19
from functools import partial
19
from functools import partial
4471
20
20
4474
21
from PyQt4 import QtCore
21
from PyQt4 import QtGui, QtCore
4473
22
from twisted.internet import defer
4475
23
22
4476
24
from ubuntu_sso import NO_OP
23
from ubuntu_sso import NO_OP
4477
24
from ubuntu_sso.logger import setup_gui_logging
4478
25
from ubuntu_sso.qt import build_general_error_message
25
from ubuntu_sso.qt import build_general_error_message
4481
26
from ubuntu_sso.qt.gui import SSOWizardPage
26
from ubuntu_sso.qt.sso_wizard_page import SSOWizardPage
4482
27
from ubuntu_sso.logger import setup_logging
27
from ubuntu_sso.qt.ui.email_verification_ui import Ui_EmailVerificationPage
4483
28
from ubuntu_sso.utils.ui import (
28
from ubuntu_sso.utils.ui import (
4484
29
    ERROR_EMAIL_TOKEN,
4485
30
    NEXT,
4486
31
    VERIFICATION_CODE,
4487
29
    VERIFY_EMAIL_TITLE,
32
    VERIFY_EMAIL_TITLE,
4488
30
    VERIFY_EMAIL_CONTENT,
33
    VERIFY_EMAIL_CONTENT,
4489
31
)
34
)
4494
32
from ubuntu_sso.utils.ui import ERROR_EMAIL_TOKEN
35
4495
33
36
4496
34
37
logger = setup_gui_logging('ubuntu_sso.email_verification_page')
4493
35
logger = setup_logging('ubuntu_sso.email_verification_page')
4497
36
38
4498
37
39
4499
38
class EmailVerificationPage(SSOWizardPage):
40
class EmailVerificationPage(SSOWizardPage):
4500
39
    """Widget used to input the email verification code."""
41
    """Widget used to input the email verification code."""
4501
40
42
4503
41
    registrationSuccess = QtCore.pyqtSignal('QString', 'QString')
43
    ui_class = Ui_EmailVerificationPage
4504
44
    registrationSuccess = QtCore.pyqtSignal(unicode)
4505
42
45
4509
43
    def __init__(self, ui, ping_url, *args, **kwargs):
46
    def __init__(self, *args, **kwargs):
4507
44
        super(EmailVerificationPage, self).__init__(ui, *args, **kwargs)
4508
45
        self.ping_url = ping_url
4510
46
        self.email = ''
47
        self.email = ''
4511
47
        self.password = ''
48
        self.password = ''
4513
48
        self._signals = {
49
        super(EmailVerificationPage, self).__init__(*args, **kwargs)
4514
50
4515
51
    @property
4516
52
    def _signals(self):
4517
53
        """The signals to connect to the backend."""
4518
54
        result = {
4519
49
            'EmailValidated':
55
            'EmailValidated':
4520
50
             self._filter_by_app_name(self.on_email_validated),
56
             self._filter_by_app_name(self.on_email_validated),
4521
51
            'EmailValidationError':
57
            'EmailValidationError':
4522
52
             self._filter_by_app_name(self.on_email_validation_error),
58
             self._filter_by_app_name(self.on_email_validation_error),
4523
53
        }
59
        }
4532
54
        self.setup_page()
60
        return result
4525
55
4526
56
    @defer.inlineCallbacks
4527
57
    def setup_page(self):
4528
58
        """Setup the ui components."""
4529
59
        self.backend = yield self.get_backend()
4530
60
        self._setup_signals()
4531
61
        self._connect_ui_elements()
4533
62
61
4534
63
    @property
62
    @property
4535
64
    def verification_code(self):
63
    def verification_code(self):
4536
@@ -70,9 +69,9 @@
4537
70
        """Return the button that move to the next stage."""
69
        """Return the button that move to the next stage."""
4538
71
        return self.ui.next_button
70
        return self.ui.next_button
4539
72
71
4541
73
    def _connect_ui_elements(self):
72
    def _connect_ui(self):
4542
74
        """Set the connection of signals."""
73
        """Set the connection of signals."""
4544
75
        logger.debug('EmailVerificationController._connect_ui_elements')
74
        logger.debug('EmailVerificationController._connect_ui')
4545
76
        self.ui.verification_code_edit.textChanged.connect(
75
        self.ui.verification_code_edit.textChanged.connect(
4546
77
            self.validate_form)
76
            self.validate_form)
4547
78
        self.next_button.clicked.connect(self.validate_email)
77
        self.next_button.clicked.connect(self.validate_email)
4548
@@ -82,12 +81,8 @@
4549
82
        code = self.verification_code.strip()
81
        code = self.verification_code.strip()
4550
83
        enabled = len(code) > 0
82
        enabled = len(code) > 0
4551
84
        self.next_button.setEnabled(enabled)
83
        self.next_button.setEnabled(enabled)
4552
85
        self.next_button.setProperty('DisabledState',
4553
86
            not self.next_button.isEnabled())
4554
87
        self.next_button.style().unpolish(self.next_button)
4555
88
        self.next_button.style().polish(self.next_button)
4556
89
84
4558
90
    def _set_titles(self):
85
    def _set_translated_strings(self):
4559
91
        """Set the different titles."""
86
        """Set the different titles."""
4560
92
        logger.debug('EmailVerificationController._set_titles')
87
        logger.debug('EmailVerificationController._set_titles')
4561
93
        self.header.set_title(VERIFY_EMAIL_TITLE)
88
        self.header.set_title(VERIFY_EMAIL_TITLE)
4562
@@ -95,20 +90,24 @@
4563
95
            "app_name": self.app_name,
90
            "app_name": self.app_name,
4564
96
            "email": self.email,
91
            "email": self.email,
4565
97
        })
92
        })
4566
93
        self.ui.label.setText(VERIFICATION_CODE)
4567
94
        self.ui.next_button.setText(NEXT)
4568
98
95
4569
99
    def set_titles(self, email):
96
    def set_titles(self, email):
4570
100
        """This class needs to have a public set_titles.
97
        """This class needs to have a public set_titles.
4571
101
98
4572
102
        Since the subtitle contains data that is only known after SetupAccount
99
        Since the subtitle contains data that is only known after SetupAccount
4574
103
        and _set_titles is only called on initialization.
100
        and _set_translated_strings is only called on initialization.
4575
104
        """
101
        """
4577
105
        self._set_titles()
102
        self._set_translated_strings()
4578
106
103
4579
107
    def validate_email(self):
104
    def validate_email(self):
4580
108
        """Call the next action."""
105
        """Call the next action."""
4581
109
        logger.debug('EmailVerificationController.validate_email')
106
        logger.debug('EmailVerificationController.validate_email')
4582
110
        code = unicode(self.ui.verification_code_edit.text())
107
        code = unicode(self.ui.verification_code_edit.text())
4583
111
        args = (self.app_name, self.email, self.password, code)
108
        args = (self.app_name, self.email, self.password, code)
4584
109
        self.hide_error()
4585
110
        self.show_overlay()
4586
112
        if self.ping_url:
111
        if self.ping_url:
4587
113
            f = self.backend.validate_email_and_ping
112
            f = self.backend.validate_email_and_ping
4588
114
            args = args + (self.ping_url,)
113
            args = args + (self.ping_url,)
4589
@@ -122,24 +121,25 @@
4590
122
                                self.on_email_validation_error)
121
                                self.on_email_validation_error)
4591
123
        f(*args, reply_handler=NO_OP, error_handler=error_handler)
122
        f(*args, reply_handler=NO_OP, error_handler=error_handler)
4592
124
123
4594
125
    def on_email_validated(self, app_name, *args, **kwargs):
124
    def on_email_validated(self, app_name, email):
4595
126
        """Signal thrown after the email is validated."""
125
        """Signal thrown after the email is validated."""
4596
127
        logger.info('EmailVerificationController.on_email_validated')
126
        logger.info('EmailVerificationController.on_email_validated')
4598
128
        self.registrationSuccess.emit(app_name, self.email)
127
        self.hide_overlay()
4599
128
        self.registrationSuccess.emit(self.email)
4600
129
129
4601
130
    def on_email_validation_error(self, app_name, error):
130
    def on_email_validation_error(self, app_name, error):
4602
131
        """Signal thrown when there's a problem validating the email."""
131
        """Signal thrown when there's a problem validating the email."""
4603
132
        self.hide_overlay()
4604
132
        msg = error.pop(ERROR_EMAIL_TOKEN, '')
133
        msg = error.pop(ERROR_EMAIL_TOKEN, '')
4605
133
        msg += build_general_error_message(error)
134
        msg += build_general_error_message(error)
4609
134
        self.message_box.critical(self, self.app_name, msg)
135
        self.show_error(self.app_name, msg)
4610
135
136
4611
136
    #pylint: disable=C0103
137
    # pylint: disable=C0103
4612
138
4613
137
    def initializePage(self):
139
    def initializePage(self):
4614
138
        """Called to prepare the page just before it is shown."""
140
        """Called to prepare the page just before it is shown."""
4615
139
        self.next_button.setDefault(True)
141
        self.next_button.setDefault(True)
4616
140
        self.next_button.setEnabled(False)
142
        self.next_button.setEnabled(False)
4621
141
        self.next_button.setProperty('DisabledState',
143
        self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
4622
142
            not self.next_button.isEnabled())
144
4619
143
        self.next_button.style().unpolish(self.next_button)
4620
144
        self.next_button.style().polish(self.next_button)
4623
145
    #pylint: enable=C0103
145
    #pylint: enable=C0103
4624
146
146
4625
=== modified file 'ubuntu_sso/qt/enhanced_check_box.py'
4626
--- ubuntu_sso/qt/enhanced_check_box.py	2012-02-16 18:40:41 +0000
4627
+++ ubuntu_sso/qt/enhanced_check_box.py	2012-03-06 15:41:36 +0000
4628
@@ -32,7 +32,7 @@
4629
32
        self.text_label.setOpenExternalLinks(True)
32
        self.text_label.setOpenExternalLinks(True)
4630
33
        padding = self.iconSize().width()
33
        padding = self.iconSize().width()
4631
34
        self.text_label.setStyleSheet("margin-top: -3px;"
34
        self.text_label.setStyleSheet("margin-top: -3px;"
4633
35
                                      "padding-left: {0}px;".format(padding))
35
                                      "padding-left: 2px;")
4634
36
        hbox.setContentsMargins(padding, 0, 0, 0)
36
        hbox.setContentsMargins(padding, 0, 0, 0)
4635
37
        hbox.addWidget(self.text_label)
37
        hbox.addWidget(self.text_label)
4636
38
        self.setLayout(hbox)
38
        self.setLayout(hbox)
4637
39
39
4638
=== modified file 'ubuntu_sso/qt/error_page.py'
4639
--- ubuntu_sso/qt/error_page.py	2012-02-07 18:59:36 +0000
4640
+++ ubuntu_sso/qt/error_page.py	2012-03-06 15:41:36 +0000
4641
@@ -16,14 +16,21 @@
4642
16
16
4643
17
"""Email Verification page UI."""
17
"""Email Verification page UI."""
4644
18
18
4646
19
from ubuntu_sso.qt.gui import SSOWizardPage
19
from ubuntu_sso.qt.sso_wizard_page import SSOWizardPage
4647
20
from ubuntu_sso.qt.ui.error_message_ui import Ui_ErrorPage
4648
20
from ubuntu_sso.utils.ui import ERROR
21
from ubuntu_sso.utils.ui import ERROR
4649
21
22
4650
22
23
4651
23
class ErrorPage(SSOWizardPage):
24
class ErrorPage(SSOWizardPage):
4652
24
    """Widget used to show the diff errors."""
25
    """Widget used to show the diff errors."""
4653
25
26
4656
26
    def __init__(self, ui, *args, **kwargs):
27
    ui_class = Ui_ErrorPage
4657
27
        super(ErrorPage, self).__init__(ui, *args, **kwargs)
28
    next = None
4658
29
4659
30
    def _set_translated_strings(self):
4660
31
        """Set the translated strings."""
4661
32
        self.ui.error_message_label.setText(ERROR)
4662
33
4663
34
    def _connect_ui(self):
4664
35
        """Connect the buttons to perform actions."""
4665
28
        self.next = -1
36
        self.next = -1
4666
29
        self.ui.error_message_label.setText(ERROR)
4667
30
37
4668
=== added file 'ubuntu_sso/qt/expander.py'
4669
--- ubuntu_sso/qt/expander.py	1970-01-01 00:00:00 +0000
4670
+++ ubuntu_sso/qt/expander.py	2012-03-06 15:41:36 +0000
4671
@@ -0,0 +1,115 @@
4672
1
# -*- coding: utf-8 -*-
4673
2
#
4674
3
# Copyright 2012 Canonical Ltd.
4675
4
#
4676
5
# This program is free software: you can redistribute it and/or modify it
4677
6
# under the terms of the GNU General Public License version 3, as published
4678
7
# by the Free Software Foundation.
4679
8
#
4680
9
# This program is distributed in the hope that it will be useful, but
4681
10
# WITHOUT ANY WARRANTY; without even the implied warranties of
4682
11
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4683
12
# PURPOSE.  See the GNU General Public License for more details.
4684
13
#
4685
14
# You should have received a copy of the GNU General Public License along
4686
15
# with this program.  If not, see <http://www.gnu.org/licenses/>.
4687
16
"""A Expander widget similar to the GtkExpander."""
4688
17
4689
18
from PyQt4.QtCore import pyqtSignal
4690
19
from PyQt4.QtGui import QHBoxLayout, QLabel, QSizePolicy, QVBoxLayout, QWidget
4691
20
4692
21
from ubuntu_sso.qt.arrow import QArrow
4693
22
4694
23
# we are following the Qt style, lets tell pylint to ignore it
4695
24
# pylint: disable=C0103
4696
25
4697
26
4698
27
class QExpanderLabel(QWidget):
4699
28
    """Widget used to show the label of a QExpander."""
4700
29
4701
30
    clicked = pyqtSignal()
4702
31
4703
32
    def __init__(self, label, parent=None):
4704
33
        """Create a new instance."""
4705
34
        super(QExpanderLabel, self).__init__(parent)
4706
35
        self.arrow = QArrow(QArrow.RIGHT)
4707
36
        self.label = QLabel(label)
4708
37
        layout = QHBoxLayout()
4709
38
        layout.setContentsMargins(0, 0, 0, 0)
4710
39
        self.setLayout(layout)
4711
40
        layout.addWidget(self.arrow)
4712
41
        layout.addWidget(self.label)
4713
42
4714
43
    def mousePressEvent(self, event):
4715
44
        """Mouse clicked."""
4716
45
        if self.arrow.direction == QArrow.DOWN:
4717
46
            self.arrow.direction = QArrow.RIGHT
4718
47
        else:
4719
48
            self.arrow.direction = QArrow.DOWN
4720
49
        self.clicked.emit()
4721
50
4722
51
    def text(self):
4723
52
        """Return the text of the label."""
4724
53
        return self.label.text()
4725
54
4726
55
    def setText(self, text):
4727
56
        """Set the text of the label."""
4728
57
        self.label.setText(text)
4729
58
4730
59
4731
60
class QExpander(QWidget):
4732
61
    """A Qt implementation similar to GtkExpander."""
4733
62
4734
63
    def __init__(self, label, expanded=False, parent=None):
4735
64
        """Create a new instance."""
4736
65
        super(QExpander, self).__init__(parent)
4737
66
        self.label = QExpanderLabel(label)
4738
67
        self.label.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
4739
68
        self.content = None
4740
69
        self.layout = QVBoxLayout()
4741
70
        self.layout.setContentsMargins(0, 0, 0, 0)
4742
71
        self.setLayout(self.layout)
4743
72
        self.layout.addWidget(self.label)
4744
73
        self.layout.addStretch()
4745
74
        self.label.clicked.connect(self._on_label_clicked)
4746
75
        self.setExpanded(expanded)
4747
76
4748
77
    def _on_label_clicked(self):
4749
78
        """The expander widget was clicked."""
4750
79
        self._expanded = not self._expanded
4751
80
        self.setExpanded(self._expanded)
4752
81
4753
82
    def addWidget(self, widget):
4754
83
        """Add a widget to the expander.
4755
84
4756
85
        The previous widget will be removed.
4757
86
        """
4758
87
        if self.content is not None:
4759
88
            self.layout.removeWidget(self.content)
4760
89
        self.content = widget
4761
90
        self.content.setVisible(self._expanded)
4762
91
        self.layout.insertWidget(1, self.content)
4763
92
4764
93
    def text(self):
4765
94
        """Return the text of the label."""
4766
95
        return self.label.text()
4767
96
4768
97
    def setText(self, text):
4769
98
        """Set the text of the label."""
4770
99
        self.label.setText(text)
4771
100
4772
101
    def expanded(self):
4773
102
        """Return if widget is expanded."""
4774
103
        return self._expanded
4775
104
4776
105
    # pylint: disable=W0201
4777
106
    def setExpanded(self, is_expanded):
4778
107
        """Expand the widget or not."""
4779
108
        self._expanded = is_expanded
4780
109
        if self._expanded:
4781
110
            self.label.arrow.direction = QArrow.DOWN
4782
111
        else:
4783
112
            self.label.arrow.direction = QArrow.RIGHT
4784
113
        if self.content is not None:
4785
114
            self.content.setVisible(self._expanded)
4786
115
    # pylint: enable=W0201
4787
0
116
4788
=== modified file 'ubuntu_sso/qt/forgotten_password_page.py'
4789
--- ubuntu_sso/qt/forgotten_password_page.py	2012-02-16 14:13:36 +0000
4790
+++ ubuntu_sso/qt/forgotten_password_page.py	2012-03-06 15:41:36 +0000
4791
@@ -19,178 +19,108 @@
4792
19
from functools import partial
19
from functools import partial
4793
20
20
4794
21
from PyQt4 import QtCore
21
from PyQt4 import QtCore
4795
22
from twisted.internet import defer
4796
23
22
4797
24
from ubuntu_sso import NO_OP
23
from ubuntu_sso import NO_OP
4799
25
from ubuntu_sso.qt.gui import SSOWizardEnhancedEditPage
24
from ubuntu_sso.logger import setup_gui_logging, log_call
4800
25
from ubuntu_sso.qt.sso_wizard_page import SSOWizardEnhancedEditPage
4801
26
from ubuntu_sso.qt.ui.forgotten_password_ui import Ui_ForgottenPasswordPage
4802
26
from ubuntu_sso.utils.ui import (
27
from ubuntu_sso.utils.ui import (
4803
27
    EMAIL_LABEL,
28
    EMAIL_LABEL,
4804
29
    FORGOTTEN_PASSWORD_TITLE,
4805
30
    FORGOTTEN_PASSWORD_SUBTITLE,
4806
28
    is_correct_email,
31
    is_correct_email,
4807
29
    RESET_PASSWORD,
32
    RESET_PASSWORD,
4808
30
    REQUEST_PASSWORD_TOKEN_LABEL,
4809
31
    REQUEST_PASSWORD_TOKEN_WRONG_EMAIL,
33
    REQUEST_PASSWORD_TOKEN_WRONG_EMAIL,
4810
32
    REQUEST_PASSWORD_TOKEN_TECH_ERROR,
4811
33
    TRY_AGAIN_BUTTON,
4812
34
)
34
)
4813
35
35
4814
36
36
4815
37
logger = setup_gui_logging('ubuntu_sso.forgotten_password_page')
4816
38
4817
39
4818
37
class ForgottenPasswordPage(SSOWizardEnhancedEditPage):
40
class ForgottenPasswordPage(SSOWizardEnhancedEditPage):
4819
38
    """Widget used to deal with users that forgot the password."""
41
    """Widget used to deal with users that forgot the password."""
4820
39
42
4822
40
    passwordResetTokenSent = QtCore.pyqtSignal()
43
    ui_class = Ui_ForgottenPasswordPage
4823
44
    passwordResetTokenSent = QtCore.pyqtSignal(unicode)
4824
41
45
4828
42
    def __init__(self, ui, *args, **kwargs):
46
    @property
4829
43
        super(ForgottenPasswordPage, self).__init__(ui, *args, **kwargs)
47
    def _signals(self):
4830
44
        self._signals = {
48
        """The signals to connect to the backend."""
4831
49
        result = {
4832
45
            'PasswordResetTokenSent':
50
            'PasswordResetTokenSent':
4833
46
             self._filter_by_app_name(self.on_password_reset_token_sent),
51
             self._filter_by_app_name(self.on_password_reset_token_sent),
4834
47
            'PasswordResetError':
52
            'PasswordResetError':
4835
48
             self._filter_by_app_name(self.on_password_reset_error),
53
             self._filter_by_app_name(self.on_password_reset_error),
4836
49
        }
54
        }
4870
50
        self.setup_page()
55
        return result
4838
51
4839
52
    @defer.inlineCallbacks
4840
53
    def setup_page(self):
4841
54
        """Setup the widget components."""
4842
55
        self.backend = yield self.get_backend()
4843
56
        self._setup_signals()
4844
57
        # hide the error label
4845
58
        self.try_again_widget.setVisible(False)
4846
59
        self._set_translated_strings()
4847
60
        self._connect_ui()
4848
61
        self._set_enhanced_line_edit()
4849
62
        self._register_fields()
4850
63
4851
64
    @property
4852
65
    def email_widget(self):
4853
66
        """Return the widget used to show the email information."""
4854
67
        return self.ui.email_widget
4855
68
4856
69
    @property
4857
70
    def forgotted_password_intro_label(self):
4858
71
        """Return the intro label that lets the user know the issue."""
4859
72
        return self.ui.forgotted_password_intro_label
4860
73
4861
74
    @property
4862
75
    def error_label(self):
4863
76
        """Return the label used to show error."""
4864
77
        return self.ui.error_label
4865
78
4866
79
    @property
4867
80
    def email_address_label(self):
4868
81
        """Return the lable used to state the use of the line edit."""
4869
82
        return self.ui.email_address_label
4871
83
56
4872
84
    @property
57
    @property
4873
85
    def email_address(self):
58
    def email_address(self):
4874
86
        """Return the email address provided by the user."""
59
        """Return the email address provided by the user."""
4896
87
        return str(self.ui.email_line_edit.text())
60
        return unicode(self.ui.email_line_edit.text())
4876
88
4877
89
    @property
4878
90
    def email_address_line_edit(self):
4879
91
        """Return the line edit with the content."""
4880
92
        return self.ui.email_line_edit
4881
93
4882
94
    @property
4883
95
    def send_button(self):
4884
96
        """Return the button used to request the new password."""
4885
97
        return self.ui.send_button
4886
98
4887
99
    @property
4888
100
    def try_again_widget(self):
4889
101
        """Return the widget used to display the try again button."""
4890
102
        return self.ui.try_again_widget
4891
103
4892
104
    @property
4893
105
    def try_again_button(self):
4894
106
        """Return the button used to try again the reset password."""
4895
107
        return self.ui.try_again_button
4897
108
61
4898
109
    #pylint: disable=C0103
62
    #pylint: disable=C0103
4899
63
4900
110
    def initializePage(self):
64
    def initializePage(self):
4901
111
        """Set the initial state of ForgottenPassword page."""
65
        """Set the initial state of ForgottenPassword page."""
4903
112
        self.send_button.setDefault(True)
66
        self.ui.send_button.setDefault(True)
4904
113
        enabled = not self.ui.email_line_edit.text().isEmpty()
67
        enabled = not self.ui.email_line_edit.text().isEmpty()
4911
114
        self.send_button.setEnabled(enabled)
68
        self.ui.send_button.setEnabled(enabled)
4912
115
        # The style from this property come from the Wizard
69
4907
116
        self.send_button.setProperty("DisabledState",
4908
117
            not self.send_button.isEnabled())
4909
118
        self.send_button.style().unpolish(self.send_button)
4910
119
        self.send_button.style().polish(self.send_button)
4913
120
    #pylint: enable=C0103
70
    #pylint: enable=C0103
4914
121
71
4915
122
    def _register_fields(self):
72
    def _register_fields(self):
4916
123
        """Register the fields of the wizard page."""
73
        """Register the fields of the wizard page."""
4917
124
        self.registerField('email_address',
74
        self.registerField('email_address',
4919
125
                                self.email_address_line_edit)
75
                           self.ui.email_line_edit)
4920
126
76
4921
127
    def _set_translated_strings(self):
77
    def _set_translated_strings(self):
4922
128
        """Set the translated strings in the view."""
78
        """Set the translated strings in the view."""
4929
129
        self.forgotted_password_intro_label.setText(
79
        self.setTitle(FORGOTTEN_PASSWORD_TITLE)
4930
130
                                    REQUEST_PASSWORD_TOKEN_LABEL % {'app_name':
80
        subtitle = FORGOTTEN_PASSWORD_SUBTITLE.format(app_name=self.app_name)
4931
131
                                    self.app_name})
81
        self.setSubTitle(subtitle)
4932
132
        self.email_address_label.setText(EMAIL_LABEL)
82
        self.ui.email_address_label.setText(EMAIL_LABEL)
4933
133
        self.send_button.setText(RESET_PASSWORD)
83
        self.ui.send_button.setText(RESET_PASSWORD)
4928
134
        self.try_again_button.setText(TRY_AGAIN_BUTTON)
4934
135
84
4935
136
    def _set_enhanced_line_edit(self):
85
    def _set_enhanced_line_edit(self):
4936
137
        """Set the extra logic to the line edits."""
86
        """Set the extra logic to the line edits."""
4939
138
        self.set_line_edit_validation_rule(
87
        self.set_line_edit_validation_rule(self.ui.email_line_edit,
4938
139
                                           self.email_address_line_edit,
4940
140
                                           is_correct_email)
88
                                           is_correct_email)
4941
141
89
4942
142
    def _connect_ui(self):
90
    def _connect_ui(self):
4943
143
        """Connect the diff signals from the Ui."""
91
        """Connect the diff signals from the Ui."""
4948
144
        self.email_address_line_edit.textChanged.connect(self._validate)
92
        self.ui.email_line_edit.textChanged.connect(self._validate)
4949
145
93
        self.ui.send_button.clicked.connect(self.request_new_password)
4950
146
        self.send_button.clicked.connect(self.request_new_password)
94
        self._set_enhanced_line_edit()
4951
147
        self.try_again_button.clicked.connect(self.on_try_again)
95
        self._register_fields()
4952
148
96
4953
149
    def request_new_password(self):
97
    def request_new_password(self):
4954
150
        """Send the request password operation."""
98
        """Send the request password operation."""
4955
99
        self.hide_error()
4956
151
        args = (self.app_name, self.email_address)
100
        args = (self.app_name, self.email_address)
4957
152
        f = self.backend.request_password_reset_token
101
        f = self.backend.request_password_reset_token
4958
153
102
4959
154
        error_handler = partial(self._handle_error, f,
103
        error_handler = partial(self._handle_error, f,
4960
155
            self.on_password_reset_error)
104
            self.on_password_reset_error)
4961
156
105
4963
157
        self.overlay.show()
106
        self.show_overlay()
4964
158
        f(*args, reply_handler=NO_OP, error_handler=error_handler)
107
        f(*args, reply_handler=NO_OP, error_handler=error_handler)
4965
159
108
4966
160
    def _validate(self):
109
    def _validate(self):
4967
161
        """Validate that we have an email."""
110
        """Validate that we have an email."""
4982
162
        email = unicode(self.email_address_line_edit.text())
111
        email = unicode(self.ui.email_line_edit.text())
4983
163
        self.send_button.setEnabled(is_correct_email(email))
112
        self.ui.send_button.setEnabled(is_correct_email(email))
4984
164
        self.send_button.setProperty("DisabledState",
113
4985
165
            not self.send_button.isEnabled())
114
    def on_password_reset_token_sent(self, app_name, email):
4972
166
        self.send_button.style().unpolish(self.send_button)
4973
167
        self.send_button.style().polish(self.send_button)
4974
168
4975
169
    def on_try_again(self):
4976
170
        """Set back the widget to the initial state."""
4977
171
        self.try_again_widget.setVisible(False)
4978
172
        self.email_widget.setVisible(True)
4979
173
4980
174
    # pylint: disable=W0212
4981
175
    def on_password_reset_token_sent(self, app_name, result):
4986
176
        """Action taken when we managed to get the password reset done."""
115
        """Action taken when we managed to get the password reset done."""
4987
177
        # ignore the result and move to the reset page
116
        # ignore the result and move to the reset page
4991
178
        self.overlay.hide()
117
        self.hide_overlay()
4992
179
        self.passwordResetTokenSent.emit()
118
        self.passwordResetTokenSent.emit(email)
4990
180
    # pylint: enable=W0212
4993
181
119
4994
120
    @log_call(logger.error)
4995
182
    def on_password_reset_error(self, app_name, error):
121
    def on_password_reset_error(self, app_name, error):
4996
183
        """Action taken when there was an error requesting the reset."""
122
        """Action taken when there was an error requesting the reset."""
4997
184
        # set the error message
123
        # set the error message
4998
185
        self.overlay.hide()
4999
186
        msg = REQUEST_PASSWORD_TOKEN_TECH_ERROR
5000
187
        if error['errtype'] == 'ResetPasswordTokenError':
Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2012-03-06	Approve on 2012-03-06
Review via email: mp+96154@code.launchpad.net