Remove the Keep button from the activity toolbar

The keep button has led to a false assumption: learners
confused it with a traditional save button and not recognising
it as what it is, an option to duplicate an entry.

Eben suggested to remove the button [1] and others have since
then. The functionality of duplicating an entry will be moved
to the entry palette in the Journal and the entry detail view [2].

We will print a warning when the KeepButton is used and remove
it after another cycle.

[1] http://lists.sugarlabs.org/archive/sugar-devel/2010-April/023439.html
[2] http://lists.sugarlabs.org/archive/sugar-devel/2011-May/031316.html

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
This commit is contained in:
Simon Schampijer 2011-07-27 16:47:24 +02:00
parent 4010878b7f
commit 0082e10f8e

View File

@ -18,6 +18,7 @@
import gtk import gtk
import gettext import gettext
import gconf import gconf
import logging
from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toolbutton import ToolButton
from sugar.graphics.toolbarbox import ToolbarButton from sugar.graphics.toolbarbox import ToolbarButton
@ -161,10 +162,13 @@ class ShareButton(RadioMenuButton):
self.neighborhood.handler_unblock(self._neighborhood_handle) self.neighborhood.handler_unblock(self._neighborhood_handle)
# DEPRECATED
class KeepButton(ToolButton): class KeepButton(ToolButton):
def __init__(self, activity, **kwargs): def __init__(self, activity, **kwargs):
ToolButton.__init__(self, **kwargs) ToolButton.__init__(self, **kwargs)
logging.warning('KeepButton has been deprecated since Sugar 0.94'
' and should not be used in newly written code.')
self.props.tooltip = _('Keep') self.props.tooltip = _('Keep')
self.props.accelerator = '<Ctrl>S' self.props.accelerator = '<Ctrl>S'
@ -232,8 +236,8 @@ class TitleEntry(gtk.ToolItem):
class ActivityToolbar(gtk.Toolbar): class ActivityToolbar(gtk.Toolbar):
"""The Activity toolbar with the Journal entry title, sharing, """The Activity toolbar with the Journal entry title, sharing
Keep and Stop buttons and Stop buttons
All activities should have this toolbar. It is easiest to add it to your All activities should have this toolbar. It is easiest to add it to your
Activity by using the ActivityToolbox. Activity by using the ActivityToolbox.
@ -261,10 +265,6 @@ class ActivityToolbar(gtk.Toolbar):
self.share.show() self.share.show()
self.insert(self.share, -1) self.insert(self.share, -1)
self.keep = KeepButton(activity)
self.insert(self.keep, -1)
self.keep.show()
self.stop = StopButton(activity) self.stop = StopButton(activity)
self.insert(self.stop, -1) self.insert(self.stop, -1)
self.stop.show() self.stop.show()