gnue/designer/src Debugger.py Icons.py Instance...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/04 21:27:23

Modified files:
        designer/src   : Debugger.py Icons.py Instance.py 
                         LayoutEditor.py 

Log message:
        fixed title bar bug; fixed jamest's bug :)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Debugger.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Icons.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: gnue/designer/src/Debugger.py
diff -u gnue/designer/src/Debugger.py:1.2 gnue/designer/src/Debugger.py:1.3
--- gnue/designer/src/Debugger.py:1.2   Tue Jul 10 19:18:03 2001
+++ gnue/designer/src/Debugger.py       Sun Nov  4 21:27:23 2001
@@ -19,7 +19,7 @@
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
 # FILE:
-# GFDesigner.py
+# Debugger.py
 #
 # DESCRIPTION:
 #
Index: gnue/designer/src/Icons.py
diff -u gnue/designer/src/Icons.py:1.3 gnue/designer/src/Icons.py:1.4
--- gnue/designer/src/Icons.py:1.3      Sun Nov  4 20:28:05 2001
+++ gnue/designer/src/Icons.py  Sun Nov  4 21:27:23 2001
@@ -29,9 +29,14 @@
 import os
 from wxPython.wx import *
 
+# Nasty hack to get around wxPython bug (still in 2.3.1)
+class myImageList(wxImageList):
+  def __del__(self):
+    pass
+
 treeIconMap = {}
-treeIconList = wxImageList(16,16,false)
- 
+treeIconList = myImageList(16,16,false)
+
 if not os.environ.has_key('INSTALL_PREFIX'):
   iconlocation = os.environ['INSTALL_PREFIX']
   print iconlocation
@@ -39,11 +44,11 @@
   iconlocation = '/usr/local/gnue/shared/images'
 
 for f in ('block','datasource','entry','import','pagewidget',
-          'page','trigger','properties'): 
+          'page','trigger','properties'):
 #  if os.path.isfile('%s/destree_%s.xpm' % (iconlocation, f)):
 #    treeIconMap[f] = treeIconList.AddIcon(
 #        wxIcon('%s/destree_%s.xpm' % (iconlocation, f), wxBITMAP_TYPE_XPM))
-#  else: 
+#  else:
     treeIconMap[f] = treeIconList.AddIcon(wxNullIcon)
 
 
Index: gnue/designer/src/Instance.py
diff -u gnue/designer/src/Instance.py:1.23 gnue/designer/src/Instance.py:1.24
--- gnue/designer/src/Instance.py:1.23  Sun Sep 16 19:43:53 2001
+++ gnue/designer/src/Instance.py       Sun Nov  4 21:27:23 2001
@@ -107,7 +107,7 @@
     self._form.name = "Form"
 
     self.CreateStatusBar()
-    self.SetStatusText('Waddaya mean "Moo! M-Moo! Moo! Moo!"?...."Sheep ya 
dern fool!"')
+    self.SetStatusText('Waddaya mean "Baa! B-Baa! ! Baa!"?...."Sheep ya dern 
fool!"')
     self._menubar = MainMenuBar(self)
     self.SetMenuBar(self._menubar)
     self.Show(true)
@@ -170,6 +170,7 @@
 
   def __loadForm(self, location):
     try:
+      self._path = location
       fileHandle = open(location,'r')
       self.__loadFormFromBuffer(fileHandle)
       fileHandle.close()
Index: gnue/designer/src/LayoutEditor.py
diff -u gnue/designer/src/LayoutEditor.py:1.24 
gnue/designer/src/LayoutEditor.py:1.25
--- gnue/designer/src/LayoutEditor.py:1.24      Sun Nov  4 20:28:05 2001
+++ gnue/designer/src/LayoutEditor.py   Sun Nov  4 21:27:23 2001
@@ -1,4 +1,4 @@
-#
+        #
 # Copyright 2001 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
@@ -47,11 +47,11 @@
 
     self.toolpanel = wxPanel(self, -1, pos=wxPoint(0,0), size=wxSize(32,32), 
style=wxRAISED_BORDER|wxCLIP_CHILDREN)
 
-    # TODO: self.workspace needs to have SetScrollbars called with 
+    # TODO: self.workspace needs to have SetScrollbars called with
     # TODO: reasonable values based on size and position of self.panel
     self.workspace = wxScrolledWindow(self, -1, pos=wxPoint(0,32), 
style=wxCLIP_CHILDREN|wxHSCROLL|wxVSCROLL)
 
-    # TODO: There must be a better way of calculating a lighter shade 
+    # TODO: There must be a better way of calculating a lighter shade
     # TODO: for the workspace. What happens if a color value > (255-32)?
     self.workspace.SetBackgroundColour(wxColour(self.panelColor.Red()+32,
                  self.panelColor.Green()+32,    
@@ -333,9 +333,9 @@
     self.setAllChildren(EVT_LEFT_UP, self.highlightBox, self.OnLeftUp)
     self.setAllChildren(EVT_LEFT_DOWN, self.highlightBox, self.OnLeftDown)
     self.setAllChildren(EVT_RIGHT_UP, self.highlightBox, self.OnRightUp)
-    self.setAllChildren(EVT_MOTION, self.highlightBox, self.instance.OnMotion)
+    self.setAllChildren(EVT_MOTION, self.highlightBox, self.OnMotion)
 
-    self.widget.Refresh()    
+    self.widget.Refresh()
 
   def recalcBoundaries(self): 
     x1,y1,x2,y2 = (9999999,9999999,0,0)