[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers _base/UIWidget.py curs...
|
From: |
James Thompson |
|
Subject: |
gnue/forms/src/uidrivers _base/UIWidget.py curs... |
|
Date: |
Tue, 10 Dec 2002 20:18:33 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 02/12/10 20:18:33
Modified files:
forms/src/uidrivers/_base: UIWidget.py
forms/src/uidrivers/curses: UIdriver.py
forms/src/uidrivers/gtk2: UIdriver.py
forms/src/uidrivers/wx: UIdriver.py
Removed files:
forms/src/uidrivers/curses: README
Log message:
Minor UI driver cleanup
Removed outdated file
Curses fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIWidget.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.221&tr2=1.222&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/_base/UIWidget.py
diff -c gnue/forms/src/uidrivers/_base/UIWidget.py:1.7
gnue/forms/src/uidrivers/_base/UIWidget.py:1.8
*** gnue/forms/src/uidrivers/_base/UIWidget.py:1.7 Tue Dec 3 22:05:28 2002
--- gnue/forms/src/uidrivers/_base/UIWidget.py Tue Dec 10 20:18:32 2002
***************
*** 59,66 ****
--- 59,87 ----
self.widgets.append(newWidget)
+ #
+ # The following functions should be overridden by the widgets
+ # in the ui driver.
+ #
def createWidget(self, event, spacer):
GDebug.printMesg(1,"UI doesn't support %s" % self.__class__)
+ def indexedFocus(self, index):
+ pass
+ def showModal(self):
+ pass
+
+ def destroy(self):
+ pass
+
+ def setValue(self, value, index=0, enabled=1):
+ pass
+
+ def setCursorPosition(self, position, index=0):
+ pass
+
+ def setSelectedArea(self, selection1, selection2, index=0):
+ pass
+
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.25
gnue/forms/src/uidrivers/curses/UIdriver.py:1.26
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.25 Tue Nov 26 22:23:30 2002
--- gnue/forms/src/uidrivers/curses/UIdriver.py Tue Dec 10 20:18:32 2002
***************
*** 441,447 ****
#
# Provides a UI widget set of std functions to reduce the number of functions
# require in each UIclass listed below
! class UIHelper:
def showModal(self):
pass # self.ShowModal()
--- 441,447 ----
#
# Provides a UI widget set of std functions to reduce the number of functions
# require in each UIclass listed below
! class UIHelper(UIWidget):
def showModal(self):
pass # self.ShowModal()
***************
*** 492,498 ****
#
# Widget set specific function that creates a single instance of a label
#
! class UILabel(UIHelper, UIWidget):
alignmentStyle = { 'left' : 0,
'center': 0,
'right' : 0,
--- 492,498 ----
#
# Widget set specific function that creates a single instance of a label
#
! class UILabel(UIHelper):
alignmentStyle = { 'left' : 0,
'center': 0,
'right' : 0,
***************
*** 511,517 ****
#
# 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 = GroupBox(event.container,'name',object.Char__y,object.Char__x,
--- 511,517 ----
#
# Widget set specific function that creates a single instance of a border box
#
! class UIBox(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
newWidget = GroupBox(event.container,'name',object.Char__y,object.Char__x,
***************
*** 525,531 ****
# Widget set specific function that creates a single instance of a scroll bar
used
# to navigate multiple records
#
! class UIScrollBar(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
--- 525,531 ----
# Widget set specific function that creates a single instance of a scroll bar
used
# to navigate multiple records
#
! class UIScrollBar(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
***************
*** 542,548 ****
#
# 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.Char__y+spacer,object.Char__x,object.Char__width,str(object.label))
--- 542,548 ----
#
# Widget set specific function that creates a single instance of a button
#
! class UIButton(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
newWidget =
Button(event.container,'name',object.Char__y+spacer,object.Char__x,object.Char__width,str(object.label))
***************
*** 571,577 ****
#
# 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
--- 571,577 ----
#
# Note: The event trap for changing notebook pages is attached to the UIForm
#
! class UIPage(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
***************
*** 592,598 ****
width = event.screenWidth
! newWidget = Frame(event.container, y, x, y+height-1, x+width-1 ,
object._parent.title)
###newWidget.DeActivate(0)
event.interface._pageList.append(newWidget)
event.interface._objectMapping[object] = newWidget
--- 592,598 ----
width = event.screenWidth
! newWidget = Frame(event.container, y, x, y+height-1, x+width-1) # ,
object._parent.title)
###newWidget.DeActivate(0)
event.interface._pageList.append(newWidget)
event.interface._objectMapping[object] = newWidget
***************
*** 608,621 ****
#
# 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()[1]
else:
choices = [""]
newWidget = ComboBox(event.container,
'name',object.Char__y+spacer,object.Char__x, object.Char__width)
--- 608,621 ----
#
# Widget set specific function that creates a single instance of a data entry
widget
#
! class UIEntry(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
style = object.style
if style == 'dropdown':
if event.initialize:
! choices = object._field.allowedValues()[1]
else:
choices = [""]
newWidget = ComboBox(event.container,
'name',object.Char__y+spacer,object.Char__x, object.Char__width)
***************
*** 625,631 ****
newWidget = TextBox(event.container, 'name', object.Char__y+spacer,
object.Char__x, object.Char__width)
elif style == 'checkbox':
newWidget = CheckBox(event.container,
'name',object.Char__y+spacer,object.Char__x,'',0)
! elif object.Char__height > 1: # Normal text box/Multiline
newWidget = TextArea(event.container, 'name', object.Char__y+spacer,
object.Char__x, object.Char__width, object.Char__height)
else: # Normal text box
newWidget = TextBox(event.container, 'name', object.Char__y+spacer,
object.Char__x, object.Char__width)
--- 625,631 ----
newWidget = TextBox(event.container, 'name', object.Char__y+spacer,
object.Char__x, object.Char__width)
elif style == 'checkbox':
newWidget = CheckBox(event.container,
'name',object.Char__y+spacer,object.Char__x,'',0)
! elif hasattr(object,'Char__height') and object.Char__height > 1: # Normal
text box/Multiline
newWidget = TextArea(event.container, 'name', object.Char__y+spacer,
object.Char__x, object.Char__width, object.Char__height)
else: # Normal text box
newWidget = TextBox(event.container, 'name', object.Char__y+spacer,
object.Char__x, object.Char__width)
***************
*** 639,645 ****
#
# Widget set specific function that creates a single instance of a Form widget
#
! class UIForm(UIHelper, UIWidget):
tabStyles = {'top':0,
'left':1,
'right':2,
--- 639,645 ----
#
# Widget set specific function that creates a single instance of a Form widget
#
! class UIForm(UIHelper):
tabStyles = {'top':0,
'left':1,
'right':2,
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.15
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.16
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.15 Tue Nov 26 22:23:30 2002
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py Tue Dec 10 20:18:33 2002
***************
*** 811,817 ****
! class UIHelper:
def showModal(self):
#$self.ShowModal()
None
--- 811,817 ----
! class UIHelper(UIWidget):
def showModal(self):
#$self.ShowModal()
None
***************
*** 899,905 ****
#
! class UILabel(UIHelper, UIWidget):
alignmentStyle = { 'left' : gtk.JUSTIFY_LEFT,
'center': gtk.JUSTIFY_CENTER,
'right' : gtk.JUSTIFY_RIGHT,
--- 899,905 ----
#
! class UILabel(UIHelper):
alignmentStyle = { 'left' : gtk.JUSTIFY_LEFT,
'center': gtk.JUSTIFY_CENTER,
'right' : gtk.JUSTIFY_RIGHT,
***************
*** 927,933 ****
#
# Widget set specific function that creates a single instance of a border box
#
! class UIBox(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
#$print "inside UIBOX"
GDebug.printMesg(1, "inside UIBOX")
--- 927,933 ----
#
# Widget set specific function that creates a single instance of a border box
#
! class UIBox(UIHelper):
def _createWidget(self, event, spacer):
#$print "inside UIBOX"
GDebug.printMesg(1, "inside UIBOX")
***************
*** 940,946 ****
# Widget set specific function that creates a single instance of a scroll bar
used
# to navigate multiple records
#
! class UIScrollBar(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
--- 940,946 ----
# Widget set specific function that creates a single instance of a scroll bar
used
# to navigate multiple records
#
! class UIScrollBar(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
***************
*** 970,976 ****
#
# Widget set specific function that creates a single instance of a button
#
! class UIButton(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
--- 970,976 ----
#
# Widget set specific function that creates a single instance of a button
#
! class UIButton(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
***************
*** 1005,1011 ****
#
# Note: The event trap for changing notebook pages is attached to the UIForm
#
! class UIPage(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
if _NOTEBOOK:
newWidget = gtk.Fixed()
--- 1005,1011 ----
#
# Note: The event trap for changing notebook pages is attached to the UIForm
#
! class UIPage(UIHelper):
def _createWidget(self, event, spacer):
if _NOTEBOOK:
newWidget = gtk.Fixed()
***************
*** 1033,1039 ****
# 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
--- 1033,1039 ----
# Widget set specific function that creates a single instance of a data entry
widget
#
! class UIEntry(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
style = object.style
***************
*** 1120,1126 ****
#
# Widget set specific function that creates a single instance of a Form widget
#
! class UIForm(UIHelper, UIWidget):
tabStyles = {'left':gtk.POS_LEFT,
'right':gtk.POS_RIGHT,
'bottom':gtk.POS_BOTTOM,
--- 1120,1126 ----
#
# Widget set specific function that creates a single instance of a Form widget
#
! class UIForm(UIHelper):
tabStyles = {'left':gtk.POS_LEFT,
'right':gtk.POS_RIGHT,
'bottom':gtk.POS_BOTTOM,
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.221
gnue/forms/src/uidrivers/wx/UIdriver.py:1.222
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.221 Tue Dec 3 22:05:28 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py Tue Dec 10 20:18:33 2002
***************
*** 25,31 ****
# A wxPython based user interface driver for GNUe forms.
#
# NOTES:
- # TODO: why does UIhelper not inherit from UIwidget?
#
import sys
--- 25,30 ----
***************
*** 668,681 ****
# UIHelper
#
# Provides a UI widget set of std functions to reduce the number of functions
! # require in each UIclass listed below
! class UIHelper:
def showModal(self):
self.ShowModal()
- def show(self, flag=TRUE):
- self.Show(flag)
-
def destroy(self):
self.Destroy()
--- 667,700 ----
# UIHelper
#
# Provides a UI widget set of std functions to reduce the number of functions
! # require in each UIclass listed below.
! #
! class UIHelper(UIWidget):
! #
! # Functions limited to the wx driver
! #
! def _addToCrossRef(self, widget,gfobject, uiobject):
! id = widget.GetId()
! _IdToWxObj[id]=widget
! _IdToGFObj[id]=gfobject
! _IdToUIObj[id]=uiobject
! widget.__origBackgroundColor = widget.GetBackgroundColour()
!
! def _deleteFromCrossRef(self, widget, object):
! id = widget.GetId()
! try:
! del _IdToWxObj[id]
! del _IdToGFObj[id]
! del _IdToUIObj[id]
! except:
! pass
!
! #
! # Override the base UIWidget functions
! #
def showModal(self):
self.ShowModal()
def destroy(self):
self.Destroy()
***************
*** 731,752 ****
except (AttributeError, TypeError):
pass # For label-style & dropdown entries
- def _addToCrossRef(self, widget,gfobject, uiobject):
- id = widget.GetId()
- _IdToWxObj[id]=widget
- _IdToGFObj[id]=gfobject
- _IdToUIObj[id]=uiobject
- widget.__origBackgroundColor = widget.GetBackgroundColour()
-
- def _deleteFromCrossRef(self, widget, object):
- id = widget.GetId()
- try:
- del _IdToWxObj[id]
- del _IdToGFObj[id]
- del _IdToUIObj[id]
- except:
- pass
-
def createWidget(self, event, spacer):
newWidget = self._createWidget(event, spacer)
initFont(newWidget)
--- 750,755 ----
***************
*** 767,778 ****
#
# Widget set specific function that creates a single instance of a label
#
! class UILabel(UIHelper, UIWidget):
alignmentStyle = { 'left' : wxALIGN_LEFT|wxST_NO_AUTORESIZE,
'center': wxALIGN_CENTRE|wxST_NO_AUTORESIZE,
'right' : wxALIGN_RIGHT|wxST_NO_AUTORESIZE,
}
def _createWidget(self, event, spacer):
object = event.object
style = self.alignmentStyle[object.alignment]
--- 770,782 ----
#
# Widget set specific function that creates a single instance of a label
#
! class UILabel(UIHelper):
alignmentStyle = { 'left' : wxALIGN_LEFT|wxST_NO_AUTORESIZE,
'center': wxALIGN_CENTRE|wxST_NO_AUTORESIZE,
'right' : wxALIGN_RIGHT|wxST_NO_AUTORESIZE,
}
+
def _createWidget(self, event, spacer):
object = event.object
style = self.alignmentStyle[object.alignment]
***************
*** 787,793 ****
#
# 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
--- 791,797 ----
#
# Widget set specific function that creates a single instance of a border box
#
! class UIBox(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
***************
*** 804,810 ****
# Widget set specific function that creates a single instance of a scroll bar
used
# to navigate multiple records
#
! class UIScrollBar(UIHelper, UIWidget):
def _createWidget(self, event, spacer):
object = event.object
newWidget =wxScrollBar(event.container,-1,
--- 808,814 ----
# Widget set specific function that creates a single instance of a scroll bar
used
# to navigate multiple records
#
! class UIScrollBar(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
newWidget =wxScrollBar(event.container,-1,
***************
*** 818,824 ****
#
# 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),
--- 822,828 ----
#
# Widget set specific function that creates a single instance of a button
#
! class UIButton(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
newWidget = wxButton(event.container,-1,str(object.label),
***************
*** 850,856 ****
#
# 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:
--- 854,860 ----
#
# Note: The event trap for changing notebook pages is attached to the UIForm
#
! class UIPage(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
if event.interface._notebook:
***************
*** 871,877 ****
#
# 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
--- 875,881 ----
#
# Widget set specific function that creates a single instance of a data entry
widget
#
! class UIEntry(UIHelper):
def _createWidget(self, event, spacer):
object = event.object
***************
*** 953,959 ****
#
# Widget set specific function that creates a single instance of a Form widget
#
! class UIForm(UIHelper, UIWidget):
tabStyles = {'left':wxNB_LEFT,
'right':wxNB_RIGHT,
'bottom':wxNB_BOTTOM,
--- 957,963 ----
#
# Widget set specific function that creates a single instance of a Form widget
#
! class UIForm(UIHelper):
tabStyles = {'left':wxNB_LEFT,
'right':wxNB_RIGHT,
'bottom':wxNB_BOTTOM,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src/uidrivers _base/UIWidget.py curs...,
James Thompson <=