[gnue] r7549 - in trunk/gnue-forms: dialogs src src/dialogs

[johannes]

Author: johannes
Date: 2005-05-20 02:57:59 -0500 (Fri, 20 May 2005)
New Revision: 7549

Removed:
   trunk/gnue-forms/dialogs/jumpto.gfd
   trunk/gnue-forms/src/dialogs/jumpto/
Modified:
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/dialogs/__init__.py
Log:
Replaced jumpto.gfd by a call to getInput ()


Deleted: trunk/gnue-forms/dialogs/jumpto.gfd
===================================================================
--- trunk/gnue-forms/dialogs/jumpto.gfd 2005-05-19 12:21:17 UTC (rev 7548)
+++ trunk/gnue-forms/dialogs/jumpto.gfd 2005-05-20 07:57:59 UTC (rev 7549)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<form style="dialog" name="_jumpto" title="Jump to Record">
-  <trigger type="On-Startup">
-    form.setFeature('GUI:MENUBAR:SUPPRESS',1)
-    form.setFeature('GUI:TOOLBAR:SUPPRESS',1)
-    form.setFeature('GUI:STATUSBAR:SUPPRESS',1)
-  </trigger>
-  <trigger type="on-activation">
-    Block_1.rollback()
-    setFocus (Block_1.Entry_1)
-  </trigger>
-  <options/>
-  <logic>
-    <block name="Block_1">
-      <field name="Entry_1" typecast="number"/>
-    </block>
-  </logic>
-  <layout xmlns:c="GNUe:Layout:Char" c:height="5" c:width="32">
-    <page name="Record">
-      <label c:x="1" c:y="1" c:width="30" c:height="1"
-        text="Enter record number to jump to"/>
-      <entry c:x="1" c:y="2" c:width="30" c:height="1" block="Block_1"
-        field="Entry_1"/>
-      <button c:x="10" c:y="4" c:width="10" c:height="1" label="Ok">
-        <trigger name="OkTrigger" type="On-Action"><![CDATA[
-           setParameter('recordNumber',"%s" % Block_1.Entry_1)
-           close()]]>
-        </trigger>
-      </button>
-      <button c:x="21" c:y="4" c:width="10" c:height="1" label="Cancel">
-        <trigger name="CancelTrigger" type="On-Action"><![CDATA[
-           setParameter('cancel',1)
-           close()]]>
-        </trigger>
-      </button>
-    </page>
-  </layout>
-</form>

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2005-05-19 12:21:17 UTC (rev 7548)
+++ trunk/gnue-forms/src/GFInstance.py  2005-05-20 07:57:59 UTC (rev 7549)
@@ -1018,15 +1018,15 @@
     requested record
     """
 
-    parameters = {'recordnumber': ''}
-    self.activateForm ('_jumpto', parameters, modal = True)
+    fields = [(u_("Recordnumber"), 'record', 'string', None, None, [])]
+    result = self._uiinstance.getInput (u_("Jump to record"), fields)
 
-    if not parameters.has_key ('cancel'):
+    if result is not None:
       if not event._form.endEditing ():
         return
 
       try:
-        count = abs (int (float (parameters ['recordnumber']))) - 1
+        count = abs (int (float (result ['record']))) - 1
 
       except ValueError:
         message = _("Invalid numeric value entered.")

Modified: trunk/gnue-forms/src/dialogs/__init__.py
===================================================================
--- trunk/gnue-forms/src/dialogs/__init__.py    2005-05-19 12:21:17 UTC (rev 
7548)
+++ trunk/gnue-forms/src/dialogs/__init__.py    2005-05-20 07:57:59 UTC (rev 
7549)
@@ -1 +1 @@
-DIALOGS = ['jumpto']
+DIALOGS = []