From 69d7ba3bf324228f916c657a4fd4ec9f83782f9d Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 23 Mar 2012 19:18:17 +0000
Subject: new help system

---
(limited to 'TurtleArt/tawindow.py')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index b324c7b..3771484 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -124,6 +124,8 @@ class TurtleArtWindow():
         self.height = gtk.gdk.screen_height()
         self.rect = gtk.gdk.Rectangle(0, 0, 0, 0)
 
+        self.no_help = False
+
         self.keypress = ''
         self.keyvalue = 0
         self.dead_key = ''
@@ -1729,6 +1731,8 @@ class TurtleArtWindow():
 
     def _do_show_popup(self, block_name):
         """ Fetch the help text and display it.  """
+        if self.no_help:
+            return 0
         if block_name in special_names:
             special_block_name = special_names[block_name]
         elif block_name in block_names:
@@ -1738,18 +1742,16 @@ class TurtleArtWindow():
         else:
             special_block_name = _(block_name)
         if block_name in help_strings:
+            label = help_strings[block_name]
+            '''
             if special_block_name == '':
                 label = help_strings[block_name]
             else:
                 label = special_block_name + ": " + help_strings[block_name]
+            '''
         else:
             label = special_block_name
-        if self.running_sugar:
-            self.activity.hover_help_label.set_text(label)
-            self.activity.hover_help_label.show()
-        else:
-            if self.interactive_mode:
-                self.parent.set_title(_("Turtle Art") + " — " + label)
+        self.showlabel('help', label=label)
         return 0
 
     def _buttonrelease_cb(self, win, event):
@@ -3073,7 +3075,9 @@ class TurtleArtWindow():
         if shp == 'info':
             self.status_spr.move((PALETTE_WIDTH, self.height - 400))
         else:
-            self.status_spr.move((PALETTE_WIDTH, self.height - 200))
+            # Adjust vertical position based on scrolled window adjustment
+            self.status_spr.move((0, self.height - 200 + \
+                     self.activity.sw.get_vadjustment().get_value()))
 
     def calc_position(self, template):
         """ Relative placement of portfolio objects (deprecated) """
--
cgit v0.9.1