Merge lp:~nataliabidart/ubuntuone-control-panel/import-qt4reactor into lp:ubuntuone-control-panel

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 245
Merged at revision: 238
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/import-qt4reactor
Merge into: lp:ubuntuone-control-panel
Diff against target: 194 lines (+58/-75)
3 files modified
ubuntuone/controlpanel/gui/qt/main/__init__.py (+41/-7)
ubuntuone/controlpanel/gui/qt/main/linux.py (+7/-34)
ubuntuone/controlpanel/gui/qt/main/windows.py (+10/-34)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/import-qt4reactor
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Review via email: mp+81980@code.launchpad.net

Commit message

- Import qt4reactor properly (LP: #888722).

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

Looks good.
Tested IRL on windows

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (1.0 MiB)

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/import-qt4reactor into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/loadingoverlay.ui into ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
Compiled data/qt/signin.ui into ubuntuone/controlpanel/gui/qt/ui/signin_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
Compiled data/qt/account.ui into ubuntuone/controlpanel/gui/qt/ui/account_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/cache.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/device.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/filesyncstatus.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/loadingoverlay.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/...

245. By Natalia Bidart

Fix lint issue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
2--- ubuntuone/controlpanel/gui/qt/main/__init__.py 2011-07-11 11:19:09 +0000
3+++ ubuntuone/controlpanel/gui/qt/main/__init__.py 2011-11-14 11:56:20 +0000
4@@ -1,6 +1,4 @@
5 # -*- coding: utf-8 -*-
6-
7-# Authors: Manuel de la Pena <manuel@canonical.com>
8 #
9 # Copyright 2011 Canonical Ltd.
10 #
11@@ -15,16 +13,52 @@
12 #
13 # You should have received a copy of the GNU General Public License along
14 # with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16 """Provide the correct reactor and ui integration."""
17
18 import sys
19
20-# pylint: disable=C0103
21-main = None
22-
23+from PyQt4 import QtGui
24+
25+# Module used to include the resources into this file
26+# Unused import images_rc, pylint: disable=W0611
27+from ubuntuone.controlpanel.gui.qt.ui import images_rc
28+# pylint: enable=W0611
29+
30+
31+# Invalid name "source", pylint: disable=C0103
32 if sys.platform == 'win32':
33 from ubuntuone.controlpanel.gui.qt.main import windows
34- main = windows.main
35+ source = windows
36 else:
37 from ubuntuone.controlpanel.gui.qt.main import linux
38- main = linux.main
39+ source = linux
40+# pylint: enable=C0103
41+
42+
43+def main(switch_to='', alert=False, minimized=False, with_icon=False):
44+ """Start the Qt reactor and open the main window."""
45+ # The following cannot be imported outside this function
46+ # because u1trial already provides a reactor.
47+
48+ # The main loop MUST be initialized before importing the reactor
49+ app = QtGui.QApplication(sys.argv)
50+ source.main(app)
51+
52+ # Reimport 'qt4reactor', 'reactor', 'start', pylint: disable=W0404, F0401
53+ import qt4reactor
54+ qt4reactor.install()
55+
56+ from twisted.internet import reactor
57+ from ubuntuone.controlpanel.gui.qt.gui import start
58+ # pylint: enable=W0404, F0401
59+
60+ # Module 'reactor' has no 'run'/'stop' member, pylint: disable=E1101
61+
62+ # Unused variable 'window', 'icon', pylint: disable=W0612
63+ icon, window = start(reactor.stop,
64+ minimized=minimized, with_icon=with_icon)
65+ # pylint: enable=W0612
66+
67+ reactor.run()
68+ # pylint: enable=E1101
69
70=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
71--- ubuntuone/controlpanel/gui/qt/main/linux.py 2011-09-15 16:34:02 +0000
72+++ ubuntuone/controlpanel/gui/qt/main/linux.py 2011-11-14 11:56:20 +0000
73@@ -1,7 +1,4 @@
74 # -*- coding: utf-8 -*-
75-
76-# Authors: Manuel de la Pena <manuel@canonical.com>
77-# Authors: Alejandro J. Cura <alecu@canonical.com>
78 #
79 # Copyright 2011 Canonical Ltd.
80 #
81@@ -16,42 +13,18 @@
82 #
83 # You should have received a copy of the GNU General Public License along
84 # with this program. If not, see <http://www.gnu.org/licenses/>.
85+
86 """Main method to be used on linux."""
87
88-import sys
89-
90 from dbus.mainloop.qt import DBusQtMainLoop
91-from PyQt4 import Qt, QtCore
92-
93-# Module used to include the resources into this file
94-# pylint: disable=W0611
95-from ubuntuone.controlpanel.gui.qt.ui import images_rc
96-# pylint: enable=W0611
97-
98-
99-def main(switch_to='', alert=False, minimized=False, with_icon=False):
100- """Start the Qt reactor and open the main window."""
101-
102+from PyQt4 import QtCore
103+
104+
105+def main(app):
106+ """Apply style sheet."""
107 # The DBus main loop MUST be initialized before importing the reactor
108 DBusQtMainLoop(set_as_default=True)
109
110- # The app variable should be in scope of the reactor.run()
111- # pylint: disable=W0612
112- app = Qt.QApplication(sys.argv)
113-
114- # Apply Style Sheet -- ONLY FOR DEBUGGING PURPOSES
115+ # Apply Style Sheet -- The linux version may be different
116 qss = QtCore.QResource(":/ubuntuone.qss")
117 app.setStyleSheet(qss.data())
118-
119- # The following cannot be imported outside this function
120- # because u1trial already provides a reactor.
121- # pylint: disable=W0404, F0401
122- from qtreactor import qt4reactor
123- qt4reactor.install()
124- from twisted.internet import reactor
125- from ubuntuone.controlpanel.gui.qt.gui import start
126-
127- # pylint: disable=E1101
128- icon, window = start(reactor.stop,
129- minimized=minimized, with_icon=with_icon)
130- reactor.run()
131
132=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
133--- ubuntuone/controlpanel/gui/qt/main/windows.py 2011-09-15 14:42:24 +0000
134+++ ubuntuone/controlpanel/gui/qt/main/windows.py 2011-11-14 11:56:20 +0000
135@@ -1,6 +1,4 @@
136 # -*- coding: utf-8 -*-
137-
138-# Authors: Manuel de la Pena <manuel@canonical.com>
139 #
140 # Copyright 2011 Canonical Ltd.
141 #
142@@ -15,42 +13,20 @@
143 #
144 # You should have received a copy of the GNU General Public License along
145 # with this program. If not, see <http://www.gnu.org/licenses/>.
146-"""Reactor installation for windows."""
147-
148-import sys
149-
150-from PyQt4 import Qt, QtGui, QtCore
151-
152-# Module used to include the resources into this file
153-# pylint: disable=W0611
154-from ubuntuone.controlpanel.gui.qt.ui import images_rc
155-# pylint: enable=W0611
156-
157-
158-def main(switch_to='', alert=False, minimized=False, with_icon=False):
159- """Start the Qt reactor and open the main window."""
160-
161- # The following cannot be imported outside this function
162- # because u1trial already provides a reactor.
163- # pylint: disable=F0401, W0404
164- import qtreactor.qt4reactor
165- qtreactor.qt4reactor.install()
166- from twisted.internet import reactor
167- from ubuntuone.controlpanel.gui.qt.gui import start
168-
169- # The main loop MUST be initialized before importing the reactor
170- # pylint: disable=W0612
171- app = Qt.QApplication(sys.argv)
172+
173+"""Main method to be used on windows."""
174+
175+from PyQt4 import QtGui, QtCore
176+
177+
178+def main(app):
179+ """Apply style sheet and fonts."""
180 # Apply font to the entire application
181 QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
182 QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
183- # Apply Style Sheet
184+
185+ # Apply Style Sheet -- The windows version may be different
186 qss_file = QtCore.QFile(":/ubuntuone.qss")
187 qss_file.open(QtCore.QFile.ReadOnly)
188 stylesheet = QtCore.QLatin1String(qss_file.readAll())
189 app.setStyleSheet(stylesheet)
190-
191- icon, window = start(reactor.stop,
192- minimized=minimized, with_icon=with_icon)
193- # pylint: disable=E1101
194- reactor.run()

Subscribers

People subscribed via source and target branches