From 0082e10f8ebc201d0837dc67ba739d9079903e45 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 27 Jul 2011 14:47:24 +0000
Subject: 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>
---
diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py
index 9503d36..0c34a1f 100644
--- a/src/sugar/activity/widgets.py
+++ b/src/sugar/activity/widgets.py
@@ -18,6 +18,7 @@
 import gtk
 import gettext
 import gconf
+import logging
 
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.toolbarbox import ToolbarButton
@@ -161,10 +162,13 @@ class ShareButton(RadioMenuButton):
             self.neighborhood.handler_unblock(self._neighborhood_handle)
 
 
+# DEPRECATED
 class KeepButton(ToolButton):
 
     def __init__(self, activity, **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.accelerator = '<Ctrl>S'
 
@@ -232,8 +236,8 @@ class TitleEntry(gtk.ToolItem):
 
 
 class ActivityToolbar(gtk.Toolbar):
-    """The Activity toolbar with the Journal entry title, sharing,
-       Keep and Stop buttons
+    """The Activity toolbar with the Journal entry title, sharing
+       and Stop buttons
 
     All activities should have this toolbar. It is easiest to add it to your
     Activity by using the ActivityToolbox.
@@ -261,10 +265,6 @@ class ActivityToolbar(gtk.Toolbar):
         self.share.show()
         self.insert(self.share, -1)
 
-        self.keep = KeepButton(activity)
-        self.insert(self.keep, -1)
-        self.keep.show()
-
         self.stop = StopButton(activity)
         self.insert(self.stop, -1)
         self.stop.show()
--
cgit v0.9.1