[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r5795 - trunk/gnue-forms/src
From: |
jcater |
Subject: |
r5795 - trunk/gnue-forms/src |
Date: |
Sat, 8 May 2004 22:00:14 -0500 (CDT) |
Author: jcater
Date: 2004-05-08 22:00:13 -0500 (Sat, 08 May 2004)
New Revision: 5795
Modified:
trunk/gnue-forms/src/GFDisplayHandler.py
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
Log:
navigational bug fixes/cleanup
Modified: trunk/gnue-forms/src/GFDisplayHandler.py
===================================================================
--- trunk/gnue-forms/src/GFDisplayHandler.py 2004-05-08 22:42:16 UTC (rev
5794)
+++ trunk/gnue-forms/src/GFDisplayHandler.py 2004-05-09 03:00:13 UTC (rev
5795)
@@ -106,7 +106,7 @@
))
def isPending(self):
- return not self.editing or self.modified
+ return self.editing and self.modified
#####################
#
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2004-05-08 22:42:16 UTC (rev 5794)
+++ trunk/gnue-forms/src/GFForm.py 2004-05-09 03:00:13 UTC (rev 5795)
@@ -219,18 +219,8 @@
break
return rv
+ ###################################################################
#
- # Set a user parameter.
- #
- def triggerSetParameter(self, parameter, value):
- param = string.lower(parameter)
- self._parameters[param]=value
-
- def triggerActivateTrigger(self,name):
- self.processTrigger(name)
-
- #
- #
# Focus functions
#
#
@@ -470,7 +460,7 @@
for block in self._logic._blockList:
block.initQuery()
-
+ self.triggerSetStatusText(_('Enter your query criteria.'))
return message
@@ -481,6 +471,7 @@
for block in self._logic._blockList:
block.cancelQuery()
+ self.triggerSetStatusText(_('Query canceled.'))
return message
def copyQuery(self):
@@ -518,9 +509,14 @@
#self._instance.dispatchEvent('endWAIT', _form=self)
# TODO: may need to make self._currentBlock just self
self.refreshDisplay(self._currentBlock)
+ if self._currentBlock.isEmpty():
+ self.triggerSetStatusText(_('Query returned no results.'))
+ else:
+ self.triggerSetStatusText(_('Query sucessful.'))
+
def commit(self):
self.dispatchEvent('beginWAIT', _form=self)
#self._instance.dispatchEvent('beginWAIT', _form=self)
@@ -737,7 +733,7 @@
self.refreshUIEvents()
def __refreshDisplay(self, object):
- if object._type == 'GFEntry' or object._type == "GFImage":
+ if object._type in ('GFEntry', "GFImage"):
self.dispatchEvent('updateENTRY',object, _form=self)
#
@@ -848,40 +844,41 @@
def prevRecord(self):
-# if self._currentBlock.mode == 'query':
-# GDebug.printMesg(5,'Cannot go to previous record: in query mode!')
-# return
+ if self._currentBlock.mode == 'query':
+ self.triggerSetStatusText(_('You cannot do that in query mode.'))
+ return
self._currentBlock.prevRecord()
def firstRecord(self):
-# if self._currentBlock.mode == 'query':
-# GDebug.printMesg(5,'Cannot go to first record: in query mode!')
-# return
+ if self._currentBlock.mode == 'query':
+ self.triggerSetStatusText(_('You cannot do that in query mode.'))
+ return
self._currentBlock.firstRecord()
def lastRecord(self):
-# if self._currentBlock.mode == 'query':
-# GDebug.printMesg(5,'Cannot go to last record: in query mode!')
-# return
+ if self._currentBlock.mode == 'query':
+ self.triggerSetStatusText(_('You cannot do that in query mode.'))
+ return
self._currentBlock.lastRecord()
def nextRecord(self):
-# if self._currentBlock.mode == 'query':
-# GDebug.printMesg(5,'Cannot go to next record: in query mode!')
-# return
+ if self._currentBlock.mode == 'query':
+ self.triggerSetStatusText(_('You cannot do that in query mode.'))
+ return
self._currentBlock.nextRecord()
def jumpRecord(self,count):
-# if self._currentBlock.mode == 'query':
-# GDebug.printMesg(5,'Cannot jump to record: in query mode!')
-# return
+ if self._currentBlock.mode == 'query':
+ self.triggerSetStatusText(_('You cannot do that in query mode.'))
+ return
self._currentBlock.jumpRecord(count)
def toggleInsertMode(self):
self._insertMode = not self._insertMode
+
+ ###################################################################
#
- #
# Trigger functions
#
# The following functions are only used to implement
@@ -964,7 +961,7 @@
# on the forms status bar
#
def triggerSetStatusText(self,tip=''):
- self.dispatchEvent('uiUPDATESTATUS',tip=tip, _form=self)
+ self._instance.updateStatusBar(tip=tip, form=self)
#
# triggerRunForm
@@ -1034,4 +1031,14 @@
def triggerGetAuthenticatedUser(self, connection=None):
return self._instance.connections.getAuthenticatedUser(connection)
+ #
+ # Set a user parameter.
+ #
+ def triggerSetParameter(self, parameter, value):
+ param = string.lower(parameter)
+ self._parameters[param]=value
+ def triggerActivateTrigger(self,name):
+ self.processTrigger(name)
+
+
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2004-05-08 22:42:16 UTC (rev 5794)
+++ trunk/gnue-forms/src/GFInstance.py 2004-05-09 03:00:13 UTC (rev 5795)
@@ -415,6 +415,12 @@
def updateStatusBar(self, tip=None, recordStatus=None, insertMode=None,
currentRecord=None,maxRecord=None, currentPage=None,
maxPage=None, form=None):
+ try:
+ if not tip:
+ tip = self.__lasttip
+ except:
+ pass
+ self.__lasttip = tip
self.dispatchEvent('uiUPDATESTATUS',tip=tip, recordStatus=recordStatus,
insertMode=insertMode, currentRecord=currentRecord,
maxRecord=maxRecord, currentPage=currentPage,
@@ -648,8 +654,13 @@
# form move a specific record
#
def jumpToRecord(self,event):
+ if event._form._currentBlock.mode == 'query':
+ event._form.triggerSetStatusText(_('You cannot do that in query mode.'))
+ return
+
if not event._form.endEditing():
return
+
try:
count = abs(int(event.data))-1
except ValueError:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r5795 - trunk/gnue-forms/src,
jcater <=