[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/GTrigger.py forms/BUGS forms/sa...
|
From: |
James Thompson |
|
Subject: |
gnue common/src/GTrigger.py forms/BUGS forms/sa... |
|
Date: |
Sat, 09 Feb 2002 23:43:05 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 02/02/09 23:43:05
Modified files:
common/src : GTrigger.py
forms : BUGS
forms/samples/zipcode: zipcode.gfd
forms/src : UIwxpython.py
forms/src/GFObjects: GFBlock.py
Log message:
More trigger namespace changes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/BUGS.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/zipcode/zipcode.gfd.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/UIwxpython.py.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
Patches:
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.9 gnue/common/src/GTrigger.py:1.10
*** gnue/common/src/GTrigger.py:1.9 Fri Feb 1 00:38:01 2002
--- gnue/common/src/GTrigger.py Sat Feb 9 23:43:04 2002
***************
*** 483,489 ****
if self.type == 'NAMED':
return self.name
else:
! return VALIDTRIGGERS[self.type]
#
# dumpXML
--- 483,489 ----
if self.type == 'NAMED':
return self.name
else:
! return VALIDTRIGGERS[string.upper(self.type)]
#
# dumpXML
Index: gnue/forms/BUGS
diff -c gnue/forms/BUGS:1.2 gnue/forms/BUGS:1.3
*** gnue/forms/BUGS:1.2 Tue Nov 20 22:23:03 2001
--- gnue/forms/BUGS Sat Feb 9 23:43:04 2002
***************
*** 1,3 ****
--- 1,6 ----
+ block autofillBySequence: if the user doesn't have perms
+ on the sequence then the system fails
+
When using pypgsql databases UI corruption is possible
on widgets with visible counts > 1.
Index: gnue/forms/samples/zipcode/zipcode.gfd
diff -c gnue/forms/samples/zipcode/zipcode.gfd:1.17
gnue/forms/samples/zipcode/zipcode.gfd:1.18
*** gnue/forms/samples/zipcode/zipcode.gfd:1.17 Tue Feb 5 00:45:53 2002
--- gnue/forms/samples/zipcode/zipcode.gfd Sat Feb 9 23:43:04 2002
***************
*** 9,29 ****
</options>
<datasource prequery="" cache="5" database="gnue" name="zips"
order_by="state,city" table="zipcode"/>
! <!-- <datasource prequery="" database="gnue" name="validator"
order_by="description" table="state"/>
! -->
<page name="Page_1">
<block name="zip" rows="15" datasource="zips">
<label x="1" y="1" name="Label_1" text="City"/>
! <entry name="city" x="1" y="2" width="15" field="city" case="upper">
<options>
<option name="tip" value="Full name of city"/>
</options>
</entry>
<label x="17" y="1" name="Label_2" text="State"/>
! <entry x="17" y="2" field="state" name="state" width="15">
! <!-- style="dropdown" foreign_key="validator.state"
! foreign_key_description="description"> -->
<options>
<option name="tip" value="State"/>
</options>
--- 9,29 ----
</options>
<datasource prequery="" cache="5" database="gnue" name="zips"
order_by="state,city" table="zipcode"/>
! <datasource prequery="" database="gnue" name="validator"
order_by="description" table="state"/>
!
<page name="Page_1">
<block name="zip" rows="15" datasource="zips">
<label x="1" y="1" name="Label_1" text="City"/>
! <entry name="city" x="1" y="2" width="15" field="city" case="upper"
required="">
<options>
<option name="tip" value="Full name of city"/>
</options>
</entry>
<label x="17" y="1" name="Label_2" text="State"/>
! <entry x="17" y="2" field="state" name="state" width="15"
! style="dropdown" foreign_key="validator.state"
! foreign_key_description="description">
<options>
<option name="tip" value="State"/>
</options>
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.31
gnue/forms/src/GFObjects/GFBlock.py:1.32
*** gnue/forms/src/GFObjects/GFBlock.py:1.31 Tue Feb 5 00:45:53 2002
--- gnue/forms/src/GFObjects/GFBlock.py Sat Feb 9 23:43:05 2002
***************
*** 75,81 ****
# Trigger exposure
#
self._triggerGlobal = 1
!
self._triggerFunctions={'autofillBySequence':{'function':self.triggerAutofillBySequence}}
def __getitem__(self, index):
--- 75,85 ----
# Trigger exposure
#
self._triggerGlobal = 1
!
self._triggerFunctions={'autofillBySequence':{'function':self.triggerAutofillBySequence},
! 'rollback':{'function':self.processRollback},
! 'gotoRecord':{'function':self.jumpRecord},
! 'newRecord':{'function':self.newRecord},
! }
def __getitem__(self, index):
***************
*** 97,108 ****
for item in self._entryList:
if item.name == string.lower(fieldName):
entry = item.field
for count in range(self._resultSet.getRecordCount()):
! if (not self._resultSet.getRecord(count).getField(fieldName)) or \
! self._resultSet.getRecord(count).getField(fieldName)=="":
! sequenceNumber =
self._dataSourceLink._dataObject.triggerExtensions.getSequence(sequenceName)
self._resultSet.getRecord(count).setField(entry, sequenceNumber)
def _buildObject(self):
--- 101,115 ----
for item in self._entryList:
if item.name == string.lower(fieldName):
entry = item.field
+ break
for count in range(self._resultSet.getRecordCount()):
! if (not self._resultSet.getRecord(count).getField(entry)) or \
! self._resultSet.getRecord(count).getField(entry)=="":
! print "Pre",self._resultSet.getRecord(count).getField(entry)
! sequenceNumber =
self._dataSourceLink._dataObject.triggerExtensions.getSequence(sequenceName)
self._resultSet.getRecord(count).setField(entry, sequenceNumber)
+ print "Post",self._resultSet.getRecord(count).getField(entry)
def _buildObject(self):
Index: gnue/forms/src/UIwxpython.py
diff -c gnue/forms/src/UIwxpython.py:1.135 gnue/forms/src/UIwxpython.py:1.136
*** gnue/forms/src/UIwxpython.py:1.135 Tue Feb 5 19:13:38 2002
--- gnue/forms/src/UIwxpython.py Sat Feb 9 23:43:04 2002
***************
*** 137,170 ****
self._wxapp = getWxApp()
self._disableSplash = disableSplash
GFUserInterfaceBase.__init__(self)
!
! ## self.keyEvents = {WXK_PRIOR: GFEvent('requestPREVBLOCK'),
! ## WXK_NEXT: GFEvent('requestNEXTBLOCK'),
! ## WXK_TAB: GFEvent('requestNEXTENTRY'),
! ## WXK_LEFT: GFEvent('requestCURSORLEFT'),
! ## WXK_RIGHT: GFEvent('requestCURSORRIGHT'),
! ## WXK_END: GFEvent('requestCURSOREND'),
! ## WXK_HOME: GFEvent('requestCURSORHOME'),
! ## WXK_BACK: GFEvent('requestBACKSPACE'),
! ##
! ## WXK_INSERT: GFEvent('requestMODETOGGLE'),
! ## WXK_DELETE: GFEvent('requestDELETE'),
! ##
! ## WXK_UP: GFEvent('requestPREVRECORD'),
! ## WXK_DOWN: GFEvent('requestNEXTRECORD'),
! ##
! ## WXK_F5: GFEvent('requestMARKFORDELETE'),
! ## WXK_F6: GFEvent('requestCOMMIT'),
! ## WXK_F8: GFEvent('requestQUERY'),
! ## WXK_F9: GFEvent('requestEXEQUERY'),
! ## WXK_F11: GFEvent('requestROLLBACK'),
! ## WXK_F12: GFEvent('requestNEWRECORD'),
! ## }
self.forms = {}
-
self.init()
- #self._loginHandler = wxLoginHandler()
#
# mainLoop
#
--- 137,146 ----
self._wxapp = getWxApp()
self._disableSplash = disableSplash
GFUserInterfaceBase.__init__(self)
!
self.forms = {}
self.init()
#
# mainLoop
#
***************
*** 202,208 ****
self.splash.SetForegroundColour(wxColour(0xFF, 0xFF, 0xFF))
self.splash.SetFont(wxFont(20,wxSWISS,wxNORMAL,wxBOLD))
-
text = "GNU Enterprise Forms"
twidth,theight = self.splash.GetTextExtent(text)
wxStaticText(parent=self.splash, id=-1, label=str(text),
--- 178,183 ----
***************
*** 537,543 ****
#
# KeyBoard Events
#
! if event.GetEventType() == wxEVT_CHAR:
command = GFKeyMapper.KeyMapper.getEvent(
event.KeyCode(),
--- 512,518 ----
#
# KeyBoard Events
#
! if event.GetEventType() == wxEVT_CHAR or
event.GetEventType()==wxEVT_KEY_DOWN:
command = GFKeyMapper.KeyMapper.getEvent(
event.KeyCode(),
***************
*** 558,583 ****
code=event.KeyCode())
except ValueError:
event.Skip()
-
- ##
- ## if event.ShiftDown() == TRUE and event.KeyCode() == WXK_TAB:
- ## action = GFEvent('requestPREVENTRY')
- ## else:
- ## try:
- ## action = self.keyEvents[event.KeyCode()]
- ## except KeyError:
- ## if event.ControlDown():
- ## GDebug.printMesg(2, "Control %s" % (chr(event.KeyCode())))
- ## action = GFEvent('requestHOTKEY',chr(event.KeyCode()))
- ## elif (32 <= event.KeyCode() <= 126) or (event.KeyCode() ==
WXK_RETURN):
- ## action = GFEvent('requestKEYPRESS',chr(event.KeyCode()))
- ## # quick hack for for russian support from Dmitry Sorokin
<address@hidden>
- ## elif (192 <= event.KeyCode() <= 255):
- ## action = GFEvent('requestKEYPRESS',chr(event.KeyCode()))
- ## elif event.KeyCode() == WXK_F2:
- ## self.promptForRecordNumber()
- ##
-
#
# Mouse Events
#
--- 533,538 ----
***************
*** 683,688 ****
--- 638,646 ----
#
# Unhandled events
#
+ elif event.GetEventType() == wxEVT_KEY_DOWN:
+ print "down"
+
else:
# Need to probably log this somewhere in debug mode
pass
***************
*** 861,870 ****
wxSize(int(object.width)*int(textWidth),
int(object.height)*int(textHeight)),
choices, wxCB_DROPDOWN|wxWANTS_CHARS,
- # validator=MyComboBoxValidator()
)
newWidget.SetValue("")
if initialize:
EVT_CHAR(newWidget, interface.uiEventTrap)
EVT_COMBOBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
--- 819,831 ----
wxSize(int(object.width)*int(textWidth),
int(object.height)*int(textHeight)),
choices, wxCB_DROPDOWN|wxWANTS_CHARS,
)
newWidget.SetValue("")
+ #handler = comboEvtHandler()
+ #newWidget.SetEventHandler(handler)
+ #handler.SetEvtHandlerEnabled(TRUE)
+
if initialize:
EVT_CHAR(newWidget, interface.uiEventTrap)
EVT_COMBOBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
***************
*** 888,898 ****
(int(object.y)+spacer+(object._gap*spacer))*int(widgetHeight)),
wxSize(int(2)*int(textWidth),
int(1)*int(textHeight)), wxNO_BORDER)
- #
wxSize(int(object.width)*int(self.textWidth),
- #
int(object.height)*int(self.textHeight)), wxNO_BORDER)
newWidget.SetValue(0)
-
if initialize:
EVT_CHECKBOX(newWidget, newWidget.GetId(), interface.uiEventTrap)
--- 849,856 ----
***************
*** 919,924 ****
--- 877,894 ----
initFont(newWidget, 0)
return newWidget
+ class comboEvtHandler(wxEvtHandler):
+ def __init__(self, *args):
+ eventList = [wxEVT_CHAR, wxEVT_KEY_DOWN, wxEVT_KEY_UP, wxEVT_LEFT_DOWN
+ ]
+ wxEvtHandler.__init__(self, *args)
+ for eventType in eventList:
+ self.Connect(-1, -1, eventType, self._processEvent)
+
+ def _processEvent(self,event):
+ print "foo"
+ event.Skip()
+
#
# UIForm
#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/src/GTrigger.py forms/BUGS forms/sa...,
James Thompson <=