remove old toolbar, change sugar sugar by 3 and add gitignore file exclusions

3 files changed, 27 insertions, 47 deletions

diff --git a/.gitignore b/.gitignore
index 6fd0efc..babeb12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.xo
 *.pyc
+*.pyo
+*.bak
 .DS_Store
 locale
diff --git a/clock.py b/clock.py
index 48ff674..873701b 100755
--- a/clock.py
+++ b/clock.py
@@ -75,13 +75,9 @@ import cairo
 import pangocairo
 import rsvg
 
-OLD_TOOLBAR = False
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox
-    from sugar.activity.widgets import StopButton
-    from sugar.activity.widgets import ActivityToolbarButton
-except ImportError:
-    OLD_TOOLBAR = True
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.activity.widgets import StopButton
+from sugar3.activity.widgets import ActivityToolbarButton
 
 import math
 from datetime import datetime
@@ -90,10 +86,10 @@ import re
 
 from gettext import gettext as _
 
-from sugar.activity import activity
-from sugar.graphics.toggletoolbutton import ToggleToolButton
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics import style
+from sugar3.activity import activity
+from sugar3.graphics.toggletoolbutton import ToggleToolButton
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics import style
 
 from speaker import Speaker
 from timewriter import TimeWriter
@@ -162,11 +158,6 @@ class ClockActivity(activity.Activity):
         # Show the activity on the screen
         self.show_all()
 
-        if OLD_TOOLBAR:
-            # Hide the tools we don't use from the activity toolbar
-            toolbox.get_activity_toolbar().share.hide()
-            toolbox.get_activity_toolbar().keep.hide()
-
         # We want to be notified when the minutes change
         self._clock.connect("time_minute", self._minutes_changed_cb)
 
@@ -225,39 +216,26 @@ class ClockActivity(activity.Activity):
         Load and show icons. Associate them to the call back methods.
         """
         # Default toolbar
-        if OLD_TOOLBAR:
-            toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(toolbox)
-            display_toolbar = gtk.Toolbar()
+        self.max_participants = 1
+        toolbar_box = ToolbarBox()
+        activity_button = ActivityToolbarButton(self)
+        activity_button.show()
+        toolbar_box.toolbar.insert(activity_button, 0)
+
+        self._add_clock_controls(toolbar_box.toolbar)
 
-            # Add the toolbar to the activity menu
-            self._add_clock_controls(display_toolbar)
-            toolbox.add_toolbar(_('Clock'), display_toolbar)
-            toolbox.set_current_toolbar(1)
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_size_request(0, -1)
+        separator.set_expand(True)
+        toolbar_box.toolbar.insert(separator, -1)
 
-            return toolbox
+        toolbar_box.toolbar.insert(StopButton(self), -1)
 
-        else:
-            self.max_participants = 1
-            toolbar_box = ToolbarBox()
-            activity_button = ActivityToolbarButton(self)
-            activity_button.show()
-            toolbar_box.toolbar.insert(activity_button, 0)
-
-            self._add_clock_controls(toolbar_box.toolbar)
-
-            separator = gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_size_request(0, -1)
-            separator.set_expand(True)
-            toolbar_box.toolbar.insert(separator, -1)
-
-            toolbar_box.toolbar.insert(StopButton(self), -1)
-
-            self.set_toolbar_box(toolbar_box)
-            toolbar_box.show_all()
-            display_toolbar = toolbar_box.toolbar
-            return toolbar_box
+        self.set_toolbar_box(toolbar_box)
+        toolbar_box.show_all()
+        display_toolbar = toolbar_box.toolbar
+        return toolbar_box
 
     def _add_clock_controls(self, display_toolbar):
 
diff --git a/setup.py b/setup.py
index 79c36f5..2f07066 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 try:
-    from sugar.activity import bundlebuilder
+    from sugar3.activity import bundlebuilder
     bundlebuilder.start()
 except ImportError:
     print "Error: sugar.activity.Bundlebuilder not found."