gnue designer/src/Icons.py designer/src/LayoutE...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/11/04 20:28:05

Modified files:
        designer/src   : Icons.py LayoutEditor.py TreeView.py 
        gnuef/src      : __init__.py 

Log message:
        Designer now runs on win32 platforms

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Icons.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TreeView.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/__init__.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/designer/src/Icons.py
diff -u gnue/designer/src/Icons.py:1.2 gnue/designer/src/Icons.py:1.3
--- gnue/designer/src/Icons.py:1.2      Sun Jul 29 16:10:51 2001
+++ gnue/designer/src/Icons.py  Sun Nov  4 20:28:05 2001
@@ -34,7 +34,8 @@
  
 if not os.environ.has_key('INSTALL_PREFIX'):
   iconlocation = os.environ['INSTALL_PREFIX']
-else: 
+  print iconlocation
+else:
   iconlocation = '/usr/local/gnue/shared/images'
 
 for f in ('block','datasource','entry','import','pagewidget',
@@ -44,5 +45,12 @@
 #        wxIcon('%s/destree_%s.xpm' % (iconlocation, f), wxBITMAP_TYPE_XPM))
 #  else: 
     treeIconMap[f] = treeIconList.AddIcon(wxNullIcon)
+
+
+
+
+
+
+
 
 
Index: gnue/designer/src/LayoutEditor.py
diff -u gnue/designer/src/LayoutEditor.py:1.23 
gnue/designer/src/LayoutEditor.py:1.24
--- gnue/designer/src/LayoutEditor.py:1.23      Sun Nov  4 15:26:37 2001
+++ gnue/designer/src/LayoutEditor.py   Sun Nov  4 20:28:05 2001
@@ -265,13 +265,6 @@
       menu.AppendMenu(wxNewId(), block.name, PageMenu(self._instance, block, 
x, y))
     
     self.panel.PopupMenu(menu, event.GetPosition())
-
-
-  def OnMotion(self, event): 
-    if event.Dragging() and event.LeftIsDown(): 
-      pos = event.GetPositionTuple() 
-      print pos
-    pass
        
   def keyTrap(self, event): 
     if event.KeyCode() in (WXK_LEFT, WXK_RIGHT, WXK_UP, WXK_DOWN) and \
@@ -419,8 +412,8 @@
       relativeX = x - self.mouseStartX
       relativeY = y - self.mouseStartY 
 
-      GDebug.printMesg(0, 'Start XY %s, %s Current X,Y %s, %s Movement %s, %s' 
%
-                         (self.mouseStartX,self.mouseStartY, 
x,y,relativeX,relativeY))
+#      GDebug.printMesg(0, 'Start XY %s, %s Current X,Y %s, %s Movement %s, 
%s' %
+#                         (self.mouseStartX,self.mouseStartY, 
x,y,relativeX,relativeY))
 
       if abs(relativeX) > self.instance.gridWidth/2:
          xshift = (abs(relativeX)/relativeX)
@@ -429,18 +422,10 @@
          yshift = (abs(relativeY)/relativeY)
 
       if xshift or yshift:
-        GDebug.printMesg(0, 'Shift Start XY %s, %s Movement %s, %s Shift 
%s,%s' %
-                         (self.mouseStartX,self.mouseStartY, 
relativeX,relativeY,xshift,yshift))
+#        GDebug.printMesg(0, 'Shift Start XY %s, %s Movement %s, %s Shift 
%s,%s' %
+#                         (self.mouseStartX,self.mouseStartY, 
relativeX,relativeY,xshift,yshift))
         self.relativeMove(xshift,yshift)
         
-#        positionWidget.WarpPointer(self.mouseStartX+self.instance.gridWidth,
-#                                   self.mouseStartY+self.instance.gridHeight)
-#        positionWidget.WarpPointer(self.mouseStartX,self.mouseStartY)
-#        positionWidget.WarpPointer(x,y)
-   
-#        self.mouseStartX = x
-#        self.mouseStartY = y
-
   def OnRightDown(self, event): 
     pass
  
