[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/etc/sample.report-filters.conf form...
|
From: |
Jason Cater |
|
Subject: |
gnue common/etc/sample.report-filters.conf form... |
|
Date: |
Thu, 10 Oct 2002 21:47:25 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/10/10 21:47:25
Modified files:
common/etc : sample.report-filters.conf
forms/doc : Developers-Guide.sxw
forms/src/uidrivers/nstti: UIdriver.py
Log message:
More work on curses support
(I have screens drawing properly,
and a login dialog working now)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/etc/sample.report-filters.conf.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/doc/Developers-Guide.sxw.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: gnue/common/etc/sample.report-filters.conf
diff -c gnue/common/etc/sample.report-filters.conf:1.15
gnue/common/etc/sample.report-filters.conf:1.16
*** gnue/common/etc/sample.report-filters.conf:1.15 Tue Oct 8 17:50:42 2002
--- gnue/common/etc/sample.report-filters.conf Thu Oct 10 21:47:25 2002
***************
*** 66,72 ****
[mailmerge:amc8fax]
description = AMC8 Fax
engine = merge_psfax
! template = ~/amc8fax.ps
#
--- 66,72 ----
[mailmerge:amc8fax]
description = AMC8 Fax
engine = merge_psfax
! template = /home/jason/amcfax.ps
#
Index: gnue/forms/doc/Developers-Guide.sxw
Index: gnue/forms/src/uidrivers/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.7
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.8
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.7 Thu Oct 10 02:45:36 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py Thu Oct 10 21:47:25 2002
***************
*** 213,225 ****
newMenu.AddItem(menuitem['id'],menuitem['text'])
else:
newMenu.InsertSeperator()
! ## newMenu.Finalize()
! ## self.mainWindow.AddControl(menuBar)
return 1
def activateForm(self, form):
- print "Activated!"
width = int(self._form.width)
height = int(self._form.height)
--- 213,225 ----
newMenu.AddItem(menuitem['id'],menuitem['text'])
else:
newMenu.InsertSeperator()
! newMenu.Finalize()
! self.mainWindow.AddControl(menuBar)
! self.mainWindow.Paint()
return 1
def activateForm(self, form):
width = int(self._form.width)
height = int(self._form.height)
***************
*** 292,301 ****
# fully activated
#
def mainLoop(self):
- print "mainLoop"
# print "mainWindow.run()"
self.mainWindow.panel.RunDialog()
- print self.mainWindow._pageList
# self.mainWindow.Run()
#
--- 292,299 ----
***************
*** 326,341 ****
# a line of text
#
def formAlert(self, event):
! print "Beep! Beep!"
# Called whenever forms goes into a "wait" state in which user cannot
# interact with interface (e.g., while waiting for a query or a commit)
def beginWait (self, event):
! print "Dew Break!"
# Called whenever forms leaves a "wait" state
def endWait (self, event):
! print "Off yer keesteers!"
#############################################################################
#
--- 324,342 ----
# a line of text
#
def formAlert(self, event):
! curses.beep()
!
# Called whenever forms goes into a "wait" state in which user cannot
# interact with interface (e.g., while waiting for a query or a commit)
def beginWait (self, event):
! pass
!
# Called whenever forms leaves a "wait" state
def endWait (self, event):
! pass
!
#############################################################################
#
***************
*** 377,382 ****
--- 378,385 ----
## else:
## object.Destroy()
+
+
#############################################################################
#############################################################################
#
***************
*** 409,415 ****
pass # self.widgets[index].SetFocus()
def setValue(self, value, index=0):
! pass
## self.widgets[index].SetEvtHandlerEnabled(FALSE)
## self.widgets[index].SetValue(value)
## self.widgets[index].SetEvtHandlerEnabled(1)
--- 412,418 ----
pass # self.widgets[index].SetFocus()
def setValue(self, value, index=0):
! self.widgets[index].SetValue(value)
## self.widgets[index].SetEvtHandlerEnabled(FALSE)
## self.widgets[index].SetValue(value)
## self.widgets[index].SetEvtHandlerEnabled(1)
***************
*** 456,462 ****
object = event.object
style = self.alignmentStyle[object.alignment]
GDebug.printMesg(0,"*****Label Alert!!! (x,y)=(%s,%s) %s" % (object.x,
object.y,event.container))
! newWidget =
Label(event.container,str(self),object.y,object.x,str(object.text))
event.container.AddControl(newWidget)
return newWidget
--- 459,465 ----
object = event.object
style = self.alignmentStyle[object.alignment]
GDebug.printMesg(0,"*****Label Alert!!! (x,y)=(%s,%s) %s" % (object.x,
object.y,event.container))
! newWidget =
Label(event.container,str(self),object.y+spacer,object.x,str(object.text))
event.container.AddControl(newWidget)
return newWidget
***************
*** 470,475 ****
--- 473,479 ----
object = event.object
newWidget = Frame(event.container,'name',object.y,object.x,
object.width, object.height,str(object.label))
+ event.container.AddControl(newWidget)
return newWidget
#
***************
*** 486,491 ****
--- 490,496 ----
newWidget =
ScrollBar(event.container,'name',object.y,object.x,object.width)
else:
newWidget =
VScrollBar(event.container,'name',object.y,object.x,object.height)
+ event.container.AddControl(newWidget)
return newWidget
#
***************
*** 496,515 ****
class UIButton(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
! newWidget =
Button(event.container,'name',object.y,object.x,object.width,str(object.label))
return newWidget
! ## def buttonHandler(self,event):
## if event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED:
## action = None
## object = _eventObjTowxWindow(event)
-
## id = object.GetId()
## gfObject = _IdToGFObj[id]
- ## action = GFEvent('fireTRIGGER',gfObject.trigger)
! ## if action:
! ## _EVENTPROCESSOR(action)
#
# UIPage
--- 501,524 ----
class UIButton(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
! newWidget =
Button(event.container,'name',object.y+spacer,object.x,object.width,str(object.label))
! event.container.AddControl(newWidget)
! self.__trigger = object.trigger
! newWidget.SetMethod("CLICK", self.buttonHandler)
return newWidget
! def buttonHandler(self, a1, a2, a3):
!
## if event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED:
## action = None
## object = _eventObjTowxWindow(event)
## id = object.GetId()
## gfObject = _IdToGFObj[id]
! _EVENTPROCESSOR(GFEvent('fireTRIGGER',self.__trigger))
!
! ## if action:
! ## _EVENTPROCESSOR(action)
#
# UIPage
***************
*** 521,527 ****
class UIPage(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
! GDebug.printMesg(2,"Created a page %s (%s,%s)" %
(self,event.widgetWidth, event.widgetHeight))
width = event.formWidth + 2
height = event.formHeight + 2
x = int(event.screenWidth/2 - width/2)
--- 530,536 ----
class UIPage(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
!
width = event.formWidth + 2
height = event.formHeight + 2
x = int(event.screenWidth/2 - width/2)
***************
*** 538,550 ****
if x + width > event.screenWidth- 2:
width = event.screenWidth
- GDebug.printMesg(2,'event dict=%s' % event.__dict__)
- GDebug.printMesg(2,'x,y,w,h = %s,%s,%s,%s' % (x,y,width, height))
-
newWidget = Dialog(event.container, y, x, y+height-1, x+width-1 )
###newWidget.DeActivate(0)
event.interface._pageList.append(newWidget)
return newWidget
#
--- 547,559 ----
if x + width > event.screenWidth- 2:
width = event.screenWidth
newWidget = Dialog(event.container, y, x, y+height-1, x+width-1 )
###newWidget.DeActivate(0)
event.interface._pageList.append(newWidget)
+
+ newWidget.KeyboardHook = keyboardEvtHandler(_EVENTPROCESSOR)._processEvent
+ keyboardEvtHandler
return newWidget
#
***************
*** 562,578 ****
choices = object.allowedValues()[1]
else:
choices = [""]
! newWidget = ComboBox(event.container, 'name',object.y,object.x,
object.width)
for index in range(len(choices)):
newWidget.AddItem(index,choices[index])
elif style == 'label':
! newWidget = TextBox(event.ontainer, 'name', object.y, object.x,
object.width)
elif style == 'checkbox':
! newWidget = CheckBox(event.container, 'name',object.y,object.x,'',0)
else: # Normal text box
! newWidget = TextBox(event.container, 'name', object.y, object.x,
object.width)
- GDebug.printMesg(2,"*****Entry Alert!!! (x,y)=(%s,%s) %s" % (object.x,
object.y,event.container))
event.container.AddControl(newWidget)
return newWidget
--- 571,588 ----
choices = object.allowedValues()[1]
else:
choices = [""]
! newWidget = ComboBox(event.container, 'name',object.y+spacer,object.x,
object.width)
for index in range(len(choices)):
newWidget.AddItem(index,choices[index])
elif style == 'label':
! newWidget = TextBox(event.container, 'name', object.y+spacer, object.x,
object.width)
elif style == 'checkbox':
! newWidget = CheckBox(event.container,
'name',object.y+spacer,object.x,'',0)
! elif object.height > 1: # Normal text box/Multiline
! newWidget = TextArea(event.container, 'name', object.y+spacer,
object.x, object.width, object.height)
else: # Normal text box
! newWidget = TextBox(event.container, 'name', object.y+spacer, object.x,
object.width)
event.container.AddControl(newWidget)
return newWidget
***************
*** 619,625 ****
def __init__(self, interface, message, caption):
message = lineWrap(message,60)
pass
!
#####################################################################
##
## Keymapper Support
--- 629,635 ----
def __init__(self, interface, message, caption):
message = lineWrap(message,60)
pass
!
#####################################################################
##
## Keymapper Support
***************
*** 654,660 ****
def _setDefaultEventHandlers(newWidget, initialize):
global _EVENTPROCESSOR
! ## if initialize:
## # TODO: this should use one instance
## newWidget.PushEventHandler(mouseEvtHandler(_EVENTPROCESSOR))
## newWidget.PushEventHandler(keyboardEvtHandler(_EVENTPROCESSOR))
--- 664,672 ----
def _setDefaultEventHandlers(newWidget, initialize):
global _EVENTPROCESSOR
! if initialize:
! newWidget.SetMethod("CLICK", mouseEvtHandler(_EVENTPROCESSOR))
!
## # TODO: this should use one instance
## newWidget.PushEventHandler(mouseEvtHandler(_EVENTPROCESSOR))
## newWidget.PushEventHandler(keyboardEvtHandler(_EVENTPROCESSOR))
***************
*** 667,685 ****
## for eventType in eventList:
## self.Connect(-1, -1, eventType,self._processEvent)
! ## def _processEvent(self,event):
## GDebug.printMesg(0,"uiBaseEvtHandler _processEvent was called?!?")
!
class mouseEvtHandler(uiBaseEvtHandler):
def __init__(self,eventProcessor):
pass
## eventList = [wxEVT_LEFT_DOWN]
## uiBaseEvtHandler.__init__(self, eventList, eventProcessor)
!
## def _processEvent(self,event):
## global _charWidth
## object = _eventObjTowxWindow(event)
!
## # compute the location of the character in the widget
## x,y = event.GetPosition()
## cursorPosition = 1 + x/_charWidth
--- 679,697 ----
## for eventType in eventList:
## self.Connect(-1, -1, eventType,self._processEvent)
! ## def _processEvent(self,a1, a2, a3):
## GDebug.printMesg(0,"uiBaseEvtHandler _processEvent was called?!?")
!
class mouseEvtHandler(uiBaseEvtHandler):
def __init__(self,eventProcessor):
pass
## eventList = [wxEVT_LEFT_DOWN]
## uiBaseEvtHandler.__init__(self, eventList, eventProcessor)
!
## def _processEvent(self,event):
## global _charWidth
## object = _eventObjTowxWindow(event)
!
## # compute the location of the character in the widget
## x,y = event.GetPosition()
## cursorPosition = 1 + x/_charWidth
***************
*** 697,735 ****
class keyboardEvtHandler(uiBaseEvtHandler):
def __init__(self, eventProcessor):
! pass
! ## eventList = [wxEVT_CHAR,wxEVT_KEY_DOWN]
! ## uiBaseEvtHandler.__init__(self, eventList, eventProcessor)
!
! ## def _processEvent(self,event):
! ## action = None
! ## # hack for swig shortcomming needed by wxPython 2.2.x (2.3 does not
need this)
! ## # compute the location of the character in the widget
! ## if event.GetEventType() == wxEVT_CHAR or
event.GetEventType()==wxEVT_KEY_DOWN:
! ## object = _eventObjTowxWindow(event)
! ## command = GFKeyMapper.KeyMapper.getEvent(
! ## event.KeyCode(),
! ## event.ShiftDown(),
! ## event.ControlDown(),
! ## event.AltDown())
!
! ## # TODO : Broken for the moment, this should probably be form driven
! ## #if command == 'JUMPRECORD':
! ## # self.promptForRecordNumber()
!
! ## if command:
! ## action = GFEvent('request%s' % command)
!
! ## else:
! ## try:
! ## action = GFEvent('requestKEYPRESS', chr(event.KeyCode()),
! ## text=chr(event.KeyCode()),
! ## code=event.KeyCode())
! ## except ValueError:
! ## pass #event.Skip()
! ## if action:
! ## self._eventProcessor(action)
#####################################################################
##
--- 709,750 ----
class keyboardEvtHandler(uiBaseEvtHandler):
def __init__(self, eventProcessor):
! self._eventProcessor = eventProcessor
! uiBaseEvtHandler.__init__(self, [], eventProcessor)
!
! def _processEvent(self, keystroke):
! action = None
!
! ##object = _eventObjTowxWindow(event)
!
! command = GFKeyMapper.KeyMapper.getEvent(
! keystroke,
! 0, #event.ShiftDown(),
! 0, #event.ControlDown(),
! 0) #event.AltDown())
! GDebug.printMesg(0,"========= %s" % command)
!
! # TODO : Broken for the moment, this should probably be form driven
! #if command == 'JUMPRECORD':
! # self.promptForRecordNumber()
!
! if command:
! action = GFEvent('request%s' % command)
!
! else:
! try:
! action = GFEvent('requestKEYPRESS', chr(keystroke),
! text=chr(keystroke),
! code=keystroke)
! except ValueError:
! pass
!
! if action:
! self._eventProcessor(action)
!
! return None
!
#####################################################################
##
***************
*** 790,796 ****
x = int(root.MAXCOL/2 - w/2 + .5)
y = int(root.MAXROW/2 - h/2 + .5)
! dlg = dlg = Dialog(screen, y, x, y+h-1, x+w-1 )
gnueLabel = dlg.AddDialogControl(Label(dlg, "lbl1", 1,
int((dlgWidth - len(gnueMesg))/2),
--- 805,811 ----
x = int(root.MAXCOL/2 - w/2 + .5)
y = int(root.MAXROW/2 - h/2 + .5)
! dlg = dlg = Dialog(screen, y, x, y+h-1, x+w-1)
gnueLabel = dlg.AddDialogControl(Label(dlg, "lbl1", 1,
int((dlgWidth - len(gnueMesg))/2),
***************
*** 810,816 ****
textctrlList.append(t)
lastY += 1
! loginButton = dlg.AddDialogControl(Button(dlg,"LoginButton",dlgHeight
- 1,dlgWidth - len(cbMesg) - len(lbMesg) - 9,len(lbMesg)+4,lbMesg))
loginButton.EXITFORM = 1
cancelButton =
dlg.AddDialogControl(Button(dlg,"CancelButton",dlgHeight - 1,dlgWidth -
len(cbMesg) - 5,len(cbMesg)+4,cbMesg))
cancelButton.EXITFORM = 1
--- 825,831 ----
textctrlList.append(t)
lastY += 1
! loginButton = dlg.AddDialogControl(Button(dlg,"LoginButton",dlgHeight
- 1,dlgWidth - len(cbMesg) - len(lbMesg) - 10,len(lbMesg)+4,lbMesg))
loginButton.EXITFORM = 1
cancelButton =
dlg.AddDialogControl(Button(dlg,"CancelButton",dlgHeight - 1,dlgWidth -
len(cbMesg) - 5,len(cbMesg)+4,cbMesg))
cancelButton.EXITFORM = 1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/etc/sample.report-filters.conf form...,
Jason Cater <=