<div class="gmail_quote">On Tue, Jun 7, 2011 at 11:31 AM, Sascha Silbe <span dir="ltr"><<a href="mailto:silbe@activitycentral.com">silbe@activitycentral.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
The warning previously used the word "cancel" to describe two antagonistic<br>
operations: Not continuing the download (including erasing it from the<br>
Journal) and not stopping Browse.<br>
<br>
The new wording was agreed upon [1] by the Design Team.<br>
<br>
[1] <a href="http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-05-29T16:09:15.html" target="_blank">http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-05-29T16:09:15.html</a><br>
<br>
Closes: SL#1508<br>
Signed-off-by: Sascha Silbe <<a href="mailto:silbe@activitycentral.com">silbe@activitycentral.com</a>><br>
---<br>
downloadmanager.py | 4 ++++<br>
webactivity.py | 14 +++++++++++---<br>
2 files changed, 15 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/downloadmanager.py b/downloadmanager.py<br>
index a88389f..4eab726 100644<br>
--- a/downloadmanager.py<br>
+++ b/downloadmanager.py<br>
@@ -64,6 +64,10 @@ def can_quit():<br>
return len(_active_downloads) == 0<br>
<br>
<br>
+def num_downloads():<br>
+ return len(_active_downloads)<br>
+<br>
+<br>
def remove_all_downloads():<br>
for download in _active_downloads:<br>
download.cancelable.cancel(NS_ERROR_FAILURE)<br>
diff --git a/webactivity.py b/webactivity.py<br>
index 48cb3ed..fc9e913 100644<br>
--- a/webactivity.py<br>
+++ b/webactivity.py<br>
@@ -18,6 +18,7 @@<br>
<br>
import logging<br>
from gettext import gettext as _<br>
+from gettext import ngettext<br>
import os<br>
import subprocess<br>
<br>
@@ -650,10 +651,17 @@ class WebActivity(activity.Activity):<br>
return True<br>
else:<br>
alert = Alert()<br>
- alert.props.title = _('Download in progress')<br>
- alert.props.msg = _('Stopping now will cancel your download')<br>
+ alert.props.title = ngettext('Download in progress',<br>
+ 'Downloads in progress',<br>
+ downloadmanager.num_downloads())<br>
+ message = ngettext('Stopping now will erase your download',<br>
+ 'Stopping now will erase your downloads',<br>
+ downloadmanager.num_downloads())<br>
+ alert.props.msg = message<br>
cancel_icon = Icon(icon_name='dialog-cancel')<br>
- alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'), cancel_icon)<br>
+ cancel_label = ngettext('Continue download', 'Continue downloads',<br>
+ downloadmanager.num_downloads())<br>
+ alert.add_button(gtk.RESPONSE_CANCEL, cancel_label, cancel_icon)<br>
stop_icon = Icon(icon_name='dialog-ok')<br>
alert.add_button(gtk.RESPONSE_OK, _('Stop'), stop_icon)<br>
stop_icon.show()<br>
<font color="#888888">--<br>
1.7.4.1<br>
<br>
_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
</font></blockquote></div><div><br></div><div>One comment here: when one stops a download described by </div><div>'Stopping now will erase your download', it</div><div>also quits the activity. </div><div><br></div>
<div>agree with the 'Continue download', dialog. </div><div><br></div><div><br></div><meta http-equiv="content-type" content="text/html; charset=utf-8">