gnue common/src/GObjects.py forms/samples/dialo...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/27 16:29:17

Modified files:
        common/src     : GObjects.py 
        forms/samples/dialog: dialog.gfd 
        forms/samples/intro: intro.gfd 
        forms/src      : GFClient.py GFForm.py 
        samples/testcases/trigger: subformA.gfd subformB.gfd 

Log message:
        Syncing machines.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GObjects.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/dialog/dialog.gfd.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/intro/intro.gfd.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.209&tr2=1.210&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/samples/testcases/trigger/subformA.gfd.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/samples/testcases/trigger/subformB.gfd.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.44 gnue/common/src/GObjects.py:1.45
*** gnue/common/src/GObjects.py:1.44    Tue Nov 26 18:45:20 2002
--- gnue/common/src/GObjects.py Wed Nov 27 16:29:16 2002
***************
*** 123,129 ****
      return content
  
    def showTree(self, indent=0):
!     print ' ' * indent + `self._type`
      for child in self._children:
         child.showTree(indent + 2)
  
--- 123,130 ----
      return content
  
    def showTree(self, indent=0):
!     print ' ' * indent + `self._type`,self
!     
      for child in self._children:
         child.showTree(indent + 2)
  
Index: gnue/forms/samples/dialog/dialog.gfd
diff -c gnue/forms/samples/dialog/dialog.gfd:1.1 
gnue/forms/samples/dialog/dialog.gfd:1.2
*** gnue/forms/samples/dialog/dialog.gfd:1.1    Wed Nov 27 00:47:06 2002
--- gnue/forms/samples/dialog/dialog.gfd        Wed Nov 27 16:29:16 2002
***************
*** 6,11 ****
--- 6,12 ----
  <form xmlns:c="GNUe:Layout:Char">
    <options/>
    <trigger name="button1_Trigger" type="NAMED"><![CDATA[##
+     runDialog("selector")
      print "dialog(selector,modal=1) comming soon"
  ]]></trigger>
    <logic>
Index: gnue/forms/samples/intro/intro.gfd
diff -c gnue/forms/samples/intro/intro.gfd:1.15 
gnue/forms/samples/intro/intro.gfd:1.16
*** gnue/forms/samples/intro/intro.gfd:1.15     Tue Nov 26 21:29:37 2002
--- gnue/forms/samples/intro/intro.gfd  Wed Nov 27 16:29:16 2002
***************
*** 76,81 ****
--- 76,83 ----
              'You have a magnetic personality with GNUe forms.',
              'Use GNUe and you will notice the extraordinary in the ordinary.']
  
+ 
+ foo()
  if not SampleBlock.YearEntry.isEmpty():
  
    try:
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.56 gnue/forms/src/GFClient.py:1.57
*** gnue/forms/src/GFClient.py:1.56     Wed Nov 27 00:47:06 2002
--- gnue/forms/src/GFClient.py  Wed Nov 27 16:29:16 2002
***************
*** 213,218 ****
--- 213,272 ----
        self.handleStartupError(mesg)
  
  
