Merge lp:~mandel/ubuntu-sso-client/error_message_style_and_image into lp:ubuntu-sso-client
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Roberto Alsina | ||||||||||||||||
Approved revision: | 777 | ||||||||||||||||
Merged at revision: | 706 | ||||||||||||||||
Proposed branch: | lp:~mandel/ubuntu-sso-client/error_message_style_and_image | ||||||||||||||||
Merge into: | lp:ubuntu-sso-client | ||||||||||||||||
Prerequisite: | lp:~mandel/ubuntu-sso-client/success_message | ||||||||||||||||
Diff against target: |
431 lines (+196/-15) 7 files modified
.bzrignore (+1/-0) data/qt/error_message.ui (+31/-0) setup.py (+3/-3) ubuntu_sso/qt/controllers.py (+51/-4) ubuntu_sso/qt/gui.py (+41/-7) ubuntu_sso/qt/tests/test_qt_views.py (+28/-0) ubuntu_sso/qt/tests/test_windows.py (+41/-1) |
||||||||||||||||
To merge this branch: | bzr merge lp:~mandel/ubuntu-sso-client/error_message_style_and_image | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Shane Fagan (community) | Approve | ||
Review via email: mp+56712@code.launchpad.net |
Commit message
Fixes lp:751496
When working with py2exe and pyqt error will be raised in a Qt plugin is used such as the one that provides support for JPEG images. In order to fix that an new dependency PIL has be added on the Windows side (This issue will not occur on KDE) that allows to convert the captcha image from jpg to png so that we can used the Qt native support.
Fixes lp:751572
Added an error page to be shown when there was an issue in the final step of the process.
Fixes lp:752334
The Wizard controller set the style of the Wizard to be the correct one. Since it is done in the controller this will not affect KDE users.
Fixes lp:752367
Pass the app_name that was forgotten.
Description of the change
Fixes lp:751496
When working with py2exe and pyqt error will be raised in a Qt plugin is used such as the one that provides support for JPEG images. In order to fix that an new dependency PIL has be added on the Windows side (This issue will not occur on KDE) that allows to convert the captcha image from jpg to png so that we can used the Qt native support. Since the plugin are not longer needed the setup dont longer provide them.
Fixes lp:751572
Added an error page to be shown when there was an issue in the final step of the process.
Fixes lp:752334
The Wizard controller set the style of the Wizard to be the correct one. Since it is done in the controller this will not affect KDE users.
Fixes lp:752367
Pass the app_name that was forgotten.
+1 passes tests and I cant see any mistakes in spelling