← Back to branch summary

~dobey/ubuntuone-control-panel/update-3-0

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Roberto Alsina, Brian Curtin, Natalia B. Bidart
  • Date: 2012-03-27 19:35:42 UTC
  • mfrom: (255.1.2 stable-3-0-update-2.99.91.1)
  • Revision ID: tarmac-20120327193542-f1omhul1co3ik82e
Tags: release-2_99_91_1
[ Natalia B. Bidart <natalia.bidart@canonical.com> ]
  - Isolate linux specific styling hacks to avoid weird side effects
    on windows (LP: #961229).
  - Handle errors from backend on the signin wizard page (LP: #945078).
  - Avoid the 'show/hide details' button to grow when focused (LP: #961348).
  - Modified stylesheet to use the new colours from brand, and to also ease
    the reading of white text (LP: #956077).
  - Fixed the gap tab outlines (LP: #822629).

[ Brian Curtin <brian.curtin@canonical.com> ]
  - Add Ubuntu One to the Windows auto-start registry key.
  - Made the creation of symlinks a separated test case so it can be
    skipped on Windows.
  - Better cleanup in tests -- allow the rest of the test suite to
    complete. Fix courtesy of Natalia Bidart.

[ Roberto Alsina <roberto.alsina@canonical.com> ]
  - Made the license page from the wizard be shown (only when called
    with --installer) (LP: #933697).
  - Forced white background (LP: #961346).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/gui/qt/main/__init__.py
55
55
                        default=False,
56
56
                        help="Start Ubuntu One "
57
57
                             "with an icon in the notification area.")
 
58
    result.add_argument("--installer", dest="installer", action="store_true",
 
59
                        default=False,
 
60
                        help="Show the license agreement page first.")
58
61
    return result
59
62
 
60
63
 
82
85
    switch_to = args.switch_to
83
86
    minimized = args.minimized
84
87
    with_icon = args.with_icon
 
88
    installer = args.installer
85
89
    source.main(app)
86
90
 
87
91
    data = []
88
 
    for qss_name in (source.PLATFORM_QSS, ":/ubuntuone.qss"):
 
92
    for qss_name in (":/ubuntuone.qss", source.PLATFORM_QSS):
89
93
        qss = QtCore.QResource(qss_name)
90
94
        data.append(unicode(qss.data()))
91
95
    app.setStyleSheet('\n'.join(data))
92
96
 
93
97
    # Unused variable 'window', 'icon', pylint: disable=W0612
94
98
    icon, window = start(lambda: source.main_quit(app),
95
 
                         minimized=minimized, with_icon=with_icon)
 
99
                         minimized=minimized, with_icon=with_icon,
 
100
                         installer=installer)
96
101
    window.switch_to(switch_to)
97
102
    # pylint: enable=W0612
98
103
    if icon: