Merge lp:~ralsina/ubuntuone-windows-installer/select-by-default into lp:ubuntuone-windows-installer

[Roberto Alsina]

If the user manually adds a UDF, start with that UDF selected.

If the user manually adds a UDF, start with that UDF selected.

To test IRL:

* Start the installer.
* In the computer-to-cloud page, choose a valid UDF
* It should appear "checked"

[Natalia Bidart (nataliabidart)]

Code looks good!

Could you please share instructions how to test this IRL? Thanks!

review: Needs Information

[Roberto Alsina (ralsina)]

> Code looks good!
>
> Could you please share instructions how to test this IRL? Thanks!

Sure! added to the MP.

[Natalia Bidart (nataliabidart)]

Looks good and works ok, though I found bug #848981 in the process (will be fixed on a separated branch).

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-09-12 17:05:18 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-09-13 02:14:41 +0000
@@ -302,4 +302,6 @@
                                           'home_folder': user_home}
             QtGui.QMessageBox.warning(self, '', text, QtGui.QMessageBox.Close)
             return
-        yield self.add_folder(folder, validate=False, volume_id=False)
+        item = yield self.add_folder(folder, validate=False, volume_id=False)
+        if item is not None:
+            item.setCheckState(0, QtCore.Qt.Checked)

=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-12 17:31:03 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-13 02:14:41 +0000
@@ -449,6 +449,15 @@
         self.assertEqual(self._called,
             ((u'c:\\whatever',), {'validate': False, 'volume_id': False}))
 
+    @defer.inlineCallbacks
+    def test_add_folder_valid_starts_selected(self):
+        """When adding a valid folder, it starts as selected."""
+        self.patch(QtGui, "QFileDialog", FakeFileDialog())
+        yield self.ui.on_add_folder_button_clicked()
+        self.assertEqual(
+            self.ui.items[u'c:\\whatever'].checkState(0),
+            QtCore.Qt.Checked)
+
     def test_add_folder_clicked_invalid(self):
         """Test behaviour when adding an invalid folder via the button."""
         self.patch(QtGui, "QFileDialog", FakeFileDialog())