adopt to changes in the toolkit

2 files changed, 22 insertions, 17 deletions

diff --git a/webactivity.py b/webactivity.py
index 3ab7c62..8e49f2d 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -44,7 +44,7 @@ from sugar.graphics.tray import HTray
 from sugar import profile
 from sugar.graphics.alert import Alert
 from sugar.graphics.icon import Icon
-from sugar.graphics.toolbar import Toolbar, ToolbarButton
+from sugar.graphics.toolbarbox import ToolbarButton
 from sugar import mime
 
 PROFILE_VERSION = 1
@@ -197,8 +197,9 @@ class WebActivity(activity.Activity):
         self._edit_toolbar_button = ToolbarButton(
                 page=self._edit_toolbar,
                 icon_name='edit-bar')
-        self._primary_toolbar.top.insert(self._edit_toolbar_button, 
-                                         self._primary_toolbar.top.get_n_items() - 1)
+        self._primary_toolbar.toolbar.insert(
+                self._edit_toolbar_button, 
+                self._primary_toolbar.toolbar.get_n_items() - 1)
 
         self._tray = HTray()
         self.set_tray(self._tray, gtk.POS_BOTTOM)
@@ -208,11 +209,12 @@ class WebActivity(activity.Activity):
         view_toolbar_button = ToolbarButton(
                 page=self._view_toolbar,
                 icon_name='camera')
-        self._primary_toolbar.top.insert(view_toolbar_button, 
-                                         self._primary_toolbar.top.get_n_items() - 1)
+        self._primary_toolbar.toolbar.insert(
+                view_toolbar_button, 
+                self._primary_toolbar.toolbar.get_n_items() - 1)
 
         self._primary_toolbar.show_all()
-        self.set_toolbox(self._primary_toolbar)
+        self.set_toolbar_box(self._primary_toolbar)
 
         self.set_canvas(self._tabbed_view)
         self._tabbed_view.show()
diff --git a/webtoolbar.py b/webtoolbar.py
index e87eb6f..f784f34 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -27,7 +27,9 @@ from xpcom import components
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.menuitem import MenuItem
 from sugar._sugarext import AddressEntry
-from sugar.graphics.toolbar import Toolbar
+from sugar.graphics.toolbarbox import ToolbarBox
+from sugar.activity.widgets import ActivityToolbarButton
+from sugar.activity.widgets import StopButton
 from sugar.activity import activity
 
 import filepicker
@@ -214,7 +216,7 @@ class WebEntry(AddressEntry):
         else:
             self._search_popup()
 
-class PrimaryToolbar(Toolbar):
+class PrimaryToolbar(ToolbarBox):
     __gtype_name__ = 'PrimaryToolbar'
 
     __gsignals__ = {
@@ -224,7 +226,7 @@ class PrimaryToolbar(Toolbar):
     }
 
     def __init__(self, tabbed_view, act):
-        Toolbar.__init__(self)
+        ToolbarBox.__init__(self)
 
         self._activity = act
 
@@ -232,25 +234,26 @@ class PrimaryToolbar(Toolbar):
         
         self._loading = False
 
-        self.top.insert(activity.toolbar(self._activity), 0)
+        activity_button = ActivityToolbarButton(self._activity)
+        self.toolbar.insert(activity_button, 0)
 
         self._back = ToolButton('go-previous-paired')
         self._back.set_tooltip(_('Back'))
         self._back.props.sensitive = False
         self._back.connect('clicked', self._go_back_cb)
-        self.top.insert(self._back, -1)
+        self.toolbar.insert(self._back, -1)
         self._back.show()
         
         self._forward = ToolButton('go-next-paired')
         self._forward.set_tooltip(_('Forward'))
         self._forward.props.sensitive = False
         self._forward.connect('clicked', self._go_forward_cb)
-        self.top.insert(self._forward, -1)
+        self.toolbar.insert(self._forward, -1)
         self._forward.show()
 
         self._stop_and_reload = ToolButton('media-playback-stop')
         self._stop_and_reload.connect('clicked', self._stop_and_reload_cb)
-        self.top.insert(self._stop_and_reload, -1)
+        self.toolbar.insert(self._stop_and_reload, -1)
         self._stop_and_reload.show()
 
         self.entry = WebEntry()
@@ -261,17 +264,17 @@ class PrimaryToolbar(Toolbar):
         entry_item.add(self.entry)
         self.entry.show()
         
-        self.top.insert(entry_item, -1)
+        self.toolbar.insert(entry_item, -1)
         entry_item.show()
 
         self._link_add = ToolButton('emblem-favorite')
         self._link_add.set_tooltip(_('Bookmark'))
         self._link_add.connect('clicked', self._link_add_clicked_cb)
-        self.top.insert(self._link_add, -1)
+        self.toolbar.insert(self._link_add, -1)
         self._link_add.show()
 
-        #self.top.insert(activity.expander(), -1)
-        self.top.insert(activity.stop_button(self._activity), -1)
+        stop_button = StopButton(self._activity)
+        self.toolbar.insert(stop_button, -1)
 
         self._progress_listener = None
         self._history = None