[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/GObjects.py common/src/dbdriver...
|
From: |
Jason Cater |
|
Subject: |
gnue common/src/GObjects.py common/src/dbdriver... |
|
Date: |
Sun, 27 Oct 2002 15:59:39 -0500 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/10/27 15:59:39
Modified files:
common/src : GObjects.py
common/src/dbdrivers/_dbsig: DBdriver.py
forms/doc : Developers-Guide.sxw gnue-forms.dtd
forms/src : GFForm.py
forms/src/GFObjects: GFBlock.py GFEntry.py
Log message:
Trigger Namespace changes:
* Added support for negative indexes in Block.gotoRecord
(negative numbers are relative to the last record)
* Added Block.parent and Entry.parent attributes
* Added getCurrentEntry, getCurrentBlock, and
getCurrentPage to Form
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GObjects.py.diff?cvsroot=OldCVS&tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/doc/Developers-Guide.sxw.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/doc/gnue-forms.dtd.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.189&tr2=1.190&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.72&tr2=1.73&r1=text&r2=text
Patches:
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.38 gnue/common/src/GObjects.py:1.39
*** gnue/common/src/GObjects.py:1.38 Mon Jul 22 19:04:59 2002
--- gnue/common/src/GObjects.py Sun Oct 27 15:59:38 2002
***************
*** 67,72 ****
--- 67,74 ----
self.phaseInit(self.buildObject(**params))
+ def getParent(self):
+ return self._parent
#
# phaseInit
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.56
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.57
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.56 Fri Oct 25 21:13:19 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py Sun Oct 27 15:59:38 2002
***************
*** 393,399 ****
def _beginTransaction(self):
pass
!
def _buildFieldDefinition(self,field):
try:
sql="%s %s" % (field.name,
--- 393,399 ----
def _beginTransaction(self):
pass
!
def _buildFieldDefinition(self,field):
try:
sql="%s %s" % (field.name,
Index: gnue/forms/doc/Developers-Guide.sxw
Index: gnue/forms/doc/gnue-forms.dtd
diff -c gnue/forms/doc/gnue-forms.dtd:1.5 gnue/forms/doc/gnue-forms.dtd:1.6
*** gnue/forms/doc/gnue-forms.dtd:1.5 Mon Jul 15 16:00:18 2002
--- gnue/forms/doc/gnue-forms.dtd Sun Oct 27 15:59:38 2002
***************
*** 1,4 ****
! <!-- GNUe Forms DTD (Version 0.4.0a) -->
<!--
Copyright 2001-2002 Free Software Foundation
--- 1,4 ----
! <!-- GNUe Forms DTD (Version 0.4.1a) -->
<!--
Copyright 2001-2002 Free Software Foundation
***************
*** 49,60 ****
<!-- ================= -->
<!ELEMENT form (database*, datasource*, import*, import-datasource*,
import-page*, import-trigger*, menu*, options?, page+,
! trigger*)>
! <!ATTLIST form height %whole; #DEFAULT "12">
<!ATTLIST form readonly %boolean;>
<!ATTLIST form tabbed (bottom | left | right | top) #IMPLIED>
! <!ATTLIST form title %text; #DEFAULT "Untitled Form">
! <!ATTLIST form width %whole; #DEFAULT "40">
<!-- ====================== -->
--- 49,60 ----
<!-- ================= -->
<!ELEMENT form (database*, datasource*, import*, import-datasource*,
import-page*, import-trigger*, menu*, options?, page+,
! parameter*, trigger*)>
! <!ATTLIST form height %whole; "12">
<!ATTLIST form readonly %boolean;>
<!ATTLIST form tabbed (bottom | left | right | top) #IMPLIED>
! <!ATTLIST form title %text; "Untitled Form">
! <!ATTLIST form width %whole; "40">
<!-- ====================== -->
***************
*** 70,105 ****
<!ATTLIST database host %text; #IMPLIED>
<!ATTLIST database service %text; #IMPLIED>
! <!ELEMENT datasource (conditions?)>
<!ATTLIST datasource name ID #REQUIRED>
! <!ATTLIST datasource cache %whole; #DEFAULT "5">
<!ATTLIST datasource database %name; #IMPLIED>
<!ATTLIST datasource detaillink %text; #IMPLIED>
<!ATTLIST datasource master %name; #IMPLIED>
<!ATTLIST datasource masterlink %text; #IMPLIED>
<!ATTLIST datasource order_by %text; #IMPLIED>
<!ATTLIST datasource prequery %boolean;>
<!ATTLIST datasource table %name; #IMPLIED>
! <!ATTLIST datasource type %name; #DEFAULT "object">
<!ELEMENT import EMPTY>
<!ATTLIST import library %name; #REQUIRED>
! <!ATTLIST import datasources %name; #DEFAULT "">
! <!ATTLIST import pages %name; #DEFAULT "">
! <!ATTLIST import triggers %name; #DEFAULT "">
<!ELEMENT import-datasource EMPTY>
<!ATTLIST import-datasource name ID #REQUIRED>
<!ATTLIST import-datasource library %name; #REQUIRED>
! <!ATTLIST import-datasource cache %whole; #DEFAULT "5">
<!ATTLIST import-datasource database %name; #IMPLIED>
<!ATTLIST import-datasource detaillink %text; #IMPLIED>
<!ATTLIST import-datasource master %name; #IMPLIED>
<!ATTLIST import-datasource masterlink %text; #IMPLIED>
<!ATTLIST import-datasource order_by %text; #IMPLIED>
<!ATTLIST import-datasource prequery %boolean;>
<!ATTLIST import-datasource table %name; #IMPLIED>
! <!ATTLIST import-datasource type %name; #DEFAULT "object">
<!ELEMENT import-page EMPTY>
<!ATTLIST import-page library %name; #REQUIRED>
--- 70,109 ----
<!ATTLIST database host %text; #IMPLIED>
<!ATTLIST database service %text; #IMPLIED>
! <!ELEMENT datasource (conditions?, staticset?)>
<!ATTLIST datasource name ID #REQUIRED>
! <!ATTLIST datasource cache %whole; "5">
<!ATTLIST datasource database %name; #IMPLIED>
<!ATTLIST datasource detaillink %text; #IMPLIED>
+ <!ATTLIST datasource explicitfields %text; #IMPLIED>
<!ATTLIST datasource master %name; #IMPLIED>
<!ATTLIST datasource masterlink %text; #IMPLIED>
<!ATTLIST datasource order_by %text; #IMPLIED>
<!ATTLIST datasource prequery %boolean;>
+ <!ATTLIST datasource primarykey %text; #IMPLIED>
<!ATTLIST datasource table %name; #IMPLIED>
! <!ATTLIST datasource type %name; "object">
<!ELEMENT import EMPTY>
<!ATTLIST import library %name; #REQUIRED>
! <!ATTLIST import datasources %name; "">
! <!ATTLIST import pages %name; "">
! <!ATTLIST import triggers %name; "">
<!ELEMENT import-datasource EMPTY>
<!ATTLIST import-datasource name ID #REQUIRED>
<!ATTLIST import-datasource library %name; #REQUIRED>
! <!ATTLIST import-datasource cache %whole; "5">
<!ATTLIST import-datasource database %name; #IMPLIED>
<!ATTLIST import-datasource detaillink %text; #IMPLIED>
+ <!ATTLIST import-datasource explicitfields %text; #IMPLIED>
<!ATTLIST import-datasource master %name; #IMPLIED>
<!ATTLIST import-datasource masterlink %text; #IMPLIED>
<!ATTLIST import-datasource order_by %text; #IMPLIED>
<!ATTLIST import-datasource prequery %boolean;>
+ <!ATTLIST import-datasource primarykey %text; #IMPLIED>
<!ATTLIST import-datasource table %name; #IMPLIED>
! <!ATTLIST import-datasource type %name; "object">
<!ELEMENT import-page EMPTY>
<!ATTLIST import-page library %name; #REQUIRED>
***************
*** 134,139 ****
--- 138,150 ----
<!ATTLIST page caption %text; #IMPLIED>
<!ATTLIST page name ID #IMPLIED>
+ <!ELEMENT parameter EMPTY>
+ <!ATTLIST parameter name ID #REQUIRED>
+ <!ATTLIST parameter default %text; #IMPLIED>
+ <!ATTLIST parameter description %text; #IMPLIED>
+ <!ATTLIST parameter required %boolean;>
+ <!ATTLIST parameter type %name; "char">
+
<!ELEMENT trigger EMPTY>
<!-- DEPRECATED: The "id" attribute of "trigger" has been deprecated [Use
name="..." instead.] -->
***************
*** 149,154 ****
--- 160,168 ----
<!-- ============================ -->
<!ELEMENT conditions (condition*)>
+ <!ELEMENT staticset (staticsetrow?)>
+ <!ATTLIST staticset fields %text; #REQUIRED>
+
<!-- ========================= -->
<!-- Child elements of options -->
***************
*** 203,213 ****
<!ATTLIST block rows %whole; #IMPLIED>
<!ATTLIST block transparentBlock %boolean;>
! <!ELEMENT box EMPTY>
<!ATTLIST box height %whole; #REQUIRED>
<!ATTLIST box width %whole; #REQUIRED>
<!ATTLIST box x %whole; #REQUIRED>
<!ATTLIST box y %whole; #REQUIRED>
<!ATTLIST box label %text; #IMPLIED>
<!ATTLIST box name ID #IMPLIED>
--- 217,228 ----
<!ATTLIST block rows %whole; #IMPLIED>
<!ATTLIST block transparentBlock %boolean;>
! <!ELEMENT box (button*, entry*, import-button*, import-entry*, scrollbar*)>
<!ATTLIST box height %whole; #REQUIRED>
<!ATTLIST box width %whole; #REQUIRED>
<!ATTLIST box x %whole; #REQUIRED>
<!ATTLIST box y %whole; #REQUIRED>
+ <!ATTLIST box focusorder %whole; #IMPLIED>
<!ATTLIST box label %text; #IMPLIED>
<!ATTLIST box name ID #IMPLIED>
***************
*** 216,221 ****
--- 231,237 ----
<!ATTLIST button width %whole; #REQUIRED>
<!ATTLIST button x %whole; #REQUIRED>
<!ATTLIST button y %whole; #REQUIRED>
+ <!ATTLIST button focusorder %whole; #IMPLIED>
<!ATTLIST button label %name; #IMPLIED>
<!ATTLIST button name ID #IMPLIED>
<!ATTLIST button trigger %name; #IMPLIED>
***************
*** 236,241 ****
--- 252,258 ----
<!ATTLIST import-button width %whole; #REQUIRED>
<!ATTLIST import-button x %whole; #REQUIRED>
<!ATTLIST import-button y %whole; #REQUIRED>
+ <!ATTLIST import-button focusorder %whole; #IMPLIED>
<!ATTLIST import-button label %name; #IMPLIED>
<!ATTLIST import-button name ID #IMPLIED>
<!ATTLIST import-button trigger %name; #IMPLIED>
***************
*** 264,269 ****
--- 281,292 ----
negate*, not*, notbetween*, notlike*, or*)>
+ <!-- =========================== -->
+ <!-- Child elements of staticset -->
+ <!-- =========================== -->
+ <!ELEMENT staticsetrow (staticsetfield*)>
+
+
<!-- ======================= -->
<!-- Child elements of block -->
<!-- ======================= -->
***************
*** 281,286 ****
--- 304,310 ----
<!ATTLIST entry fk_description %name; #IMPLIED>
<!ATTLIST entry fk_key %name; #IMPLIED>
<!ATTLIST entry fk_source %name; #IMPLIED>
+ <!ATTLIST entry focusorder %whole; #IMPLIED>
<!-- DEPRECATED: The "foreign_key" attribute of "entry" has been deprecated
[Use fk_source="..." and fk_key="..." instead.] -->
<!ATTLIST entry foreign_key %name; #IMPLIED>
***************
*** 288,294 ****
deprecated [Use fk_description="..." instead.] -->
<!ATTLIST entry foreign_key_description %text; #IMPLIED>
<!ATTLIST entry formatmask %text; #IMPLIED>
! <!ATTLIST entry height %whole; #DEFAULT "1">
<!ATTLIST entry hidden %boolean;>
<!ATTLIST entry ignoreCaseOnQuery %boolean;>
<!ATTLIST entry inputmask %text; #IMPLIED>
--- 312,318 ----
deprecated [Use fk_description="..." instead.] -->
<!ATTLIST entry foreign_key_description %text; #IMPLIED>
<!ATTLIST entry formatmask %text; #IMPLIED>
! <!ATTLIST entry height %whole; "1">
<!ATTLIST entry hidden %boolean;>
<!ATTLIST entry ignoreCaseOnQuery %boolean;>
<!ATTLIST entry inputmask %text; #IMPLIED>
***************
*** 337,342 ****
--- 361,367 ----
<!ATTLIST import-entry fk_description %name; #IMPLIED>
<!ATTLIST import-entry fk_key %name; #IMPLIED>
<!ATTLIST import-entry fk_source %name; #IMPLIED>
+ <!ATTLIST import-entry focusorder %whole; #IMPLIED>
<!-- DEPRECATED: The "foreign_key" attribute of "import-entry" has been
deprecated [Use fk_source="..." and fk_key="..." instead.]
-->
***************
*** 345,351 ****
been deprecated [Use fk_description="..." instead.] -->
<!ATTLIST import-entry foreign_key_description %text; #IMPLIED>
<!ATTLIST import-entry formatmask %text; #IMPLIED>
! <!ATTLIST import-entry height %whole; #DEFAULT "1">
<!ATTLIST import-entry hidden %boolean;>
<!ATTLIST import-entry ignoreCaseOnQuery %boolean;>
<!ATTLIST import-entry inputmask %text; #IMPLIED>
--- 370,376 ----
been deprecated [Use fk_description="..." instead.] -->
<!ATTLIST import-entry foreign_key_description %text; #IMPLIED>
<!ATTLIST import-entry formatmask %text; #IMPLIED>
! <!ATTLIST import-entry height %whole; "1">
<!ATTLIST import-entry hidden %boolean;>
<!ATTLIST import-entry ignoreCaseOnQuery %boolean;>
<!ATTLIST import-entry inputmask %text; #IMPLIED>
***************
*** 417,422 ****
--- 442,455 ----
negate*, not*, notbetween*, notlike*, or*)>
+ <!-- ============================== -->
+ <!-- Child elements of staticsetrow -->
+ <!-- ============================== -->
+ <!ELEMENT staticsetfield EMPTY>
+ <!ATTLIST staticsetfield name %text; #REQUIRED>
+ <!ATTLIST staticsetfield value %text; #REQUIRED>
+
+
<!-- ========================= -->
<!-- Child elements of between -->
<!-- ========================= -->
***************
*** 439,443 ****
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:56:26 -->
--- 472,476 ----
<!-- This DTD was created by gnuedtd
! Updated: 2002-10-27 14:09:52 -->
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.189 gnue/forms/src/GFForm.py:1.190
*** gnue/forms/src/GFForm.py:1.189 Fri Oct 25 21:13:19 2002
--- gnue/forms/src/GFForm.py Sun Oct 27 15:59:39 2002
***************
*** 89,94 ****
--- 89,103 ----
self._triggerFunctions = {'setFocus':{'function':self.triggerSetFocus,
'global': 1,
},
+
'getCurrentEntry':{'function':self.triggerGetCurrentEntry,
+ 'global': 1,
+ },
+
'getCurrentBlock':{'function':self.triggerGetCurrentBlock,
+ 'global': 1,
+ },
+
'getCurrentPage':{'function':self.triggerGetCurrentPage,
+ 'global': 1,
+ },
'setStatusText':{'function':self.triggerSetStatusText,
'global': 1,
},
***************
*** 698,703 ****
--- 707,721 ----
# print _("If i was working then %s would now have focus") % object._object
self.changeFocus(object._object,1)
self.dispatchEvent(events.Event('gotoENTRY',{'object':self._currentEntry}))
+
+ def triggerGetCurrentEntry(self):
+ return self._currentEntry
+
+ def triggerGetCurrentBlock(self):
+ return self._currentBlock
+
+ def triggerGetCurrentPage(self):
+ return self._currentPage
def triggerSetStatusText(self,tip=''):
self.dispatchEvent(events.Event('uiUPDATESTATUS',[tip,None,None,None,None,None,None]))
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.54
gnue/forms/src/GFObjects/GFBlock.py:1.55
*** gnue/forms/src/GFObjects/GFBlock.py:1.54 Thu Oct 24 00:39:02 2002
--- gnue/forms/src/GFObjects/GFBlock.py Sun Oct 27 15:59:39 2002
***************
*** 79,84 ****
--- 79,86 ----
'prevRecord':{'function':self.prevRecord},
'deleteRecord':{'function':self.deleteRecord},
}
+
+ self._triggerProperties={'parent': {'get':self.getParent}}
def __getitem__(self, index):
***************
*** 240,245 ****
--- 242,252 ----
self.switchRecord(-1)
def jumpRecord(self, recordNumber):
+ # If recordNumber is negative, move relative to last record
+ if recordNumber < 0:
+ recordNumber += self._resultSet.getRecordCount()
+ if recordNumber < 0:
+ raise "Invalid record number"
if not self._resultSet.setRecord(recordNumber):
self._resultSet.lastRecord()
jump = self._resultSet.getRecordNumber() - self._currentRecord
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.72
gnue/forms/src/GFObjects/GFEntry.py:1.73
*** gnue/forms/src/GFObjects/GFEntry.py:1.72 Fri Oct 25 18:08:33 2002
--- gnue/forms/src/GFObjects/GFEntry.py Sun Oct 27 15:59:39 2002
***************
*** 76,82 ****
}
self._triggerProperties={'readonly':{'set':self.setReadonly,
'get':self.getReadonly
! }
}
self._triggerSet = self.triggerSetValue
self._triggerGet = self.getValue
--- 76,83 ----
}
self._triggerProperties={'readonly':{'set':self.setReadonly,
'get':self.getReadonly
! },
! 'parent': {'get':self.getParent}
}
self._triggerSet = self.triggerSetValue
self._triggerGet = self.getValue
***************
*** 316,319 ****
self._allowedValues = None
self.allowedValues()
!
\ No newline at end of file
--- 317,320 ----
self._allowedValues = None
self.allowedValues()
!
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/src/GObjects.py common/src/dbdriver...,
Jason Cater <=