[Python-checkins] CVS: python/dist/src/Mac/Demo/mlte mlted.py,1.1,1.1.2.1
Tim Peters
tim_one@users.sourceforge.net
Mon, 16 Jul 2001 21:19:07 -0700
- Previous message: [Python-checkins] CVS: python/dist/src/Lib/test test_parser.py,1.6.6.1,1.6.6.2 test_rfc822.py,1.9.6.1,1.9.6.2 test_urllib2.py,1.2.4.1,1.2.4.2
- Next message: [Python-checkins] CVS: python/dist/src/Mac/Modules/mlte Mltemodule.c,1.3,1.3.2.1 mltescan.py,1.3,1.3.2.1 mltesupport.py,1.3,1.3.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Mac/Demo/mlte
In directory usw-pr-cvs1:/tmp/cvs-serv7540/descr/dist/src/Mac/Demo/mlte
Modified Files:
Tag: descr-branch
mlted.py
Log Message:
Last trunk->branch merge for today <ahem>.
Index: mlted.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/mlte/mlted.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** mlted.py 2001/07/14 14:02:21 1.1
--- mlted.py 2001/07/17 04:19:05 1.1.2.1
***************
*** 7,10 ****
--- 7,11 ----
from FrameWork import *
import Win
+ import Ctl
import Qd
import Res
***************
*** 19,23 ****
"Style Change", "Align Left", "Align Center", "Align Right", "Drop", "Move"]
! class WasteWindow(Window):
def open(self, path, name, data):
self.path = path
--- 20,24 ----
"Style Change", "Align Left", "Align Center", "Align Right", "Drop", "Move"]
! class MlteWindow(Window):
def open(self, path, name, data):
self.path = path
***************
*** 26,45 ****
w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
self.wid = w
! ## vr = 0, 0, r[2]-r[0]-15, r[3]-r[1]-15
! ## dr = (0, 0, 10240, 0)
! ## Qd.SetPort(w)
! ## Qd.TextFont(4)
! ## Qd.TextSize(9)
! ## self.ted = waste.WENew(dr, vr, flags)
! flags = MacTextEditor.kTXNDrawGrowIconMask|MacTextEditor.kTXNShowWindowMask|MacTextEditor.kTXNWantHScrollBarMask| \
MacTextEditor.kTXNWantVScrollBarMask
self.ted, self.frameid = Mlte.TXNNewObject(None, w, None, flags, MacTextEditor.kTXNTextEditStyleFrameType,
MacTextEditor.kTXNTextFile, MacTextEditor.kTXNMacOSEncoding)
- ## self.tedtexthandle = Res.Resource(data)
- ## self.ted.WEUseText(self.tedtexthandle)
self.ted.TXNSetData(MacTextEditor.kTXNTextData, data, 0, 0x7fffffff)
- ## self.ted.WECalText()
- ## w.DrawGrowIcon()
- ## self.scrollbars()
self.changed = 0
self.do_postopen()
--- 27,35 ----
w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
self.wid = w
! flags = MacTextEditor.kTXNDrawGrowIconMask|MacTextEditor.kTXNWantHScrollBarMask| \
MacTextEditor.kTXNWantVScrollBarMask
self.ted, self.frameid = Mlte.TXNNewObject(None, w, None, flags, MacTextEditor.kTXNTextEditStyleFrameType,
MacTextEditor.kTXNTextFile, MacTextEditor.kTXNMacOSEncoding)
self.ted.TXNSetData(MacTextEditor.kTXNTextData, data, 0, 0x7fffffff)
self.changed = 0
self.do_postopen()
***************
*** 47,157 ****
def do_idle(self, event):
- ## (what, message, when, where, modifiers) = event
- ## Qd.SetPort(self.wid)
self.ted.TXNIdle()
self.ted.TXNAdjustCursor(None)
- ## def getscrollbarvalues(self):
- ## dr = self.ted.WEGetDestRect()
- ## vr = self.ted.WEGetViewRect()
- ## vx = self.scalebarvalue(dr[0], dr[2], vr[0], vr[2])
- ## vy = self.scalebarvalue(dr[1], dr[3], vr[1], vr[3])
- #### print dr, vr, vx, vy
- ## return vx, vy
- ##
- ## def scrollbar_callback(self, which, what, value):
- ## if which == 'y':
- ## if what == 'set':
- ## height = self.ted.WEGetHeight(0, 0x3fffffff)
- ## cur = self.getscrollbarvalues()[1]
- ## delta = (cur-value)*height/32767
- ## if what == '-':
- ## topline_off,dummy = self.ted.WEGetOffset((1,1))
- ## topline_num = self.ted.WEOffsetToLine(topline_off)
- ## delta = self.ted.WEGetHeight(topline_num, topline_num+1)
- ## elif what == '--':
- ## delta = (self.ted.WEGetViewRect()[3]-10)
- ## if delta <= 0:
- ## delta = 10 # Random value
- ## elif what == '+':
- ## # XXXX Wrong: should be bottom line size
- ## topline_off,dummy = self.ted.WEGetOffset((1,1))
- ## topline_num = self.ted.WEOffsetToLine(topline_off)
- ## delta = -self.ted.WEGetHeight(topline_num, topline_num+1)
- ## elif what == '++':
- ## delta = -(self.ted.WEGetViewRect()[3]-10)
- ## if delta >= 0:
- ## delta = -10
- ## self.ted.WEScroll(0, delta)
- #### print 'SCROLL Y', delta
- ## else:
- ## if what == 'set':
- ## return # XXXX
- ## vr = self.ted.WEGetViewRect()
- ## winwidth = vr[2]-vr[0]
- ## if what == '-':
- ## delta = winwidth/10
- ## elif what == '--':
- ## delta = winwidth/2
- ## elif what == '+':
- ## delta = -winwidth/10
- ## elif what == '++':
- ## delta = -winwidth/2
- ## self.ted.WEScroll(delta, 0)
- ## # Pin the scroll
- ## l, t, r, b = self.ted.WEGetDestRect()
- ## vl, vt, vr, vb = self.ted.WEGetViewRect()
- ## if t > 0 or l > 0:
- ## dx = dy = 0
- ## if t > 0: dy = -t
- ## if l > 0: dx = -l
- #### print 'Extra scroll', dx, dy
- ## self.ted.WEScroll(dx, dy)
- ## elif b < vb:
- #### print 'Extra downscroll', b-vb
- ## self.ted.WEScroll(0, b-vb)
def do_activate(self, onoff, evt):
- ## print "ACTIVATE", onoff
- Qd.SetPort(self.wid)
- Window.do_activate(self, onoff, evt)
if onoff:
self.ted.TXNFocus(1)
self.parent.active = self
- self.parent.updatemenubar()
else:
self.ted.TXNFocus(0)
def do_update(self, wid, event):
! Qd.SetPort(self.wid)
! ## region = wid.GetWindowPort().visRgn
! ## if Qd.EmptyRgn(region):
! ## return
! ## Qd.EraseRgn(region)
! self.ted.TXNUpdate()
! ## self.updatescrollbars()
! ## def do_postresize(self, width, height, window):
! ## l, t, r, b = self.ted.WEGetViewRect()
! ## vr = (l, t, l+width-15, t+height-15)
! ## self.ted.WESetViewRect(vr)
! ## self.wid.InvalWindowRect(vr)
! ## ScrolledWindow.do_postresize(self, width, height, window)
def do_contentclick(self, local, modifiers, evt):
- ## (what, message, when, where, modifiers) = evt
self.ted.TXNClick(evt)
- ## self.updatescrollbars()
self.parent.updatemenubar()
!
def do_char(self, ch, event):
self.ted.TXNKeyDown(event)
! ## self.ted.WESelView()
! ## (what, message, when, where, modifiers) = event
! ## self.ted.WEKey(ord(ch), modifiers)
! ## self.changed = 1
! ## self.updatescrollbars()
! ## self.parent.updatemenubar()
def close(self):
--- 37,68 ----
def do_idle(self, event):
self.ted.TXNIdle()
self.ted.TXNAdjustCursor(None)
def do_activate(self, onoff, evt):
if onoff:
+ ## self.ted.TXNActivate(self.frameid, 0)
self.ted.TXNFocus(1)
self.parent.active = self
else:
self.ted.TXNFocus(0)
+ self.parent.active = None
+ self.parent.updatemenubar()
def do_update(self, wid, event):
! self.ted.TXNDraw(None)
! def do_postresize(self, width, height, window):
! self.ted.TXNResizeFrame(width, height, self.frameid)
def do_contentclick(self, local, modifiers, evt):
self.ted.TXNClick(evt)
self.parent.updatemenubar()
!
def do_char(self, ch, event):
self.ted.TXNKeyDown(event)
! self.parent.updatemenubar()
def close(self):
***************
*** 164,168 ****
if self.parent.active == self:
self.parent.active = None
! ## self.parent.updatemenubar()
del self.ted
## del self.tedtexthandle
--- 75,79 ----
if self.parent.active == self:
self.parent.active = None
! self.ted.TXNDeleteObject()
del self.ted
## del self.tedtexthandle
***************
*** 173,177 ****
self.menu_save_as()
return # Will call us recursively
- print 'Saving to ', self.path
dhandle = self.ted.TXNGetData(0, 0x7fffffff)
data = dhandle.data
--- 84,87 ----
***************
*** 280,284 ****
self.editmenu = m = Menu(self.menubar, "Edit")
self.undoitem = MenuItem(m, "Undo", "Z", self.undo)
! self.redoitem = MenuItem(m, "Undo", None, self.redo)
self.cutitem = MenuItem(m, "Cut", "X", self.cut)
self.copyitem = MenuItem(m, "Copy", "C", self.copy)
--- 190,195 ----
self.editmenu = m = Menu(self.menubar, "Edit")
self.undoitem = MenuItem(m, "Undo", "Z", self.undo)
! self.redoitem = MenuItem(m, "Redo", None, self.redo)
! m.addseparator()
self.cutitem = MenuItem(m, "Cut", "X", self.cut)
self.copyitem = MenuItem(m, "Copy", "C", self.copy)
***************
*** 374,378 ****
name = "Untitled %d"%self.num
data = ''
! w = WasteWindow(self)
w.open(path, name, data)
self.num = self.num + 1
--- 285,289 ----
name = "Untitled %d"%self.num
data = ''
! w = MlteWindow(self)
w.open(path, name, data)
self.num = self.num + 1
- Previous message: [Python-checkins] CVS: python/dist/src/Lib/test test_parser.py,1.6.6.1,1.6.6.2 test_rfc822.py,1.9.6.1,1.9.6.2 test_urllib2.py,1.2.4.1,1.2.4.2
- Next message: [Python-checkins] CVS: python/dist/src/Mac/Modules/mlte Mltemodule.c,1.3,1.3.2.1 mltescan.py,1.3,1.3.2.1 mltesupport.py,1.3,1.3.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]