Merge lp://staging/~diegosarmentero/ubuntu-sso-client/rebranding into lp://staging/ubuntu-sso-client

Proposed by Diego Sarmentero
Status: Superseded
Proposed branch: lp://staging/~diegosarmentero/ubuntu-sso-client/rebranding
Merge into: lp://staging/ubuntu-sso-client
Diff against target: 336 lines (+83/-48)
11 files modified
data/qt/network_detection.ui (+1/-1)
setup.py (+35/-12)
ubuntu_sso/constants.py.in (+2/-2)
ubuntu_sso/qt/main/__init__.py (+4/-0)
ubuntu_sso/qt/main/tests/test_main.py (+3/-0)
ubuntu_sso/qt/sso_wizard_page.py (+27/-5)
ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+1/-1)
ubuntu_sso/qt/tests/test_email_verification.py (+1/-1)
ubuntu_sso/tests/__init__.py (+1/-1)
ubuntu_sso/utils/tests/test_parse_args.py (+0/-17)
ubuntu_sso/utils/ui.py (+8/-8)
To merge this branch: bzr merge lp://staging/~diegosarmentero/ubuntu-sso-client/rebranding
Reviewer Review Type Date Requested Status
dobey (community) Needs Fixing
Ubuntu One hackers Pending
Review via email: mp+154517@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-03-21.

Commit message

- Rebranding

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

This is the wrong icon. On Ubuntu it would be nice if we could use the named icon from the system theme ("ubuntuone") so that it will have the correct size in the correct places, and if we could use the appropriate windows/mac icons on those platforms, from ubuntuone-client-data.

review: Needs Fixing
Revision history for this message
dobey (dobey) wrote :

Also, we can't import the values from ubuntuone.platform.credentials to use here, as that would introduce a circular dependency. We need to copy those values over into ubuntu-sso-client for use.

1025. By Diego Sarmentero

removing circular dep
adding system icon

1026. By Diego Sarmentero

removing icon

1027. By Diego Sarmentero

using version from constants

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches