erasing toolbar compatibility

11 files changed, 40 insertions, 40 deletions

diff --git a/activity.py b/activity.py
index 631cb8d..ba4f392 100644
--- a/activity.py
+++ b/activity.py
@@ -42,44 +42,44 @@ class StopWatchActivity(Activity):
         GObject.threads_init()
 
         # top toolbar with share and close buttons:
-        OLD_TOOLBAR = False
+        #OLD_TOOLBAR = False
 
-        try:
-            from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
-            from sugar3.activity.widgets import ActivityToolbarButton, StopButton, \
+        #try:
+        from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
+        from sugar3.activity.widgets import ActivityToolbarButton, StopButton, \
                     ShareButton, TitleEntry, ActivityButton
-        except ImportError:
-            OLD_TOOLBAR = True
-
-        if OLD_TOOLBAR:
-            toolbox = ToolbarBox(self)
-            self.set_toolbox(toolbox)
-            toolbox.show()
-        else:
-            toolbar_box = ToolbarBox()
-            self.activity_button = ActivityButton(self)
-            toolbar_box.toolbar.insert(self.activity_button, 0)
-            self.activity_button.show()
-
-            title_entry = TitleEntry(self)
-            toolbar_box.toolbar.insert(title_entry, -1)
-            title_entry.show()
-
-            share_button = ShareButton(self)
-            toolbar_box.toolbar.insert(share_button, -1)
-            share_button.show()
-
-            separator = Gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            toolbar_box.toolbar.insert(separator, -1)
-            separator.show()
-
-            stop_button = StopButton(self)
-            toolbar_box.toolbar.insert(stop_button, -1)
-            stop_button.show()
-
-            self.set_toolbar_box(toolbar_box)
+        #except ImportError:
+        #    OLD_TOOLBAR = True
+
+        #if OLD_TOOLBAR:
+        #    toolbox = ToolbarBox(self)
+        #    self.set_toolbox(toolbox)
+        #    toolbox.show()
+        #else:
+        toolbar_box = ToolbarBox()
+        self.activity_button = ActivityButton(self)
+        toolbar_box.toolbar.insert(self.activity_button, 0)
+        self.activity_button.show()
+
+        title_entry = TitleEntry(self)
+        toolbar_box.toolbar.insert(title_entry, -1)
+        title_entry.show()
+
+        share_button = ShareButton(self)
+        toolbar_box.toolbar.insert(share_button, -1)
+        share_button.show()
+
+        separator = Gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbar_box.toolbar.insert(separator, -1)
+        separator.show()
+
+        stop_button = StopButton(self)
+        toolbar_box.toolbar.insert(stop_button, -1)
+        stop_button.show()
+
+        self.set_toolbar_box(toolbar_box)
 
         self.tubebox = dobject.TubeBox()
         self.timer = dobject.TimeHandler("main", self.tubebox)
diff --git a/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo
index d13186a..ad5c7a7 100644
--- a/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo
+++ b/locale/fr/LC_MESSAGES/org.laptop.StopWatchActivity.mo
diff --git a/locale/fr/activity.linfo b/locale/fr/activity.linfo
index 4ca3bc1..5b439bc 100644
--- a/locale/fr/activity.linfo
+++ b/locale/fr/activity.linfo
@@ -1,2 +1,2 @@
 [Activity]
-name = StopWatch
+name = Chronomètre
diff --git a/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo
index 86860f9..ebc955c 100644
--- a/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo
+++ b/locale/hus/LC_MESSAGES/org.laptop.StopWatchActivity.mo
diff --git a/locale/hus/activity.linfo b/locale/hus/activity.linfo
index 4ca3bc1..dd369d4 100644
--- a/locale/hus/activity.linfo
+++ b/locale/hus/activity.linfo
@@ -1,2 +1,2 @@
 [Activity]
-name = StopWatch
+name = Lejbaxk'ij
diff --git a/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo
index 8da00a1..5e36b09 100644
--- a/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo
+++ b/locale/pl/LC_MESSAGES/org.laptop.StopWatchActivity.mo
diff --git a/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo
index 86860f9..a8f7ed2 100644
--- a/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo
+++ b/locale/sr/LC_MESSAGES/org.laptop.StopWatchActivity.mo
diff --git a/locale/sr/activity.linfo b/locale/sr/activity.linfo
index 4ca3bc1..61145bd 100644
--- a/locale/sr/activity.linfo
+++ b/locale/sr/activity.linfo
@@ -1,2 +1,2 @@
 [Activity]
-name = StopWatch
+name = Штоперица
diff --git a/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo
index 86860f9..d34ec9f 100644
--- a/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo
+++ b/locale/sw/LC_MESSAGES/org.laptop.StopWatchActivity.mo
diff --git a/locale/sw/activity.linfo b/locale/sw/activity.linfo
index 4ca3bc1..8d307a3 100644
--- a/locale/sw/activity.linfo
+++ b/locale/sw/activity.linfo
@@ -1,2 +1,2 @@
 [Activity]
-name = StopWatch
+name = kuachakuangalia
diff --git a/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo b/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo
index 86860f9..51b1c9b 100644
--- a/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo
+++ b/locale/tzm/LC_MESSAGES/org.laptop.StopWatchActivity.mo