Merge lp:~ralsina/ubuntuone-control-panel/fix_906541 into lp:ubuntuone-control-panel

[Roberto Alsina]

Make addfolder open the file dialog in $HOME instead of in the WD.

Make addfolder open the file dialog in $HOME instead of in the WD.

[lp:~ralsina/ubuntuone-control-panel/fix_906541]

249. By Roberto Alsina on 2011-12-26

It's directory in PyQt, not dir

[Guillermo Gonzalez (verterok)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2011-09-07 16:56:39 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2011-12-26 19:49:23 +0000
@@ -57,7 +57,8 @@
         """The 'Sync another folder' button was clicked."""
         # The options argument is because of LP: #835013
         folder = QtGui.QFileDialog.getExistingDirectory(
-            parent=self, options=QtGui.QFileDialog.DontUseNativeDialog)
+            parent=self, directory=os.path.expanduser('~'),
+            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)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-10-05 16:35:59 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-12-26 19:49:23 +0000
@@ -83,6 +83,7 @@
         self.assertEqual(FakedFileDialog.args, ())
         self.assertEqual(FakedFileDialog.kwargs, {
             'options': gui.QtGui.QFileDialog.DontUseNativeDialog,
+            'directory': os.path.expanduser('~'),
             'parent': self.ui,
         })