Merge v5 and updated toolbar.

6 files changed, 49 insertions, 19 deletions

diff --git a/LanguageModel.py b/LanguageModel.py
index 120bdb9..d3521e0 100644
--- a/LanguageModel.py
+++ b/LanguageModel.py
@@ -16,20 +16,8 @@
 
 from __future__ import with_statement
 import time
-import os
-
-def GetSupportedLanguages():
-    ret = []
-    files = os.listdir("lang/")
-    for name in files:
-        fn, ext = os.path.splitext(name)
-        if ext == ".txt":
-            ret.append(fn)
-    ret.sort()
-    return ret
 
 class LanguageModel():
-
     def SetLanguages(self, lang1, lang2):
         """Take a language pair, prepare the language model."""
         self.lang1_lang2 = {}
diff --git a/NEWS b/NEWS
index 35a7785..5dcba0f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+5
+translation correction fixing #2212
+
 4
 
 2
diff --git a/activity/activity.info b/activity/activity.info
index 0ce0d4f..b2cf3fb 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,8 @@
 [Activity]
 name = Words
 bundle_id = org.laptop.Words
+service_name = org.laptop.Words
 class = pippy_app.WordsActivity
 icon = activity-icon
-activity_version = 4
+activity_version = 5
 show_launcher = yes
diff --git a/lang/Spanish.txt b/lang/Spanish.txt
index 43fbc2e..04b897b 100644
--- a/lang/Spanish.txt
+++ b/lang/Spanish.txt
@@ -4879,6 +4879,7 @@ March	marzo
 market	el mercado
 married	casado
 marry	casarse
+mascot  mascota
 mask	máscara
 May	mayo
 mayonnaise	la mayonesa
diff --git a/pippy_app.py b/pippy_app.py
index b9a5a25..92ba6ed 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -43,21 +43,58 @@ class WordsActivity(ViewSourceActivity):
         from sugar.graphics.icon import Icon
 
         # Instantiate a language model.
-        import LanguageModel
-        self.langs = LanguageModel.GetSupportedLanguages()
+        # FIXME: We should ask the language model what langs it supports.
+        self.langs = ["French", "German", "Italian", "Portuguese", "Spanish"]
         # Initial values.
         self.fromlang = "English"
         self.tolang   = "Spanish"
+        import LanguageModel
         self.languagemodel = LanguageModel.LanguageModel()
 
+        # we do not have collaboration features
+        # make the share option insensitive
+        self.max_participants = 1
+
         # Main layout.
         hbox = gtk.HBox(homogeneous=True)
         vbox = gtk.VBox()
 
         # Toolbar.
-        toolbox = ActivityToolbox(self)
-        self.set_toolbox(toolbox)
-        toolbox.show()
+        try:
+            from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
+            from sugar.activity.widgets import ActivityButton, StopButton, \
+                                                ShareButton, KeepButton, TitleEntry
+
+            toolbar_box = ToolbarBox()
+            activity_button = ActivityButton(self)
+            toolbar_box.toolbar.insert(activity_button, 0)
+            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)
+            stop_button.props.accelerator = '<Ctrl><Shift>Q'
+            toolbar_box.toolbar.insert(stop_button, -1)
+            stop_button.show()
+
+            self.set_toolbox(toolbar_box)
+            toolbar_box.show()
+        except ImportError:
+            toolbox = ActivityToolbox(self)
+            self.set_toolbox(toolbox)
+            toolbox.show()
 
         # transbox: <label> - <text entry> - <speak button>
         transbox1 = gtk.HBox()
diff --git a/setup.py b/setup.py
index 32616de..530f97c 100755
--- a/setup.py
+++ b/setup.py
@@ -18,4 +18,4 @@
 
 from sugar.activity import bundlebuilder
 
-bundlebuilder.start('Words')
+bundlebuilder.start()