Merge lp:~ralsina/ubuntuone-control-panel/udf-path-is-not-empty into lp:ubuntuone-control-panel

[Roberto Alsina]

Don't use a native file dialog, because of a Qt bug libraries can be selected and they are not folders (LP: #835013).

Don't use a native file dialog, because of a Qt bug.

[Natalia Bidart (nataliabidart)]

The test suite for QT is failing (command used was ./run-tests -qt):

FAILED (skips=2, failures=7, errors=8, successes=575)

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Since you're referencing a bug in the comment (which is great), please use this notation so we can click on the bug while browsing the code: "LP: #835013". Thanks

[lp:~ralsina/ubuntuone-control-panel/udf-path-is-not-empty]

207. By Roberto Alsina on 2011-08-27

Improve FakedFileDialog so more tests pass

208. By Roberto Alsina on 2011-08-27

fix test

209. By Roberto Alsina on 2011-08-27

use correct notation for bug

[Roberto Alsina (ralsina)]

> Since you're referencing a bug in the comment (which is great), please use
> this notation so we can click on the bug while browsing the code: "LP:
> #835013". Thanks

Fixed in revno 209

[Roberto Alsina (ralsina)]

> The test suite for QT is failing (command used was ./run-tests -qt):
>
> FAILED (skips=2, failures=7, errors=8, successes=575)

Fixed in revno 209

[Natalia Bidart (nataliabidart)]

Looks good!

Simple fix: please replace this 'options': 4 by 'options': gui.QtGui.QFileDialog.DontUseNativeDialog. Thanks!

review: Approve

[lp:~ralsina/ubuntuone-control-panel/udf-path-is-not-empty]

210. By Roberto Alsina on 2011-08-29

no magic number 4

=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2011-06-29 13:06:15 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2011-08-29 13:30:28 +0000
@@ -55,8 +55,10 @@
     @defer.inlineCallbacks
     def on_clicked(self):
         """The 'Sync another folder' button was clicked."""
-        folder = QtGui.QFileDialog.getExistingDirectory(parent=self)
-        folder = unicode(folder)
+        # The options argument is because of LP: #835013
+        folder = QtGui.QFileDialog.getExistingDirectory(
+            parent=self, options=QtGui.QFileDialog.DontUseNativeDialog)
+        folder = unicode(QtCore.QDir.toNativeSeparators(folder))
         logger.debug('on_add_folder_button_clicked: user requested folder '
                      'creation for path %r', folder)
         if folder == '':

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-08-26 17:16:16 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-08-29 13:30:28 +0000
@@ -154,6 +154,7 @@
     """Fake a file chooser dialog."""
 
     response = args = kwargs = None
+    DontUseNativeDialog = 4
 
     # Invalid name "getExistingDirectory"
     # pylint: disable=C0103

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-07-20 16:31:52 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-08-29 13:30:28 +0000
@@ -92,7 +92,10 @@
         yield self.ui.click()
 
         self.assertEqual(FakedFileDialog.args, ())
-        self.assertEqual(FakedFileDialog.kwargs, {'parent': self.ui})
+        self.assertEqual(FakedFileDialog.kwargs, {
+            'options': gui.QtGui.QFileDialog.DontUseNativeDialog,
+            'parent': self.ui,
+        })
 
     @defer.inlineCallbacks
     def test_does_nothing_if_user_closes_file_chooser(self):