Index: gnue/designer/src/TreeView.py
diff -u gnue/designer/src/TreeView.py:1.13 gnue/designer/src/TreeView.py:1.14
--- gnue/designer/src/TreeView.py:1.13  Sun Jul 29 00:12:14 2001
+++ gnue/designer/src/TreeView.py       Sun Nov  4 20:28:05 2001
@@ -25,6 +25,7 @@
 #
 # NOTES:
 #
+# TODO: all the SetItemImage lines in this file have been commented out as on 
win32 it was segfaulting
 
 import sys, os, time
 from wxPython.wx import *
@@ -51,19 +52,19 @@
     self.form._treeItem = self.AddRoot("Form")
     self.form._treeItemFormProperties = \
         self.AppendItem(self.form._treeItem, "Properties")
-    self.SetItemImage(self.form._treeItemFormProperties, 
treeIconMap['properties'])
+    #self.SetItemImage(self.form._treeItemFormProperties, 
treeIconMap['properties'])
     self.form._treeItemImportedLibraries = \
         self.AppendItem(self.form._treeItem, "Imported Libraries")
-    self.SetItemImage(self.form._treeItemImportedLibraries, 
treeIconMap['import'])
+    #self.SetItemImage(self.form._treeItemImportedLibraries, 
treeIconMap['import'])
     self.form._treeItemDataSources = \
         self.AppendItem(self.form._treeItem, "Data Sources")
-    self.SetItemImage(self.form._treeItemDataSources, 
treeIconMap['datasource'])
+    #self.SetItemImage(self.form._treeItemDataSources, 
treeIconMap['datasource'])
     self.form._treeItemNamedTriggers = \
         self.AppendItem(self.form._treeItem, "Shared Triggers")
-    self.SetItemImage(self.form._treeItemNamedTriggers, treeIconMap['trigger'])
+    #self.SetItemImage(self.form._treeItemNamedTriggers, 
treeIconMap['trigger'])
     self.form._treeItemPageLayout = \
         self.AppendItem(self.form._treeItem, "Page Layout")
-    self.SetItemImage(self.form._treeItemPageLayout, treeIconMap['page'])
+    #self.SetItemImage(self.form._treeItemPageLayout, treeIconMap['page'])
 
     self.SetPyData(self.form._treeItem, self.form)
     self.SetPyData(self.form._treeItemFormProperties, 
ObjectMenu(self.instance,None))
@@ -95,7 +96,7 @@
           if not hasattr(object._parent,'_treeItemTrigger'): 
             object._parent._treeItemTrigger = \
               self.AppendItem(object._parent._treeItem, "Events")
-            self.SetItemImage(object._parent._treeItemTrigger, 
treeIconMap['trigger'])
+            #self.SetItemImage(object._parent._treeItemTrigger, 
treeIconMap['trigger'])
 
 
           parentTreeItem = object._parent._treeItemTrigger
@@ -124,7 +125,7 @@
         object._treeItem = self.AppendItem(parentTreeItem, 
             "%s" % object.getDescription())
         self.SetPyData(object._treeItem, object)
-        self.SetItemImage(object._treeItem, treeIconMap[icon])
+        #self.SetItemImage(object._treeItem, treeIconMap[icon])
 
 
   def AppendItem(self, parent, description): 
Index: gnue/gnuef/src/__init__.py
diff -u gnue/gnuef/src/__init__.py:1.2 gnue/gnuef/src/__init__.py:1.3
--- gnue/gnuef/src/__init__.py:1.2      Mon Jul  2 13:54:19 2001
+++ gnue/gnuef/src/__init__.py  Sun Nov  4 20:28:05 2001
@@ -20,4 +20,4 @@
 #
 
 PACKAGE="GNUe Forms"
-VERSION="pre0.1.0"
+VERSION="0.1.0"