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

Proposed by Roberto Alsina
Status: Merged
Merged at revision: 8
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/fix_800715
Merge into: lp:ubuntuone-windows-installer
Diff against target: 64 lines (+48/-1)
2 files modified
bin/ubuntuone-installer-qt (+1/-1)
ubuntuone_installer/gui/qt/main/windows.py (+47/-0)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/fix_800715
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Review via email: mp+65524@code.launchpad.net

Commit message

Add windows-specific bits.

Description of the change

Add windows-specific bit.

To test (on windows):

1) get txnamedpipes and ubuntuone-client on the PYTHONPATH
2) python bin\ubuntuone-installer-qt

You should see a window.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Works fine on my VM!
Please set your name in the Authors line of the file, or add yourself to the current one.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/ubuntuone-installer-qt'
--- bin/ubuntuone-installer-qt 2011-06-21 16:36:01 +0000
+++ bin/ubuntuone-installer-qt 2011-06-22 15:54:36 +0000
@@ -27,7 +27,7 @@
2727
28from optparse import OptionParser28from optparse import OptionParser
2929
30from ubuntuone.controlpanel import TRANSLATION_DOMAIN30from ubuntuone_installer import TRANSLATION_DOMAIN
3131
32gettext.textdomain(TRANSLATION_DOMAIN)32gettext.textdomain(TRANSLATION_DOMAIN)
33# import the GUI after the translation domain has been set33# import the GUI after the translation domain has been set
3434
=== added file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py 1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py 2011-06-22 15:54:36 +0000
@@ -0,0 +1,47 @@
1# -*- coding: utf-8 -*-
2
3# Authors: Manuel de la Pena <manuel@canonical.com>
4#
5# Copyright 2011 Canonical Ltd.
6#
7# This program is free software: you can redistribute it and/or modify it
8# under the terms of the GNU General Public License version 3, as published
9# by the Free Software Foundation.
10#
11# This program is distributed in the hope that it will be useful, but
12# WITHOUT ANY WARRANTY; without even the implied warranties of
13# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
14# PURPOSE. See the GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License along
17# with this program. If not, see <http://www.gnu.org/licenses/>.
18"""Reactor installation for windows."""
19
20import sys
21
22from PyQt4 import Qt
23
24# pylint: disable=E1101, F0401, W0404
25from txnamedpipes.threadedreactor import install
26from txnamedpipes.qt import Interleaver
27from ubuntuone_installer.gui.qt.gui import MainWindow
28
29
30def main(switch_to='', alert=False):
31 """Start the Qt reactor and open the main window."""
32
33 # The DBus main loop MUST be initialized before importing the reactor
34 app = Qt.QApplication(sys.argv)
35
36 # The following cannot be imported outside this function
37 # because u1trial already provides a reactor.
38 # pylint: disable=W0404, F0401
39 install()
40 from twisted.internet import reactor
41 ii = Interleaver()
42 reactor.interleave(ii.toInterleave)
43
44 window = MainWindow(close_callback=app.quit)
45 window.show()
46
47 app.exec_()

Subscribers

People subscribed via source and target branches