+   def runDialog(self, formName, disableSplash=0, parameters={}):
+     try:
+       #
+       # Create the instance
+       #
+       instance = GFInstance(self, self.getNextSerialNumber(),
+           connections=self.connections, ui=self._ui, 
disableSplash=disableSplash,
+           parameters=parameters)
+       self._formInstances[instance.getSerialNumber()] = instance
+ 
+       #
+       # Assign the proper login handler based upon the user interface choice
+       #
+       self.getConnectionManager().setLoginHandler(self._ui.UILoginHandler())
+ 
+       #
+       # Build the form tree
+       #
+       #fileHandle=openResource(formFile)
+ 
+       #form = loadFile (fileHandle, instance)
+       #fileHandle.close()
+ 
+       #form.showTree()
+       #
+       # Start the instance
+       #
+       self._formInstances[1]._form._dialogDictionary[formName].showTree()
+       
+       
#self._formInstances[1]._form._dialogDictionary[formName].phaseInit(dialogInit=1)
+       #instance.setForm(self._form._dialogDictionary[formName])
+       #instance.activate()
+ 
+     except GConnections.Error, mesg:
+       self.handleStartupError(mesg)
+ 
+     except IOError, mesg:
+       self.handleStartupError(_("Unable to open file\n\n     %s")%mesg)
+ 
+     except GDataObjects.ConnectError, mesg:
+       self.handleStartupError(\
+          _("Unable to login to datasource.\n\n       %s") %mesg)
+ 
+     except GDataObjects.ConnectionError, mesg:
+       self.handleStartupError(\
+          _("Error while communicating with datasource.\n\n       %s") %mesg)
+ 
+     except GDataObjects.Error, mesg:
+       self.handleStartupError(mesg)
+ 
+ 
+   def countInits(self,
+ 
+ 
    def getNextSerialNumber (self):
       self._lastSerialNumber = self._lastSerialNumber + 1
       return self._lastSerialNumber
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.209 gnue/forms/src/GFForm.py:1.210
*** gnue/forms/src/GFForm.py:1.209      Wed Nov 27 00:47:06 2002
--- gnue/forms/src/GFForm.py    Wed Nov 27 16:29:16 2002
***************
*** 196,202 ****
      self.initTriggerSystem()
      self._triggerns.update(self._triggerNamespaceTree._globalNamespace)
      # TODO: Is this right
!     #self._triggerns['runForm'] = self._app.manager.runFormFromTrigger
  
    #
    # Secondary init (stuff that must happen
--- 196,203 ----
      self.initTriggerSystem()
      self._triggerns.update(self._triggerNamespaceTree._globalNamespace)
      # TODO: Is this right
!     self._triggerns['runForm'] = self._app.manager.runFormFromTrigger
!     self._triggerns['runDialog'] = self._app.manager.runDialog
  
    #
    # Secondary init (stuff that must happen
***************
*** 218,226 ****
--- 219,229 ----
    # any UI stuff is constructed
    #
    def reapDialogs(self):
+     #print self.showTree()
      for child in self._children:
        if isinstance(child, GFForm):
          # TODO : Might init them at this stage
+         self._parent = None
          self._dialogDictionary[child.name] = child
          self._children.remove(child)
      print "GFForm dialogs"
Index: gnue/samples/testcases/trigger/subformA.gfd
diff -c gnue/samples/testcases/trigger/subformA.gfd:1.1 
gnue/samples/testcases/trigger/subformA.gfd:1.2
*** gnue/samples/testcases/trigger/subformA.gfd:1.1     Sat Sep 28 10:42:02 2002
--- gnue/samples/testcases/trigger/subformA.gfd Wed Nov 27 16:29:17 2002
***************
*** 1,37 ****
! <?xml version="1.0"?>
! 
! <!--  GNUe Designer (0.4.0a)
!       Saved on: 2002-09-28 15:44:24  -->
! 
! <form height="16" title="Subform Sample" width="50">
!   <options>
!     <option name="version" value="0.0.1"/>
!     <option name="author" value="GNUE Enterprise Developers"/>
!   </options>
!   <trigger name="opensubform" type="NAMED"><![CDATA[
!         params={"x":theblock.xval,\
!                 "y":theblock.yval,\
!                 "n":theblock.nval}
!       runForm("subformB.gfd",params)
!   ]]></trigger>
!   <trigger name="setparamvalues" type="ON-STARTUP"><![CDATA[
!       theblock.xval=getParameter("x")
!       theblock.yval=getParameter("y")
!       theblock.nval=getParameter("n")
!   ]]></trigger>
!   <page name="Page_1">
!     <block name="theblock">
!       <label name="Label_0" text="Parameter:" width="14"
!              x="1" y="3"/>
!       <entry name="xval" typecast="number" width="16" x="4" y="4"/>
!       <entry name="yval" typecast="number" width="16" x="4" y="5"/>
!       <entry name="nval" typecast="number" width="16" x="4" y="6"/>
!       <button height="1" label="Open Form B" name="two" trigger="opensubform"
!               width="19" x="1" y="8"/>
!     </block>
!     <label name="Label_1" text="x=" width="2" x="1" y="4"/>
!     <label name="Label_2" text="y=" width="2" x="1" y="5"/>
!     <label name="Label_3" text="n=" width="2" x="1" y="6"/>
!     <label name="Label_4" text="Subform Test (Form A)" width="21" x="1" 
y="1"/>
!   </page>
! </form>
--- 1,47 ----
! <?xml version="1.0"?>
! 
! <!--  GNUe Forms 0.5.0 Migration Tool
!       Saved on: 2002-11-27 08:25:32  -->
! 
! <form title="Subform Sample">
!   <options>
!     <option name="version" value="0.0.1"/>
!     <option name="author" value="GNUE Enterprise Developers"/>
!   </options>
!   <trigger name="opensubform" type="NAMED"><![CDATA[
!         params={"x":theblock.xval,\
!                 "y":theblock.yval,\
!                 "n":theblock.nval}
!         print "HI"
!       runForm("subformB.gfd",params)
!   ]]></trigger>
!   <trigger name="setparamvalues" type="ON-STARTUP"><![CDATA[
!       theblock.xval=getParameter("x")
!       theblock.yval=getParameter("y")
!       theblock.nval=getParameter("n")
!   ]]></trigger>
!   <logic>
!     <block name="theblock">
!       <field name="xval" typecast="number"/>
!       <field name="yval" typecast="number"/>
!       <field name="nval" typecast="number"/>
!     </block>
!   </logic>
!   <layout xmlns:c="GNUe:Layout:Char" c:height="16" c:width="50">
!     <page name="Page_1">
!       <label name="Label_1" text="x=" c:width="2" c:x="1" c:y="4"/>
!       <label name="Label_2" text="y=" c:width="2" c:x="1" c:y="5"/>
!       <label name="Label_3" text="n=" c:width="2" c:x="1" c:y="6"/>
!       <label name="Label_4" text="Subform Test (Form A)" c:width="21" c:x="1"
!              c:y="1"/>
!       <label name="Label_0" text="Parameter:" c:width="14" c:x="1" c:y="3"/>
!       <entry block="theblock" field="xval" c:width="16" c:x="4" c:y="4"/>
!       <entry block="theblock" field="yval" c:width="16" c:x="4" c:y="5"/>
!       <entry block="theblock" field="nval" c:width="16" c:x="4" c:y="6"/>
!       <button name="two" c:height="1" label="Open Form B" c:width="19" c:x="1"
!               c:y="8">
!         <trigger src="opensubform" type="On-Action"/>
!       </button>
!     </page>
!   </layout>
! </form>
Index: gnue/samples/testcases/trigger/subformB.gfd
diff -c gnue/samples/testcases/trigger/subformB.gfd:1.1 
gnue/samples/testcases/trigger/subformB.gfd:1.2
*** gnue/samples/testcases/trigger/subformB.gfd:1.1     Sat Sep 28 10:42:03 2002
--- gnue/samples/testcases/trigger/subformB.gfd Wed Nov 27 16:29:17 2002
***************
*** 12,18 ****
          params={"x":theblock.xval,\
                  "y":theblock.yval,\
                  "n":theblock.nval}
!       runForm("subformA.gfd",params)
    ]]></trigger>
    <trigger name="setparamvalues" type="ON-STARTUP"><![CDATA[
        theblock.xval=getParameter("x")
--- 12,18 ----
          params={"x":theblock.xval,\
                  "y":theblock.yval,\
                  "n":theblock.nval}
!         runForm("subformA.gfd",params)
    ]]></trigger>
    <trigger name="setparamvalues" type="ON-STARTUP"><![CDATA[
        theblock.xval=getParameter("x")