← Back to branch summary

~mvo/ubuntu-sso-client/strawman-lp711413

« back to all changes in this revision

Viewing changes to data/qt/reset_password.ui

  • Committer: Tarmac
  • Author(s): Diego Sarmentero, Alejandro J. Cura, Natalia B. Bidart, Manuel de la Pena, Roberto Alsina, Rodney Dawes, Jeremy Bicha
  • Date: 2012-03-21 13:39:14 UTC
  • mfrom: (829.1.2 stable-3-0-update-2.99.91)
  • Revision ID: tarmac-20120321133914-cwlk2mgns4ygbnkj
- Updating from trunk up to revno 930:

[ Alejandro J. Cura <alecu@canonical.com> ]
  - Do not allow ssl errors to be ignored (LP: #959390).
  - Handle wrong credentials properly in qtnetwork webclient
    (LP: #957317).
  - Use HTTPClientFactory to allow replacing the reactor used to connect
    (LP: #929207).

[ Diego Sarmentero <diego.sarmentero@canonical.com> ]
  - Decode the content of help_text (LP: #951371).
  - Removed the title from the reset page.
  - Adding missing file for translation (LP: #951376).
  - Adding a general error message when the argument received by
    build_general_error_message is not a dict (LP: #865176).
  - Adding some checks to setup_page (LP: #951461).
  - Adding a padding to the right margin of the reset layout, and align
    one of its layout to the left (LP: #945065).
  - Executing hide_error when the user click the refresh captcha link,
    not inside of the _refresh_captcha method, because this is executed
    automatically when a captcha error is generated, so we will always
    miss the error message (LP: #955010).
  - Removing the align property from the label that wasn't necessary
    and was breakint the work wrap. Also adjust the height of the widget
    depending if it has more than one line (LP: #940392).
  - Improve logging operations (LP: #934500).
  - Making LINK_STYLE to be unicode (LP: #950953).
  - Setting the window title equal to the app_name (LP: #949744).
  - The _move_to_email_verification_page wasn't receiving the params
    that the signal emits (LP: #945066).

[ Jeremy Bicha <jbicha@ubuntu.com> ]
  - Improve the grammar for the CLOSE_AND_SETUP_LATER button text
    (LP: #949978).

[ Manuel de la Pena <manuel.delapena@canonical.com> ]
  - Changed the way in which we deal with proxies to work around bugs
    found in the QNetworkAccessManager (LP: #957313).
  - Stopped listening to the proxyAuthenticationRequired to avoid the
    dialog showing more than once (LP: #957170)
  - Made changes in the way the webclient is selected to ensure that qt
    is used when possible (LP: #957169)
  - Connected the WebKit browser correctly so that the tc page gets
    loaded (LP: #933081).
  - Added code to check if the browser with the t&c was already loaded.
    If it is just show the t&c page, otherwise perform the request
    (LP: #956185).
  - Added a translatable string to give more context of the ssl cert
    info to the user (LP: #948119).
  - Provided the logic required for the Qt webclient implementation to
    detect ssl errors and spawn the ssl dialog to allow the user accept
    the ssl cert exceptions (LP: #948134).
  - Changed the qt webclient implementation to use a proxy factory so
    that the correct proxy is chosen according to the request
    (LP: #950088).
  - Added the required code to allow the webclient use authenticated
    proxies and request the creds when needed (LP: #933727).

[ Natalia B. Bidart <natalia.bidart@canonical.com> ]
  - The tooltip should not be shown for titles and subtitles when
    no cut off was needed (LP: #949741).
  - Making the WizardHeader a reusable class.
  - Added some minor logging to build_general_error_msg.
  - Improved code for the 'sign in' button validation.

[ Roberto Alsina <roberto.alsina@canonical.com> ]
  - Made the ubuntu-sso-proxy-creds script crossplatform (LP: #958884).
  - Added .exe to the constant for binary names if needed (LP: #958778).
  - Enable platform-specific styling (LP: #953318).
  - Return the executable's dirname as BIN_DIR for frozen binaries
    (LP: #956187).
  - Only import DBus on Linux (LP: #956304).
  - Fixed tests so they work under non-ascii locales (LP: #951716).

[ Rodney Dawes <rodney.dawes@canonical.com> ]
  - Don't hard-code font sizes
  - Remove usage of weight property as a numeric; just use bold
    property instead (LP: #953062).

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/qt/reset_password.ui
6
6
   <rect>
7
7
    <x>0</x>
8
8
    <y>0</y>
9
 
    <width>544</width>
10
 
    <height>280</height>
 
9
    <width>505</width>
 
10
    <height>260</height>
11
11
   </rect>
12
12
  </property>
13
 
  <property name="layoutDirection">
14
 
   <enum>Qt::LeftToRight</enum>
 
13
  <property name="windowTitle">
 
14
   <string/>
15
15
  </property>
16
 
  <layout class="QVBoxLayout" name="verticalLayout_6">
 
16
  <layout class="QVBoxLayout" name="verticalLayout_4">
17
17
   <property name="spacing">
18
18
    <number>15</number>
19
19
   </property>
21
21
    <number>0</number>
22
22
   </property>
23
23
   <item>
24
 
    <layout class="QHBoxLayout" name="horizontalLayout">
25
 
     <property name="spacing">
26
 
      <number>0</number>
27
 
     </property>
28
 
     <item>
29
 
      <layout class="QVBoxLayout" name="verticalLayout_5">
30
 
       <property name="spacing">
31
 
        <number>15</number>
32
 
       </property>
33
 
       <item>
34
 
        <layout class="QVBoxLayout" name="verticalLayout_4">
35
 
         <property name="spacing">
36
 
          <number>3</number>
37
 
         </property>
38
 
         <item>
39
 
          <widget class="QLabel" name="reset_code">
40
 
           <property name="sizePolicy">
41
 
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
42
 
             <horstretch>0</horstretch>
43
 
             <verstretch>0</verstretch>
44
 
            </sizepolicy>
45
 
           </property>
46
 
           <property name="minimumSize">
47
 
            <size>
48
 
             <width>310</width>
49
 
             <height>0</height>
50
 
            </size>
51
 
           </property>
52
 
           <property name="maximumSize">
53
 
            <size>
54
 
             <width>16777215</width>
55
 
             <height>16777215</height>
56
 
            </size>
57
 
           </property>
58
 
           <property name="font">
59
 
            <font>
60
 
             <weight>75</weight>
61
 
             <bold>true</bold>
62
 
            </font>
63
 
           </property>
64
 
           <property name="text">
65
 
            <string notr="true">reset_code</string>
66
 
           </property>
67
 
          </widget>
68
 
         </item>
69
 
         <item>
70
 
          <widget class="QLineEdit" name="reset_code_line_edit">
71
 
           <property name="sizePolicy">
72
 
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
73
 
             <horstretch>0</horstretch>
74
 
             <verstretch>0</verstretch>
75
 
            </sizepolicy>
76
 
           </property>
77
 
           <property name="minimumSize">
78
 
            <size>
79
 
             <width>300</width>
80
 
             <height>0</height>
81
 
            </size>
82
 
           </property>
83
 
           <property name="maximumSize">
84
 
            <size>
85
 
             <width>300</width>
86
 
             <height>16777215</height>
87
 
            </size>
88
 
           </property>
89
 
          </widget>
90
 
         </item>
91
 
        </layout>
92
 
       </item>
93
 
       <item>
94
 
        <layout class="QVBoxLayout" name="verticalLayout">
95
 
         <property name="spacing">
96
 
          <number>3</number>
97
 
         </property>
98
 
         <item>
99
 
          <widget class="QLabel" name="password_label">
100
 
           <property name="sizePolicy">
101
 
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
102
 
             <horstretch>0</horstretch>
103
 
             <verstretch>0</verstretch>
104
 
            </sizepolicy>
105
 
           </property>
106
 
           <property name="minimumSize">
107
 
            <size>
108
 
             <width>310</width>
109
 
             <height>0</height>
110
 
            </size>
111
 
           </property>
112
 
           <property name="maximumSize">
113
 
            <size>
114
 
             <width>16777215</width>
115
 
             <height>16777215</height>
116
 
            </size>
117
 
           </property>
118
 
           <property name="font">
119
 
            <font>
120
 
             <weight>75</weight>
121
 
             <bold>true</bold>
122
 
            </font>
123
 
           </property>
124
 
           <property name="text">
125
 
            <string notr="true">password_label</string>
126
 
           </property>
127
 
          </widget>
128
 
         </item>
129
 
         <item>
130
 
          <widget class="QLineEdit" name="password_line_edit">
131
 
           <property name="sizePolicy">
132
 
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
133
 
             <horstretch>0</horstretch>
134
 
             <verstretch>0</verstretch>
135
 
            </sizepolicy>
136
 
           </property>
137
 
           <property name="minimumSize">
138
 
            <size>
139
 
             <width>300</width>
140
 
             <height>0</height>
141
 
            </size>
142
 
           </property>
143
 
           <property name="maximumSize">
144
 
            <size>
145
 
             <width>300</width>
146
 
             <height>16777215</height>
147
 
            </size>
148
 
           </property>
149
 
           <property name="echoMode">
150
 
            <enum>QLineEdit::Password</enum>
151
 
           </property>
152
 
          </widget>
153
 
         </item>
154
 
        </layout>
155
 
       </item>
156
 
       <item>
157
 
        <layout class="QVBoxLayout" name="verticalLayout_2">
158
 
         <property name="spacing">
159
 
          <number>3</number>
160
 
         </property>
161
 
         <item>
162
 
          <widget class="QLabel" name="confirm_password_label">
163
 
           <property name="sizePolicy">
164
 
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
165
 
             <horstretch>0</horstretch>
166
 
             <verstretch>0</verstretch>
167
 
            </sizepolicy>
168
 
           </property>
169
 
           <property name="minimumSize">
170
 
            <size>
171
 
             <width>310</width>
172
 
             <height>0</height>
173
 
            </size>
174
 
           </property>
175
 
           <property name="font">
176
 
            <font>
177
 
             <weight>75</weight>
178
 
             <bold>true</bold>
179
 
            </font>
180
 
           </property>
181
 
           <property name="text">
182
 
            <string notr="true">confirm_password_label</string>
183
 
           </property>
184
 
          </widget>
185
 
         </item>
186
 
         <item>
187
 
          <widget class="QLineEdit" name="confirm_password_line_edit">
188
 
           <property name="sizePolicy">
189
 
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
190
 
             <horstretch>0</horstretch>
191
 
             <verstretch>0</verstretch>
192
 
            </sizepolicy>
193
 
           </property>
194
 
           <property name="minimumSize">
195
 
            <size>
196
 
             <width>300</width>
197
 
             <height>0</height>
198
 
            </size>
199
 
           </property>
200
 
           <property name="maximumSize">
201
 
            <size>
202
 
             <width>300</width>
203
 
             <height>16777215</height>
204
 
            </size>
205
 
           </property>
206
 
           <property name="echoMode">
207
 
            <enum>QLineEdit::Password</enum>
208
 
           </property>
209
 
          </widget>
210
 
         </item>
211
 
        </layout>
212
 
       </item>
213
 
      </layout>
214
 
     </item>
215
 
     <item>
 
24
    <layout class="QGridLayout" name="gridLayout">
 
25
     <item row="0" column="0">
 
26
      <layout class="QVBoxLayout" name="verticalLayout">
 
27
       <property name="spacing">
 
28
        <number>3</number>
 
29
       </property>
 
30
       <item>
 
31
        <widget class="QLabel" name="reset_code">
 
32
         <property name="sizePolicy">
 
33
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
 
34
           <horstretch>0</horstretch>
 
35
           <verstretch>0</verstretch>
 
36
          </sizepolicy>
 
37
         </property>
 
38
         <property name="minimumSize">
 
39
          <size>
 
40
           <width>310</width>
 
41
           <height>0</height>
 
42
          </size>
 
43
         </property>
 
44
         <property name="maximumSize">
 
45
          <size>
 
46
           <width>16777215</width>
 
47
           <height>16777215</height>
 
48
          </size>
 
49
         </property>
 
50
         <property name="font">
 
51
          <font>
 
52
           <bold>true</bold>
 
53
          </font>
 
54
         </property>
 
55
         <property name="text">
 
56
          <string notr="true">reset_code</string>
 
57
         </property>
 
58
        </widget>
 
59
       </item>
 
60
       <item>
 
61
        <widget class="QLineEdit" name="reset_code_line_edit">
 
62
         <property name="sizePolicy">
 
63
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
 
64
           <horstretch>0</horstretch>
 
65
           <verstretch>0</verstretch>
 
66
          </sizepolicy>
 
67
         </property>
 
68
         <property name="minimumSize">
 
69
          <size>
 
70
           <width>300</width>
 
71
           <height>0</height>
 
72
          </size>
 
73
         </property>
 
74
         <property name="maximumSize">
 
75
          <size>
 
76
           <width>300</width>
 
77
           <height>16777215</height>
 
78
          </size>
 
79
         </property>
 
80
        </widget>
 
81
       </item>
 
82
      </layout>
 
83
     </item>
 
84
     <item row="1" column="0">
 
85
      <layout class="QVBoxLayout" name="verticalLayout_2">
 
86
       <property name="spacing">
 
87
        <number>3</number>
 
88
       </property>
 
89
       <item>
 
90
        <widget class="QLabel" name="password_label">
 
91
         <property name="sizePolicy">
 
92
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 
93
           <horstretch>0</horstretch>
 
94
           <verstretch>0</verstretch>
 
95
          </sizepolicy>
 
96
         </property>
 
97
         <property name="minimumSize">
 
98
          <size>
 
99
           <width>310</width>
 
100
           <height>0</height>
 
101
          </size>
 
102
         </property>
 
103
         <property name="maximumSize">
 
104
          <size>
 
105
           <width>16777215</width>
 
106
           <height>16777215</height>
 
107
          </size>
 
108
         </property>
 
109
         <property name="font">
 
110
          <font>
 
111
           <bold>true</bold>
 
112
          </font>
 
113
         </property>
 
114
         <property name="text">
 
115
          <string notr="true">password_label</string>
 
116
         </property>
 
117
        </widget>
 
118
       </item>
 
119
       <item>
 
120
        <widget class="QLineEdit" name="password_line_edit">
 
121
         <property name="sizePolicy">
 
122
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
 
123
           <horstretch>0</horstretch>
 
124
           <verstretch>0</verstretch>
 
125
          </sizepolicy>
 
126
         </property>
 
127
         <property name="minimumSize">
 
128
          <size>
 
129
           <width>300</width>
 
130
           <height>0</height>
 
131
          </size>
 
132
         </property>
 
133
         <property name="maximumSize">
 
134
          <size>
 
135
           <width>300</width>
 
136
           <height>16777215</height>
 
137
          </size>
 
138
         </property>
 
139
         <property name="echoMode">
 
140
          <enum>QLineEdit::Password</enum>
 
141
         </property>
 
142
        </widget>
 
143
       </item>
 
144
      </layout>
 
145
     </item>
 
146
     <item row="2" column="0">
216
147
      <layout class="QVBoxLayout" name="verticalLayout_3">
217
148
       <property name="spacing">
218
 
        <number>0</number>
 
149
        <number>3</number>
219
150
       </property>
220
151
       <item>
221
 
        <widget class="QLabel" name="password_assistance">
222
 
         <property name="sizePolicy">
223
 
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
224
 
           <horstretch>0</horstretch>
225
 
           <verstretch>0</verstretch>
226
 
          </sizepolicy>
227
 
         </property>
228
 
         <property name="minimumSize">
229
 
          <size>
230
 
           <width>220</width>
231
 
           <height>100</height>
 
152
        <widget class="QLabel" name="confirm_password_label">
 
153
         <property name="sizePolicy">
 
154
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
 
155
           <horstretch>0</horstretch>
 
156
           <verstretch>0</verstretch>
 
157
          </sizepolicy>
 
158
         </property>
 
159
         <property name="minimumSize">
 
160
          <size>
 
161
           <width>310</width>
 
162
           <height>0</height>
 
163
          </size>
 
164
         </property>
 
165
         <property name="font">
 
166
          <font>
 
167
           <bold>true</bold>
 
168
          </font>
 
169
         </property>
 
170
         <property name="text">
 
171
          <string notr="true">confirm_password_label</string>
 
172
         </property>
 
173
        </widget>
 
174
       </item>
 
175
       <item>
 
176
        <widget class="QLineEdit" name="confirm_password_line_edit">
 
177
         <property name="sizePolicy">
 
178
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
 
179
           <horstretch>0</horstretch>
 
180
           <verstretch>0</verstretch>
 
181
          </sizepolicy>
 
182
         </property>
 
183
         <property name="minimumSize">
 
184
          <size>
 
185
           <width>300</width>
 
186
           <height>0</height>
232
187
          </size>
233
188
         </property>
234
189
         <property name="maximumSize">
235
190
          <size>
236
 
           <width>220</width>
 
191
           <width>300</width>
237
192
           <height>16777215</height>
238
193
          </size>
239
194
         </property>
240
 
         <property name="text">
241
 
          <string notr="true">password_assistance</string>
242
 
         </property>
243
 
         <property name="indent">
244
 
          <number>20</number>
 
195
         <property name="echoMode">
 
196
          <enum>QLineEdit::Password</enum>
245
197
         </property>
246
198
        </widget>
247
199
       </item>
248
 
       <item>
249
 
        <spacer name="verticalSpacer_2">
250
 
         <property name="orientation">
251
 
          <enum>Qt::Vertical</enum>
252
 
         </property>
253
 
         <property name="sizeHint" stdset="0">
254
 
          <size>
255
 
           <width>20</width>
256
 
           <height>40</height>
257
 
          </size>
258
 
         </property>
259
 
        </spacer>
260
 
       </item>
261
 
       <item>
262
 
        <spacer name="horizontalSpacer">
263
 
         <property name="orientation">
264
 
          <enum>Qt::Horizontal</enum>
265
 
         </property>
266
 
         <property name="sizeType">
267
 
          <enum>QSizePolicy::Ignored</enum>
268
 
         </property>
269
 
         <property name="sizeHint" stdset="0">
270
 
          <size>
271
 
           <width>220</width>
272
 
           <height>0</height>
273
 
          </size>
274
 
         </property>
275
 
        </spacer>
276
 
       </item>
277
200
      </layout>
278
201
     </item>
 
202
     <item row="1" column="1" rowspan="2">
 
203
      <widget class="QLabel" name="password_assistance">
 
204
       <property name="sizePolicy">
 
205
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
 
206
         <horstretch>0</horstretch>
 
207
         <verstretch>0</verstretch>
 
208
        </sizepolicy>
 
209
       </property>
 
210
       <property name="minimumSize">
 
211
        <size>
 
212
         <width>185</width>
 
213
         <height>95</height>
 
214
        </size>
 
215
       </property>
 
216
       <property name="maximumSize">
 
217
        <size>
 
218
         <width>185</width>
 
219
         <height>95</height>
 
220
        </size>
 
221
       </property>
 
222
       <property name="text">
 
223
        <string notr="true">password_assistance</string>
 
224
       </property>
 
225
       <property name="wordWrap">
 
226
        <bool>true</bool>
 
227
       </property>
 
228
       <property name="indent">
 
229
        <number>20</number>
 
230
       </property>
 
231
      </widget>
 
232
     </item>
279
233
    </layout>
280
234
   </item>
281
235
   <item>
327
281
  </layout>
328
282
 </widget>
329
283
 <resources/>
330
 
 <connections>
331
 
  <connection>
332
 
   <sender>confirm_password_line_edit</sender>
333
 
   <signal>returnPressed()</signal>
334
 
   <receiver>reset_password_button</receiver>
335
 
   <slot>click()</slot>
336
 
   <hints>
337
 
    <hint type="sourcelabel">
338
 
     <x>160</x>
339
 
     <y>81</y>
340
 
    </hint>
341
 
    <hint type="destinationlabel">
342
 
     <x>541</x>
343
 
     <y>237</y>
344
 
    </hint>
345
 
   </hints>
346
 
  </connection>
347
 
 </connections>
 
284
 <connections/>
348
285
</ui>