UX improvement: move Share and Keep to main bar

2 files changed, 65 insertions, 2 deletions

diff --git a/Maze.activity/olpcgames/activity.py b/Maze.activity/olpcgames/activity.py
index 98fbf4c..1b744f3 100644
--- a/Maze.activity/olpcgames/activity.py
+++ b/Maze.activity/olpcgames/activity.py
@@ -110,10 +110,12 @@ class PyGameActivity(activity.Activity):
 
         try:
             from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
-            from sugar.activity.widgets import ActivityToolbarButton, StopButton
+            from sugar.activity.widgets import ActivityToolbarButton, StopButton, \
+                                                ShareButton, KeepButton
+            from mybutton import MyActivityToolbarButton
 
             toolbar_box = ToolbarBox()
-            activity_button = ActivityToolbarButton(self)
+            activity_button = MyActivityToolbarButton(self)
             toolbar_box.toolbar.insert(activity_button, 0)
             activity_button.show()
 
@@ -123,6 +125,14 @@ class PyGameActivity(activity.Activity):
             toolbar_box.toolbar.insert(separator, -1)
             separator.show()
 
+            share_button = ShareButton(self)
+            toolbar_box.toolbar.insert(share_button, -1)
+            share_button.show()
+
+            keep_button = KeepButton(self)
+            toolbar_box.toolbar.insert(keep_button, -1)
+            keep_button.show()
+
             stop_button = StopButton(self)
             stop_button.props.accelerator = '<Ctrl><Shift>Q'
             toolbar_box.toolbar.insert(stop_button, -1)
diff --git a/Maze.activity/olpcgames/mybutton.py b/Maze.activity/olpcgames/mybutton.py
new file mode 100644
index 0000000..2d1677d
--- /dev/null
+++ b/Maze.activity/olpcgames/mybutton.py
@@ -0,0 +1,53 @@
+# mybutton.py  A version of ActivityToolbarButton that hides the "Keep"
+# button.
+
+# Copyright (C) 2010  James D. Simmons
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
+import gtk
+import gconf
+
+from sugar.graphics.toolbarbox import ToolbarButton
+from sugar.activity.widgets import ActivityToolbar
+from sugar.graphics.xocolor import XoColor
+from sugar.graphics.icon import Icon
+from sugar.bundle.activitybundle import ActivityBundle
+
+def _create_activity_icon(metadata):
+    if metadata.get('icon-color', ''):
+        color = XoColor(metadata['icon-color'])
+    else:
+        client = gconf.client_get_default()
+        color = XoColor(client.get_string('/desktop/sugar/user/color'))
+
+    from sugar.activity.activity import get_bundle_path
+    bundle = ActivityBundle(get_bundle_path())
+    icon = Icon(file=bundle.get_icon(), xo_color=color)
+
+    return icon
+
+class MyActivityToolbarButton(ToolbarButton):
+
+    def __init__(self, activity, **kwargs):
+        toolbar = ActivityToolbar(activity, orientation_left=True)
+        toolbar.share.hide()
+        toolbar.stop.hide()
+        toolbar.keep.hide()
+
+        ToolbarButton.__init__(self, page=toolbar, **kwargs)
+
+        icon = _create_activity_icon(activity.metadata)
+        self.set_icon_widget(icon)
+        icon.show()