gnue designer/src/LayoutEditor.py gnuef/setup.py

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/11/04 10:54:24

Modified files:
        designer/src   : LayoutEditor.py 
        gnuef          : setup.py 

Log message:
        Designer support using the mouse to move widgets (work in process)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.41&tr2=1.42&r1=text&r2=text

Patches:
Index: gnue/designer/src/LayoutEditor.py
diff -u gnue/designer/src/LayoutEditor.py:1.20 
gnue/designer/src/LayoutEditor.py:1.21
--- gnue/designer/src/LayoutEditor.py:1.20      Sun Jul 29 00:36:30 2001
+++ gnue/designer/src/LayoutEditor.py   Sun Nov  4 10:54:24 2001
@@ -182,7 +182,7 @@
 #    EVT_LEFT_UP(self.panel, self.OnLeftUp)
 #    EVT_LEFT_DOWN(self.panel, self.OnLeftDown)
     EVT_RIGHT_UP(self.panel, self.OnRightUp)
-    EVT_MOTION(self.panel, self.OnMotion)
+#    EVT_MOTION(self.panel, self.OnMotion)
 
   def getPages(self): 
     self.pageCombo.Clear()
@@ -268,9 +268,9 @@
 
 
   def OnMotion(self, event): 
-#    if event.Dragging() and event.LeftIsDown(): 
-#      pos = event.GetPositionTuple() 
-#      coords = (self.x, self.y) + pos 
+    if event.Dragging() and event.LeftIsDown(): 
+      pos = event.GetPositionTuple() 
+      print pos
     pass
        
   def keyTrap(self, event): 
@@ -332,7 +332,7 @@
       self.setAllChildren(EVT_LEFT_DOWN, widget, self.OnLeftDown)
       self.setAllChildren(EVT_RIGHT_DOWN, widget, self.OnRightDown)
       self.setAllChildren(EVT_RIGHT_UP, widget, self.OnRightUp)
-      self.setAllChildren(EVT_MOTION, widget, self.instance.OnMotion)
+      self.setAllChildren(EVT_MOTION, widget, self.OnMotion)
       self.setAllChildren(EVT_LEFT_DCLICK, widget, self.OnEditProperties)
     self.setAllChildren(EVT_KEY_UP, self.highlightBox, self.instance.keyTrap)
     self.setAllChildren(EVT_SET_FOCUS, self.highlightBox, self.focusGainedTrap)
@@ -386,7 +386,9 @@
     event.Skip()
 
   def OnLeftDown(self, event): 
-#    self.instance.panel.CaptureMouse() 
+
+    self.mouseStartX, self.mouseStartY = event.GetPositionTuple()
+
     if not event.ShiftDown(): 
       for selection in self.instance._currentSelection.keys(): 
         selection.setSelected(0)
@@ -416,10 +418,34 @@
 
   def OnMotion(self, event): 
     if event.Dragging() and event.LeftIsDown(): 
-      pos = event.GetPositionTuple() 
-      self.x, self.y = pos 
-
 
+      xshift = 0
+      yshift = 0
+      
+      x, y  = event.GetPositionTuple()
+      relativeX = self.mouseStartX - x
+      relativeY = self.mouseStartY - y
+      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) > 4:
+         xshift = (abs(relativeX)/relativeX) * -1 #(abs(relativeX)/4)
+      if abs(relativeY) > 4:
+         yshift = (abs(relativeY)/relativeY) * -1 #(abs(relativeY)/4)
+
+      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))
+        self.relativeMove(xshift,yshift)
+        
+        self.mainWidget.widgets[0].WarpPointer(self.mouseStartX,# 
xshift*self.instance.gridWidth,
+                                               
self.mouseStartY+yshift*self.instance.gridHeight)
+#        
self.mainWidget.widgets[0].WarpPointer(self.mouseStartX,self.mouseStartY)
+#        self.mainWidget.widgets[0].WarpPointer(x,y)
+   
+        #self.mouseStartX = x
+        #self.mouseStartY = y
+         
   def OnEditProperties(self, event): 
     self.instance._instance.propertyEditorWindow.Show(1)
     self.instance._instance.propertyEditorWindow.Raise()
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.41 gnue/gnuef/setup.py:1.42
--- gnue/gnuef/setup.py:1.41    Tue Oct  9 11:19:57 2001
+++ gnue/gnuef/setup.py Sun Nov  4 10:54:24 2001
@@ -225,13 +225,14 @@
          + "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
          + "#######\n"
     else:
+      print "Win32"
       gnue_env = \
            "#######\n" \
          + "# The following variable were set when GNUe was installed\n\n"    \
          + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % (sys.prefix) \
          + "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)               \
          + "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)                  \
-         + "#######\n"
+         + "#######\n" 
 
     for script in self.scripts:
       print "Building %s..."% (script),
@@ -283,3 +284,10 @@
 if not 'sdist' in sys.argv:
   if sys.platform != 'win32':
     os.system (""" /bin/rm -rf setup.cfg""")
+
+
+
+
+
+
+