← Back to branch summary

~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.90

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): ralsina, Diego Sarmentero, Natalia B. Bidart
  • Date: 2012-01-17 17:51:33 UTC
  • mfrom: (244.1.2 stable-3-0-update-2.99.2)
  • Revision ID: tarmac-20120117175133-isdy75657dwg05nv
[ Diego Sarmentero <diego.sarmentero@canonical.com> ]
  - Fixed: two remove buttons (LP: #904551).
[ Robert Alsina <roberto.alsina@canonical.com> ]
  - Make control panel a unique instance app on windows (LP: #862997).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/gui/qt/main/__init__.py
18
18
 
19
19
import sys
20
20
 
21
 
from PyQt4 import QtGui
22
 
 
23
21
# Module used to include the resources into this file
24
22
# Unused import images_rc, pylint: disable=W0611
25
23
from ubuntuone.controlpanel.gui.qt.ui import images_rc
26
24
# pylint: enable=W0611
27
 
 
 
25
from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication
28
26
 
29
27
# Invalid name "source", pylint: disable=C0103
30
28
if sys.platform == 'win32':
42
40
    # because u1trial already provides a reactor.
43
41
 
44
42
    # The main loop MUST be initialized before importing the reactor
45
 
    app = QtGui.QApplication(sys.argv)
 
43
    app = UniqueApplication(sys.argv, "ubuntuone-control-panel")
46
44
    source.main(app)
47
45
 
48
46
    # Reimport 'qt4reactor', 'reactor', 'start', pylint: disable=W0404, F0401
59
57
    icon, window = start(reactor.stop,
60
58
                         minimized=minimized, with_icon=with_icon)
61
59
    # pylint: enable=W0612
 
60
    if icon:
 
61
        app.new_instance.connect(icon.restore_window)
62
62
 
63
63
    reactor.run()
64
64
    # pylint: enable=E1101