adding hover help to commandline version

3 files changed, 39 insertions, 30 deletions

diff --git a/NEWS b/NEWS
index 2a08162..1ce692c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+74
+
+* load start block for new projects
+* fixed bug with reloading descriptions from Journal
+* added hover help to command line version
+
 73
 
 * raise status flag when catching overflow error
diff --git a/tawindow.py b/tawindow.py
index 3fe3f8e..3a47700 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -434,24 +434,27 @@ def button_release(tw, x, y, verbose=False):
         else: run_stack(tw, spr)
 
 def import_from_journal(tw, spr):
-    chooser = ObjectChooser('Choose image', None, gtk.DIALOG_MODAL | \
-        gtk.DIALOG_DESTROY_WITH_PARENT)
-    try:
-        result = chooser.run()
-        if result == gtk.RESPONSE_ACCEPT:
-            dsobject = chooser.get_selected_object()
-            # change block graphic to indicate that object is "loaded"
-            if spr.proto.name == 'journal':
-                load_image(tw, dsobject, spr)
-            elif spr.proto.name == 'audiooff':
-                setimage(spr,tw.media_shapes['audioon'])
-            else:
-                setimage(spr, tw.media_shapes['decson'])
-            spr.ds_id = dsobject.object_id
-            dsobject.destroy()
-    finally:
-        chooser.destroy()
-        del chooser
+    if hasattr(tw,"activity"):
+        chooser = ObjectChooser('Choose image', None,\
+                              gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
+        try:
+            result = chooser.run()
+            if result == gtk.RESPONSE_ACCEPT:
+                dsobject = chooser.get_selected_object()
+                # change block graphic to indicate that object is "loaded"
+                if spr.proto.name == 'journal':
+                    load_image(tw, dsobject, spr)
+                elif spr.proto.name == 'audiooff':
+                    setimage(spr,tw.media_shapes['audioon'])
+                elif:
+                    setimage(spr, tw.media_shapes['decson'])
+                spr.ds_id = dsobject.object_id
+                dsobject.destroy()
+        finally:
+            chooser.destroy()
+            del chooser
+    else:
+        print "Journal Object Chooser unavailable from outside of Sugar"
 
 # Replace Journal block graphic with preview image
 def load_image(tw, picture, spr):
@@ -770,17 +773,17 @@ def xy(event):
     return map(int, event.get_coords())
 
 def showPopup(block_name,tw):
+    if block_name in blocks_dict:
+        block_name_s = _(blocks_dict[block_name])
+    else:
+        block_name_s = _(block_name)
+    try:
+        label = block_name_s + ": " + hover_dict[block_name]
+    except:
+        label = block_name_s
     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_s + ": " + hover_dict[block_name]
-        except:
-            label = block_name_s
-        # Use new toolbar
         tw.activity.hover_help_label.set_text(label)
         tw.activity.hover_help_label.show()
+    elif hasattr(tw,"win"):
+        tw.win.set_title(_("Turtle Art") + " — " + label)
     return 0
diff --git a/turtleart.py b/turtleart.py
index df871fa..f9b9ce1 100755
--- a/turtleart.py
+++ b/turtleart.py
@@ -67,7 +67,7 @@ class TurtleMain():
         if not lang:
             lang = 'en'
         lang = lang[0:2]
-    
+        
         win = gtk.Window(gtk.WINDOW_TOPLEVEL)
         win.maximize()
         win.set_title(_("Turtle Art"))
@@ -136,7 +136,7 @@ class TurtleMain():
 
         win.show_all()
         self.tw = twNew(canvas, os.path.abspath('.'), lang)
-        self.tw.win = canvas
+        self.tw.win = win
 
     def _do_open_cb(self, widget):
         load_file(self.tw, True)