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

[Jonathan Riddell]

  * 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

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-10 16:35:33 +0000
+++ debian/changelog	2012-12-12 15:21:23 +0000
@@ -4,12 +4,20 @@
   * Honour base-installer/kernel/altmeta when deciding which kernels to
     install or keep installed.
 
+<<<<<<< TREE
   [ Dmitrijs Ledkovs ]
   * Moving question dialog to use a glade ui file, made it non
     "re-entrant" safe, i.e. it started to remember previous action area
     buttons. The fix is to clear action area, all other parts of the
     dialog are always reset with something fresh. (LP: #1087823)
 
+=======
+  [ 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)
+
+>>>>>>> MERGE-SOURCE
  -- 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-12 15:21:23 +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>

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2012-11-27 06:02:43 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2012-12-12 15:21:23 +0000
@@ -504,6 +504,7 @@
         #self.page.password.textChanged[str].connect(self.on_password_changed)
         #self.page.verified_password.textChanged[str].connect(
         #    self.on_verified_password_changed)
+        self.page.login_pass.clicked[bool].connect(self.on_login_pass_clicked)
 
         self.page.password_debug_warning_label.setVisible(
             'UBIQUITY_DEBUG' in os.environ)
@@ -562,6 +563,9 @@
     def get_auto_login(self):
         return self.page.login_auto.isChecked()
 
+    def on_login_pass_clicked(self, checked):
+        self.page.login_encrypt.setEnabled(checked)
+
     def set_encrypt_home(self, value):
         self.page.login_encrypt.setChecked(value)