← Back to branch summary

~dobey/ubuntuone-control-panel/update-4-0

« back to all changes in this revision

Viewing changes to ubuntuone/controlpanel/gui/qt/main/__init__.py

  • Committer: Tarmac
  • Author(s): Diego Sarmentero, mike.mccracken at canonical, Roberto Alsina, Rodney Dawes
  • Date: 2012-06-20 19:33:56 UTC
  • mfrom: (327.7.1 update-4-0)
  • Revision ID: tarmac-20120620193356-en3jx8bhrcl62yjo
[Mike McCracken]

    - Use qt4reactor on Darwin. (LP: #1013820)
    - Make run-tests script work on Darwin. (LP: #1010211)

[Roberto Alsina]

    - Enable folder list sorting (Fixes LP:1006385).

[Diego Sarmentero]

    - Using suggested_path to server path comparisons (LP: #1004603).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/gui/qt/main/__init__.py
29
29
from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication
30
30
 
31
31
# Invalid name "source", pylint: disable=C0103
32
 
if sys.platform == 'win32':
33
 
    from ubuntuone.controlpanel.gui.qt.main import windows
34
 
    source = windows
 
32
if sys.platform in ('win32', 'darwin'):
 
33
    from ubuntuone.controlpanel.gui.qt.main import twisted_main
 
34
    source = twisted_main
35
35
else:
36
 
    from ubuntuone.controlpanel.gui.qt.main import linux
37
 
    source = linux
 
36
    from ubuntuone.controlpanel.gui.qt.main import dbus_main
 
37
    source = dbus_main
38
38
# pylint: enable=C0103
39
39
 
40
40