Merge lp:~ralsina/ubuntuone-windows-installer/fix_805290 into lp:ubuntuone-windows-installer

Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 35
Merged at revision: 17
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/fix_805290
Merge into: lp:ubuntuone-windows-installer
Diff against target: 0 lines
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/fix_805290
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+66739@code.launchpad.net

Commit message

Add the "Are you sure" dialog to be displayed on cancellation, as requested by design.

Description of the change

Add the "Are you sure" dialog to be displayed on cancellation, as requested by design.

To test IRL (Windows only):

set PYTHONPATH=..\ubuntuone-control-panel;..\ubuntuone-client;..\ubuntu-sso-client;.
python bin\ubuntuone-installer-qt

And click the "cancel" button.

-----------------

This is the requested wireframe: https://bugs.launchpad.net/ubuntuone-windows-installer/+bug/805290/+attachment/2189876/+files/are_you_sure.png

This is the implemented dialog: https://bugs.launchpad.net/ubuntuone-windows-installer/+bug/805290/+attachment/2189924/+files/are_you_sure_implementation.png

------------------

To test IRL (Windows):

On one terminal start SSO:

set PYTHONPATH=.
python bin\ubuntu-sso-login

On another terminal, start the installer:

set PYTHONPATH=..\ubuntuone-client;..\ubuntuone-control-panel;..\ubuntu-sso-client;.
python bin\ubuntuone-installer-qt

If you cancel in any way (cancel button, closing the window), you should get a "Are you sure" dialog with the usual behaviour.

To post a comment you must log in.
20. By Roberto Alsina

fix test name

21. By Roberto Alsina

missing docstring

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

* Can you please add tests for the are_you_sure new widget?
Something simple like ensuring that instantiating the class works and the title is correct.

* Can you think of any way of setting the text from the outside (ie programmatically) so it does not have all the html stuff? I'm not sure translators will translate the current message as is, is very difficult to read (and to re-type),

review: Needs Fixing
22. By Roberto Alsina

Make it more translator-friendly

23. By Roberto Alsina

strings in another file

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Hi!

* Could you please re-use the APP_NAME definition from ubuntuone.clientdefs? SO we don't duplicate that value.

* Could you change the name of the variable 'r' to something more self-explained such as 'response'?

* Could you please fix teh docstring for test_start_control_panel_on_finishing and test_sync_later_hides_message (since you already fixed the one from test_not_start_control_panel_on_cancel)?

* Could you please add ending dots to those docstrings that don't have it (in ubuntuone_installer/gui/qt/tests/test_gui.py)?

* Could you please remove the gettext import in ubuntuone_installer/gui/qt/are_you_sure.py since is not needed?

Thanks!

review: Needs Fixing
24. By Roberto Alsina

missing file

25. By Roberto Alsina

forgt def

26. By Roberto Alsina

style fixes

27. By Roberto Alsina

added missing docstring

28. By Roberto Alsina

style fixes

29. By Roberto Alsina

remove gettext

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks great, thanks!

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

I approved this branch by mistake :-).

review: Needs Fixing
30. By Roberto Alsina

merged r13 from trunk

31. By Roberto Alsina

merged r14 from trunk

32. By Roberto Alsina

merged r15 from trunk

33. By Roberto Alsina

merged r16 from trunk

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Missing docstring:

65:86:87:C0111: 33:MainWindowTestCase.test_title: Missing docstring

Pep8 issues:

./ubuntuone_installer/gui/qt/gui.py:70:21: E202 whitespace before ')'
./ubuntuone_installer/gui/qt/tests/test_gui.py:43:21: E202 whitespace before ')'
./ubuntuone_installer/gui/qt/tests/test_gui.py:426:57: E202 whitespace before ')'
./ubuntuone_installer/gui/qt/tests/test_gui.py:442:57: E202 whitespace before ')'
./ubuntuone_installer/gui/qt/tests/test_gui.py:469:60: E202 whitespace before ')'
./ubuntuone_installer/gui/qt/tests/test_gui.py:510:58: E202 whitespace before ')'

The test case for ubuntuone_installer/gui/qt/tests/test_are_you_sure.py should not be called MainWindowTestCase, shouldn't it?
Also, you need to assert over the dialog message_label content.

review: Needs Fixing
34. By Roberto Alsina

Style fixes, extra test

35. By Roberto Alsina

strip trailing spaces

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Finally! :-)

review: Approve

Preview Diff

Empty

Subscribers

People subscribed via source and target branches