[Anygui-checkins] CVS: anygui/lib/anygui Applications.py,1.21,1.22 Defaults.py,1.21,1.22 Frames.py,1
Brought to you by:
mlh
Menu
▾
▴
[Anygui-checkins] CVS: anygui/lib/anygui Applications.py,1.21,1.22 Defaults.py,1.21,1.22 Frames.py,1.27,1.28 LayoutManagers.py,1.6,1.7 TextComponents.py,1.9,1.10 TextFields.py,1.4,1.5 __init__.py,1.56,1.57
|
From: Joseph A K. <jk...@us...> - 2002-06-25 01:54:48
|
Update of /cvsroot/anygui/anygui/lib/anygui
In directory usw-pr-cvs1:/tmp/cvs-serv5207/lib/anygui
Modified Files:
Applications.py Defaults.py Frames.py LayoutManagers.py
TextComponents.py TextFields.py __init__.py
Log Message:
All Default classes now exist. Whether they're correct
or not is another matter; I just emacs-macroed them
into shape based on the old definitions.
Somewhat working test_textfield.py for tkgui.
Windows now appear in test_window.py; the fix for this
was to add win.wrapper.prod() in Application.add(). Almost
certainly, this is wrong, but I'm not quite sure what's
right.
Index: Applications.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/Applications.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** Applications.py 31 May 2002 04:35:49 -0000 1.21
--- Applications.py 25 Jun 2002 01:54:44 -0000 1.22
***************
*** 18,21 ****
--- 18,22 ----
self._windows.append(w)
win.container = self
+ win.wrapper.prod()
def remove(self, win):
Index: Defaults.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/Defaults.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** Defaults.py 16 Jun 2002 19:58:49 -0000 1.21
--- Defaults.py 25 Jun 2002 01:54:44 -0000 1.22
***************
*** 78,82 ****
'enabled': 1,
}
! #_list_attributes(Label)
# FIXME: Should be improved -- base new placement on top window etc.
--- 78,99 ----
'enabled': 1,
}
!
! class TextField:
! state = {
! 'text' : '',
! 'default_event' : 'enterkey',
! 'x' : 0,
! 'y' : 0,
! 'width' : 100,
! 'height' : 25,
! 'hmove' : 0,
! 'vmove' : 0,
! 'hstretch' : 0,
! 'vstretch' : 0,
! 'visible' : 1,
! 'enabled' : 1,
! 'editable' : 1,
! 'selection' : (0, 0),
! }
# FIXME: Should be improved -- base new placement on top window etc.
***************
*** 90,192 ****
winY %= 360
- """
class Canvas:
! _text = 'Canvas' # Hardly needed...
! _x = 0
! _y = 0
! _width = 400
! _height = 300
! _hmove = 0
! _vmove = 0
! _hstretch = 0
! _vstretch = 0
! _visible = 1
! _enabled = 1
! _list_attributes(Canvas)
class CheckBox:
! _text = 'CheckBox'
! _default_event = 'click'
! _x = 0
! _y = 0
! _width = 100
! _height = 15
! _hmove = 0
! _vmove = 0
! _hstretch = 0
! _vstretch = 0
! _visible = 1
! _enabled = 1
! _list_attributes(CheckBox)
class ListBox:
! _text = 'ListBox'
! _default_event = 'select'
! _x = 0
! _y = 0
! _width = 100
! _height = 100
! _hmove = 0
! _vmove = 0
! _hstretch = 0
! _vstretch = 0
! _visible = 1
! _enabled = 1
! _items = ()
! _selection = 0
! _list_attributes(ListBox)
!
class RadioButton:
! _text = 'RadioButton'
! _default_event = 'click'
! _x = 0
! _y = 0
! _width = 100
! _height = 15
! _hmove = 0
! _vmove = 0
! _hstretch = 0
! _vstretch = 0
! _visible = 1
! _enabled = 1
! _list_attributes(RadioButton)
class RadioGroup:
! _items = None
! _value = None
! _default_event = 'select'
! _list_attributes(RadioGroup)
class TextArea:
! _text = ''
! _x = 0
! _y = 0
! _width = 100
! _height = 100
! _hmove = 0
! _vmove = 0
! _hstretch = 0
! _vstretch = 0
! _visible = 1
! _enabled = 1
! _editable = 1
! _selection = (0, 0)
! _list_attributes(TextArea)
!
! class TextField:
! _text = ''
! _default_event = 'enterkey'
! _x = 0
! _y = 0
! _width = 100
! _height = 25
! _hmove = 0
! _vmove = 0
! _hstretch = 0
! _vstretch = 0
! _visible = 1
! _enabled = 1
! _editable = 1
! _selection = (0, 0)
! _list_attributes(TextField)
! """
--- 107,196 ----
winY %= 360
class Canvas:
! state = {
! 'text' : 'Canvas', # Hardly needed...,
! 'x' : 0,
! 'y' : 0,
! 'width' : 400,
! 'height' : 300,
! 'hmove' : 0,
! 'vmove' : 0,
! 'hstretch' : 0,
! 'vstretch' : 0,
! 'visible' : 1,
! 'enabled' : 1,
! }
class CheckBox:
! state = {
! 'text' : 'CheckBox',
! 'default_event' : 'click',
! 'x' : 0,
! 'y' : 0,
! 'width' : 100,
! 'height' : 15,
! 'hmove' : 0,
! 'vmove' : 0,
! 'hstretch' : 0,
! 'vstretch' : 0,
! 'visible' : 1,
! 'enabled' : 1,
! }
class ListBox:
! state = {
! 'text' : 'ListBox',
! 'default_event' : 'select',
! 'x' : 0,
! 'y' : 0,
! 'width' : 100,
! 'height' : 100,
! 'hmove' : 0,
! 'vmove' : 0,
! 'hstretch' : 0,
! 'vstretch' : 0,
! 'visible' : 1,
! 'enabled' : 1,
! 'items' : (),
! 'selection' : 0,
! }
!
class RadioButton:
! state = {
! 'text' : 'RadioButton',
! 'default_event' : 'click',
! 'x' : 0,
! 'y' : 0,
! 'width' : 100,
! 'height' : 15,
! 'hmove' : 0,
! 'vmove' : 0,
! 'hstretch' : 0,
! 'vstretch' : 0,
! 'visible' : 1,
! 'enabled' : 1,
! }
class RadioGroup:
! state = {
! 'items' : None,
! 'value' : None,
! 'default_event' : 'select',
! }
class TextArea:
! state = {
! 'text' : '',
! 'x' : 0,
! 'y' : 0,
! 'width' : 100,
! 'height' : 100,
! 'hmove' : 0,
! 'vmove' : 0,
! 'hstretch' : 0,
! 'vstretch' : 0,
! 'visible' : 1,
! 'enabled' : 1,
! 'editable' : 1,
! 'selection' : (0, 0),
! }
Index: Frames.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/Frames.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** Frames.py 31 May 2002 04:35:49 -0000 1.27
--- Frames.py 25 Jun 2002 01:54:45 -0000 1.28
***************
*** 11,16 ****
self._contents = []
Component.__init__(self, *args, **kw)
! self._layout = None
! self.layout = Placer()
def wrapperFactory(self):
--- 11,17 ----
self._contents = []
Component.__init__(self, *args, **kw)
! self._layout = Placer()
! self._layout._container=self
! #self.layout = Placer()
def wrapperFactory(self):
Index: LayoutManagers.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/LayoutManagers.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** LayoutManagers.py 15 Mar 2002 20:05:16 -0000 1.6
--- LayoutManagers.py 25 Jun 2002 01:54:45 -0000 1.7
***************
*** 42,46 ****
for item in items:
if item not in self._container._contents:
! item._set_container(self._container)
if options:
--- 42,47 ----
for item in items:
if item not in self._container._contents:
! #item._set_container(self._container)
! item.container=self._container
if options:
***************
*** 201,206 ****
# Compute the proper width and height for each
# component.
! w = self._container._width
! h = self._container._height
rowh = h/self.rows
colw = w/self.cols
--- 202,207 ----
# Compute the proper width and height for each
# component.
! w = self._container.width
! h = self._container.height
rowh = h/self.rows
colw = w/self.cols
***************
*** 325,331 ****
self.compute_rowcol_data(**kwds)
if xsize == 0:
! self.colinfo[self.cur_col].size = comp._width
if ysize == 0:
! self.rowinfo[self.cur_row].size = comp._height
comp.layout_data.row = self.cur_row
comp.layout_data.col = self.cur_col
--- 326,332 ----
self.compute_rowcol_data(**kwds)
if xsize == 0:
! self.colinfo[self.cur_col].size = comp.width
if ysize == 0:
! self.rowinfo[self.cur_row].size = comp.height
comp.layout_data.row = self.cur_row
comp.layout_data.col = self.cur_col
***************
*** 348,353 ****
# First, figure out the proper sizes of all rows and columns.
! self.w = self._container._width
! self.h = self._container._height
self.compute_leftover_wh()
--- 349,354 ----
# First, figure out the proper sizes of all rows and columns.
! self.w = self._container.width
! self.h = self._container.height
self.compute_leftover_wh()
***************
*** 558,562 ****
r = right_obj.x - right_off
elif right_off is not None:
! r = self._container._width - right_off
else:
r = None
--- 559,563 ----
r = right_obj.x - right_off
elif right_off is not None:
! r = self._container.width - right_off
else:
r = None
***************
*** 565,569 ****
b = bottom_obj.y - bottom_off
elif bottom_off is not None:
! b = self._container._height - bottom_off
else:
b = None
--- 566,570 ----
b = bottom_obj.y - bottom_off
elif bottom_off is not None:
! b = self._container.height - bottom_off
else:
b = None
***************
*** 648,653 ****
dh = cdh
if dx != 0 or dy != 0 or dw != 0 or dh != 0:
! comp.geometry = (comp._x + dx, comp._y + dy,
! comp._width + dw, comp._height + dh)
def resized(self,dw,dh):
--- 649,654 ----
dh = cdh
if dx != 0 or dy != 0 or dw != 0 or dh != 0:
! comp.geometry = (comp.x + dx, comp.y + dy,
! comp.width + dw, comp.height + dh)
def resized(self,dw,dh):
Index: TextComponents.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/TextComponents.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** TextComponents.py 12 Feb 2002 19:35:56 -0000 1.9
--- TextComponents.py 25 Jun 2002 01:54:45 -0000 1.10
***************
*** 1,7 ****
from anygui.Components import Component
! from anygui.Exceptions import UnimplementedMethod
class TextComponent(Component):
_selection = (0, 0)
_editable = 1
--- 1,9 ----
from anygui.Components import Component
! from anygui import Defaults, backendModule
class TextComponent(Component):
+ pass
+ '''
_selection = (0, 0)
_editable = 1
***************
*** 60,61 ****
--- 62,64 ----
# self._ensure_selection()
# self._ensure_editable()
+ '''
Index: TextFields.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/TextFields.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TextFields.py 12 Feb 2002 19:35:56 -0000 1.4
--- TextFields.py 25 Jun 2002 01:54:45 -0000 1.5
***************
*** 1,5 ****
from anygui.TextComponents import TextComponent
! from anygui import Defaults
class TextField(TextComponent, Defaults.TextField):
! pass
--- 1,7 ----
from anygui.TextComponents import TextComponent
! from anygui import Defaults,backendModule
class TextField(TextComponent, Defaults.TextField):
!
! def wrapperFactory(self):
! return backendModule().TextFieldWrapper(self)
Index: __init__.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/__init__.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** __init__.py 16 Jun 2002 19:58:49 -0000 1.56
--- __init__.py 25 Jun 2002 01:54:45 -0000 1.57
***************
*** 42,46 ****
#from anygui.RadioButtons import RadioButton
#from anygui.RadioGroups import RadioGroup
! #from anygui.TextFields import TextField
#from anygui.TextAreas import TextArea
#from anygui.ListBoxes import ListBox
--- 42,46 ----
#from anygui.RadioButtons import RadioButton
#from anygui.RadioGroups import RadioGroup
! from anygui.TextFields import TextField
#from anygui.TextAreas import TextArea
#from anygui.ListBoxes import ListBox
***************
*** 60,63 ****
--- 60,64 ----
Window
Label
+ TextField
any
application
|