Merge lp:~diegosarmentero/ubuntu-sso-client/bug999885 into lp:ubuntu-sso-client

[Diego Sarmentero]

- Setting the size property to expanding and adding a maximum width (LP: #999885).

[Diego Sarmentero (diegosarmentero)]

Before:
https://bugs.launchpad.net/ubuntu-sso-client/+bug/999885/+attachment/3148136/+files/reset_password_screenshot.tiff

After:
http://ubuntuone.com/0D7twlXNI8v4QjXFLMMCLw
http://ubuntuone.com/2awHjUPTfidwuwCbv3S45c

[lp:~diegosarmentero/ubuntu-sso-client/bug999885]

962. By Diego Sarmentero on 2012-05-25

Deleting maximum size

963. By Diego Sarmentero on 2012-05-25

Reverting maximum size

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'data/qt/reset_password.ui'
--- data/qt/reset_password.ui	2012-03-16 21:03:09 +0000
+++ data/qt/reset_password.ui	2012-05-25 14:29:19 +0000
@@ -202,7 +202,7 @@
      <item row="1" column="1" rowspan="2">
       <widget class="QLabel" name="password_assistance">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -215,8 +215,8 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>185</width>
-         <height>95</height>
+         <width>300</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="text">