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