gnue/designer/src GFDesigner.py Instance.py Pop...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/29 13:18:55

Modified files:
        designer/src   : GFDesigner.py Instance.py PopupMenu.py 

Log message:
        misc bug fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/PopupMenu.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/designer/src/GFDesigner.py
diff -u gnue/designer/src/GFDesigner.py:1.15 
gnue/designer/src/GFDesigner.py:1.16
--- gnue/designer/src/GFDesigner.py:1.15        Sun Jul  1 10:07:37 2001
+++ gnue/designer/src/GFDesigner.py     Sun Jul 29 13:18:55 2001
@@ -31,6 +31,7 @@
 from gnue.common.GClientApp import GClientApp
 from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
 from Instance import *
+from gnue.designer import VERSION
 import TemplateParser
 
 
Index: gnue/designer/src/Instance.py
diff -u gnue/designer/src/Instance.py:1.20 gnue/designer/src/Instance.py:1.21
--- gnue/designer/src/Instance.py:1.20  Wed Jul 18 19:20:48 2001
+++ gnue/designer/src/Instance.py       Sun Jul 29 13:18:55 2001
@@ -41,9 +41,9 @@
 from gnue.designer import RuntimeSettings
 from gnue.designer.Incubator import elements
 from gnue.designer.ToolFrame import ToolFrame
+from gnue.designer import VERSION
 
-TITLE =  "GNU Enterprise Designer"
-VERSION = "0.0.1"
+TITLE = 'GNU Enterprise Designer'
 
 class GFDInstance(GFInstance.GFInstance, wxFrame):
   def __init__(self, app, location=None): 
Index: gnue/designer/src/PopupMenu.py
diff -u gnue/designer/src/PopupMenu.py:1.3 gnue/designer/src/PopupMenu.py:1.4
--- gnue/designer/src/PopupMenu.py:1.3  Sat Jul 28 20:19:35 2001
+++ gnue/designer/src/PopupMenu.py      Sun Jul 29 13:18:55 2001
@@ -27,7 +27,7 @@
 
 import sys, os, time, string
 from wxPython.wx import *
-from gnue.common import GDebug, GConfig
+from gnue.common import GDebug, GConfig, GObjects
 from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
 import Incubator
 
@@ -234,8 +234,8 @@
 class PageMenu(wxMenu): 
   def __init__(self, instance, object, x, y): 
     wxMenu.__init__(self, hasattr(object,'name') and \
-       object.name or string.upper(object.getObjectType[2]) + \
-       string.lower(object.getObjectType[3:]) )
+       object.name or string.upper(object.getObjectType()[2]) + \
+       string.lower(object.getObjectType()[3:]) )
 
     self.object = object
     self.instance = instance
@@ -305,7 +305,11 @@
       if len(object._children): 
         self.AppendSeparator()
         for child in object._children: 
-          self.AppendMenu(wxNewId(), child.name, PageMenu(instance, child, x, 
y))
+          if isinstance (child, GObjects.GObj): 
+            self.AppendMenu(wxNewId(), hasattr(child,'name') and child.name or 
\
+              string.upper(child.getObjectType()[2]) + \
+              string.lower(child.getObjectType()[3:]),
+              PageMenu(instance, child, x, y))
           
       self.AppendSeparator()