Merge lp:~kitterman/ubiquity/encryptcheckbox_fix into lp:ubiquity

[Scott Kitterman]

[Jonathan Riddell (jr)]

There's no code to disable the "Require Password and decrypt home to login" tickbox so the user can select "Login automatically" and tick "Require Password and decrypt home to login" which is pretty unintuitive

[Scott Kitterman (kitterman)]

I see. I don't think we actually support encrypted home with passwordless login, so it needs that. I'll have to consult for some help on that. Thanks for the review.

[Jonathan Riddell (jr)]

How's this? https://code.launchpad.net/~jr/ubiquity/encryptcheckbox_fix

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-06 17:19:43 +0000
+++ debian/changelog	2012-12-08 00:11:22 +0000
@@ -1,8 +1,14 @@
 ubiquity (2.13.8) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Honour base-installer/kernel/altmeta when deciding which kernels to
     install or keep installed.
 
+  [ Scott Kitterman ]
+  * Change encrypt home question to checkbox and indent it under the login
+    option to make it clear it is a sub question to the login option
+    (LP: #1066225)
+
  -- Colin Watson <[e-mail]>  Thu, 06 Dec 2012 17:19:09 +0000
 
 ubiquity (2.13.7) raring; urgency=low

=== modified file 'gui/qt/stepUserSetup.ui'
--- gui/qt/stepUserSetup.ui	2012-02-16 11:22:22 +0000
+++ gui/qt/stepUserSetup.ui	2012-12-08 00:11:22 +0000
@@ -509,41 +509,54 @@
    </item>
    <item>
     <widget class="QWidget" name="widget_6" native="true">
-     <layout class="QGridLayout" name="gridLayout_8">
-      <property name="margin">
-       <number>2</number>
-      </property>
-      <item row="1" column="0" colspan="2">
-       <widget class="QRadioButton" name="login_encrypt">
-        <property name="text">
-         <string>Require Password and decrypt home to login</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QRadioButton" name="login_auto">
-        <property name="text">
-         <string>Log in Automatically</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="login_pass">
-        <property name="text">
-         <string>Require my password to log in</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <widget class="QCheckBox" name="login_encrypt">
+      <property name="geometry">
+       <rect>
+        <x>27</x>
+        <y>27</y>
+        <width>291</width>
+        <height>21</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Require Password and decrypt home to login</string>
+      </property>
+      <property name="checked">
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QRadioButton" name="login_auto">
+      <property name="geometry">
+       <rect>
+        <x>346</x>
+        <y>2</y>
+        <width>139</width>
+        <height>21</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Log in Automatically</string>
+      </property>
+      <property name="checked">
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QRadioButton" name="login_pass">
+      <property name="geometry">
+       <rect>
+        <x>2</x>
+        <y>2</y>
+        <width>193</width>
+        <height>21</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Require my password to log in</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
     </widget>
    </item>
    <item>