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

[Roberto Alsina]

- Switched to non-native dialog on darwin (LP:1040905).

To test IRL:

* Start on mac
* Click "add a folder from this computer"
* see ugly dialog
* wait a minute
* ugly dialog still there? then it's fixed.

[Mike McCracken (mikemc)]

Worked for me.

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2012-03-19 20:55:52 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2012-08-24 20:44:20 +0000
@@ -33,13 +33,13 @@
 logger = setup_logging('qt.addfolder')
 
 CLOSE = QtGui.QMessageBox.Close
-# NOTE: this is temporary because of a Qt bug that will be fixed
-# on Qt 4.9. You cannot, in general, use sys.platform in these
+# NOTE: this is temporary because of Qt bugs.
+# You cannot, in general, use sys.platform in these
 # modules. Do not do this. Please. This is an exception, one
 # time only, pinky-swear, cross my heart and hope to die if
 # I lie.
 FILE_CHOOSER_OPTIONS = QtGui.QFileDialog.ShowDirsOnly
-if sys.platform == 'win32':
+if sys.platform in ('win32', 'darwin'):
     FILE_CHOOSER_OPTIONS |= QtGui.QFileDialog.DontUseNativeDialog
 # Yes, that is true. If you do that again, you will be hunted
 # down and taught a lesson. You will be sorry.