From d7eb57fe22a8ef293dc78f93b9db4d3de783d7eb Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Fri, 25 Sep 2009 19:25:43 +0000
Subject: fix i18n problem with block names in hover help

---
diff --git a/tahoverhelp.py b/tahoverhelp.py
index 3f08597..25836cf 100644
--- a/tahoverhelp.py
+++ b/tahoverhelp.py
@@ -120,3 +120,79 @@ hover_dict = { \
     "template4":_("presentation template: select Journal object (no description)"), \
     "template3":_("presentation template: seven bullets"), \
     "hideblocks":_("declutter canvas by hiding blocks")}
+
+blocks_dict = {
+    'TurtleArt' : _('Turtle Art'), 
+    'turtle' : _('Turtle'), 
+    'setxy' : _('set xy'),
+    'seth' : _('seth'), 
+    'setscale' : _('set scale'), 
+    'fillscreen' : _('fill screen'), 
+    'pen' : _('Pen'), 
+    'pendown' : _('pen down'), 
+    'penup' : _('pen up'), 
+    'setpensize' : _('set pen size'), 
+    'setcolor' : _('set color'), 
+    'setshade' : _('set shade'), 
+    'pensize' : _('pen size'), 
+    'textsize' : _('text size'), 
+    'textcolor' : _('text color'), 
+    'settextsize' : _('set text size'), 
+    'settextcolor' : _('set text color'), 
+    'color' : _('color'), 
+    'greater' : _('greater'), 
+    'numbers' : _('Numbers'), 
+    'division2' : _('division'), 
+    'equal' : _('equal'), 
+    'plus2' : _('plus2'), 
+    'product2' : _('product2'), 
+    'remainder2' : _('mod'), 
+    'identity' : _('identity'), 
+    'identity2' : _('identity2'), 
+    'less' : _('less'), 
+    'minus2' : _('minus2'), 
+    'sqrt' : _('sqrt'), 
+    'ifelse' : _('else'), 
+    'flow' : _('Flow'), 
+    'hspace' : _('hspace'), 
+    'vspace' : _('vspace'),
+    'stopstack' : _('stopstack'), 
+    'string' : _('string'), 
+    'sensors' : _('Extras'), 
+    'clearheap' : _('clearheap'), 
+    'emptyheap' : _('empty heap'), 
+    'loadmyblock' : _('load my block'), 
+    'myfunc' : _('myfunc'), 
+    'toppos' : _('toppos'), 
+    'vres' : _('height'), 
+    'hres' : _('width'), 
+    'bottompos' : _('bottom'), 
+    'kbinput' : _('read key'), 
+    'leftpos' : _('leftpos'), 
+    'rightpos' : _('rightpos'), 
+    'printheap' : _('printheap'), 
+    'myblocks' : _('My Blocks'), 
+    'stack' : _('stack'), 
+    'stack2' : _('stack 2'), 
+    'stack1' : _('stack 1'), 
+    'storeinbox1' : _('store in box 1'), 
+    'box1' : _('box 1'), 
+    'storeinbox2' : _('store in box 2'), 
+    'box2' : _('box 2'), 
+    'storein' : _('store in'), 
+    'hat' : _('hat'), 
+    'hat1' : _('hat1'), 
+    'hat2' : _('hat2'), 
+    'nop' : _('nop'), 
+    'templates' : _('Templates'), 
+    'hideblocks' : _('hide blocks'), 
+    'journal' : _('journal'), 
+    'audiooff' : _('audiooff'), 
+    'descriptionoff' : _('descriptionoff'), 
+    'template1' : _('template1'), 
+    'template2' : _('template2'), 
+    'template3' : _('template3'),  
+    'template4' : _('template4'), 
+    'template6' : _('template6'), 
+    'template7' : _('template7')
+}
diff --git a/tawindow.py b/tawindow.py
index bb6567e..0424093 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -45,38 +45,9 @@ from taturtle import *
 from taproject import *
 from sugar.graphics.objectchooser import ObjectChooser
 
-from palettes import ContentInvoker
 from tahoverhelp import *
 from gettext import gettext as _
 
-class PopupHandler():
-
-    def __init__(self):
-        self.table = {}
-
-    def getInvoker(self, block_name):
-        if block_name in self.table:
-            return self.table[block_name]
-        
-        msg = self._getHelpMessage(block_name)
-        if msg != "":
-            self.table[block_name] = ContentInvoker(msg)
-            return self.table[block_name]
-
-        print("no invoker for " + block_name)
-        return None
-
-    def _getHelpMessage(self, block_name):
-        try:
-            return (hover_dict[block_name])
-        except:
-            print("no dictionary entry for " + block_name)
-            return("")
-
-popupHandler = PopupHandler()
-
-timeout_tag = [0]
-
 # dead key dictionaries
 dead_grave = {'A':192,'E':200,'I':204,'O':210,'U':217,'a':224,'e':232,'i':236,\
               'o':242,'u':249}
@@ -89,6 +60,10 @@ dead_diaeresis = {'A':196,'E':203,'I':207,'O':211,'U':218,'a':228,'e':235,\
                   'i':239,'o':245,'u':252}
 dead_abovering = {'A':197,'a':229}
 
+# Time out for triggering help
+timeout_tag = [0]
+
+
 #
 # Setup
 #
@@ -783,10 +758,15 @@ def xy(event):
 
 def showPopup(block_name,tw):
     if hasattr(tw,"activity"):
+        if block_name in blocks_dict:
+            block_name_s = _(blocks_dict[block_name])
+        else:
+            block_name_s = _(block_name)
+        
         try:
-            label = _(block_name) + ": " + hover_dict[block_name]
+            label = block_name_s + ": " + hover_dict[block_name]
         except:
-            label = _(block_name)
+            label = block_name_s
         try:
             # Use new toolbar
             tw.activity.hover_help_label.set_text(label)
@@ -795,9 +775,4 @@ def showPopup(block_name,tw):
             # Use old toolbar
             tw.activity.helpToolbar.hover_help_label.set_text(label)
             tw.activity.helpToolbar.hover_help_label.show()
-    """
-    i = popupHandler.getInvoker(block_name)
-    if i:
-        return gobject.timeout_add(500, i.showPopup, "")
-    """
     return 0
--
cgit v0.9.1