--- a/ActiveHelp.st Fri Nov 18 21:09:18 2016 +0000
+++ b/ActiveHelp.st Thu Nov 24 06:40:55 2016 +0100
@@ -465,7 +465,7 @@
helpTextFor:aView at:aDevicePointOrNil
"retrieve helptext for aView as a string;
- walk along the views superView chain,
+ walk along the view's superView chain,
asking models and views encountered while walking.
The first one who understands and returns a nonNil answer to the
#helpTextFor:at: or #helpTextFor: message ends this search and the
--- a/AlignmentOrigin.st Fri Nov 18 21:09:18 2016 +0000
+++ b/AlignmentOrigin.st Thu Nov 24 06:40:55 2016 +0100
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
+
LayoutOrigin subclass:#AlignmentOrigin
instanceVariableNames:'leftAlignmentFraction topAlignmentFraction'
classVariableNames:''
@@ -294,7 +296,7 @@
rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
- given the superViews rectangle and the views preferredExtent."
+ given the superViews rectangle and the view's preferredExtent."
|x y prefRect|
@@ -341,6 +343,6 @@
!AlignmentOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/AlignmentOrigin.st,v 1.27 2014-05-07 22:07:49 cg Exp $'
+ ^ '$Header$'
! !
--- a/ApplicationModel.st Fri Nov 18 21:09:18 2016 +0000
+++ b/ApplicationModel.st Thu Nov 24 06:40:55 2016 +0100
@@ -15,8 +15,8 @@
Model subclass:#ApplicationModel
instanceVariableNames:'builder resources device masterApplication'
- classVariableNames:'DefaultLabels DefaultVisuals RecentlyOpenedApplications
- DefaultExtents'
+ classVariableNames:'DefaultExtents DefaultLabels DefaultVisuals
+ RecentlyOpenedApplications'
poolDictionaries:''
category:'Interface-Framework'
!
@@ -2461,7 +2461,7 @@
method, when the mouse pointer is moved over my widgets.
The default here is true, however, the #showHelp:for: methods are empty.
These should be redefined to put the help text into some info label,
- or into the views title bar.
+ or into the view's title bar.
You may also redefine the showingHelp/showingHelp: methods, to
remember the flag setting."
@@ -2475,34 +2475,36 @@
basicFlyByHelpTextForKey:aKey
"flyByHelp interface: return some short help text for a key.
key is the symbol associated with some widget or menu item.
- Return the original (english) text; needs to be translated as per language"
+ Return the original (english) text as written in the helpSpec;
+ needs to be translated as per language"
|helpSpecFromBindings helpText helpSpec "resourceArgs"|
helpSpecFromBindings := self aspectFor:#flyByHelpSpec.
helpSpecFromBindings notNil ifTrue:[
- helpText := helpSpecFromBindings at:aKey ifAbsent:nil.
+ helpText := helpSpecFromBindings at:aKey ifAbsent:nil.
] ifFalse:[
- helpSpecFromBindings := self aspectFor:#helpSpec.
- helpSpecFromBindings notNil ifTrue:[
- helpText := helpSpecFromBindings at:aKey ifAbsent:nil.
- ].
+ helpSpecFromBindings := self aspectFor:#helpSpec.
+ helpSpecFromBindings notNil ifTrue:[
+ helpText := helpSpecFromBindings at:aKey ifAbsent:nil.
+ ].
].
helpText isNil ifTrue:[
- helpSpec := self flyByHelpSpec.
- helpSpec notNil ifTrue:[
- helpText := helpSpec at:aKey ifAbsent:nil.
- ].
+ helpSpec := self flyByHelpSpec.
+ helpSpec notNil ifTrue:[
+ helpText := helpSpec at:aKey ifAbsent:nil.
+ ].
].
"/ new: allow for a collection (resource-key arg1 arg2...)
helpText isNonByteCollection ifTrue:[
- helpText := helpText first.
+ helpText := helpText first.
"/ resourceArgs := helpText copyFrom:2.
].
^ helpText
"Modified: / 27-01-2012 / 14:30:20 / cg"
+ "Modified (comment): / 17-11-2016 / 22:37:05 / cg"
!
basicHelpTextForKey:aKey
--- a/FlyByHelp.st Fri Nov 18 21:09:18 2016 +0000
+++ b/FlyByHelp.st Thu Nov 24 06:40:55 2016 +0100
@@ -366,7 +366,7 @@
showHelp:aHelpText for:view
"show the help text for aView"
- |wg applicationOrNil org p v dev helpTextShown textLines
+ |wg applicationOrNil org p v device helpTextShown textLines
helpViewWidth helpViewHeight usableWidth monitorBounds usableHeight
showTime cursorView|
@@ -379,8 +379,10 @@
].
].
+ device := view graphicsDevice.
+
"/ mouse still over that view?
- cursorView := view graphicsDevice viewFromPoint:(view graphicsDevice cursorPoint).
+ cursorView := device viewFromPoint:(device pointerPosition).
cursorView ~~ view ifTrue:[
Debugging ifTrue:[ 'mouse no longer in view' infoPrintCR ].
^ self
@@ -426,18 +428,17 @@
currentFrame := org extent:view extent.
org := org + (view extent // 2).
- dev := view graphicsDevice.
wg notNil ifTrue:[ applicationOrNil := wg application ].
- v := self activeHelpViewForApplication:applicationOrNil text:helpTextShown onDevice:dev.
+ v := self activeHelpViewForApplication:applicationOrNil text:helpTextShown onDevice:device.
v perform:#controllingHelpListener: with:self ifNotUnderstood:[].
helpViewWidth := v width.
helpViewHeight := v height.
- org := dev pointerPosition + (0@18"24").
- monitorBounds := dev monitorBoundsAt:org.
+ org := device pointerPosition + (0@18"24").
+ monitorBounds := device monitorBoundsAt:org.
usableWidth := monitorBounds width - 2.
- usableHeight := dev usableHeightAt:org.
+ usableHeight := device usableHeightAt:org.
helpViewWidth > usableWidth ifTrue:[v width:(helpViewWidth := usableWidth)].
helpViewHeight > usableHeight ifTrue:[v height:(helpViewHeight := usableHeight)].
@@ -478,7 +479,7 @@
].
"Modified: / 31-08-1995 / 19:20:45 / claus"
- "Modified: / 16-07-2010 / 14:33:13 / cg"
+ "Modified: / 17-11-2016 / 22:11:37 / cg"
!
stopHelpDisplayProcess
--- a/GIFReader.st Fri Nov 18 21:09:18 2016 +0000
+++ b/GIFReader.st Thu Nov 24 06:40:55 2016 +0100
@@ -593,7 +593,7 @@
(compressedData size < (index+count)) ifTrue:[
|t|
- t := ByteArray uninitializedNew:(index+count*3//2).
+ t := ByteArray uninitializedNew:((index+count)*3//2).
t replaceBytesFrom:1 to:index-1 with:compressedData startingAt:1.
compressedData := t.
].
@@ -659,8 +659,9 @@
tmp := nil.
].
- "Created: / 13.1.1998 / 10:44:05 / cg"
- "Modified: / 12.8.1998 / 13:55:32 / cg"
+ "Created: / 13-01-1998 / 10:44:05 / cg"
+ "Modified: / 12-08-1998 / 13:55:32 / cg"
+ "Modified (format): / 16-11-2016 / 23:07:20 / cg"
! !
!GIFReader methodsFor:'private-writing'!
--- a/Layout.st Fri Nov 18 21:09:18 2016 +0000
+++ b/Layout.st Thu Nov 24 06:40:55 2016 +0100
@@ -127,7 +127,7 @@
rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
- given the superViews rectangle and the views preferredExtent.
+ given the superViews rectangle and the view's preferredExtent.
Must be implemented by concrete subclasses."
^ self subclassResponsibility
--- a/LayoutFrame.st Fri Nov 18 21:09:18 2016 +0000
+++ b/LayoutFrame.st Thu Nov 24 06:40:55 2016 +0100
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
+
LayoutOrigin subclass:#LayoutFrame
instanceVariableNames:'rightFraction bottomFraction rightOffset bottomOffset'
classVariableNames:''
@@ -570,7 +572,7 @@
rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
- given the superViews rectangle and the views preferredExtent."
+ given the superViews rectangle and the view's preferredExtent."
|x1 y1 x2 y2 superWidth superHeight|
@@ -627,10 +629,10 @@
!LayoutFrame class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/LayoutFrame.st,v 1.43 2014-12-02 22:40:21 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview2/LayoutFrame.st,v 1.43 2014-12-02 22:40:21 cg Exp $'
+ ^ '$Header$'
! !
--- a/LayoutOrigin.st Fri Nov 18 21:09:18 2016 +0000
+++ b/LayoutOrigin.st Thu Nov 24 06:40:55 2016 +0100
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
+
Layout subclass:#LayoutOrigin
instanceVariableNames:'leftFraction topFraction leftOffset topOffset'
classVariableNames:''
@@ -374,7 +376,7 @@
rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
- given the superViews rectangle and the views preferredExtent."
+ given the superViews rectangle and the view's preferredExtent."
|x y prefRect|
@@ -413,10 +415,10 @@
!LayoutOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/LayoutOrigin.st,v 1.27 2014-05-08 00:29:33 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview2/LayoutOrigin.st,v 1.27 2014-05-08 00:29:33 cg Exp $'
+ ^ '$Header$'
! !
--- a/stx_libview2.st Fri Nov 18 21:09:18 2016 +0000
+++ b/stx_libview2.st Thu Nov 24 06:40:55 2016 +0100
@@ -1,6 +1,6 @@
"
- COPYRIGHT (c) 2006 by eXept Software AG
- All Rights Reserved
+ COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -24,8 +24,8 @@
copyright
"
- COPYRIGHT (c) 2006 by eXept Software AG
- All Rights Reserved
+ COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -398,7 +398,9 @@
companyName
"Return a companyname which will appear in <lib>.rc"
- ^ 'eXept Software AG'
+ ^ 'Claus Gittinger / eXept Software AG'
+
+ "Modified: / 18-11-2016 / 11:47:52 / cg"
!
description
@@ -410,9 +412,9 @@
legalCopyright
"Return copyright string which will appear in <lib>.rc"
- ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012'
+ ^ 'Copyright Claus Gittinger 1988\nCopyright eXept Software AG 2012'
- "Modified: / 18-07-2012 / 19:12:07 / cg"
+ "Modified: / 18-11-2016 / 12:19:10 / cg"
!
productName