[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers _base/UIWidget.py _bas...
|
From: |
Jason Cater |
|
Subject: |
gnue/forms/src/uidrivers _base/UIWidget.py _bas... |
|
Date: |
Thu, 06 Jun 2002 14:06:11 -0400 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/06/06 14:06:11
Modified files:
forms/src/uidrivers/_base: UIWidget.py UIdriver.py
forms/src/uidrivers/nstti: UIdriver.py
forms/src/uidrivers/wx: UIdriver.py
Log message:
cleaned up the UI widget createWidget methods; hopefully solved the
problem of having multiple forms open with multipage notebook tabs
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/_base/UIWidget.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.175&tr2=1.176&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/_base/UIWidget.py
diff -c gnue/forms/src/uidrivers/_base/UIWidget.py:1.3
gnue/forms/src/uidrivers/_base/UIWidget.py:1.4
*** gnue/forms/src/uidrivers/_base/UIWidget.py:1.3 Tue Apr 2 17:14:01 2002
--- gnue/forms/src/uidrivers/_base/UIWidget.py Thu Jun 6 14:06:11 2002
***************
*** 34,41 ****
#from gnue.common.GObjects import *
class UIWidget:
! def __init__(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight, interface, initialize=1):
self.widgets = []
if not hasattr(object,'_rows'):
object._rows = 1
--- 34,43 ----
#from gnue.common.GObjects import *
class UIWidget:
! def __init__(self, event):
!
! object = event.object
!
self.widgets = []
if not hasattr(object,'_rows'):
object._rows = 1
***************
*** 44,69 ****
object._gap = 0
if hasattr(object,'width'):
! self.itemWidth = object.width*int(textWidth)
! self.itemHeight = object.height*int(textHeight)
else:
self.itemWidth = -1
self.itemHeight = -1
if hasattr(object,'x'):
! self.itemX = object.x*int(widgetWidth)
else:
self.itemX = -1
if not object.hidden:
for spacer in range(int(object._rows)):
! newWidget = self.createWidget(object, container, textWidth,
textHeight,
! widgetWidth, widgetHeight, interface,
spacer, initialize)
self.widgets.append(newWidget)
! def createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight, interface, spacer,initialize=1):
GDebug.printMesg(1,"UI doesn't support %s" % self.__class__)
--- 46,69 ----
object._gap = 0
if hasattr(object,'width'):
! self.itemWidth = object.width*int(event.textWidth)
! self.itemHeight = object.height*int(event.textHeight)
else:
self.itemWidth = -1
self.itemHeight = -1
if hasattr(object,'x'):
! self.itemX = object.x*int(event.widgetWidth)
else:
self.itemX = -1
if not object.hidden:
for spacer in range(int(object._rows)):
! newWidget = self.createWidget(event, spacer)
self.widgets.append(newWidget)
! def createWidget(self, event, spacer):
GDebug.printMesg(1,"UI doesn't support %s" % self.__class__)
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.68
gnue/forms/src/uidrivers/_base/UIdriver.py:1.69
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.68 Wed Apr 17 15:09:19 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py Thu Jun 6 14:06:11 2002
***************
*** 71,77 ****
# Our local "clipboard"
self.__clipboard = None
!
self.widgets = self._WIDGETS
self._formToUI = {} # the GFObj to UI widget cross ref
--- 71,77 ----
# Our local "clipboard"
self.__clipboard = None
!
self.widgets = self._WIDGETS
self._formToUI = {} # the GFObj to UI widget cross ref
***************
*** 99,109 ****
def _stdHandler(self):
object = self._currentObject[0]
! container = self.currentWidget[0]
! newWidget = self.widgets[object._type](object,container, self.textWidth,
self.textHeight,
! self.widgetWidth,
self.widgetHeight, self)
return newWidget
#
# buildUI
#
--- 99,122 ----
def _stdHandler(self):
object = self._currentObject[0]
! event = self._updateCreateEvent(GFEvent('CreateUIWidget',None,
! object=object,
! container=self.currentWidget[0],
! textWidth=self.textWidth,
! textHeight=self.textHeight,
! widgetWidth=self.widgetWidth,
! widgetHeight=self.widgetHeight,
! interface=self,
! initialize=1))
!
! newWidget = self.widgets[object._type](event)
return newWidget
+ # Can be used by UI drivers to add more attributes to the event.
+ def _updateCreateEvent(self, event):
+ return event
+
+
#
# buildUI
#
***************
*** 115,121 ****
def _buildUI(self):
try:
uiWidget = self.widgetConstructorFunction[self._currentObject[0]._type]
()
! widget = uiWidget.widgets
GDebug.printMesg(2, "Widget is %s" % widget)
self._formToUIWidget[self._currentObject[0]]=uiWidget
--- 128,134 ----
def _buildUI(self):
try:
uiWidget = self.widgetConstructorFunction[self._currentObject[0]._type]
()
! widget = uiWidget.widgets
GDebug.printMesg(2, "Widget is %s" % widget)
self._formToUIWidget[self._currentObject[0]]=uiWidget
***************
*** 133,139 ****
except KeyError:
pass
!
if self._currentObject[0]._children:
for child in self._currentObject[0]._children:
if isinstance(child, GObj):
--- 146,152 ----
except KeyError:
pass
!
if self._currentObject[0]._children:
for child in self._currentObject[0]._children:
if isinstance(child, GObj):
***************
*** 151,157 ****
# The interface exposed to the forms backend
#
#
!
#
# buildForm
#
--- 164,170 ----
# The interface exposed to the forms backend
#
#
!
#
# buildForm
#
***************
*** 163,169 ****
self._form = form
# Create the UI from the GFForm passed in
self._buildUI()
!
--- 176,182 ----
self._form = form
# Create the UI from the GFForm passed in
self._buildUI()
!
***************
*** 174,180 ****
# Handles incoming events and calls UI instance specific functions to
# execute the actions. These events come from the forms back end.
#
!
#
# Clipboard routines
#
--- 187,193 ----
# Handles incoming events and calls UI instance specific functions to
# execute the actions. These events come from the forms back end.
#
!
#
# Clipboard routines
#
Index: gnue/forms/src/uidrivers/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.2
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.3
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.2 Sat May 4 12:45:08 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py Thu Jun 6 14:06:11 2002
***************
*** 413,424 ****
## _IdToGFObj[id]=gfobject
## _IdToUIObj[id]=uiobject
! def createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight, interface, spacer,initialize=1):
! newWidget = self._createWidget(object, container, textWidth, textHeight,
! widgetWidth, widgetHeight, interface,
spacer,initialize)
! self._addToCrossRef(newWidget,object,self)
return newWidget
#
--- 413,422 ----
## _IdToGFObj[id]=gfobject
## _IdToUIObj[id]=uiobject
! def createWidget(self, event, spacer):
! newWidget = self._createWidget(event, spacer)
! self._addToCrossRef(newWidget,event.object,self)
return newWidget
#
***************
*** 432,441 ****
'right' : 0,
}
! def _createWidget(self, object, container, textWidth, textHeight,
widgetWidth,
! widgetHeight,interface,spacer,initialize=1):
style = self.alignmentStyle[object.alignment]
! newWidget = Label(container,'name',object.y,object.x,str(object.text))
return newWidget
#
--- 430,439 ----
'right' : 0,
}
! def _createWidget(self, event, spacer):
! object = event.object
style = self.alignmentStyle[object.alignment]
! newWidget =
Label(event.container,'name',object.y,object.x,str(object.text))
return newWidget
#
***************
*** 444,452 ****
# Widget set specific function that creates a single instance of a border box
#
class UIBox(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget = Frame(container,'name',object.y,object.x,
object.width, object.height,str(object.label))
return newWidget
--- 442,450 ----
# Widget set specific function that creates a single instance of a border box
#
class UIBox(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
! newWidget = Frame(event.container,'name',object.y,object.x,
object.width, object.height,str(object.label))
return newWidget
***************
*** 457,480 ****
# to navigate multiple records
#
class UIScrollBar(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
if object.width > 1:
! newWidget = ScrollBar(container,'name',object.y,object.x,object.width)
else:
! newWidget = VScrollBar(container,'name',object.y,object.x,object.height)
return newWidget
!
#
# UIButton
#
# Widget set specific function that creates a single instance of a button
#
class UIButton(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget =
Button(container,'name',object.y,object.x,object.width,str(object.label))
return newWidget
## def buttonHandler(self,event):
--- 455,478 ----
# to navigate multiple records
#
class UIScrollBar(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
if object.width > 1:
! newWidget =
ScrollBar(event.container,'name',object.y,object.x,object.width)
else:
! newWidget =
VScrollBar(event.container,'name',object.y,object.x,object.height)
return newWidget
!
#
# UIButton
#
# Widget set specific function that creates a single instance of a button
#
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):
***************
*** 485,493 ****
## id = object.GetId()
## gfObject = _IdToGFObj[id]
## action = GFEvent('fireTRIGGER',gfObject.trigger)
!
## if action:
! ## _EVENTPROCESSOR(action)
#
# UIPage
--- 483,491 ----
## id = object.GetId()
## gfObject = _IdToGFObj[id]
## action = GFEvent('fireTRIGGER',gfObject.trigger)
!
## if action:
! ## _EVENTPROCESSOR(action)
#
# UIPage
***************
*** 497,508 ****
# Note: The event trap for changing notebook pages is attached to the UIForm
#
class UIPage(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget = Dialog(container, 0, 0, widgetWidth, widgetHeight )
newWidget.DeActivate(tiFALSE)
!
! interface._pageList.append(newWidget)
return newWidget
#
--- 495,506 ----
# Note: The event trap for changing notebook pages is attached to the UIForm
#
class UIPage(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
! newWidget = Dialog(container, 0, 0, event.widgetWidth, event.widgetHeight
)
newWidget.DeActivate(tiFALSE)
!
! event.interface._pageList.append(newWidget)
return newWidget
#
***************
*** 511,534 ****
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
style = object.style
if style == 'dropdown':
! if initialize:
choices = object.allowedValues().values()
else:
choices = [""]
! newWidget = ComboBox(container, 'name',object.y,object.x, object.width)
for index in range(len(choices)):
newWidget.AddItem(index,choices[index])
elif style == 'label':
! newWidget = TextBox(ontainer, 'name', object.y, object.x, object.width)
elif style == 'checkbox':
! newWidget = CheckBox(container, 'name',object.y,object.x,'',0)
else: # Normal text box
! newWidget = TextBox(container, 'name', object.y, object.x, object.width)
return newWidget
#
--- 509,532 ----
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
style = object.style
if style == 'dropdown':
! if event.initialize:
choices = object.allowedValues().values()
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)
return newWidget
#
***************
*** 543,551 ****
'bottom':3,
}
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget = Dialog(container, 0, 0, interface._screen.MAXROW,
interface._screen.MAXCOL )
return newWidget
--- 541,549 ----
'bottom':3,
}
! def _createWidget(self, event, spacer):
! object = event.object
! newWidget = Dialog(event.container, 0, 0, event.interface._screen.MAXROW,
event.interface._screen.MAXCOL )
return newWidget
***************
*** 555,561 ****
## Required Dialog box support
##
#####################################################################
!
#
# UIAbout
#
--- 553,559 ----
## Required Dialog box support
##
#####################################################################
!
#
# UIAbout
#
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.175
gnue/forms/src/uidrivers/wx/UIdriver.py:1.176
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.175 Tue May 28 11:28:19 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py Thu Jun 6 14:06:11 2002
***************
*** 44,50 ****
from gnue.common import GConfig
from gnue.common import lineWrap
- _NOTEBOOK = None
_LOOPTRAP = 0
_EVENTPROCESSOR = None
_PROMPTFORRECORD = None
--- 44,49 ----
***************
*** 317,326 ****
# Only one page at a time can be visible
self.visiblePage = self._pageList[0]
! if _NOTEBOOK: # Adjust sizes
! _NOTEBOOK.SetSize(formSize)
! child = _NOTEBOOK.GetParent()
while child:
child.Fit()
child = child.GetParent()
--- 316,325 ----
# Only one page at a time can be visible
self.visiblePage = self._pageList[0]
! if self._notebook: # Adjust sizes
! self._notebook.SetSize(formSize)
! child = self._notebook.GetParent()
while child:
child.Fit()
child = child.GetParent()
***************
*** 403,409 ****
# makes the requested page visible on the screen
#
def gotoPage(self, event):
! if not _NOTEBOOK:
self.visiblePage.Show(FALSE)
self.visiblePage = self._formToUI[event.data][0]
# TODO: move the calculatoin out of here
--- 402,408 ----
# makes the requested page visible on the screen
#
def gotoPage(self, event):
! if not self._notebook:
self.visiblePage.Show(FALSE)
self.visiblePage = self._formToUI[event.data][0]
# TODO: move the calculatoin out of here
***************
*** 411,419 ****
(self._form.height+self.menu_sb_space)*self.widgetHeight))
else:
self.visiblePage = self._formToUI[event.data][0]
! for count in range(_NOTEBOOK.GetPageCount()):
! if self.visiblePage.GetId() == _NOTEBOOK.GetPage(count).GetId():
! _NOTEBOOK.SetSelection(count)
break
self.visiblePage.Show(TRUE)
--- 410,418 ----
(self._form.height+self.menu_sb_space)*self.widgetHeight))
else:
self.visiblePage = self._formToUI[event.data][0]
! for count in range(self._notebook.GetPageCount()):
! if self.visiblePage.GetId() == self._notebook.GetPage(count).GetId():
! self._notebook.SetSelection(count)
break
self.visiblePage.Show(TRUE)
***************
*** 602,614 ****
pass
! def createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight, interface, spacer,initialize=1):
! newWidget = self._createWidget(object, container, textWidth, textHeight,
! widgetWidth, widgetHeight, interface,
spacer,initialize)
initFont(newWidget)
! self._addToCrossRef(newWidget,object,self)
return newWidget
def cleanup(self, object):
--- 601,611 ----
pass
! def createWidget(self, event, spacer):
! newWidget = self._createWidget(event, spacer)
initFont(newWidget)
! self._addToCrossRef(newWidget,event.object,self)
return newWidget
def cleanup(self, object):
***************
*** 632,643 ****
'right' : wxALIGN_RIGHT|wxST_NO_AUTORESIZE,
}
! def _createWidget(self, object, container, textWidth, textHeight,
widgetWidth,
! widgetHeight,interface,spacer,initialize=1):
style = self.alignmentStyle[object.alignment]
! newWidget = wxStaticText(container, -1, str(object.text),
! wxPoint(object.x*widgetWidth,
!
(object.y+spacer+(spacer*object._gap))*widgetHeight),
wxSize(self.itemWidth,self.itemHeight), style)
return newWidget
--- 629,640 ----
'right' : wxALIGN_RIGHT|wxST_NO_AUTORESIZE,
}
! def _createWidget(self, event, spacer):
! object = event.object
style = self.alignmentStyle[object.alignment]
! newWidget = wxStaticText(event.container, -1, str(object.text),
! wxPoint(object.x*event.widgetWidth,
!
(object.y+spacer+(spacer*object._gap))*event.widgetHeight),
wxSize(self.itemWidth,self.itemHeight), style)
return newWidget
***************
*** 647,659 ****
# Widget set specific function that creates a single instance of a border box
#
class UIBox(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget = wxStaticBox(container,-1,str(object.label),
! wxPoint(object.x*widgetWidth+(widgetWidth/2),
!
(object.y+spacer+(spacer*object._gap))*widgetHeight+(widgetHeight/2)),
! wxSize((object.width-1)*widgetWidth,
! (object.height-1)*widgetHeight))
return newWidget
#
--- 644,656 ----
# Widget set specific function that creates a single instance of a border box
#
class UIBox(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
! newWidget = wxStaticBox(event.container,-1,str(object.label),
!
wxPoint(object.x*event.widgetWidth+(event.widgetWidth/2),
!
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
! wxSize((object.width-1)*event.widgetWidth,
! (object.height-1)*event.widgetHeight))
return newWidget
#
***************
*** 663,673 ****
# to navigate multiple records
#
class UIScrollBar(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget =wxScrollBar(container,-1,
!
wxPoint(object.x*widgetWidth,(object.y+spacer)*widgetHeight),
!
wxSize(object.width*widgetWidth,object.height*widgetHeight),
wxSB_VERTICAL)
return newWidget
--- 660,670 ----
# to navigate multiple records
#
class UIScrollBar(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
! newWidget =wxScrollBar(event.container,-1,
!
wxPoint(object.x*event.widgetWidth,(object.y+spacer)*event.widgetHeight),
!
wxSize(object.width*event.widgetWidth,object.height*event.widgetHeight),
wxSB_VERTICAL)
return newWidget
***************
*** 677,689 ****
# Widget set specific function that creates a single instance of a button
#
class UIButton(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! newWidget = wxButton(container,-1,str(object.label),
!
wxPoint(object.x*widgetWidth,(object.y+spacer)*widgetHeight),
!
wxSize(object.width*widgetWidth,object.height*widgetHeight)
)
! if initialize:
EVT_BUTTON(newWidget,newWidget.GetId(),self.buttonHandler)
#_setDefaultEventHandlers(newWidget,initialize)
--- 674,686 ----
# Widget set specific function that creates a single instance of a button
#
class UIButton(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
! newWidget = wxButton(event.container,-1,str(object.label),
!
wxPoint(object.x*event.widgetWidth,(object.y+spacer)*event.widgetHeight),
!
wxSize(object.width*event.widgetWidth,object.height*event.widgetHeight)
)
! if event.initialize:
EVT_BUTTON(newWidget,newWidget.GetId(),self.buttonHandler)
#_setDefaultEventHandlers(newWidget,initialize)
***************
*** 709,727 ****
# Note: The event trap for changing notebook pages is attached to the UIForm
#
class UIPage(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! if _NOTEBOOK:
! newWidget = wxPanel(_NOTEBOOK, -1,wxDefaultPosition,_NOTEBOOK.GetSize())
! _NOTEBOOK.AddPage(newWidget,object.name)
! newWidget.Show(TRUE)
else:
! newWidget = wxPanel(container, -1,wxDefaultPosition,container.GetSize())
! newWidget.Show(FALSE)
! _setDefaultEventHandlers(newWidget,initialize)
! interface._pageList.append(newWidget)
return newWidget
#
--- 706,724 ----
# Note: The event trap for changing notebook pages is attached to the UIForm
#
class UIPage(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
! if event.interface._notebook:
! newWidget = wxPanel(event.interface._notebook,
-1,wxDefaultPosition,event.interface._notebook.GetSize())
! event.interface._notebook.AddPage(newWidget,object.name)
! newWidget.Show(1)
else:
! newWidget = wxPanel(event.container,
-1,wxDefaultPosition,event.container.GetSize())
! newWidget.Show(0)
! _setDefaultEventHandlers(newWidget,event.initialize)
! event.interface._pageList.append(newWidget)
return newWidget
#
***************
*** 730,752 ****
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIHelper, UIWidget):
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
style = object.style
! defaultPoint = wxPoint(object.x*widgetWidth,
!
(object.y+spacer+(object._gap*spacer))*widgetHeight)
defaultSize = wxSize(self.itemWidth,self.itemHeight+1)
if style == 'dropdown':
! if initialize:
choices = object.allowedValues().values()
else:
choices = [""]
choices.sort()
! newWidget = wxComboBox(container, -1, "",defaultPoint,
wxSize(self.itemWidth,self.itemHeight),
choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
newWidget.SetValue("")
--- 727,749 ----
# Widget set specific function that creates a single instance of a data entry
widget
#
class UIEntry(UIHelper, UIWidget):
! def _createWidget(self, event, spacer):
! object = event.object
style = object.style
! defaultPoint = wxPoint(object.x*event.widgetWidth,
!
(object.y+spacer+(object._gap*spacer))*event.widgetHeight)
defaultSize = wxSize(self.itemWidth,self.itemHeight+1)
if style == 'dropdown':
! if event.initialize:
choices = object.allowedValues().values()
else:
choices = [""]
choices.sort()
! newWidget = wxComboBox(event.container, -1, "",defaultPoint,
wxSize(self.itemWidth,self.itemHeight),
choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
newWidget.SetValue("")
***************
*** 754,773 ****
elif style == 'label':
! newWidget = wxStaticText(container, -1, "",defaultPoint,defaultSize,
wxST_NO_AUTORESIZE)
# To make the label consistent with the other entry styles...
newWidget.SetValue = newWidget.SetLabel
newWidget.GetValue = newWidget.GetLabel
elif style == 'checkbox':
! newWidget = wxCheckBox(container, -1, "",defaultPoint,
! wxSize(2*textWidth,textHeight),
wxNO_BORDER)
newWidget.SetValue(0)
else: # Normal text box
! if initialize:
styles = wxTE_PROCESS_TAB
if object.height > 1:
styles = styles|wxTE_MULTILINE
--- 751,770 ----
elif style == 'label':
! newWidget = wxStaticText(event.container, -1,
"",defaultPoint,defaultSize,
wxST_NO_AUTORESIZE)
# To make the label consistent with the other entry styles...
newWidget.SetValue = newWidget.SetLabel
newWidget.GetValue = newWidget.GetLabel
elif style == 'checkbox':
! newWidget = wxCheckBox(event.container, -1, "",defaultPoint,
! wxSize(2*event.textWidth,event.textHeight),
wxNO_BORDER)
newWidget.SetValue(0)
else: # Normal text box
! if event.initialize:
styles = wxTE_PROCESS_TAB
if object.height > 1:
styles = styles|wxTE_MULTILINE
***************
*** 776,784 ****
styles = 0
value = ""
! newWidget = wxTextCtrl(container, -1, value, defaultPoint, defaultSize,
styles)
! _setDefaultEventHandlers(newWidget,initialize)
return newWidget
def comboHandler(self, event):
--- 773,781 ----
styles = 0
value = ""
! newWidget = wxTextCtrl(event.container, -1, value, defaultPoint,
defaultSize, styles)
! _setDefaultEventHandlers(newWidget,event.initialize)
return newWidget
def comboHandler(self, event):
***************
*** 827,848 ****
'top':0,
}
! def _createWidget(self, object, container, textWidth, textHeight,
! widgetWidth, widgetHeight,interface,spacer,initialize=1):
! global _NOTEBOOK
if object.tabbed:
tabstyle =self.tabStyles[object.tabbed]
! newWidget =
wxNotebook(container,-1,wxPoint(10,10),size=container.GetSize(),style=tabstyle)
newWidget.Show(TRUE)
EVT_NOTEBOOK_PAGE_CHANGING(newWidget, newWidget.GetId(),
self.notebookTabHandler)
! _NOTEBOOK = newWidget
else:
! newWidget = wxPanel(interface.mainWindow.panel,-1, wxDefaultPosition)
! if initialize:
! EVT_CLOSE(interface.mainWindow,interface.closeTrap)
return newWidget
--- 824,845 ----
'top':0,
}
! def _createWidget(self, event, spacer):
! object = event.object
if object.tabbed:
tabstyle =self.tabStyles[object.tabbed]
! newWidget =
wxNotebook(event.container,-1,wxPoint(10,10),size=event.container.GetSize(),style=tabstyle)
newWidget.Show(TRUE)
EVT_NOTEBOOK_PAGE_CHANGING(newWidget, newWidget.GetId(),
self.notebookTabHandler)
! event.interface._notebook = newWidget
else:
! newWidget = wxPanel(event.interface.mainWindow.panel,-1,
wxDefaultPosition)
! event.interface._notebook = None
! if event.initialize:
! EVT_CLOSE(event.interface.mainWindow,event.interface.closeTrap)
return newWidget
***************
*** 879,886 ****
_(" Name : ")+"%s\n"+ \
_(" Version: ")+"%s\n"+ \
_(" Author : ")+"%s\n"+ \
! _(" Description:")+"%s\n"
! wxMessageDialog.__init__(self, interface,
text % (programVersion, formName
,formVersion,author,description),
_("About"), wxOK | wxICON_INFORMATION)
#
--- 876,883 ----
_(" Name : ")+"%s\n"+ \
_(" Version: ")+"%s\n"+ \
_(" Author : ")+"%s\n"+ \
! _(" Description:")+"%s\n"
! wxMessageDialog.__init__(self, interface,
text % (programVersion, formName
,formVersion,author,description),
_("About"), wxOK | wxICON_INFORMATION)
#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src/uidrivers _base/UIWidget.py _bas...,
Jason Cater <=