Merge lp:~ralsina/ubuntuone-control-panel/go-native into lp:ubuntuone-control-panel

[Roberto Alsina]

 - Switched to the native file chooser on Linux (Fixes LP: #947711).

Only use the non-native file chooser on Windows

[Natalia Bidart (nataliabidart)]

When opening the file choose from the Folders tab, I'm getting:

  File "/home/nessita/canonical/controlpanel/review_go-native/ubuntuone/controlpanel/gui/qt/__init__.py", line 94, in inner
    res = yield f(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/home/nessita/canonical/controlpanel/review_go-native/ubuntuone/controlpanel/gui/qt/addfolder.py", line 61, in on_clicked
    options=FILE_CHOOSER_OPTIONS)
TypeError: QFileDialog.getExistingDirectory(QWidget parent=None, QString caption=QString(), QString directory=QString(), QFileDialog.Options options=QFileDialog.ShowDirsOnly): argument 'options' has unexpected type 'int'

review: Needs Fixing

[lp:~ralsina/ubuntuone-control-panel/go-native]

279. By Roberto Alsina on 2012-03-06

No, 0 is not a good option

[Roberto Alsina (ralsina)]

> When opening the file choose from the Folders tab, I'm getting:
>
> File "/home/nessita/canonical/controlpanel/review_go-
> native/ubuntuone/controlpanel/gui/qt/__init__.py", line 94, in inner
> res = yield f(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line
> 1039, in _inlineCallbacks
> result = g.send(result)
> File "/home/nessita/canonical/controlpanel/review_go-
> native/ubuntuone/controlpanel/gui/qt/addfolder.py", line 61, in on_clicked
> options=FILE_CHOOSER_OPTIONS)
> TypeError: QFileDialog.getExistingDirectory(QWidget parent=None, QString
> caption=QString(), QString directory=QString(), QFileDialog.Options
> options=QFileDialog.ShowDirsOnly): argument 'options' has unexpected type
> 'int'

I forgot to IRL test the last revno. So, I added the right constant now, but I amhaving two concerns about this branch:

1) It's importing PyQt outside qt/
2) I created a linux.py just for a constant

[Natalia Bidart (nataliabidart)]

> I forgot to IRL test the last revno. So, I added the right constant now, but I
> amhaving two concerns about this branch:
>
> 1) It's importing PyQt outside qt/
> 2) I created a linux.py just for a constant

What about if you just do the following in ubuntuone/controlpanel/utils/__init__.py?

if windows:
    FILE_CHOOSER_OPTIONS = QtGui.QFileDialog.DontUseNativeDialog | QtGui.QFileDialog.ShowDirsOnly
else:
    FILE_CHOOSER_OPTIONS = QtGui.QFileDialog.ShowDirsOnly

[lp:~ralsina/ubuntuone-control-panel/go-native]

280. By Roberto Alsina on 2012-03-09

simplify a bit

[Roberto Alsina (ralsina)]

> What about if you just do the following in
> ubuntuone/controlpanel/utils/__init__.py?
>
> if windows:
> FILE_CHOOSER_OPTIONS = QtGui.QFileDialog.DontUseNativeDialog |
> QtGui.QFileDialog.ShowDirsOnly
> else:
> FILE_CHOOSER_OPTIONS = QtGui.QFileDialog.ShowDirsOnly

Sure, done in revno 280 (no need for the | ShowDirsOnly). It would still be importing QtGui outside qt/ though

[Manuel de la Peña (mandel)]

Did an IRL and got the native dialog.

review: Approve

[lp:~ralsina/ubuntuone-control-panel/go-native]

281. By Roberto Alsina on 2012-03-09

moved constants into folders.py

282. By Roberto Alsina on 2012-03-09

move things around

283. By Roberto Alsina on 2012-03-09

merged trunk

284. By Roberto Alsina on 2012-03-09

stupid me

285. By Roberto Alsina on 2012-03-09

engage brain before coding

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[lp:~ralsina/ubuntuone-control-panel/go-native]

286. By Roberto Alsina on 2012-03-09

typo

=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2012-01-18 19:52:25 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2012-03-09 14:19:21 +0000
@@ -19,6 +19,7 @@
 """The user interface for the control panel for Ubuntu One."""
 
 from __future__ import division
+import sys
 
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
@@ -32,6 +33,16 @@
 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
+# 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':
+    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.
 
 
 class AddFolderButton(cache.Cache, QtGui.QPushButton):
@@ -57,7 +68,7 @@
         home_dir = yield self.backend.get_home_dir()
         folder = QtGui.QFileDialog.getExistingDirectory(
             parent=self, directory=home_dir,
-            options=QtGui.QFileDialog.DontUseNativeDialog)
+            options=FILE_CHOOSER_OPTIONS)
         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	2012-03-02 17:13:04 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-03-09 14:19:21 +0000
@@ -81,7 +81,7 @@
         home_dir = yield self.ui.backend.get_home_dir()
         self.assertEqual(FakedFileDialog.args, ())
         self.assertEqual(FakedFileDialog.kwargs, {
-            'options': gui.QtGui.QFileDialog.DontUseNativeDialog,
+            'options': gui.FILE_CHOOSER_OPTIONS,
             'directory': home_dir,
             'parent': self.ui,
         })

=== modified file 'ubuntuone/controlpanel/utils/windows.py'
--- ubuntuone/controlpanel/utils/windows.py	2011-11-15 12:36:15 +0000
+++ ubuntuone/controlpanel/utils/windows.py	2012-03-09 14:19:21 +0000
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Autoupdate functions for windows."""
+"""Miscelaneous functions and constants for windows."""
 
 import os
 import sys
@@ -24,7 +24,6 @@
 # pylint: disable=F0401
 import win32api
 # pylint: enable=F0401
-
 from twisted.internet import defer
 from twisted.internet.utils import getProcessValue