From 9efbc664263f5967f981b073eb36b760817d937d Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 12 Aug 2009 09:33:25 +0000
Subject: Adpot to activity toolbar redesign

http://wiki.sugarlabs.org/go/Features/New_Toolbar_Design
---
diff --git a/activity.py b/activity.py
index 9a36f98..b6835e2 100644
--- a/activity.py
+++ b/activity.py
@@ -17,26 +17,47 @@
 """HelloWorld Activity: A case study for developing an activity."""
 
 import gtk
-import logging
 
 from gettext import gettext as _
 
-from sugar.activity import activity 
+from sugar.activity import activity
+from sugar.graphics.toolbarbox import ToolbarBox
+from sugar.activity.widgets import ActivityToolbarButton
+from sugar.activity.widgets import StopButton
+
 
 class HelloWorldActivity(activity.Activity):
     """HelloWorldActivity class as specified in activity.info"""
+
     def __init__(self, handle):
         """Set up the HelloWorld activity."""
         activity.Activity.__init__(self, handle)
 
-        # top toolbar with close button
-        toolbox = activity.ActivityToolbox(self)
-        self.set_toolbox(toolbox)
-        toolbox.show()
+        # toolbar with the new toolbar redesign
+        toolbar_box = ToolbarBox()
+
+        # we do not have collaboration features
+        # make the share option insensitive
+        self.max_participants = 1
+
+        activity_button = ActivityToolbarButton(self)
+        toolbar_box.toolbar.insert(activity_button, 0)
+        activity_button.show()
+
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbar_box.toolbar.insert(separator, -1)
+        separator.show()
 
-        # label with the text
+        stop_button = StopButton(self)
+        toolbar_box.toolbar.insert(stop_button, -1)
+        stop_button.show()
+
+        self.set_toolbar_box(toolbar_box)
+        toolbar_box.show()
+
+        # label with the text, make the string translatable
         label = gtk.Label(_("Hello World!"))
         self.set_canvas(label)
         label.show()
-
-
diff --git a/activity/activity.info b/activity/activity.info
index 2ab26a6..046456e 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = HelloWorld
-activity_version = 1
+activity_version = 2
 bundle_id = org.sugarlabs.HelloWorld
 exec = sugar-activity activity.HelloWorldActivity
 icon = activity-helloworld
--
cgit v0.9.1