--- a/.hgtags Wed Jun 24 06:49:58 2015 +0200
+++ b/.hgtags Mon Aug 03 07:02:04 2015 +0100
@@ -55,6 +55,7 @@
c51c31744560d3a09300327d8b7e0ff66c8e404b stx_513
c7f5e10435e9430067dda4a9d86eb46ea6fe28cd expecco_2_6_0rc1
d1ef5de920b913395b5e986336306c866f2bd318 expecco_2_7_5
+d1ef5de920b913395b5e986336306c866f2bd318 expecco_2_7_5a
d2d772832f991835c77f5d74c55bf5e8c2fe1c02 stx_6_2_2
d4818ca736835b4bbf55caf33b7e6f91763a0ffd expecco_2_1_0
da507ebdf37d9511a63ac81d4816b3ae671e3d16 stable_expecco_sel
--- a/AbstractHierarchicalItem.st Wed Jun 24 06:49:58 2015 +0200
+++ b/AbstractHierarchicalItem.st Mon Aug 03 07:02:04 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1999/2015 by eXept Software AG
All Rights Reserved
@@ -704,10 +706,10 @@
].
children isArray ifTrue:[
children := children asOrderedCollection
- ].
-
- size == 0 ifTrue:[
- children := OrderedCollection new
+ ] ifFalse:[
+ size == 0 ifTrue:[
+ children := OrderedCollection new
+ ].
].
aList do:[:anItem| anItem parent:self ].
children addAll:aList beforeIndex:anIndex.
@@ -1910,10 +1912,10 @@
!AbstractHierarchicalItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/AbstractHierarchicalItem.st,v 1.5 2015-05-06 13:05:19 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/AbstractHierarchicalItem.st,v 1.5 2015-05-06 13:05:19 cg Exp $'
+ ^ '$Header$'
! !
--- a/DSVColumnView.st Wed Jun 24 06:49:58 2015 +0200
+++ b/DSVColumnView.st Mon Aug 03 07:02:04 2015 +0100
@@ -4600,7 +4600,7 @@
]
].
actionBlock notNil ifTrue:[
- actionBlock value:(self selectedRowIndex)
+ actionBlock valueWithOptionalArgument:(self selectedRowIndex)
]
!
@@ -4827,10 +4827,10 @@
!DSVColumnView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.303 2015-05-22 09:15:51 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.303 2015-05-22 09:15:51 cg Exp $'
+ ^ '$Header$'
! !
--- a/FilenameWidgetWithHistory.st Wed Jun 24 06:49:58 2015 +0200
+++ b/FilenameWidgetWithHistory.st Mon Aug 03 07:02:04 2015 +0100
@@ -133,10 +133,10 @@
^ history
!
-historyList:aList
+historyList:aCollection
"set the history - useful when two or more such fields shall share a common history"
- history := aList
+ self historyList value: aCollection
!
initialDirectoryHolder
@@ -161,6 +161,10 @@
!FilenameWidgetWithHistory methodsFor:'accessing-channels'!
+acceptChannel:aValueHolder
+ fileNameEntryField acceptChannel:aValueHolder.
+!
+
enableChannel:aValueHolder
fileNameEntryField enableChannel:aValueHolder.
browseButton enableChannel:aValueHolder.
@@ -284,7 +288,12 @@
|path |
Dialog modifyingBoxWith:[:box |
- box perform:#browsemenuItemVisibleHolder: with:true ifNotUnderstood:[].
+ |holder|
+
+ holder := box perform:#browsemenuItemVisibleHolder ifNotUnderstood:[nil].
+ holder notNil ifTrue:[
+ holder value:true
+ ]
] do:[
|title defaultPath defaultDir|
@@ -342,10 +351,10 @@
!FilenameWidgetWithHistory class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/FilenameWidgetWithHistory.st,v 1.23 2015-02-27 15:31:27 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/FilenameWidgetWithHistory.st,v 1.23 2015-02-27 15:31:27 cg Exp $'
+ ^ '$Header$'
! !
--- a/SelectionInListModelView.st Wed Jun 24 06:49:58 2015 +0200
+++ b/SelectionInListModelView.st Mon Aug 03 07:02:04 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1999 by eXept Software AG
All Rights Reserved
@@ -2247,7 +2249,9 @@
cachedMaxIdx := cachedLinesY size.
cachedMaxIdx == 0 ifTrue:[ ^ 0 ].
- y1 := cachedLinesY at:cachedMaxIdx.
+ "/ !!!! cachedLinesY at:cachedMaxIdx might return nil (async reorg)
+ y1 := cachedLinesY at:cachedMaxIdx ifAbsent:nil.
+ y1 isNil ifTrue:[^ 0 ]. "/ is under construction due ro async. events
(minimumEditorHeight notNil and:[openEditorAction notNil]) ifTrue:[
y0 := cachedLinesY at:(cachedMaxIdx - 1) ifAbsent:0.
@@ -2823,10 +2827,10 @@
!SelectionInListModelView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInListModelView.st,v 1.177 2015-02-01 13:14:45 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInListModelView.st,v 1.177 2015-02-01 13:14:45 cg Exp $'
+ ^ '$Header$'
! !
--- a/TerminalView.st Wed Jun 24 06:49:58 2015 +0200
+++ b/TerminalView.st Mon Aug 03 07:02:04 2015 +0100
@@ -429,7 +429,11 @@
!
lineBufferHistory:aCollection
- lineBufferHistory := OrderedCollection withAll:aCollection.
+ aCollection isNil ifTrue:[
+ lineBufferHistory := OrderedCollection new.
+ ] ifFalse:[
+ lineBufferHistory := OrderedCollection withAll:aCollection.
+ ].
lineBufferHistoryPosition := lineBufferHistory size + 1.
!
@@ -2504,11 +2508,11 @@
!TerminalView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.200 2015-05-31 09:32:07 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.200 2015-05-31 09:32:07 cg Exp $'
+ ^ '$Header$'
! !
--- a/VT100TerminalView.st Wed Jun 24 06:49:58 2015 +0200
+++ b/VT100TerminalView.st Mon Aug 03 07:02:04 2015 +0100
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libwidg2' }"
+"{ NameSpace: Smalltalk }"
+
TerminalView subclass:#VT100TerminalView
instanceVariableNames:'currentParam parameters lastCursorLine'
classVariableNames:'TraceCSI'
@@ -52,14 +54,17 @@
5 blink on
7 reverse video on
8 nondisplayed (invisible)
+
30 black foreground
- 31 red foreground
- 32 green foreground
- 33 yellow foreground
- 34 blue foreground
- 35 magenta foreground
- 36 cyan foreground
- 37 white foreground
+ 31 faint red foreground
+ 32 faint green foreground
+ 33 faint yellow foreground
+ 34 faint blue foreground
+ 35 faint magenta foreground
+ 36 faint cyan foreground
+ 37 faint white (grey) foreground
+ 39 reset to default foreground
+
40 black background
41 red background
42 green background
@@ -68,6 +73,25 @@
45 magenta background
46 cyan background
47 white background
+ 49 reset to default background
+
+ 90 grey foreground
+ 91 bright red foreground
+ 92 bright green foreground
+ 99 bright yellow foreground
+ 94 bright blue foreground
+ 95 bright magenta foreground
+ 96 bright cyan foreground
+ 97 bright white foreground
+
+ 100 grey background
+ 101 bright red background
+ 102 bright green background
+ 109 bright yellow background
+ 104 bright blue background
+ 105 bright magenta background
+ 106 bright cyan background
+ 107 bright white background
ESC[=#;7h or Put screen in indicated mode where # is
ESC[=h or 0 for 40 x 25 black & white
@@ -148,22 +172,22 @@
|rgb|
rgb := #(
- #( 0 0 0 ) "/ black
- #(170 0 0) "/ red
- #(0 170 0) "/ green
- #(170 85 0) "/ yellow
- #(0 0 170) "/ blue
- #(170 0 170) "/ magenta
- #(0 170 170 ) "/ cyan
- #(170 170 170) "/ white ).
+ #( 0 0 0 ) "/ black fg: ESC[30m / bg: ESC[40m
+ #(170 0 0) "/ dark red
+ #(0 170 0) "/ dark green
+ #(170 85 0) "/ dark yellow
+ #(0 0 170) "/ dark blue
+ #(170 0 170) "/ dark magenta
+ #(0 170 170 ) "/ dark cyan
+ #(170 170 170) "/ dark white eg. light grey).
- #( 85 85 85 ) "/ black - darkGray
- #(255 85 85) "/ red
- #(85 255 85) "/ green
- #(255 255 85) "/ yellow
- #(85 85 255) "/ blue
- #(255 85 255) "/ magenta
- #(85 255 255 ) "/ cyan
+ #( 85 85 85 ) "/ bright black eg. darkGray fg: ESC[90m / bg: ESC[100m
+ #(255 85 85) "/ bright red
+ #(85 255 85) "/ bright green
+ #(255 255 85) "/ bright yellow
+ #(85 85 255) "/ bright blue
+ #(255 85 255) "/ bright magenta
+ #(85 255 255 ) "/ bright cyan
#(255 255 255) "/ white
).
@@ -1272,10 +1296,10 @@
!VT100TerminalView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/VT100TerminalView.st,v 1.63 2014-04-03 14:35:07 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/VT100TerminalView.st,v 1.63 2014-04-03 14:35:07 cg Exp $'
+ ^ '$Header$'
! !
--- a/stx_libwidg2.st Wed Jun 24 06:49:58 2015 +0200
+++ b/stx_libwidg2.st Mon Aug 03 07:02:04 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2006 by eXept Software AG
All Rights Reserved
@@ -293,7 +295,7 @@
legalCopyright
"Return a copyright string which will appear in <lib>.rc"
- ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012'
+ ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012'
"Modified: / 18-07-2012 / 19:12:17 / cg"
!
@@ -307,11 +309,11 @@
!stx_libwidg2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/stx_libwidg2.st,v 1.53 2015-05-01 14:41:51 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/stx_libwidg2.st,v 1.53 2015-05-01 14:41:51 cg Exp $'
+ ^ '$Header$'
!
version_HG