Ubuntu One Windows Installer

Merge lp:~ralsina/ubuntuone-windows-installer/fix_803675 into lp:ubuntuone-windows-installer

  1. fix_803675
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: no longer in the source branch.
Merged at revision: 11
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/fix_803675
Merge into: lp:ubuntuone-windows-installer
Diff against target: 44 lines (+4/-9)
2 files modified
ubuntuone_installer/gui/qt/local_folders.py (+1/-1)
ubuntuone_installer/gui/qt/main/windows.py (+3/-8)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/fix_803675
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+66491@code.launchpad.net

Commit message

Use qtreactor.

Description of the change

Use qtreactor instead of txnamedpipes in the wizard.

To test IRL (Windows):

In one terminal:

set PYTHONPATH=.
python bin\windows-ubuntu-sso-login

IN another

set PYTHONPATH=.;..\ubuntuone-control-panel;..\ubuntu-sso-client;..\ubuntuone-client
python bin\ubuntuone-installer-qt

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks fine!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
2--- ubuntuone_installer/gui/qt/local_folders.py 2011-06-29 12:40:51 +0000
3+++ ubuntuone_installer/gui/qt/local_folders.py 2011-06-30 17:55:50 +0000
4@@ -44,7 +44,7 @@
5
6
7 class CalculateSize(threading.Thread):
8- """Class to calculate the size of a folder in the background."""
9+ """Class to calculate the size of a folder in the background."""
10 def __init__(self, path_name, queue):
11 self.path_name = path_name
12 self.queue = queue
13
14=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
15--- ubuntuone_installer/gui/qt/main/windows.py 2011-06-27 09:39:21 +0000
16+++ ubuntuone_installer/gui/qt/main/windows.py 2011-06-30 17:55:50 +0000
17@@ -30,24 +30,19 @@
18 # The following cannot be imported outside this function
19 # because u1trial already provides a reactor.
20 # pylint: disable=W0404, F0401
21- from txnamedpipes.threadedreactor import install
22- from txnamedpipes.qt import Interleaver
23
24 app = Qt.QApplication(sys.argv)
25+ import qtreactor.qt4reactor
26+ qtreactor.qt4reactor.install()
27
28- install()
29 from ubuntuone_installer.gui.qt.gui import MainWindow
30 from twisted.internet import reactor
31- ii = Interleaver()
32- reactor.interleave(ii.toInterleave)
33
34 def really_quit():
35 """Close the application and cleanup."""
36- app.quit()
37 reactor.stop()
38
39 window = MainWindow(close_callback=really_quit)
40 app.window = window
41 window.show()
42-
43- app.exec_()
44+ reactor.run()

Subscribers

People subscribed via source and target branches