--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Thu May 12 08:33:55 2016 +0200
@@ -0,0 +1,15 @@
+syntax: glob
+*.so
+*.H
+*.o
+*.STH
+*.sc
+*.class
+*Init.c
+*.base
+*.orig
+*.local
+*.other
+st.chg
+makefile
+smallsense/makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgpostmerge.sh Thu May 12 08:33:55 2016 +0200
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# A simple script that has to be run after hg merge due to
+# missing renames in history
+#
+#
+
+MY_BRANCH=$(hg branch)
+BAD_FILES=$(ls Tools_[A-Z]*.st)
+LAST_MERGE_REV=$(hg log -r "children(ancestor(default, $MY_BRANCH)) and merge() and branch($MY_BRANCH)" --template "{node|short}\n")
+LAST_MERGED_REV=$(hg log -r $LAST_MERGE_REV --template "{parents}" | cut -d ' ' -f 2 | cut -d ':' -f 2)
+
+echo "Last merge with default was $LAST_MERGE_REV"
+echo "Last merged default was $LAST_MERGED_REV:"
+hg log -r $LAST_MERGED_REV
+
+for bad_file in $BAD_FILES; do
+ good_file=$(echo $bad_file | sed -e 's/_/__/g')
+ echo "Fixing $bad_file -> $good_file"
+ default_last_change_rev=$(hg log -b default $bad_file -l 1 --template "{node|short}\n")
+ if [ "$default_last_change_rev" != "$LAST_MERGED_REV" ]; then
+ echo " Changed since last merge (latest is $default_last_change_rev)"
+ cp $good_file $good_file.orig
+ cp $good_file $good_file.local
+ hg cat -r "$default_last_change_rev" "$bad_file" > "$good_file.other"
+ hg cat -r "$LAST_MERGED_REV" "$bad_file" > "$good_file.base"
+ hg resolve --unmark "$good_file"
+ fi
+done
\ No newline at end of file
--- a/AbstractRevisionItem.st Wed May 11 01:38:56 2016 +0200
+++ b/AbstractRevisionItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
AbstractVersionDiffBrowserItem subclass:#AbstractRevisionItem
instanceVariableNames:'revision'
@@ -73,12 +74,14 @@
revision
"return the value of the instance variable 'revision' (automatically generated)"
- ^ revision!
+ ^ revision
+!
revision:something
"set the value of the instance variable 'revision' (automatically generated)"
- revision := something.!
+ revision := something.
+!
revisionString
"return the value of the instance variable 'revision' (automatically generated)"
@@ -147,5 +150,15 @@
!AbstractRevisionItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractRevisionItem.st,v 1.5 2000-02-18 14:10:15 cg Exp $'
+ ^ '$Id: AbstractRevisionItem.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: AbstractRevisionItem.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/AbstractSettingsApplication.st Wed May 11 01:38:56 2016 +0200
+++ b/AbstractSettingsApplication.st Thu May 12 08:33:55 2016 +0200
@@ -13677,6 +13677,38 @@
^ #('primitive code only' 'never')
! !
+!AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'help specs'!
+
+helpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:AbstractSettingsApplication::STCCompilerSettingsAppl
+ "
+
+ <resource: #help>
+
+ ^ super helpSpec addPairsFrom:#(
+
+#ccOptions
+'Additional flags to pass to the C compiler when compiling a module. In most cases this can be left empty.'
+
+#ccOptionsBuiltin
+'These options are always passed to the C compiler.'
+
+#stcIncludes
+'Extra C compiler include directories where to search for header files.\This may be left empty, but if you use some third-party C library in your inline C code, you may want to add some extra directories here.'
+
+#stcIncludesBuiltin
+'Builtin C compiler include directories that are always used.'
+
+)
+! !
+
!AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'image specs'!
defaultIcon
@@ -13807,10 +13839,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'STC Compiler Settings'
name: 'STC Compiler Settings'
@@ -13818,7 +13850,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 600 602)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -13848,7 +13880,7 @@
adjust: left
)
)
-
+
)
extent: (Point 600 90)
)
@@ -13868,6 +13900,7 @@
label: 'PopUp List'
name: 'StcCompilation'
layout: (LayoutFrame 241 0 0 0 -5 1 22 0)
+ translateLabel: true
tabable: true
model: stcCompilationSelection
enableChannel: canLoadBinaries
@@ -13875,7 +13908,7 @@
useIndex: true
)
)
-
+
)
extent: (Point 600 29)
)
@@ -13903,7 +13936,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -13931,7 +13964,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -13950,13 +13983,14 @@
(CheckToggleSpec
name: 'CheckToggle1'
layout: (LayoutOrigin 203 0 4 0)
+ translateLabel: true
model: stcKeepCIntermediate
isTriggerOnDown: true
showLamp: false
lampColor: (Color 100.0 100.0 0.0)
)
)
-
+
)
extent: (Point 600 30)
)
@@ -13984,25 +14018,58 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
(ViewSpec
- name: 'CCOptionsBox4'
+ name: 'CCOptionsBox1'
component:
(SpecCollection
collection: (
(LabelSpec
- label: 'CC Options:'
+ label: 'Built-in C flags:'
+ name: 'Label18'
+ layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+ activeHelpKey: ccOptionsBuiltin
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField13'
+ layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+ activeHelpKey: ccOptionsBuiltin
+ initiallyDisabled: true
+ enableChannel: canLoadBinaries
+ model: ccOptionsBuiltin
+ acceptOnLeave: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ extent: (Point 600 29)
+ )
+ (ViewSpec
+ name: 'CCOptionsBox2'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'C flags:'
name: 'Label4'
layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+ activeHelpKey: ccOptions
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'EntryField4'
layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+ activeHelpKey: ccOptions
enableChannel: canLoadBinaries
model: ccOptions
acceptOnLeave: true
@@ -14012,12 +14079,43 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
(ViewSpec
- name: 'IncludeDirectoriesBox5'
+ name: 'CCIncludeDirectoriesBox2'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Builtin Include Directories:'
+ name: 'Label19'
+ layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+ activeHelpKey: stcIncludesBuiltin
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField14'
+ layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+ activeHelpKey: stcIncludesBuiltin
+ initiallyDisabled: true
+ enableChannel: canLoadBinaries
+ model: stcIncludesBuiltin
+ acceptOnLeave: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ extent: (Point 600 29)
+ )
+ (ViewSpec
+ name: 'CCIncludeDirectoriesBox2'
component:
(SpecCollection
collection: (
@@ -14025,12 +14123,14 @@
label: 'Include Directories:'
name: 'Label5'
layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+ activeHelpKey: stcIncludes
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'EntryField5'
layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+ activeHelpKey: stcIncludes
enableChannel: canLoadBinaries
model: stcIncludes
acceptOnLeave: true
@@ -14040,7 +14140,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14068,7 +14168,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14096,7 +14196,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14124,7 +14224,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14152,7 +14252,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14180,7 +14280,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14208,7 +14308,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14235,7 +14335,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14258,6 +14358,7 @@
(PopUpListSpec
name: 'PopUpList1'
layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+ translateLabel: true
tabable: true
model: supportedCCompilerSelection
menu: supportedCCompilerList
@@ -14265,7 +14366,7 @@
stateChangeCallBackSelector: supportedCCompilerSelectionChanged
)
)
-
+
)
extent: (Point 600 29)
)
@@ -14284,22 +14385,23 @@
(CheckToggleSpec
name: 'CheckToggle2'
layout: (LayoutOrigin 203 0 4 0)
+ translateLabel: true
model: verbose
isTriggerOnDown: true
showLamp: false
lampColor: (Color 100.0 100.0 0.0)
)
)
-
+
)
extent: (Point 600 30)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -14386,23 +14488,32 @@
!
setupForGCC
+ | stcPath |
self cc value:'gcc'.
- ExternalAddress pointerSize == 4 ifTrue:[
- self ccOptions value:'-m32'.
- self linkArgs value:'-m32'.
- self linkSharedArgs value:'-shared -m32'.
- ] ifFalse:[
- self ccOptions value:'-m64 -FPIC'.
- self linkArgs value:'-m64'.
- self linkSharedArgs value:'-shared -m64'.
- ].
- self stcIncludes value:'-I..\..\include -I/usr/include/freetype2'.
+ self linkSharedArgs value:'-shared'.
+
+ stcPath := self stc value asFilename.
+ (stcPath exists not and:[ stcPath isAbsolute ]) ifTrue:[
+ stcPath := OperatingSystem pathOfCommand:'stc'.
+ ].
+ (stcPath exists and:[stcPath isExecutable]) ifTrue:[
+ | stcInclude |
+
+ stcInclude := stcPath directory / 'include'.
+ stcInclude isDictionary ifTrue:[
+ self stcIncludes value:'-I', stcInclude pathName.
+ ].
+ ].
+
+
self linkCommand value:'gcc'.
self stcLibraries value:''.
self makeCommand value:'make'.
self updateModifiedChannel.
self supportedCCompilerSelection value:0
+
+ "Modified: / 05-12-2015 / 07:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
setupForMINGW
@@ -14508,6 +14619,12 @@
^ ccOptions.
!
+ccOptionsBuiltin
+ ^ STCCompilerInterface builtinCFlags
+
+ "Created: / 09-12-2015 / 09:54:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
enableStcLibraryPath
^ (ObjectFileLoader libPath notNil and:[self canLoadBinaries])
@@ -14595,6 +14712,12 @@
^ stcIncludes.
!
+stcIncludesBuiltin
+ ^ STCCompilerInterface builtinCIncludeDirectories
+
+ "Modified: / 09-12-2015 / 17:08:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
stcKeepCIntermediate
stcKeepCIntermediate isNil ifTrue:[
stcKeepCIntermediate := false asValue.
@@ -20952,5 +21075,10 @@
version_CVS
^ '$Header$'
-! !
-
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- a/AbstractSourceCodeManagementSettingsAppl.st Wed May 11 01:38:56 2016 +0200
+++ b/AbstractSourceCodeManagementSettingsAppl.st Thu May 12 08:33:55 2016 +0200
@@ -252,6 +252,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/AbstractVersionDiffBrowserItem.st Wed May 11 01:38:56 2016 +0200
+++ b/AbstractVersionDiffBrowserItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
HierarchicalItem subclass:#AbstractVersionDiffBrowserItem
instanceVariableNames:''
@@ -154,5 +155,15 @@
!AbstractVersionDiffBrowserItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractVersionDiffBrowserItem.st,v 1.5 2000-02-18 14:09:49 cg Exp $'
+ ^ '$Id: AbstractVersionDiffBrowserItem.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: AbstractVersionDiffBrowserItem.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/ApplicationBuilder.st Wed May 11 01:38:56 2016 +0200
+++ b/ApplicationBuilder.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
ToolApplicationModel subclass:#ApplicationBuilder
instanceVariableNames:'task shellView aspects'
classVariableNames:''
@@ -1389,5 +1391,14 @@
version
^ '$Header: /cvs/stx/stx/libtool/ApplicationBuilder.st,v 1.10 2013-07-30 05:57:02 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: ApplicationBuilder.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
--- a/BookmarkAddMenuBuilder.st Wed May 11 01:38:56 2016 +0200
+++ b/BookmarkAddMenuBuilder.st Thu May 12 08:33:55 2016 +0200
@@ -107,6 +107,11 @@
^ '$Header: /cvs/stx/stx/libtool/BookmarkAddMenuBuilder.st,v 1.3 2013-08-31 17:41:47 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: BookmarkAddMenuBuilder.st,v 1.3 2013-08-31 17:41:47 cg Exp $'
! !
--- a/BookmarkEditor.st Wed May 11 01:38:56 2016 +0200
+++ b/BookmarkEditor.st Thu May 12 08:33:55 2016 +0200
@@ -65,9 +65,15 @@
!BookmarkEditor class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/BookmarkEditor.st,v 1.2 2011-07-03 18:00:45 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/BookmarkEditor.st,v 1.2 2011/07/03 18:00:45 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id'
+ ^ '$Id: BookmarkEditor.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/BookmarkToolbarMenuBuilder.st Wed May 11 01:38:56 2016 +0200
+++ b/BookmarkToolbarMenuBuilder.st Thu May 12 08:33:55 2016 +0200
@@ -85,9 +85,15 @@
!BookmarkToolbarMenuBuilder class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/BookmarkToolbarMenuBuilder.st,v 1.2 2011-07-03 18:01:01 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/BookmarkToolbarMenuBuilder.st,v 1.2 2011/07/03 18:01:01 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id'
+ ^ '$Id: BookmarkToolbarMenuBuilder.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/BookmarkVisitor.st Wed May 11 01:38:56 2016 +0200
+++ b/BookmarkVisitor.st Thu May 12 08:33:55 2016 +0200
@@ -131,9 +131,15 @@
!BookmarkVisitor class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/BookmarkVisitor.st,v 1.2 2011-07-03 18:00:43 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/BookmarkVisitor.st,v 1.2 2011/07/03 18:00:43 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id'
+ ^ '$Id: BookmarkVisitor.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/BookmarksEditDialog.st Wed May 11 01:38:56 2016 +0200
+++ b/BookmarksEditDialog.st Thu May 12 08:33:55 2016 +0200
@@ -645,9 +645,19 @@
!BookmarksEditDialog class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/BookmarksEditDialog.st,v 1.10 2011-01-17 12:06:37 cg Exp $'
+ ^ '$Id: BookmarksEditDialog.st 7854 2012-01-30 17:49:41Z vranyj1 $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/BookmarksEditDialog.st,v 1.10 2011-01-17 12:06:37 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/BookmarksEditDialog.st,v 1.10 2011/01/17 12:06:37 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: BookmarksEditDialog.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/ClassItem.st Wed May 11 01:38:56 2016 +0200
+++ b/ClassItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
AbstractVersionDiffBrowserItem subclass:#ClassItem
instanceVariableNames:'myClass isRegistered revisonColl revisionInfo'
@@ -80,12 +81,14 @@
myClass
"return the value of the instance variable 'myClass' (automatically generated)"
- ^ myClass!
+ ^ myClass
+!
myClass:something
"set the value of the instance variable 'myClass' (automatically generated)"
- myClass := something.!
+ myClass := something.
+!
needsChildren
"return the value of the instance variable 'isRegistered' (automatically generated)"
@@ -96,12 +99,14 @@
revisonColl
"return the value of the instance variable 'revisonColl' (automatically generated)"
- ^ revisonColl!
+ ^ revisonColl
+!
revisonColl:something
"set the value of the instance variable 'revisonColl' (automatically generated)"
- revisonColl := something.! !
+ revisonColl := something.
+! !
!ClassItem methodsFor:'initialization'!
@@ -262,5 +267,11 @@
!ClassItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ClassItem.st,v 1.8 2000-02-18 14:09:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ClassItem.st,v 1.8 2000/02/18 14:09:35 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/ClassItemRoot.st Wed May 11 01:38:56 2016 +0200
+++ b/ClassItemRoot.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
AbstractVersionDiffBrowserItem subclass:#ClassItemRoot
instanceVariableNames:''
@@ -134,5 +135,15 @@
!ClassItemRoot class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ClassItemRoot.st,v 1.6 2000-02-18 14:09:21 cg Exp $'
+ ^ '$Id: ClassItemRoot.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: ClassItemRoot.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/ClassItemRootForRevision.st Wed May 11 01:38:56 2016 +0200
+++ b/ClassItemRootForRevision.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
ClassItemRoot subclass:#ClassItemRootForRevision
instanceVariableNames:''
@@ -92,5 +93,11 @@
!ClassItemRootForRevision class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ClassItemRootForRevision.st,v 1.3 2000-02-18 14:09:10 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ClassItemRootForRevision.st,v 1.3 2000/02/18 14:09:10 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/ClassNameItem.st Wed May 11 01:38:56 2016 +0200
+++ b/ClassNameItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
HierarchicalItem subclass:#ClassNameItem
instanceVariableNames:'revisionInfo'
@@ -76,7 +77,8 @@
@@@@@@@@@@@@@@@C@0@B@@DA@P@D@ PBA@HD@ P@@@LC@@H@@@DA@@HD@ PBA@HD@ @@@0L@@ @E@@D@A@HD@@@@@@HD@@@C@0@B@@@E@@@BA@H@@ P@A@H@
@@LC@@H@@@@E@@PBA@HD@ PBA@@@@0L@@ @@@@@@@ PBA@HD@ PB@@@C@0@B@@P@@@@D@ PBA@HD@ P@@@LC@@H@@ P@@@@@@@@@@@@@@@@@@0L@@ @D@ @@
@@@@@@@@@@@@@@@C@0@B@@HD@ PBA@HD@@H@@@@@@@LC@@H@A@HD@ PBA@H@@ @@@@@@@0L@@ @@@@@@@@@@@@@B@@@@@@@C@0@B@ HB@ HB@ HB@ H@@@@@
-@@@C@@HB@ HB@ HB@ HB@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[0 0 0 119 124 119 248 252 0 119 124 0 168 168 168 248 252 248]; mask:((Depth1Image new) width: 20; height: 20; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'??>O??>O??>O??>O??????????????????????????????????????>O??>O??>O??>O??>O_?>OO?>O') ; yourself); yourself]! !
+@@@C@@HB@ HB@ HB@ HB@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[0 0 0 119 124 119 248 252 0 119 124 0 168 168 168 248 252 248]; mask:((Depth1Image new) width: 20; height: 20; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'??>O??>O??>O??>O??????????????????????????????????????>O??>O??>O??>O??>O_?>OO?>O') ; yourself); yourself]
+! !
!ClassNameItem methodsFor:'accessing'!
@@ -90,12 +92,14 @@
revisionInfo
"return the value of the instance variable 'revisionInfo' (automatically generated)"
- ^ revisionInfo!
+ ^ revisionInfo
+!
revisionInfo:something
"set the value of the instance variable 'revisionInfo' (automatically generated)"
- revisionInfo := something.! !
+ revisionInfo := something.
+! !
!ClassNameItem methodsFor:'protocol'!
@@ -158,5 +162,11 @@
!ClassNameItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ClassNameItem.st,v 1.3 2000-02-18 14:08:58 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ClassNameItem.st,v 1.3 2000/02/18 14:08:58 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/ClassRevisionTree.st Wed May 11 01:38:56 2016 +0200
+++ b/ClassRevisionTree.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
ApplicationModel subclass:#ClassRevisionTree
instanceVariableNames:'selectionHolder dataHolder menuBlock selectionBlock listView
@@ -292,12 +293,14 @@
listView
"return the value of the instance variable 'listView' (automatically generated)"
- ^ listView!
+ ^ listView
+!
listView:something
"set the value of the instance variable 'listView' (automatically generated)"
- listView := something.! !
+ listView := something.
+! !
!ClassRevisionTree methodsFor:'actions'!
@@ -410,17 +413,20 @@
menuBlock:something
"set the value of the instance variable 'menuBlock' (automatically generated)"
- menuBlock := something.!
+ menuBlock := something.
+!
selectionBlock
"return the value of the instance variable 'selectionBlock' (automatically generated)"
- ^ selectionBlock!
+ ^ selectionBlock
+!
selectionBlock:something
"set the value of the instance variable 'selectionBlock' (automatically generated)"
- selectionBlock := something.!
+ selectionBlock := something.
+!
selectionHolder
@@ -470,5 +476,11 @@
!ClassRevisionTree class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ClassRevisionTree.st,v 1.9 2000-02-18 14:08:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ClassRevisionTree.st,v 1.9 2000/02/18 14:08:48 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/ClassVariablesInspectorView.st Wed May 11 01:38:56 2016 +0200
+++ b/ClassVariablesInspectorView.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
SmalltalkInspectorView subclass:#ClassVariablesInspectorView
instanceVariableNames:''
@@ -63,5 +64,11 @@
!ClassVariablesInspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ClassVariablesInspectorView.st,v 1.2 2006-01-30 18:17:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ClassVariablesInspectorView.st,v 1.2 2006/01/30 18:17:56 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/CodeGeneratorTests.st Wed May 11 01:38:56 2016 +0200
+++ b/CodeGeneratorTests.st Thu May 12 08:33:55 2016 +0200
@@ -25,6 +25,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
TestCase subclass:#CodeGeneratorTests
instanceVariableNames:'cg'
classVariableNames:''
--- a/CodeGeneratorTool.st Wed May 11 01:38:56 2016 +0200
+++ b/CodeGeneratorTool.st Thu May 12 08:33:55 2016 +0200
@@ -837,9 +837,15 @@
canUseRefactoringSupport
"check if refactory browser stuff is avaliable"
- ^ RefactoryChangeManager notNil
- and:[RefactoryChangeManager isLoaded
- and:[UserPreferences current useRefactoringSupport]]
+ ^ (Smalltalk at: #'stx_goodies_refactoryBrowser_changes') notNil
+ and:[ (Smalltalk at: #'stx_goodies_refactoryBrowser_browser') notNil
+ and:[ UserPreferences current useRefactoringSupport ] ]
+
+ "
+ CodeGeneratorTool canUseRefactoringSupport
+ "
+
+ "Modified: / 13-02-2016 / 15:05:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
methodNameTemplateFor:aSelector
@@ -1834,5 +1840,10 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- a/ColorInspectorView.st Wed May 11 01:38:56 2016 +0200
+++ b/ColorInspectorView.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
InspectorView subclass:#ColorInspectorView
instanceVariableNames:'colorView'
classVariableNames:''
@@ -126,5 +128,15 @@
!ColorInspectorView class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/ColorInspectorView.st,v 1.14 2011-07-05 12:04:32 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/ColorInspectorView.st,v 1.14 2011/07/05 12:04:32 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: ColorInspectorView.st 7944 2012-03-19 15:32:45Z vranyj1 $'
! !
+
--- a/DebugView.st Wed May 11 01:38:56 2016 +0200
+++ b/DebugView.st Thu May 12 08:33:55 2016 +0200
@@ -2715,6 +2715,7 @@
"Created: / 16.11.2001 / 17:36:18 / cg"
! !
+
!DebugView methodsFor:'help'!
flyByHelpDependsOnPositionIn:aView
@@ -9439,7 +9440,7 @@
printConditionOn:aStream
ignoredSendingClassAndSelectors notEmptyOrNil ifTrue:[
- aStream nextPutAll:(' if called from %1 %2'
+ aStream nextPutAll:(' if called from %1 %2'
bindWith:ignoredSendingClassAndSelectors first first
with:ignoredSendingClassAndSelectors first second).
^ self.
@@ -9738,6 +9739,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Diff.st Wed May 11 01:38:56 2016 +0200
+++ b/Diff.st Thu May 12 08:33:55 2016 +0200
@@ -1245,6 +1245,11 @@
^ '$Header: /cvs/stx/stx/libtool/Diff.st,v 1.4 2013-04-19 09:39:05 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ 'Id: Diff.st 7567 2010-04-17 10:59:53Z vranyj1 '
! !
--- a/DiffCodeView.st Wed May 11 01:38:56 2016 +0200
+++ b/DiffCodeView.st Thu May 12 08:33:55 2016 +0200
@@ -47,6 +47,7 @@
"
! !
+
!DiffCodeView class methodsFor:'defaults'!
textViewClass
@@ -56,6 +57,7 @@
^ CodeView
! !
+
!DiffCodeView methodsFor:'initialization'!
initialize
@@ -75,9 +77,19 @@
(textViews at:2) acceptAction:aOneArgBlock
! !
+
!DiffCodeView class methodsFor:'documentation'!
version
^ '$Header: /cvs/stx/stx/libtool/DiffCodeView.st,v 1.2 2013-04-14 18:10:35 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: DiffCodeView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
--- a/EWorldIconLibrary.st Wed May 11 01:38:56 2016 +0200
+++ b/EWorldIconLibrary.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
XPToolbarIconLibrary subclass:#EWorldIconLibrary
instanceVariableNames:''
classVariableNames:''
--- a/EditFieldWithCompletionSpec.st Wed May 11 01:38:56 2016 +0200
+++ b/EditFieldWithCompletionSpec.st Thu May 12 08:33:55 2016 +0200
@@ -68,9 +68,15 @@
!EditFieldWithCompletionSpec class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/EditFieldWithCompletionSpec.st,v 1.1 2011-07-01 13:30:32 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/EditFieldWithCompletionSpec.st,v 1.1 2011/07/01 13:30:32 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: EditFieldWithCompletionSpec.st 7567 2010-04-17 10:59:53Z vranyj1 '
+ ^ '$Id: EditFieldWithCompletionSpec.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/ExpandableRevisionItem.st Wed May 11 01:38:56 2016 +0200
+++ b/ExpandableRevisionItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
AbstractRevisionItem subclass:#ExpandableRevisionItem
instanceVariableNames:''
@@ -104,5 +105,11 @@
!ExpandableRevisionItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ExpandableRevisionItem.st,v 1.5 2000-02-18 14:08:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ExpandableRevisionItem.st,v 1.5 2000/02/18 14:08:35 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/FileBrowserV2PanelView.st Wed May 11 01:38:56 2016 +0200
+++ b/FileBrowserV2PanelView.st Thu May 12 08:33:55 2016 +0200
@@ -8,10 +8,7 @@
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
-
-
"
-
"{ Package: 'stx:libtool' }"
VariablePanel subclass:#FileBrowserV2PanelView
@@ -192,5 +189,15 @@
!FileBrowserV2PanelView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2PanelView.st,v 1.4 2004-08-04 17:59:43 cg Exp $'
+ ^ '$Id: FileBrowserV2PanelView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: FileBrowserV2PanelView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/FileBrowserV2Tests.st Wed May 11 01:38:56 2016 +0200
+++ b/FileBrowserV2Tests.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
TestCase subclass:#FileBrowserV2Tests
instanceVariableNames:''
@@ -184,5 +185,11 @@
!FileBrowserV2Tests class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2Tests.st,v 1.9 2003-10-02 12:22:11 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2Tests.st,v 1.9 2003/10/02 12:22:11 penk Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/FileBrowserV2UISpecifications.st Wed May 11 01:38:56 2016 +0200
+++ b/FileBrowserV2UISpecifications.st Thu May 12 08:33:55 2016 +0200
@@ -649,5 +649,14 @@
version
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: FileBrowserV2UISpecifications.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/FileBrowserV3.st Thu May 12 08:33:55 2016 +0200
@@ -0,0 +1,875 @@
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+"{ Package: 'stx:libtool' }"
+
+FileBrowserV2 subclass:#FileBrowserV3
+ instanceVariableNames:'bookmarkBarVisibleHolder bookmarkHolder'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Interface-Tools-File'
+!
+
+!FileBrowserV3 class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+! !
+
+!FileBrowserV3 class methodsFor:'help specs'!
+
+helpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:FileBrowserV3
+ "
+
+ <resource: #help>
+
+ ^ super helpSpec addPairsFrom:#(
+
+#copyFile
+''
+
+#cutFile
+''
+
+#deleteFile
+''
+
+#editFile
+''
+
+#fileGotoBookmark
+''
+
+#fileHistory
+''
+
+#fileIn
+''
+
+#pasteFile
+''
+
+)
+! !
+
+!FileBrowserV3 class methodsFor:'interface specs'!
+
+windowSpec
+ "This resource specification was automatically generated
+ by the UIPainter of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIPainter may not be able to read the specification."
+
+ "
+ UIPainter new openOnClass:FileBrowserV3 andSelector:#windowSpec
+ FileBrowserV3 new openInterface:#windowSpec
+ FileBrowserV3 open
+ "
+
+ <resource: #canvas>
+
+ ^
+ #(FullSpec
+ name: windowSpec
+ window:
+ (WindowSpec
+ label: FileBrowser
+ name: FileBrowser
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 800 600)
+ menu: mainMenu
+ icon: defaultIcon
+ )
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'ToolbarBox'
+ layout: (LayoutFrame 0 0 0 0 0 1 40 0)
+ level: 0
+ visibilityChannel: toolBarVisibleHolder
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'hideToolBarIcon'
+ name: 'HideToolBarButton'
+ layout: (LayoutFrame 0 0 0 0 13 0 40 0)
+ activeHelpKey: hideToolBar
+ hasCharacterOrientedLabel: false
+ translateLabel: true
+ model: hideToolbar
+ postBuildCallback: hideToolBarButtonCreated:
+ )
+ (MenuPanelSpec
+ name: 'ToolBar'
+ layout: (LayoutFrame 13 0 0 0 0 1 40 0)
+ level: 1
+ menu: toolBarMainMenu
+ textDefault: true
+ )
+ )
+
+ )
+ )
+ (ViewSpec
+ name: 'BookmarkBar'
+ layout: (LayoutFrame 0 0 40 0 0 1 66 0)
+ visibilityChannel: bookmarkBarVisibleHolder
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'hideToolBarIcon'
+ name: 'Button1'
+ layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+ activeHelpKey: hideToolBar
+ hasCharacterOrientedLabel: false
+ translateLabel: true
+ model: hideBookmarkBar
+ )
+ (SubCanvasSpec
+ name: 'Bookmarks'
+ layout: (LayoutFrame 13 0 0 0 0 1 0 1)
+ level: 1
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ miniScrollerHorizontal: false
+ majorKey: BookmarkBar
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: bookmarkHolder
+ aspect: bookmarkHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: bookmarksHolder
+ aspect: bookmarkListHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ )
+ )
+
+ )
+ )
+ (ViewSpec
+ name: 'FilenameEntryFieldBox'
+ layout: (LayoutFrame 0 0 67 0 0 1 92 0)
+ level: 0
+ visibilityChannel: filenameEntryFieldVisibleHolder
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'hideFilenameEntryFieldIcon'
+ name: 'HideFilenameEntryFieldButton'
+ layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+ activeHelpKey: hideFilenameEntryField
+ hasCharacterOrientedLabel: false
+ translateLabel: true
+ model: hideFilenameEntryField
+ postBuildCallback: hideFilenameEntryFieldButtonCreated:
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
+ level: 1
+ horizontalLayout: leftFit
+ verticalLayout: fit
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ComboListSpec
+ name: 'ComboList1'
+ visibilityChannel: driveSelectorVisible
+ model: selectedDeviceDrive
+ comboList: listOfDeviceDrives
+ useIndex: false
+ hidePullDownMenuButton: false
+ extent: (Point 53 23)
+ )
+ (VariableHorizontalPanelSpec
+ name: 'VariableHorizontalPanel1'
+ level: 0
+ showHandle: true
+ component:
+ (SpecCollection
+ collection: (
+ (NonScrollableArbitraryComponentSpec
+ name: 'NonScrollableArbitraryComponent1'
+ component: FilenameEditFieldV2
+ postBuildCallback: postBuildEditField:
+ )
+ (ViewSpec
+ name: 'FilterBox'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Filter:'
+ name: 'Filter'
+ layout: (LayoutFrame 0 0 0 0 40 0 0 1)
+ translateLabel: true
+ adjust: left
+ postBuildCallback: postBuildPathViewBox:
+ )
+ (ComboBoxSpec
+ name: 'FilterSelectionBox'
+ layout: (LayoutFrame 40 0 0 0 0 1 0 1)
+ model: filterModel
+ immediateAccept: true
+ acceptOnPointerLeave: false
+ comboList: filterListModel
+ )
+ )
+
+ )
+ postBuildCallback: postBuildPathViewBox:
+ )
+ )
+
+ )
+ handles: (Any 0.774936 1.0)
+ postBuildCallback: postBuildPathViewBox:
+ useDefaultExtent: true
+ )
+ )
+
+ )
+ postBuildCallback: postBuildPathViewBox:
+ )
+ )
+
+ )
+ )
+ (#'FileBrowserV2UISpecifications::PanelSpec'
+ name: 'BrowserBox'
+ layout: (LayoutFrame 0 0.0 92 0.0 0 1.0 -26 1.0)
+ level: 0
+ showHandle: true
+ snapMode: both
+ whichView: last
+ orientation: vertical
+ visibility: viewNoteBookApplicationHolder
+ component:
+ (SpecCollection
+ collection: (
+ (#'FileBrowserV2UISpecifications::PanelSpec'
+ name: 'HorizontalPanel'
+ level: 0
+ snapMode: both
+ whichView: first
+ orientation: horizontal
+ visibility: showDirectoryTree
+ component:
+ (SpecCollection
+ collection: (
+ (SubCanvasSpec
+ name: 'DirectoryTreeBrowser'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: DirectoryTreeBrowser
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: postBuildDirectoryTree:
+ )
+ (SubCanvasSpec
+ name: 'DirectoryContentsBrowser'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: DirectoryContentsBrowser
+ createNewApplication: true
+ createNewBuilder: true
+ )
+ )
+
+ )
+ handles: (Any 0.225 1.0)
+ )
+ (SubCanvasSpec
+ name: 'FileApplicationNoteBook'
+ tabable: false
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: FileApplicationNoteBook
+ createNewApplication: true
+ createNewBuilder: true
+ )
+ )
+
+ )
+ handles: (Any 0.5 1.0)
+ )
+ (ViewSpec
+ name: 'InfoBox'
+ layout: (LayoutFrame 0 0 -26 1 0 1 0 1)
+ level: 0
+ visibilityChannel: infoBarVisibleHolder
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'NotifyLabel'
+ name: 'NotifyLabel'
+ layout: (LayoutFrame 0 0 1 0.0 -220 1 1 1.0)
+ level: -1
+ translateLabel: true
+ labelChannel: notifyChannel
+ adjust: left
+ )
+ (LabelSpec
+ label: 'encoding'
+ name: 'EncodingLabel'
+ layout: (LayoutFrame -318 1 2 0.0 -235 1 0 1.0)
+ activeHelpKey: encodingLabel
+ level: 0
+ labelChannel: fileEncodingHolder
+ adjust: right
+ menu: encodingMenu
+ )
+ (LabelSpec
+ name: 'FileEncodingLockedLabel'
+ layout: (LayoutFrame -235 1 2 0.0 -220 1 20 0.0)
+ activeHelpKey: encodingLockedLabel
+ level: 0
+ labelChannel: fileEncodingLockImageHolder
+ adjust: right
+ menu: encodingMenu
+ )
+ (LabelSpec
+ label: 'Shown Files'
+ name: 'ShownFilesLabel'
+ layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
+ activeHelpKey: numberOfFiles
+ level: -1
+ translateLabel: true
+ labelChannel: shownFiles
+ adjust: right
+ )
+ (ViewSpec
+ name: 'ProgressIndicatorBox'
+ layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
+ level: -1
+ visibilityChannel: activityVisibilityChannel
+ component:
+ (SpecCollection
+ collection: (
+ (ProgressIndicatorSpec
+ name: 'ProgressIndicator1'
+ layout: (LayoutFrame 5 0.0 -7 0.5 -5 1.0 7 0.5)
+ backgroundColor: (Color 0.0 66.6666666666667 66.6666666666667)
+ isActivityIndicator: true
+ )
+ )
+
+ )
+ )
+ (LabelSpec
+ name: 'BusyLabel'
+ layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
+ activeHelpKey: modeLabel
+ level: -1
+ visibilityChannel: busyLabelVisibleHolder
+ translateLabel: true
+ labelChannel: busyLabelHolder
+ adjust: right
+ )
+ (LabelSpec
+ label: 'M'
+ name: 'ModeLabel'
+ layout: (LayoutFrame -65 1 1 0.0 -55 1 1 1.0)
+ activeHelpKey: modeLabel
+ level: -1
+ translateLabel: true
+ labelChannel: modeLabelHolder
+ adjust: right
+ postBuildCallback: postBuildEditModeInfoLabel:
+ )
+ (LabelSpec
+ label: 'L'
+ name: 'LineLabel'
+ layout: (LayoutFrame -55 1 1 0.0 -20 1 1 1.0)
+ activeHelpKey: lineLabel
+ level: -1
+ translateLabel: true
+ labelChannel: cursorLineLabelHolder
+ adjust: right
+ )
+ (LabelSpec
+ label: 'C'
+ name: 'ColLabel'
+ layout: (LayoutFrame -20 1 1 0.0 0 1 1 1.0)
+ activeHelpKey: columnLabel
+ level: -1
+ translateLabel: true
+ labelChannel: cursorColLabelHolder
+ adjust: right
+ )
+ )
+
+ )
+ )
+ (LabelSpec
+ label: 'Preview'
+ name: 'PreviewLabel'
+ layout: (LayoutFrame 0 0.5 93 0 100 0.5 115 0)
+ level: 0
+ borderWidth: 1
+ visibilityChannel: previewVisibleHolder
+ backgroundColor: (Color 86.9993133440147 86.9993133440147 86.9993133440147)
+ translateLabel: true
+ )
+ (ArbitraryComponentSpec
+ name: 'Preview'
+ layout: (LayoutFrame 0 0.5 116 0 -147 1 -266 1)
+ level: 1
+ visibilityChannel: previewVisibleHolder
+ hasBorder: false
+ component: ImageView
+ )
+ (ActionButtonSpec
+ label: 'closePreviewButtonImage'
+ name: 'ClosePreviewButton'
+ layout: (LayoutFrame -169 1 94 0 -147 1 116 0)
+ visibilityChannel: previewVisibleHolder
+ hasCharacterOrientedLabel: false
+ translateLabel: true
+ )
+ )
+
+ )
+ )
+! !
+
+!FileBrowserV3 class methodsFor:'menu specs'!
+
+toolBarMainMenu
+ "This resource specification was automatically generated
+ by the MenuEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the MenuEditor may not be able to read the specification."
+
+
+ "
+ MenuEditor new openOnClass:FileBrowserV3 andSelector:#toolBarMainMenu
+ (Menu new fromLiteralArrayEncoding:(FileBrowserV3 toolBarMainMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(Menu
+ (
+ (MenuItem
+ activeHelpKey: directoryBack
+ enabled: enableBack
+ label: 'Back'
+ itemValue: doBack
+ translateLabel: true
+ isButton: true
+ submenuChannel: menuDirHistoryBack
+ labelImage: (ResourceRetriever ToolbarIconLibrary historyBackIcon)
+ )
+ (MenuItem
+ label: ''
+ )
+ (MenuItem
+ activeHelpKey: directoryForward
+ enabled: enableForward
+ label: 'Forward'
+ itemValue: doForward
+ translateLabel: true
+ isButton: true
+ submenuChannel: menuDirHistoryForward
+ labelImage: (ResourceRetriever ToolbarIconLibrary historyForwardIcon)
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: directoryUp
+ enabled: enableDirectoryUp
+ label: 'DirectoryUp'
+ itemValue: doGoDirectoryUp
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary directoryUpIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileHome
+ enabled: enableHome
+ label: 'Home'
+ itemValue: doGotoHomeDirectory
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary homeIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileGotoDefaultDirectory
+ enabled: enableGotoDefaultDirectory
+ label: 'Current'
+ itemValue: doGotoDefaultDirectory
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary currentDirectoryIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileGotoSmalltalkDirectory
+ enabled: enableGotoSmalltalkDirectory
+ label: 'ST/X Default'
+ itemValue: doGotoSmalltalkDirectory
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary stxHomeIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileGotoBookmark
+ label: 'Bookmarks'
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ submenuChannel: gotoBookmarksMenu
+ labelImage: (ResourceRetriever ToolbarIconLibrary directoryBookmarksIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileHistory
+ enabled: enableFileHistory
+ label: 'File History'
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ submenuChannel: menuFileHistory
+ labelImage: (ResourceRetriever ToolbarIconLibrary historyIcon)
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: searchFile
+ label: 'Search File'
+ itemValue: doOpenSearchFile
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary searchFileIcon)
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: cutFile
+ enabled: hasSelection
+ label: 'Cut'
+ itemValue: cutFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary cutFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: copyFile
+ enabled: hasSelection
+ label: 'Copy'
+ itemValue: copyFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary copyFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: pasteFile
+ enabled: canPaste
+ label: 'Paste'
+ itemValue: pasteFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary pasteFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: deleteFile
+ enabled: hasSelection
+ label: 'Delete'
+ itemValue: deleteFiles
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary deleteFileIcon)
+ )
+ (MenuItem
+ label: '-'
+ isVisible: false
+ )
+ (MenuItem
+ activeHelpKey: editFile
+ label: 'Edit File'
+ itemValue: doShowFileContents
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary editFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileIn
+ label: 'File In'
+ itemValue: fileFileIn
+ translateLabel: true
+ isButton: true
+ isVisible: false
+ labelImage: (ResourceRetriever ToolbarIconLibrary fileInIcon)
+ )
+ (MenuItem
+ activeHelpKey: openChangeBrowser
+ enabled: hasFileSelection
+ label: 'Changes Browser'
+ itemValue: openChangesBrowser
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary startChangesBrowserIcon)
+ )
+ (MenuItem
+ label: '-'
+ isVisible: false
+ )
+ (MenuItem
+ activeHelpKey: addTerminal
+ label: 'VT100'
+ itemValue: doAddTerminal
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary shellTerminalIcon)
+ )
+ (MenuItem
+ activeHelpKey: make
+ enabled: canMake
+ label: 'Make'
+ itemValue: doMake
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary make24x24Icon3)
+ )
+ (MenuItem
+ activeHelpKey: viewDetails
+ label: 'viewDetails'
+ translateLabel: true
+ isButton: true
+ startGroup: right
+ hideMenuOnActivated: false
+ indication: viewDetails
+ labelImage: (ResourceRetriever ToolbarIconLibrary viewDetailsIcon)
+ )
+ (MenuItem
+ activeHelpKey: viewDetails
+ label: 'viewDetails'
+ translateLabel: true
+ isButton: true
+ startGroup: right
+ isVisible: false
+ indication: viewDetails
+ submenuChannel: viewDetailsMenuSpec
+ labelImage: (ResourceRetriever ToolbarIconLibrary viewDetailsIcon)
+ )
+ (MenuItem
+ activeHelpKey: selectDetails
+ label: ''
+ isButton: true
+ startGroup: right
+ submenuChannel: viewDetailsMenuSpec
+ labelImage: (ResourceRetriever ToolbarIconLibrary empty1x20Icon)
+ )
+ )
+ nil
+ nil
+ )
+! !
+
+!FileBrowserV3 methodsFor:'actions'!
+
+hideBookmarkBar
+
+ self bookmarkBarVisibleHolder value
+
+ "Created: / 04-04-2012 / 12:08:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+switchToBookmarkEntry: bookmark
+
+ self gotoFile: bookmark path asFilename
+
+ "Created: / 20-04-2012 / 18:07:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!FileBrowserV3 methodsFor:'aspects'!
+
+bookmarkBarVisibleHolder
+ "return/create the 'bookmarkBarVisibleHolder' value holder (automatically generated)"
+
+ bookmarkBarVisibleHolder isNil ifTrue:[
+ bookmarkBarVisibleHolder := true asValue.
+ bookmarkBarVisibleHolder addDependent:self.
+ ].
+ ^ bookmarkBarVisibleHolder
+
+ "Modified: / 10-06-2011 / 23:56:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+bookmarkBarVisibleHolder:something
+ "set the 'bookmarkBarVisibleHolder' value holder (automatically generated)"
+
+ |oldValue newValue|
+
+ bookmarkBarVisibleHolder notNil ifTrue:[
+ oldValue := bookmarkBarVisibleHolder value.
+ bookmarkBarVisibleHolder removeDependent:self.
+ ].
+ bookmarkBarVisibleHolder := something.
+ bookmarkBarVisibleHolder notNil ifTrue:[
+ bookmarkBarVisibleHolder addDependent:self.
+ ].
+ newValue := bookmarkBarVisibleHolder value.
+ oldValue ~~ newValue ifTrue:[
+ self update:#value with:newValue from:bookmarkBarVisibleHolder.
+ ].
+!
+
+bookmarkHolder
+ "return/create the 'bookmarkHolder' value holder (automatically generated)"
+
+ bookmarkHolder isNil ifTrue:[
+ bookmarkHolder := ValueHolder new.
+ ].
+ ^ bookmarkHolder
+!
+
+bookmarkListHolder
+
+ ^BookmarkList forFileBrowser
+
+ "Created: / 08-06-2011 / 12:16:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!FileBrowserV3 methodsFor:'change & update'!
+
+currentFileNameHolderChanged
+ super currentFileNameHolderChanged.
+ self updateBookmark
+
+ "Created: / 20-04-2012 / 18:04:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+update:something with:aParameter from:changedObject
+ "Invoked when an object that I depend upon sends a change notification."
+
+ "stub code automatically generated - please change as required"
+
+ "/ changedObject == someOfMyValueHolders ifTrue:[
+ "/ self doSomethingApropriate.
+ "/ ^ self.
+ "/ ].
+ super update:something with:aParameter from:changedObject
+!
+
+updateBookmark
+
+ | file bookmark |
+ file := fileEntryFieldHolder value.
+ file notEmptyOrNil ifTrue:[
+ bookmark := Bookmark forFile: file.
+ ].
+ self bookmarkHolder value: bookmark.
+
+ "Created: / 13-04-2012 / 12:37:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+updateToolVisibility
+ |builder toolBar bookmarkBar infoBar filenameEntryField vPanel topOffset bottomOffset
+ toolBarVisible bookmarkBarVisible filenameEntryFieldVisible infoBarVisible d|
+
+ builder := self builder.
+
+ topOffset := 0.
+ bottomOffset := 0.
+
+ toolBarVisible := self toolBarVisibleHolder value.
+ toolBarVisible ifTrue:[
+ toolBar := builder componentAt:#ToolbarBox.
+ topOffset := topOffset + toolBar height.
+ ].
+
+ bookmarkBarVisible := self bookmarkBarVisibleHolder value.
+ bookmarkBarVisible ifTrue:[
+ bookmarkBar := builder componentAt:#Bookmarks.
+ topOffset := topOffset + (bookmarkBar height max: 25)
+ ].
+
+ filenameEntryFieldVisible := self filenameEntryFieldVisibleHolder value.
+ filenameEntryFieldVisible ifTrue:[
+ filenameEntryField := builder componentAt:#FilenameEntryFieldBox.
+ d := filenameEntryField layout bottomOffset - filenameEntryField layout topOffset.
+ filenameEntryField layout topOffset:topOffset bottomOffset:topOffset + d.
+ topOffset := topOffset + filenameEntryField height.
+ filenameEntryField container notNil ifTrue:[
+ filenameEntryField containerChangedSize.
+ ].
+ ].
+
+ infoBarVisible := self infoBarVisibleHolder value.
+ infoBarVisible ifTrue:[
+ infoBar := builder componentAt:#InfoBox.
+ bottomOffset := bottomOffset - infoBar height.
+ ].
+
+ vPanel := builder componentAt:#BrowserBox.
+ vPanel layout topOffset:topOffset+1.
+ vPanel layout bottomOffset:bottomOffset-1.
+ vPanel container notNil ifTrue:[
+ vPanel containerChangedSize.
+ ].
+
+ "Modified: / 03-04-2012 / 22:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!FileBrowserV3 class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: FileBrowserV3.st 7985 2012-04-21 08:36:31Z vranyj1 $'
+! !
+
--- a/FileDialogV2.st Wed May 11 01:38:56 2016 +0200
+++ b/FileDialogV2.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
SimpleDialog subclass:#FileDialogV2
instanceVariableNames:'aspects directory pattern filterHolder initialText multipleSelect
doubleClickAction cancelLabelHolder okLabelHolder startFilename
@@ -1635,5 +1637,11 @@
!FileDialogV2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileDialogV2.st,v 1.6 2006-12-06 11:09:13 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileDialogV2.st,v 1.6 2006/12/06 11:09:13 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/HierarchicalClassRevisionList.st Wed May 11 01:38:56 2016 +0200
+++ b/HierarchicalClassRevisionList.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
HierarchicalList subclass:#HierarchicalClassRevisionList
instanceVariableNames:'itemComputationList semaphoreCritical itemTask currentItemInTask
@@ -205,5 +206,11 @@
!HierarchicalClassRevisionList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/HierarchicalClassRevisionList.st,v 1.3 2000-02-18 14:08:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/HierarchicalClassRevisionList.st,v 1.3 2000/02/18 14:08:26 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/HierarchicalVersionDiffBrowser.st Wed May 11 01:38:56 2016 +0200
+++ b/HierarchicalVersionDiffBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
ApplicationModel subclass:#HierarchicalVersionDiffBrowser
instanceVariableNames:'versionDiffBrowser classTree treeSelectionHolder classHolder'
@@ -374,7 +375,8 @@
classHolder:something
"set the value of the instance variable 'classHolder' (automatically generated)"
- classHolder := something.!
+ classHolder := something.
+!
classTree
@@ -384,7 +386,8 @@
classTree:something
"set the value of the instance variable 'classTree' (automatically generated)"
- classTree := something.!
+ classTree := something.
+!
treeSelectionHolder
@@ -641,5 +644,11 @@
!HierarchicalVersionDiffBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/HierarchicalVersionDiffBrowser.st,v 1.9 2000-02-18 14:06:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/HierarchicalVersionDiffBrowser.st,v 1.9 2000/02/18 14:06:52 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/LibraryBuilder.st Wed May 11 01:38:56 2016 +0200
+++ b/LibraryBuilder.st Thu May 12 08:33:55 2016 +0200
@@ -9,11 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
-
-
+"{ Package: 'stx:libtool' }"
-
-"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
ApplicationBuilder subclass:#LibraryBuilder
instanceVariableNames:''
@@ -1100,5 +1098,11 @@
!LibraryBuilder class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/LibraryBuilder.st,v 1.8 2006-09-05 16:45:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/LibraryBuilder.st,v 1.8 2006/09/05 16:45:22 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/Make.proto Wed May 11 01:38:56 2016 +0200
+++ b/Make.proto Thu May 12 08:33:55 2016 +0200
@@ -92,6 +92,13 @@
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_libtool.$(O): $(shell hg root)/.hg/dirstate
+endif
+
--- a/Makefile Wed May 11 01:38:56 2016 +0200
+++ b/Makefile Thu May 12 08:33:55 2016 +0200
@@ -1,18 +1,21 @@
#
-# DO NOT EDIT
-# automagically generated from Make.proto (by make mf)
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
#
-include ../rules/stdHeader
-include ../configurations/COMMON/defines
-include ../configurations/vendorConf
-include ../configurations/myConf
-include ../rules/stdHeader2
-include Make.spec
+
+.PHONY: run
+
+run: makefile
+ $(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
include Make.proto
-BASE_CONF=osx_x/gcc
-BASE_CONF_VENDOR=mac
-CONF_PACKS=
-CONF_TOOLS=
+makefile: mf
-include ../rules/stdRules
+mf:
+ $(TOP)/rules/stmkmf
--- a/OrderedCollectionInspectorView.st Wed May 11 01:38:56 2016 +0200
+++ b/OrderedCollectionInspectorView.st Thu May 12 08:33:55 2016 +0200
@@ -197,4 +197,14 @@
version_CVS
^ '$Header: /cvs/stx/stx/libtool/OrderedCollectionInspectorView.st,v 1.48 2012-08-06 07:02:02 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: OrderedCollectionInspectorView.st 8048 2012-09-07 17:28:09Z vranyj1 $'
! !
+
--- a/ProcessMonitor.st Wed May 11 01:38:56 2016 +0200
+++ b/ProcessMonitor.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
SystemStatusMonitor subclass:#ProcessMonitor
instanceVariableNames:'processes hideDead runColor suspendedColor waitColor cpuUsages
showDetail'
@@ -777,5 +779,11 @@
!ProcessMonitor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ProcessMonitor.st,v 1.84 2007-10-05 09:53:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ProcessMonitor.st,v 1.84 2007/10/05 09:53:00 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/ProjectView.st Wed May 11 01:38:56 2016 +0200
+++ b/ProjectView.st Thu May 12 08:33:55 2016 +0200
@@ -772,5 +772,10 @@
version
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- a/RCSConflictEditTextView.st Wed May 11 01:38:56 2016 +0200
+++ b/RCSConflictEditTextView.st Thu May 12 08:33:55 2016 +0200
@@ -9,9 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
-
+"{ Package: 'stx:libtool' }"
-"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
EditTextView subclass:#RCSConflictEditTextView
instanceVariableNames:''
@@ -154,5 +154,15 @@
!RCSConflictEditTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/RCSConflictEditTextView.st,v 1.3 2006-07-05 07:42:02 fm Exp $'
+ ^ '$Id: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id:: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
! !
+
--- a/SemaphoreMonitor.st Wed May 11 01:38:56 2016 +0200
+++ b/SemaphoreMonitor.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
SystemStatusMonitor subclass:#SemaphoreMonitor
instanceVariableNames:'semaphores'
classVariableNames:''
--- a/SetInspectorView.st Wed May 11 01:38:56 2016 +0200
+++ b/SetInspectorView.st Thu May 12 08:33:55 2016 +0200
@@ -217,5 +217,14 @@
version
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SetInspectorView.st 8074 2012-11-30 17:23:39Z vranyj1 $'
! !
--- a/SettingsDialog.st Wed May 11 01:38:56 2016 +0200
+++ b/SettingsDialog.st Thu May 12 08:33:55 2016 +0200
@@ -289,14 +289,14 @@
#('Communication/Misc/Bridges' #'AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl' )
#('Communication/Misc/Smalltalk' #'AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl' )
#('Communication/Misc/OSI Protocol' #'AbstractSettingsApplication::OsiSettingsAppl' )
- #('Communication/SQLServer' #'AbstractSettingsApplication::SQLServerSettingsAppl' )
+ "/#('Communication/SQLServer' #'AbstractSettingsApplication::SQLServerSettingsAppl' )
#('Communication/HTTPServer' #'AbstractSettingsApplication::HTTPStartServerSettingsApplication' )
);
yourself
"Modified: / 16-12-2002 / 18:12:28 / penk"
"Modified: / 25-11-2011 / 15:28:42 / cg"
- "Modified: / 27-02-2013 / 12:08:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-04-2016 / 22:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SettingsDialog class methodsFor:'defaults'!
@@ -2368,6 +2368,11 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- a/SmalltalkInspectorView.st Wed May 11 01:38:56 2016 +0200
+++ b/SmalltalkInspectorView.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
DictionaryInspectorView subclass:#SmalltalkInspectorView
instanceVariableNames:''
classVariableNames:''
@@ -70,9 +72,19 @@
!SmalltalkInspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SmalltalkInspectorView.st,v 1.4 2010-03-03 11:16:38 cg Exp $'
+ ^ '$Id: SmalltalkInspectorView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/SmalltalkInspectorView.st,v 1.4 2010-03-03 11:16:38 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/SmalltalkInspectorView.st,v 1.4 2010/03/03 11:16:38 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmalltalkInspectorView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/SourceRevisionItem.st Wed May 11 01:38:56 2016 +0200
+++ b/SourceRevisionItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
AbstractRevisionItem subclass:#SourceRevisionItem
instanceVariableNames:''
@@ -129,5 +130,11 @@
!SourceRevisionItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SourceRevisionItem.st,v 1.6 2000-02-18 14:08:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/SourceRevisionItem.st,v 1.6 2000/02/18 14:08:16 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/SyntaxHighlighter2.st Wed May 11 01:38:56 2016 +0200
+++ b/SyntaxHighlighter2.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
All Rights Reserved
@@ -258,20 +256,22 @@
"Modified: / 28-05-2013 / 22:45:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-formatStatementList:aString in:aClass elementsInto: elements
+formatStatements:aString in:aClass elementsInto: elements
"format (recolor) a statement list in a given class.
Return the text containing font changes and color information."
^ self
- format:aString parsingWith:[:parser | parser statementList]
+ format:aString parsingWith:[:parser | parser parseMethodBody]
in:aClass elementsInto:elements
"
self
- formatStatementList:'(1 + 2) max:5. 1 + 2'
+ formatStatements:'(1 + 2) max:5. 1 + 2'
in:UndefinedObject
elementsInto:(OrderedCollection new).
"
+
+ "Created: / 22-02-2016 / 21:09:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SyntaxHighlighter2 methodsFor:'accessing'!
@@ -1088,6 +1088,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/SystemStatusMonitor.st Wed May 11 01:38:56 2016 +0200
+++ b/SystemStatusMonitor.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
SimpleView subclass:#SystemStatusMonitor
instanceVariableNames:'listView listUpdateDelay updateDelay updateBlock listUpdateBlock
@@ -257,5 +258,15 @@
!SystemStatusMonitor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SystemStatusMonitor.st,v 1.17 2004-12-14 15:01:54 cg Exp $'
+ ^ '$Id: SystemStatusMonitor.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SystemStatusMonitor.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/TerminalApplication.st Wed May 11 01:38:56 2016 +0200
+++ b/TerminalApplication.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
MultiViewToolApplication subclass:#TerminalApplication
instanceVariableNames:'initialDirectory keepAlive keepAliveProcess'
classVariableNames:''
--- a/TextDiffTests.st Wed May 11 01:38:56 2016 +0200
+++ b/TextDiffTests.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
TestCase subclass:#TextDiffTests
instanceVariableNames:''
classVariableNames:''
--- a/Tools_ClassGeneratorList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools_ClassGeneratorList.st Thu May 12 08:33:55 2016 +0200
@@ -520,5 +520,4 @@
version_CVS
^ '$Header: /cvs/stx/stx/libtool/Tools_ClassGeneratorList.st,v 1.14 2013-09-05 10:46:11 vrany Exp $'
-! !
-
+! !
\ No newline at end of file
--- a/Tools_ImplementingClassList.st Wed May 11 01:38:56 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-"
- COPYRIGHT (c) 2004 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
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-
-"{ Package: 'stx:libtool' }"
-
-"{ NameSpace: Tools }"
-
-MethodList subclass:#ImplementingClassList
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Interface-Browsers-New'
-!
-
-!ImplementingClassList class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 2004 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
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-!
-
-documentation
-"
- Like a ClassList, but shows classes hierarchical.
-
- If topClassHolders value is non-nil, only that classes hierarchy
- is shown.
-
- embeddable application displaying the classes as listed by
- the inputGenerator.
- Provides an outputGenerator, which enumerates the classes and
- their protocols (method-categories) in the selected classes.
-
- [author:]
- Claus Gittinger (cg@exept.de)
-"
-
-
-! !
-
-!ImplementingClassList methodsFor:'private'!
-
-listOfMethodNames
- |methods entries newNameList
- allCategories classUses allSelectors generator
- "theMethod"|
-
- generator := inGeneratorHolder value.
- generator isNil ifTrue:[^ #() ].
-
- classUses := Bag identityNew.
- allSelectors := IdentitySet new.
- allCategories := Set new.
- entries := OrderedCollection new.
-
- "/ generator generates nil-selector entries
- "/ to pass multiple-class and multiple-protocol info
- generator do:[:cls :cat :sel :mthd |
- sel notNil ifTrue:[
- entries add:(Array with:cls with:sel with:mthd).
- classUses add:cls.
- allSelectors add:sel.
- allCategories add:mthd category.
- ]
- ].
-
- entries sort:[:a :b | |clsNmA clsNmB|
- clsNmA := (a at:1) name.
- clsNmB := (b at:1) name.
- clsNmA < clsNmB
- ].
-
- newNameList := entries collect:[:entry |
- |class nm|
-
- class := (entry at:1).
- nm := class name.
- ((allSelectors size > 1)
- or:[(classUses occurrencesOf:class) > 1]) ifTrue:[
- nm := nm , ' ' , (entry at:2)
- ].
- allCategories size > 1 ifTrue:[
- nm := nm , ' {' , (entry at:3) category , '}'
- ].
-"/ class name , ' ' , (entry at:2)
- nm
- ].
- methods := entries collect:[:entry | (entry at:3)].
- methodList := methods.
-"/ methods size == 1 ifTrue:[
-"/ theMethod := methods first.
-"/ self methodLabelHolder value:(theMethod mclass name , ' ' , theMethod selector).
-"/ ].
- ^ newNameList.
-
- "Created: / 5.2.2000 / 22:43:40 / cg"
- "Modified: / 1.3.2000 / 21:00:26 / cg"
-! !
-
-!ImplementingClassList class methodsFor:'documentation'!
-
-version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_ImplementingClassList.st,v 1.3 2005-02-02 11:02:27 cg Exp $'
-! !
--- a/Tools_SpecialCodeView.st Wed May 11 01:38:56 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-"
- COPYRIGHT (c) 2000 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
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-"{ Package: 'stx:libtool' }"
-
-"{ NameSpace: Tools }"
-
-ApplicationModel subclass:#SpecialCodeView
- instanceVariableNames:'displayMode'
- classVariableNames:''
- poolDictionaries:''
- category:'Interface-Browsers-New'
-!
-
-!SpecialCodeView class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 2000 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
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-! !
-
-!SpecialCodeView class methodsFor:'interface specs'!
-
-windowSpec
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "
- UIPainter new openOnClass:SpecialCodeView andSelector:#windowSpec
- SpecialCodeView new openInterface:#windowSpec
- SpecialCodeView open
- "
-
- <resource: #canvas>
-
- ^
- #(#FullSpec
- #name: #windowSpec
- #window:
- #(#WindowSpec
- #label: 'SpecialCodeView'
- #name: 'SpecialCodeView'
- #min: #(#Point 10 10)
- #bounds: #(#Rectangle 12 22 312 322)
- )
- #component:
- #(#SpecCollection
- #collection: #()
- )
- )
-! !
-
-!SpecialCodeView class methodsFor:'documentation'!
-
-version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_SpecialCodeView.st,v 1.3 2010-05-07 12:27:43 cg Exp $'
-!
-
-version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools_SpecialCodeView.st,v 1.3 2010-05-07 12:27:43 cg Exp $'
-! !
--- a/Tools__AbstractTestRunner.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__AbstractTestRunner.st Thu May 12 08:33:55 2016 +0200
@@ -191,6 +191,11 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__AbstractTestRunner.st,v 1.12 2013-05-21 20:21:26 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: Tools__AbstractTestRunner.st,v 1.12 2013-05-21 20:21:26 cg Exp $'
! !
--- a/Tools__Browslet.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__Browslet.st Thu May 12 08:33:55 2016 +0200
@@ -150,10 +150,15 @@
!Browslet class methodsFor:'documentation'!
version_CVS
- ^ '$Header$'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__Browslet.st,v 1.2 2011/07/03 13:40:42 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ '$Id$'
+ ^ '$Id: Tools__Browslet.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
--- a/Tools__CachedTags.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__CachedTags.st Thu May 12 08:33:55 2016 +0200
@@ -67,5 +67,15 @@
!CachedTags class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CachedTags.st,v 1.1 2011-05-06 08:34:57 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__CachedTags.st,v 1.1 2011/05/06 08:34:57 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: Tools__CachedTags.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__ChangeList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ChangeList.st Thu May 12 08:33:55 2016 +0200
@@ -869,24 +869,24 @@
handlesKeyPress:key inView:aView
<resource: #keyboard (#Accept #Ctrls)>
- (super handlesKeyPress:key inView:aView)
+ ^ (super handlesKeyPress:key inView:aView)
or:[(key == #Accept or:[ key == #Ctrls])
and:[ listView scrolledView == aView ]]
"Created: / 08-02-2012 / 14:43:11 / cg"
- "Modified: / 10-04-2014 / 11:31:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-04-2015 / 01:08:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
keyPress:key x:x y:y view:aView
(key == #Accept or:[ key == #Ctrls]) ifTrue:[
self listMenuApply.
- ^ self
+ ^ true
].
- super keyPress:key x:x y:y view:aView
+ ^ super keyPress:key x:x y:y view:aView
"Created: / 08-02-2012 / 14:42:18 / cg"
- "Modified: / 10-04-2014 / 11:31:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-04-2015 / 01:08:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList methodsFor:'generators'!
@@ -1226,6 +1226,37 @@
"Created: / 05-12-2009 / 14:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+redrawList
+ listView notNil ifTrue:[
+ listView columnView invalidate.
+ ].
+
+ "Created: / 24-04-2015 / 00:50:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 25-04-2015 / 22:14:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+redrawListItem: item
+ | index |
+
+ listView notNil ifTrue:[
+ index := listView list identityIndexOf: item.
+ self redrawListItemAt: index.
+ ]
+
+ "Created: / 25-04-2015 / 22:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-08-2015 / 16:19:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+redrawListItemAt: index
+ listView notNil ifTrue:[
+ index ~~ 0 ifTrue:[
+ listView columnView invalidateRowAt: index.
+ ].
+ ]
+
+ "Created: / 25-04-2015 / 22:17:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
updateList
|inGenerator changeset firstLineShown oldSel newList newSel|
@@ -1519,6 +1550,9 @@
removed:aBoolean
change removed: aBoolean.
+ self redraw.
+
+ "Modified: / 25-04-2015 / 22:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
source
@@ -1642,6 +1676,15 @@
"Modified (format): / 27-07-2012 / 21:25:34 / cg"
! !
+!ChangeList::ListEntry methodsFor:'redrawing'!
+
+redraw
+ "Trigger redraw of reciver."
+ application redrawListItem: self
+
+ "Created: / 25-04-2015 / 22:10:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!ChangeList class methodsFor:'documentation'!
version
@@ -1652,6 +1695,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__ChangeSetBrowser2.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ChangeSetBrowser2.st Thu May 12 08:33:55 2016 +0200
@@ -1424,6 +1424,7 @@
isVisible: allowAcceptHolder
shortcutKey: Accept
auxValue: 100
+ ignoreShortcutKeys: true
)
(MenuItem
label: 'Apply All'
@@ -1569,6 +1570,8 @@
nil
nil
)
+
+ "Modified: / 04-03-2016 / 16:02:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeMenu1
@@ -2185,11 +2188,13 @@
anEvent isKeyPressEvent ifTrue:[
evView := anEvent targetView.
anEvent key == #Accept ifTrue:[
- (evView isComponentOf:list1 window) ifTrue:[ self changeMenuApplyChanges:(self selectedChangesIn:list1). ^true ].
- (evView isComponentOf:list2 window) ifTrue:[ self changeMenuApplyChanges:(self selectedChangesIn:list2). ^true ].
+ (evView isComponentOf:list1 window) ifTrue:[ self changeMenuApplyChanges:(self selectedChangesIn:list1) in: list1 . ^true ].
+ (evView isComponentOf:list2 window) ifTrue:[ self changeMenuApplyChanges:(self selectedChangesIn:list2) in: list2 . ^true ].
].
].
^ false
+
+ "Modified: / 04-03-2016 / 15:54:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetBrowser2 methodsFor:'aspects'!
@@ -3032,11 +3037,12 @@
].
self showProgress: (resources string: 'Reading Cypress Package...') while: [
- changeset := ((Smalltalk at:#CypressPackageReader) readPackageFrom: dir) asChangeSet.
+ changeset := ((Smalltalk at:#CypressReader) readPackageFrom: dir) asChangeSet.
self doOpen: changeset.
].
"Created: / 03-09-2012 / 11:44:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 05-10-2015 / 18:12:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doOpenFile: aStringOrFilename
@@ -3239,37 +3245,39 @@
!ChangeSetBrowser2 methodsFor:'menu actions - changes'!
changeMenuApply: changeList
- | changesToApply |
+ | changesToApply changeIdx |
changesToApply := OrderedCollection new.
self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]].
self changeMenuApplyChanges: changesToApply.
- list2 notNil ifTrue:[
+ "Advance to next change"
+ changeIdx := changeList list identityIndexOf: changesToApply last change.
+ changeIdx < changeList list size ifTrue:[
+ changeList selection: { changeList list at: changeIdx + 1 }
+ ] ifFalse:[
+ changeList redrawListItemAt: changeIdx.
+ ].
+
+ (list2 notNil and:[changeList ~~ list2]) ifTrue:[
"/ to get the =-icons
- list2 updateList
+ list2 redrawList
].
"Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 28-12-2011 / 15:49:00 / cg"
+ "Modified: / 25-04-2015 / 22:17:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeMenuApplySelection: changeList
changeList selection do:[:change|
- | changeIdx |
-
self changeMenuApplyChange:change change.
-
- "Advance to next change"
- changeIdx := changeList list identityIndexOf: change.
- changeIdx < changeList list size ifTrue:[
- changeList selection: { changeList list at: changeIdx + 1 }
- ].
+ self selectChangeAfter: change change in: changeList.
].
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 28-12-2011 / 15:48:53 / cg"
- "Modified (comment): / 30-03-2012 / 13:18:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-03-2016 / 15:58:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeMenuApplyToEnd: changeList
@@ -3286,6 +3294,7 @@
changeList selection: { chg }.
self changeMenuApplyChange:chg change.
].
+ changeList redrawListItemAt: stop.
list2 notNil ifTrue:[
"/ to get the =-icons
@@ -3294,7 +3303,7 @@
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 27-12-2011 / 10:53:00 / cg"
- "Modified: / 30-03-2012 / 12:34:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 21-05-2015 / 13:41:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeMenuBrowse: changeList
@@ -3776,6 +3785,15 @@
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+changeMenuApplyChanges: changesToApply in: changeList
+ changesToApply notEmpty ifTrue:[
+ self changeMenuApplyChanges: changesToApply.
+ self selectChangeAfter: changesToApply last in: changeList.
+ ].
+
+ "Created: / 04-03-2016 / 15:54:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
changeMenuDeleteChange: change
change removed: true
@@ -3854,6 +3872,20 @@
"Created: / 16-03-2011 / 22:41:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+selectChangeAfter: change in: changeList
+ "Advance to next change"
+ | changeIdx |
+
+ changeIdx := changeList list findFirst:[:changeItem | changeItem change == change ] ifNone:[ ^ self ].
+ changeIdx < changeList list size ifTrue:[
+ changeList selection: { changeList list at: changeIdx + 1 }
+ ] ifFalse:[
+ changeList redrawListItemAt: changeIdx.
+ ].
+
+ "Created: / 04-03-2016 / 15:52:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
selectionDo: aBlock
| applyBlock |
--- a/Tools__ChangeSetDiffList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ChangeSetDiffList.st Thu May 12 08:33:55 2016 +0200
@@ -455,11 +455,11 @@
listEntryLabelFor:diff
- ^listEntryLabelGenerator
- ifNotNil: [listEntryLabelGenerator value: diff]
- ifNil:[diff name]
+ ^listEntryLabelGenerator isNil
+ ifTrue:[ diff name ]
+ ifFalse:[ listEntryLabelGenerator value:diff ]
- "Modified: / 24-11-2009 / 10:00:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2015 / 11:57:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
makeDependent
@@ -547,12 +547,12 @@
label
- ^application
- ifNotNil:[application listEntryLabelFor: model]
- ifNil:[model displayString]
+ ^application isNil
+ ifTrue:[ model displayString ]
+ ifFalse:[ application listEntryLabelFor:model ]
"Created: / 24-11-2009 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 26-11-2009 / 17:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2015 / 11:55:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
model
--- a/Tools__ClassCategoryList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ClassCategoryList.st Thu May 12 08:33:55 2016 +0200
@@ -518,7 +518,7 @@
self enqueueMessage:#updateOutputGenerator for:self arguments:nil.
^ self.
].
- (rawCategoryList includes:categoryOfClass) ifTrue:[
+ ((rawCategoryList ? #()) includes:categoryOfClass) ifTrue:[
^ self
].
self invalidateList.
@@ -569,7 +569,7 @@
super update:something with:aParameter from:changedObject
"Modified: / 20-07-2011 / 18:50:04 / cg"
- "Modified: / 25-03-2014 / 20:28:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-04-2015 / 11:55:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ClassCategoryList methodsFor:'drag & drop'!
@@ -1225,5 +1225,10 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- a/Tools__ClassGeneratorList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ClassGeneratorList.st Thu May 12 08:33:55 2016 +0200
@@ -520,5 +520,14 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: Tools__ClassGeneratorList.st 8083 2013-01-14 11:48:37Z vranyj1 $'
! !
--- a/Tools__ClassSorter.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ClassSorter.st Thu May 12 08:33:55 2016 +0200
@@ -95,9 +95,15 @@
!ClassSorter class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassSorter.st,v 1.1 2011-07-01 13:28:45 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__ClassSorter.st,v 1.1 2011/07/01 13:28:45 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__ClassSorter.st 7486 2009-10-26 22:06:24Z vranyj1 '
+ ^ '$Id: Tools__ClassSorter.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__CodeCompletionService.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__CodeCompletionService.st Thu May 12 08:33:55 2016 +0200
@@ -151,6 +151,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__CodeCritics.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__CodeCritics.st Thu May 12 08:33:55 2016 +0200
@@ -102,9 +102,15 @@
!CodeCritics class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeCritics.st,v 1.3 2011-07-03 13:31:36 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__CodeCritics.st,v 1.3 2011/07/03 13:31:36 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__CodeCritics.st 7487 2009-10-28 21:11:04Z vranyj1 '
+ ^ '$Id: Tools__CodeCritics.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__CodeHighlightingService.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__CodeHighlightingService.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
All Rights Reserved
@@ -256,7 +254,11 @@
] ifFalse:[
codeAspect == (SyntaxHighlighter codeAspectClassDefinition) ifTrue:[
highlighterClasses do:[:e|newCode := e formatClassDefinition:newCode string in:cls elementsInto: elements].
- ]
+ ] ifFalse:[
+ codeAspect == (SyntaxHighlighter codeAspectStatements) ifTrue:[
+ highlighterClasses do:[:e|newCode := e formatStatements:newCode string in:cls elementsInto: elements].
+ ]
+ ].
].
].
"/ ]
@@ -292,9 +294,9 @@
]
]
- "Modified: / 22-08-2011 / 14:17:47 / cg"
"Created: / 24-01-2012 / 12:21:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 22-07-2013 / 13:33:40 / cg"
+ "Modified: / 22-02-2016 / 21:00:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
setHighlightedCode:newCode elements: elements
@@ -408,6 +410,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__CodeView2.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__CodeView2.st Thu May 12 08:33:55 2016 +0200
@@ -2688,15 +2688,6 @@
].
servicesWithAnnotations isNil ifTrue:[ ^ nil ].
- text := servicesWithAnnotations
- inject:(OrderedCollection new)
- into:[:text :service |
- text notEmpty ifTrue:[ text add:''].
- text addAll:(service flyByHelpTextAtLine:lineNr) asString asCollectionOfLines.
- text
- ].
- ^ text asStringCollection asString.
-
"/ "/ if there is either ONLY a breakpoint service which has an annotation
"/ "/ or none has an annotation, return the breakpoint service's message
"/ (servicesWithAnnotations isEmptyOrNil
@@ -2711,6 +2702,17 @@
"/ serviceToShowHelpFor notNil ifTrue:[
"/ ^ serviceToShowHelpFor flyByHelpTextAtLine:lineNr
"/ ].
+
+ text := servicesWithAnnotations
+ inject:(OrderedCollection new)
+ into:[:text :service |
+ text notEmpty ifTrue:[ text add:''].
+ text addAll:(service flyByHelpTextAtLine:lineNr) asString asCollectionOfLines.
+ text
+ ].
+ ^ text asStringCollection asString.
+
+ "Modified: / 11-05-2015 / 15:30:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!CodeView2::GutterView methodsFor:'initialize & release'!
@@ -2842,11 +2844,11 @@
self
invalidateX: 0
y: 0
- width: w-1
+ width: w
height: self height.
"Created: / 10-09-2013 / 03:07:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-02-2014 / 21:50:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 22-02-2016 / 20:05:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
invalidateDeviceRectangle:aRectangle repairNow:doRepairNow
@@ -2896,7 +2898,7 @@
]
"Created: / 07-10-2011 / 19:44:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-02-2014 / 21:49:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 22-02-2016 / 20:09:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
redrawBackgroundX:x y:y width:w height:h
@@ -4287,6 +4289,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__CodeView2DemoApp.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__CodeView2DemoApp.st Thu May 12 08:33:55 2016 +0200
@@ -147,9 +147,15 @@
!CodeView2DemoApp class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2DemoApp.st,v 1.2 2011-07-03 17:50:09 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__CodeView2DemoApp.st,v 1.2 2011/07/03 17:50:09 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__CodeView2DemoApp.st 7567 2010-04-17 10:59:53Z vranyj1 '
+ ^ '$Id: Tools__CodeView2DemoApp.st 7567 2010-04-17 10:59:53Z vranyj1 $'
! !
+
--- a/Tools__FontSettingsApplication.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__FontSettingsApplication.st Thu May 12 08:33:55 2016 +0200
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
"{ Package: 'stx:libtool' }"
"{ NameSpace: Tools }"
@@ -17,6 +28,21 @@
category:'Interface-Smalltalk'
!
+!FontSettingsApplication class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+! !
!FontSettingsApplication class methodsFor:'instance creation'!
@@ -532,14 +558,6 @@
extent: (Point 637 45)
)
(CheckBoxSpec
- label: 'Linux font workaround: do not reset fonts on snapshot restart'
- name: 'LinuxFontWorkaroundBox'
- visibilityChannel: linuxFontWorkaroundVisible
- model: linuxFontWorkaround
- translateLabel: true
- extent: (Point 637 30)
- )
- (CheckBoxSpec
label: 'Only Use Xft Fonts / Suppress Ugly X-Fonts (Unix Only)'
name: 'CheckBox1'
activeHelpKey: useXftFontsOnly
@@ -726,17 +744,14 @@
basicReadSettings
self basicReadFontSettings.
- self readAspects: #(linuxFontWorkaround) from: currentUserPrefs
-
- "Modified: / 10-10-2011 / 12:15:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 06-02-2012 / 12:22:51 / cg"
+ "Modified: / 20-04-2016 / 20:16:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
basicSaveSettings
"/ |fn|
- self writeAspects: #(linuxFontWorkaround useXftFontsOnly useXFontsOnly) to: currentUserPrefs.
-
+ self writeAspects: #( useXftFontsOnly useXFontsOnly) to: currentUserPrefs.
UserPreferences current fontPreferences:
(
Dictionary new
@@ -783,7 +798,7 @@
DebugView newDebugger.
- "Modified: / 10-10-2011 / 12:15:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-04-2016 / 20:16:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeAllFont
@@ -1151,22 +1166,6 @@
^ labelsFontLabelHolder.
!
-linuxFontWorkaround
- linuxFontWorkaround isNil ifTrue:[
- linuxFontWorkaround := false asValue.
- linuxFontWorkaround onChangeSend:#updateModifiedChannel to:self
- ].
- ^ linuxFontWorkaround.
-
- "Created: / 10-10-2011 / 12:14:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-linuxFontWorkaroundVisible
- ^OperatingSystem getOSType == #linux
-
- "Created: / 10-10-2011 / 12:57:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
listDef
"return/create the 'listDef' value holder (automatically generated)"
@@ -1482,11 +1481,11 @@
self inputFieldDef value ~= EditField defaultFont ifTrue:[^ true].
self tooltipDef value ~= ActiveHelpView defaultFont ifTrue:[^ true].
- (self hasChangedAspectIn: #(linuxFontWorkaround useXftFontsOnly) asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ (self hasChangedAspectIn: #(useXftFontsOnly) asComparedTo:currentUserPrefs) ifTrue:[^ true].
^ false
- "Modified: / 10-10-2011 / 12:14:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-04-2016 / 20:14:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
hasXftFonts
@@ -1501,5 +1500,10 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- a/Tools__FullMethodCategoryList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__FullMethodCategoryList.st Thu May 12 08:33:55 2016 +0200
@@ -1,27 +1,13 @@
"
- Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
- Copyright (c) 2009-2010 eXept Software AG
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
"
"{ Package: 'stx:libtool' }"
@@ -38,29 +24,15 @@
copyright
"
- Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
- Copyright (c) 2009-2010 eXept Software AG
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
"
!
@@ -98,7 +70,7 @@
protocols size > 0 ifTrue:[
protocols size == 1 ifTrue:[
theProtocol := protocols first.
- Smalltalk allClassesDo:[:eachClass |
+ environment allClassesDo:[:eachClass |
eachClass instAndClassSelectorsAndMethodsDo:[:sel :eachMethod |
|cat|
@@ -114,7 +86,7 @@
].
]
] ifFalse:[
- Smalltalk allClassesDo:[:eachClass |
+ environment allClassesDo:[:eachClass |
eachClass instAndClassSelectorsAndMethodsDo:[:sel :eachMethod |
|cat|
@@ -150,10 +122,16 @@
!FullMethodCategoryList class methodsFor:'documentation'!
-version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__FullMethodCategoryList.st,v 1.3 2011-07-03 13:36:22 cg Exp $'
+version
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_FullMethodCategoryList.st,v 1.6 2013-09-05 10:46:11 vrany Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__FullMethodCategoryList.st 7796 2011-06-23 16:01:32Z vranyj1 '
+ ^ '$Id: Tools__FullMethodCategoryList.st 8083 2013-01-14 11:48:37Z vranyj1 $'
! !
+
--- a/Tools__GenericToolbox.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__GenericToolbox.st Thu May 12 08:33:55 2016 +0200
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
"{ Package: 'stx:libtool' }"
"{ NameSpace: Tools }"
@@ -11,6 +22,20 @@
!GenericToolbox class methodsFor:'documentation'!
+copyright
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
documentation
"
A generic toolbox for languages that compiles into Smalltalk/X bytecode.
--- a/Tools__HierarchicalChangeList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__HierarchicalChangeList.st Thu May 12 08:33:55 2016 +0200
@@ -202,6 +202,16 @@
"Created: / 26-07-2012 / 18:43:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+redrawListItemAt: index
+ listView notNil ifTrue:[
+ index ~~ 0 ifTrue:[
+ listView invalidateLineAt:index.
+ ].
+ ]
+
+ "Created: / 20-08-2015 / 16:19:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
updateList
|inGenerator changeset root|
@@ -221,6 +231,11 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__HierarchicalChangeList.st,v 1.9 2014-04-10 09:59:55 vrany Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: Tools__HierarchicalChangeList.st,v 1.9 2014-04-10 09:59:55 vrany Exp $'
! !
--- a/Tools__ImplementingClassList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ImplementingClassList.st Thu May 12 08:33:55 2016 +0200
@@ -1,27 +1,13 @@
"
- Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
- Copyright (c) 2009-2010 eXept Software AG
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
"
"{ Package: 'stx:libtool' }"
@@ -38,29 +24,15 @@
copyright
"
- Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
- Copyright (c) 2009-2010 eXept Software AG
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
"
!
@@ -144,10 +116,16 @@
!ImplementingClassList class methodsFor:'documentation'!
-version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ImplementingClassList.st,v 1.2 2011-07-03 13:37:11 cg Exp $'
+version
+ ^ '$Id: Tools__ImplementingClassList.st 8083 2013-01-14 11:48:37Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__ImplementingClassList.st 7796 2011-06-23 16:01:32Z vranyj1 '
+ ^ '$Id: Tools__ImplementingClassList.st 8083 2013-01-14 11:48:37Z vranyj1 $'
! !
+
--- a/Tools__ImplementingMethodList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ImplementingMethodList.st Thu May 12 08:33:55 2016 +0200
@@ -1,27 +1,13 @@
"
- Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
- Copyright (c) 2009-2010 eXept Software AG
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
"
"{ Package: 'stx:libtool' }"
@@ -38,29 +24,15 @@
copyright
"
- Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
- Copyright (c) 2009-2010 eXept Software AG
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
"
!
@@ -314,10 +286,16 @@
!ImplementingMethodList class methodsFor:'documentation'!
-version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ImplementingMethodList.st,v 1.2 2011-07-03 13:37:06 cg Exp $'
+version
+ ^ '$Id: Tools__ImplementingMethodList.st 8083 2013-01-14 11:48:37Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__ImplementingMethodList.st 7796 2011-06-23 16:01:32Z vranyj1 '
+ ^ '$Id: Tools__ImplementingMethodList.st 8083 2013-01-14 11:48:37Z vranyj1 $'
! !
+
--- a/Tools__Inspector2.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__Inspector2.st Thu May 12 08:33:55 2016 +0200
@@ -24,7 +24,7 @@
!
Model subclass:#NavigationState
- instanceVariableNames:'theObject index tabs selectionIndex displayString'
+ instanceVariableNames:'theObject index tabs selectionIndex'
classVariableNames:''
poolDictionaries:''
privateIn:Inspector2
@@ -963,14 +963,6 @@
^ toolbarBackgroundHolder
"Modified: / 17-01-2012 / 13:04:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-windowTitleAspect
- ^ (AspectAdaptor forAspect:#displayString)
- subjectChannel:self navigationStateAspect
-
- "Created: / 17-02-2008 / 08:42:21 / janfrog"
- "Modified: / 27-02-2008 / 12:05:56 / janfrog"
! !
!Inspector2 methodsFor:'change & update'!
@@ -1050,6 +1042,7 @@
#todo
! !
+
!Inspector2 methodsFor:'hooks'!
postBuildEvaluationLanguageCombo: aComboBoxView
@@ -1237,15 +1230,24 @@
"not only the label is updated;
also the current inspected object is fetched from the navigation state"
- |currentItem object|
+ |currentItem object windowLabel |
(currentItem := self navigationHistoryHolder currentItem) notNil ifTrue:[
object := currentItem theObject.
].
self currentObjectHolder value:object.
- self window label:(InspectorView commonLabelFor:object).
+ windowLabel := InspectorView commonLabelFor:object.
+ "/ Contract window label if too long...
+ (windowLabel includes: Character cr) ifTrue:[
+ windowLabel := windowLabel upTo: Character cr.
+ ].
+ windowLabel size > 200 ifTrue:[
+ windowLabel := (windowLabel contractAtEndTo: 200) , '...'
+ ].
+ self window label: windowLabel
"Created: / 15-07-2011 / 16:25:42 / cg"
+ "Modified: / 28-07-2015 / 05:49:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!Inspector2 methodsFor:'private'!
@@ -1421,30 +1423,6 @@
"Created: / 21-02-2008 / 19:38:08 / janfrog"
! !
-!Inspector2::NavigationState methodsFor:'displaying'!
-
-displayOn:aGCOrStream
-
- "/ what a kludge - Dolphin and Squeak mean: printOn: a stream;
- "/ ST/X (and some old ST80's) mean: draw-yourself on a GC.
- aGCOrStream isStream ifFalse:[
- ^ super displayOn:aGCOrStream.
- ].
-
- displayString isNil ifTrue:[
- Error handle:[:ex |
- displayString := '*ERROR*'
- ] do:[
- displayString := theObject printString contractAtEndTo:15.
- ].
- displayString := displayString , ' [', (theObject className ? '???') , ']'
- ].
- aGCOrStream nextPutAll:displayString.
-
- "Created: / 21-02-2008 / 19:53:07 / janfrog"
- "Modified: / 13-06-2012 / 14:40:34 / cg"
-! !
-
!Inspector2::NavigationState methodsFor:'initialization'!
initializeTab: selector
@@ -1522,6 +1500,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__Inspector2Tab.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__Inspector2Tab.st Thu May 12 08:33:55 2016 +0200
@@ -102,11 +102,16 @@
"Modified: / 24-03-2014 / 18:25:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-view:aView
- view := aView.
+view:aViewOrBlock
+ aViewOrBlock isBlock ifTrue:[
+ viewHolder := aViewOrBlock
+ ] ifFalse:[
+ view := aViewOrBlock.
+ ]
"Created: / 16-01-2008 / 16:51:05 / janfrog"
"Modified: / 17-02-2008 / 08:58:46 / janfrog"
+ "Modified: / 21-05-2015 / 21:31:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
viewHolder:something
@@ -129,6 +134,11 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2Tab.st,v 1.8 2014-03-24 22:38:21 vrany Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: Tools__Inspector2Tab.st,v 1.8 2014-03-24 22:38:21 vrany Exp $'
! !
--- a/Tools__MethodCategoryCache.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__MethodCategoryCache.st Thu May 12 08:33:55 2016 +0200
@@ -151,9 +151,15 @@
!MethodCategoryCache class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__MethodCategoryCache.st,v 1.4 2011-07-03 13:33:26 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__MethodCategoryCache.st,v 1.4 2011/07/03 13:33:26 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__MethodCategoryCache.st 7487 2009-10-28 21:11:04Z vranyj1 '
+ ^ '$Id: Tools__MethodCategoryCache.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__MethodRewriter.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__MethodRewriter.st Thu May 12 08:33:55 2016 +0200
@@ -1079,6 +1079,7 @@
"Modified: / 21-07-2007 / 06:55:42 / janfrog"
"Modified: / 04-08-2011 / 19:05:25 / cg"
"Created: / 22-03-2012 / 18:22:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 26-08-2015 / 19:38:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doRewriteAction
@@ -1670,6 +1671,7 @@
]
"Created: / 12-12-2007 / 10:32:16 / janfrog"
+ "Modified: / 26-08-2015 / 16:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
withMethodsDo: methodBlock finallyDo: finallyBlock
@@ -1701,6 +1703,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__NamespaceFilter.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__NamespaceFilter.st Thu May 12 08:33:55 2016 +0200
@@ -105,9 +105,15 @@
!NamespaceFilter class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NamespaceFilter.st,v 1.2 2011-07-03 13:37:47 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__NamespaceFilter.st,v 1.2 2011/07/03 13:37:47 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id'
+ ^ '$Id: Tools__NamespaceFilter.st 7911 2012-02-22 09:55:48Z vranyj1 $'
! !
+
--- a/Tools__NavigationHistory.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__NavigationHistory.st Thu May 12 08:33:55 2016 +0200
@@ -327,26 +327,24 @@
goTo: navigationHistoryItem
| idx |
- idx := items indexOf:navigationHistoryItem.
+ idx := items lastIndexOf:navigationHistoryItem.
+ "/ do not uodate history if we go twice in a row into a same item...
+ (idx ~~ 0 and:[ idx == position ]) ifTrue:[ ^ self ].
+
isGlobalHistory ifTrue:[
idx ~~ 0 ifTrue:[
items removeIndex:idx.
].
self addFirst:navigationHistoryItem.
] ifFalse:[
- idx ~~ 0 ifTrue: [
- "/ already in list
- position := idx
+ position < items size ifTrue:[
+ items removeFromIndex: position + 1 toIndex: items size
+ ].
+ items addLast: navigationHistoryItem.
+ items size > maxNumberOfItems ifTrue:[
+ items removeFirst
] ifFalse:[
- position < items size ifTrue:[
- items removeFromIndex: position + 1 toIndex: items size
- ].
- items addLast: navigationHistoryItem.
- items size > maxNumberOfItems ifTrue:[
- items removeFirst
- ] ifFalse:[
- position := position + 1
- ].
+ position := position + 1
].
].
@@ -357,6 +355,7 @@
"Created: / 21-02-2008 / 16:40:39 / janfrog"
"Modified: / 21-02-2008 / 19:12:35 / janfrog"
"Modified: / 03-07-2011 / 16:03:11 / cg"
+ "Modified (comment): / 04-09-2015 / 07:24:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!NavigationHistory methodsFor:'queries'!
@@ -388,6 +387,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__NavigationHistoryTests.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__NavigationHistoryTests.st Thu May 12 08:33:55 2016 +0200
@@ -94,13 +94,14 @@
self
assert:history currentItem = 2;
assert:history canGoBack;
- assert:history goBackItems asArray = #( 1 );
- assert:history canGoForward;
- assert:history goForwardItems asArray = #( 3 ).
+ assert:history goBackItems asArray = #( 3 2 1);
+ assert:history canGoForward not;
+ assert:history goForwardItems asArray = #( ).
"Created: / 21-02-2008 / 16:57:58 / janfrog"
"Modified: / 27-02-2008 / 11:52:26 / janfrog"
"Modified: / 06-06-2008 / 09:31:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 04-09-2015 / 06:56:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
test_05
@@ -120,6 +121,73 @@
"Created: / 21-02-2008 / 16:59:11 / janfrog"
"Modified: / 27-02-2008 / 11:52:12 / janfrog"
"Modified: / 06-06-2008 / 09:31:40 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+test_06
+ history goTo:1.
+ self assert: history currentItem = 1.
+ self assert: history canGoBack not.
+ self assert: history goBackItems asArray = #( ).
+ self assert: history canGoForward not.
+ self assert: history goForwardItems asArray = #( ).
+
+ history goTo:2.
+ self assert: history currentItem = 2.
+ self assert: history canGoBack .
+ self assert: history goBackItems asArray = #( 1 ).
+ self assert: history canGoForward not.
+ self assert: history goForwardItems asArray = #( ).
+
+ history goTo:3.
+ self assert: history currentItem = 3.
+ self assert: history canGoBack .
+ self assert: history goBackItems asArray = #( 2 1 ).
+ self assert: history canGoForward not.
+ self assert: history goForwardItems asArray = #( ).
+
+ history goTo:2.
+ self assert: history currentItem = 2.
+ self assert: history canGoBack .
+ self assert: history goBackItems asArray = #( 3 2 1 ).
+ self assert: history canGoForward not.
+ self assert: history goForwardItems asArray = #( ).
+
+ history goBack.
+ self assert: history currentItem = 3.
+ self assert: history canGoBack .
+ self assert: history goBackItems asArray = #( 2 1 ).
+ self assert: history canGoForward.
+ self assert: history goForwardItems asArray = #( 2 ).
+
+ history goBack.
+ self assert: history currentItem = 2.
+ self assert: history canGoBack .
+ self assert: history goBackItems asArray = #( 1 ).
+ self assert: history canGoForward.
+ self assert: history goForwardItems asArray = #( 3 2 ).
+
+ history goBack.
+ self assert: history currentItem = 1.
+ self assert: history canGoBack not.
+ self assert: history goBackItems asArray = #( ).
+ self assert: history canGoForward.
+ self assert: history goForwardItems asArray = #( 2 3 2 ).
+
+ history goForward.
+ self assert: history currentItem = 2.
+ self assert: history canGoBack.
+ self assert: history goBackItems asArray = #( 1 ).
+ self assert: history canGoForward.
+ self assert: history goForwardItems asArray = #( 3 2 ).
+
+ history goForward.
+ self assert: history currentItem = 3.
+ self assert: history canGoBack.
+ self assert: history goBackItems asArray = #( 2 1 ).
+ self assert: history canGoForward.
+ self assert: history goForwardItems asArray = #( 2 ).
+
+ "Created: / 04-09-2015 / 06:59:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!NavigationHistoryTests class methodsFor:'documentation'!
@@ -128,6 +196,12 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationHistoryTests.st,v 1.2 2012-09-02 11:21:14 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ 'Id: Tools__NavigationHistoryTests.st 7486 2009-10-26 22:06:24Z vranyj1 '
! !
+
--- a/Tools__NewSystemBrowser.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__NewSystemBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -7911,13 +7911,13 @@
<resource: #menu>
- ^
+ ^
#(Menu
(
(MenuItem
enabled: hasClassSelectedHolder
label: 'FileOut'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -7939,7 +7939,7 @@
(MenuItem
enabled: hasClassSelectedHolder
label: 'Special Formats'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -7994,6 +7994,23 @@
label: '-'
)
(MenuItem
+ enabled: hasClassSelectedAndCanFileOutBeeHolder
+ label: 'Bee Fileout Format as...'
+ itemValue: classMenuFileOutBeeAs
+ isVisible: hasSingleClassSelectedHolder
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedAndCanFileOutBeeHolder
+ label: 'Bee Fileout Format each in...'
+ itemValue: classMenuFileOutEachBeeIn
+ isVisible: hasMultipleClassesSelectedHolder
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
enabled: hasClassSelectedAndCanFileOutBinaryHolder
label: 'Binary as...'
itemValue: classMenuFileOutBinaryAs
@@ -8064,7 +8081,7 @@
(MenuItem
enabled: hasClassSelectedHolder
label: 'Spawn'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -8218,7 +8235,7 @@
enabled: hasClassSelectedHolder
label: 'Find'
isVisible: false
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -8262,7 +8279,7 @@
(MenuItem
label: 'New'
isVisible: isNotEmbeddedBrowserHolder
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -8285,7 +8302,7 @@
enabled: hasClassSelectedHolder
label: 'Move'
isVisible: isNotEmbeddedBrowserHolder
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -8371,7 +8388,7 @@
(MenuItem
enabled: hasClassSelectedHolder
label: 'Compare'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10263,13 +10280,13 @@
<resource: #menu>
- ^
+ ^
#(Menu
(
(MenuItem
enabled: hasProjectSelectedHolder
label: 'File out'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10296,7 +10313,7 @@
(MenuItem
enabled: hasProjectSelectedHolder
label: 'Special Formats'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10342,10 +10359,19 @@
showBusyCursorWhilePerforming: true
)
(MenuItem
- isVisible: false
enabled: hasProjectSelectedAndCanFileOutVSEHolder
label: 'VSE Fileout Format each in...'
itemValue: projectMenuFileOutEachVSEIn
+ isVisible: false
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasProjectSelectedAndCanFileOutBeeHolder
+ label: 'Bee Project Source as...'
+ itemValue: projectMenuFileOutBeeProjectSourceAs
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -10404,7 +10430,7 @@
)
(MenuItem
label: 'Documentation'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10438,7 +10464,7 @@
(MenuItem
enabled: hasProjectSelectedHolder
label: 'Spawn'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10526,11 +10552,11 @@
showBusyCursorWhilePerforming: true
)
(MenuItem
+ enabled: hasUnloadedProjectSelectedHolder
label: 'Load'
itemValue: projectMenuLoad
isVisible: hasProjectSelectedHolder
showBusyCursorWhilePerforming: true
- enabled: hasUnloadedProjectSelectedHolder
)
(MenuItem
enabled: hasRenamableProjectSelectedHolder
@@ -10547,7 +10573,7 @@
)
(MenuItem
label: 'Build'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10589,7 +10615,7 @@
(MenuItem
enabled: hasProjectSelectedHolder
label: 'Generate'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -10629,7 +10655,7 @@
)
(MenuItem
label: 'Special'
- submenu:
+ submenu:
(Menu
(
(MenuItem
@@ -19199,6 +19225,12 @@
type == #methodListBrowserSpec ifTrue:[
^ self selectedCodeComponentsUsing: #(selectedSelectorsAsEnvironment)
].
+ type == #multipleMethodBrowserSpec ifTrue:[
+ ^ self selectedCodeComponentsUsing: #(selectedSelectorsAsEnvironment)
+ ].
+ type == #multipleClassBrowserSpec ifTrue:[
+ ^ self selectedCodeComponentsUsing: #(selectedSelectorsAsEnvironment selectedProtocolsAsEnvironment selectedClassesAsEnvironment)
+ ].
"Add more..."
self breakPoint: #jv.
@@ -19206,8 +19238,7 @@
^ self selectedCodeComponentsUsing: #(selectedSelectorsAsEnvironment selectedProtocolsAsEnvironment selectedClassesAsEnvironment)
"Created: / 02-04-2014 / 11:38:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 07-10-2014 / 12:52:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 03-12-2014 / 11:15:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-09-2015 / 21:35:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selectedNonEmptyEnvironmentFrom: environmentsOrSelectors
@@ -19259,31 +19290,38 @@
method protocols. May return nil if refactory browser is not
available"
- |classes protocols theClass className|
+ | classes protocols label |
self canUseRefactoringSupport ifTrue:[
classes := self selectedClassesValue.
- classes size ~= 1 ifTrue:[
- self breakPoint: #jv. "/'Multiple selected classes are not yet supported'
+ classes isEmpty ifTrue:[
^ BrowserEnvironment empty.
].
- theClass := classes anyOne. "/ there is only one
- className := (theClass name ? '*unnamed*').
+ classes size == 1 ifTrue:[
+ label := classes anElement name.
+ ] ifFalse:[
+ classes size == 2 ifTrue:[
+ label := classes first name , ' and ' , classes second name
+ ] ifFalse:[
+ label := classes size printString , ' classes'.
+ ].
+
+ ].
protocols := self selectedProtocolsValue.
^ ProtocolEnvironment new
- class: theClass
+ classes: classes
protocols: protocols;
label:(protocols size = 1
- ifTrue:[ 'protocol' , protocols anElement printString , ' in ' , className ]
- ifFalse:[ protocols size printString , ' protocols in ' , className ]);
+ ifTrue:[ 'protocol' , protocols anElement printString , ' in ' , label ]
+ ifFalse:[ protocols size printString , ' protocols in ' , label ]);
yourself
].
^ nil
"Created: / 17-04-2010 / 10:57:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 06-03-2012 / 18:55:00 / cg"
- "Modified: / 03-12-2014 / 11:26:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 21-08-2015 / 23:46:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selectedSelectorsAsEnvironment
@@ -19763,6 +19801,7 @@
! !
+
!NewSystemBrowser methodsFor:'aspects-organization'!
categoryMenuVisible
@@ -21345,6 +21384,12 @@
"Created: / 4.2.2000 / 22:02:53 / cg"
!
+hasClassSelectedAndCanFileOutBeeHolder
+ ^ [ self hasClassSelected and:[self canFileOutBee]]
+
+ "Created: / 14-04-2015 / 12:48:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
hasClassSelectedAndCanFileOutBinaryHolder
^ [ self hasClassSelected and:[self canFileOutBinary]]
@@ -22533,7 +22578,9 @@
!
hasProjectSelectedAndCanFileOutVSEHolder
- ^ [ self hasProjectSelected and:[self canFileOutVSE] ]
+ ^ [ self hasProjectSelected and:[self canFileOutBee] ]
+
+ "Modified: / 14-04-2015 / 14:05:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
hasProjectSelectedAndCanFileOutXMLHolder
@@ -23586,6 +23633,7 @@
^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
! !
+
!NewSystemBrowser methodsFor:'binding access'!
menuFor:key
@@ -28417,6 +28465,7 @@
self spawnCategoryBrowserFor:(self selectedCategoriesValue) in:where
! !
+
!NewSystemBrowser methodsFor:'menu actions-checks-lint'!
loadSmalllint
@@ -30007,6 +30056,14 @@
"Modified: / 28-02-2012 / 16:46:20 / cg"
!
+classMenuFileOutBeeAs
+ "fileOut selected classes - visual smalltalk enterprise file format"
+
+ ^ self classMenuFileOutAsWithFormat:#bee
+
+ "Created: / 14-04-2015 / 12:49:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
classMenuFileOutBinaryAs
"fileOut selected classes - binary file format"
@@ -30021,6 +30078,14 @@
]
!
+classMenuFileOutEachBeeIn
+ "fileOut selected classes as individual files - visual smalltalk enterprise format"
+
+ self classMenuFileOutEachInWithFormat:#bee
+
+ "Created: / 14-04-2015 / 12:51:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
classMenuFileOutEachBinaryIn
"fileOut selected classes as individual files - binary format"
@@ -32850,13 +32915,17 @@
aClass fileOutXML.
]
] ifFalse:[
- formatSymbolOrNil == #binary ifTrue:[
- aClass binaryFileOutOn:(saveName asFilename writeStream binary) sourceMode:sourceMode
- ] ifFalse:[
- saveName notNil ifTrue:[
- aClass fileOutAs:saveName.
+ formatSymbolOrNil == #bee ifTrue:[
+ saveName asFilename writingFileDo:[:s| BeeSourceWriter fileOut: aClass on: s]
+ ] ifFalse:[
+ formatSymbolOrNil == #binary ifTrue:[
+ aClass binaryFileOutOn:(saveName asFilename writeStream binary) sourceMode:sourceMode
] ifFalse:[
- aClass fileOut.
+ saveName notNil ifTrue:[
+ aClass fileOutAs:saveName.
+ ] ifFalse:[
+ aClass fileOut.
+ ]
]
]
]
@@ -32866,6 +32935,7 @@
self normalLabel.
"Modified: / 27-07-2012 / 09:45:02 / cg"
+ "Modified: / 14-04-2015 / 12:55:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fileOutClasses:aBunchOfClasses withFormat:aFormatSymbolOrNil
@@ -33188,6 +33258,16 @@
].
self rememberLastProjectMoveTo:newProject.
+ "/ Only checkin classes managed by old (non-stx:libscm) based managers
+ "/ since stx:libscm care for this itself and makes this warning a little
+ "/ annoying...
+ (Smalltalk at: #SCMAbstractSourceCodeManager) notNil ifTrue:[
+ "/ stx:libscm present
+ ((AbstractSourceCodeManager managerForPackage: newProject) isKindOf: (Smalltalk at: #SCMAbstractSourceCodeManager) class) ifTrue:[
+ ^ self.
+ ].
+ ].
+
(Dialog confirm:(resources string:
(classesAlreadyInRepository notEmpty
ifTrue:['Move the classes in the repository now (recommended)?']
@@ -33234,9 +33314,10 @@
].
].
- newProjectDefinition includeClasses:(classesAlreadyInRepository , classesNotYetInRepository) usingCompiler:nil.
+ newProjectDefinition includeClasses:(classesAlreadyInRepository , classesNotYetInRepository) usingCompiler:nil.
"Modified: / 02-08-2013 / 14:26:03 / cg"
+ "Modified: / 04-10-2015 / 08:59:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
moveSelectedClassesToCategory:newCategory
@@ -34648,8 +34729,9 @@
pkg notNil ifTrue:[
def := ProjectDefinition definitionClassForPackage:pkg.
].
- def notNil and:[
- (def allClassNames includes:cls name) not]
+ def notNil
+ and: [ cls isJavaClass not
+ and: [ (def allClassNames includes:cls name) not] ]
].
classesNotInPackage := classesNotInPackage collect:[:cls | cls theNonMetaclass].
@@ -34682,7 +34764,7 @@
].
"Created: / 21-12-2011 / 18:22:58 / cg"
- "Modified: / 13-12-2012 / 15:24:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 11-06-2015 / 06:09:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
checkOutClass:aClass askForRevision:askForRevision
@@ -42121,11 +42203,40 @@
^ self
].
+ aFormatSymbolOrNil == #beestp ifTrue:[
+ | writer |
+
+ writer := [ :project |
+ tmpFilename := fileName asFilename withSuffix:'part'.
+ s := tmpFilename writeStream.
+ s lineEndCRLF.
+ [
+ BeeProjectSourceWriter fileOut:currentProject on:s.
+ ] ifCurtailed:[
+ s close.
+ tmpFilename remove
+ ].
+ s close.
+ tmpFilename renameTo:(fileName asFilename).
+ ].
+ self showMessage: (resources string:'Writing as Bee Project...')
+ while: [ selectedProjects do:[:each | writer value: each ] ]
+ inBackground: true.
+ LastCypressDirectory := saveName.
+ ^ self
+ ].
+
self shouldImplement:'support for:',aFormatSymbolOrNil asString.
"Modified: / 27-10-2010 / 11:34:45 / cg"
- "Modified: / 12-01-2014 / 23:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-04-2015 / 14:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+projectMenuFileOutBeeProjectSourceAs
+ self projectMenuFileOutAsWithFormat:#beestp
+
+ "Created: / 14-04-2015 / 14:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
projectMenuFileOutBuildSupportFiles
@@ -42452,11 +42563,17 @@
self activityNotification:(resources string:'generating build-support files...').
self withActivityNotificationsRedirectedToInfoLabelDo:[
defClass forEachFileNameAndGeneratedContentsDo:[:fileName :fileContents |
- (directory construct:fileName) contents:fileContents.
+ | file |
+
+ file := directory construct:fileName.
+ file directory recursiveMakeDirectory.
+ file contents:fileContents.
].
].
self activityNotification:nil.
+
+ "Modified: / 02-02-2016 / 09:41:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
projectMenuGeneratePatchSet
@@ -45499,6 +45616,7 @@
self findResponseTo:selector in:nil
! !
+
!NewSystemBrowser methodsFor:'menu actions-selector'!
askForClassToMoveOrCopy:doWhat
@@ -46153,21 +46271,27 @@
].
"/ do we have to update any project definitions?
- affectedPackages remove:(PackageId noProjectID) ifAbsent:[].
- affectedPackages notEmpty ifTrue:[
- |prjDefs|
-
- prjDefs := affectedPackages collect:[:id | (PackageId from:id) projectDefinitionClass] as:Set.
- prjDefs remove:nil ifAbsent:[].
- prjDefs notEmpty ifTrue:[
- (Dialog confirm:(resources string:'Update %1 definition(s) now?' with:affectedPackages size)) ifTrue:[
- self updateProjectContentsDefinitionsIn:prjDefs regenerate:true
- ].
- ].
- ].
-
+ "/ JV@2016-01-19: NO, don't ask. This is done automacically when one
+ "/ commits. Doing it each time is just too disturbing. Moreover,
+ "/ the dialog text does not make clear what's going to be updated
+ "/ and why. And - it should only update extension methods, not whole
+ "/ project definition!! So: disabled.
+"/ affectedPackages remove:(PackageId noProjectID) ifAbsent:[].
+"/ affectedPackages notEmpty ifTrue:[
+"/ |prjDefs|
+"/
+"/ prjDefs := affectedPackages collect:[:id | (PackageId from:id) projectDefinitionClass] as:Set.
+"/ prjDefs remove:nil ifAbsent:[].
+"/ prjDefs notEmpty ifTrue:[
+"/ (Dialog confirm:(resources string:'Update %1 definition(s) now?' with:affectedPackages size)) ifTrue:[
+"/ self updateProjectContentsDefinitionsIn:prjDefs regenerate:true
+"/ ].
+"/ ].
+"/ ].
+
"Created: / 17-02-2000 / 23:04:45 / cg"
"Modified: / 23-11-2006 / 17:02:10 / cg"
+ "Modified: / 19-01-2016 / 21:47:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
moveMethods:methods toProtocol:newCategory
@@ -46781,7 +46905,7 @@
self activityNotification:nil.
browser := (UserPreferences current changeSetBrowserClass) openOn:previousMethods.
- browser window label:(resources string:'Revisions of %1 %2' with:mclass name with:mselector).
+ browser window label:(resources string:'Revisions of %1 %2' with:mclass name with:mselector).
browser readOnly:true.
].
@@ -49564,6 +49688,7 @@
"Modified: / 28-02-2012 / 16:48:38 / cg"
! !
+
!NewSystemBrowser methodsFor:'menu actions-variables'!
browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -51034,6 +51159,7 @@
"Modified: / 24-02-2014 / 22:44:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!NewSystemBrowser methodsFor:'menus-dynamic'!
boockmarksMenu
@@ -51327,7 +51453,7 @@
label:[:chg |
|lbl|
"/ lbl := chg printString
- lbl := (chg className ? '???') , ' ' , (chg selector ? '???') allBold.
+ lbl := (chg className ? '???') , ' ' , (chg selector ? '???') allBold.
(chg isMethodChange and:[chg changeMethod isNil]) ifTrue:[
lbl := lbl asText allStrikedOut,' ','(removed)' allItalic.
].
@@ -51499,7 +51625,7 @@
] ifFalse:[
"/ an oldStyle popUpMenu
"/ this is a kludge...
- shiftedMenu := shiftedMenu asOldStylePopUpMenuFor:self.
+ shiftedMenu := (shiftedMenu asOldStylePopUpMenuFor:self) asMenu.
"/ would like to add the shifted-menu here
menu menuView
addLabels:(Array with:'-' with:(resources string:'Refactor'))
@@ -51533,7 +51659,7 @@
"Modified: / 18-10-2008 / 18:52:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 10-09-2013 / 14:40:13 / cg"
- "Modified: / 26-08-2014 / 22:43:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-08-2015 / 17:29:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
compareClassWithSmallTeamVersionMenu
@@ -54173,6 +54299,12 @@
"Modified: / 27-07-2012 / 22:19:07 / cg"
!
+canFileOutBee
+ ^ self hasOnlySmalltalkClassesSelected
+
+ "Created: / 14-04-2015 / 12:48:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
canFileOutBinary
^ self hasOnlySmalltalkClassesSelected
!
@@ -56689,6 +56821,7 @@
cancel: [nil]
! !
+
!NewSystemBrowser methodsFor:'private-helpers'!
anySelectedClass
@@ -56845,6 +56978,9 @@
formatSymbolOrNil == #vsePackage ifTrue:[
^ 'pkg'
].
+ formatSymbolOrNil == #beestp ifTrue:[
+ ^ 'stp'
+ ].
aClassOrNil notNil ifTrue:[
^ aClassOrNil sourceFileSuffix
].
@@ -57926,6 +58062,7 @@
^ navigationState projectListApplication
! !
+
!NewSystemBrowser methodsFor:'private-history'!
lastSearchPatterns
@@ -62198,13 +62335,13 @@
arguments:#().
^ true
].
-"/ (rawKey == #Delete) ifTrue:[
-"/ self
-"/ enqueueMessage:#classMenuRemove
-"/ for:self
-"/ arguments:#().
-"/ ^ true
-"/ ].
+ ((key == #Cut) or:[rawKey == #Delete or:[rawKey == #CmdBackSpace]]) ifTrue:[
+ self
+ enqueueMessage:#classMenuRemove
+ for:self
+ arguments:#().
+ ^ true
+ ].
(key == #Find or:[ key == #FindNext ]) ifTrue:[
self
enqueueMessage:#searchMenuFindClass
@@ -62213,6 +62350,8 @@
^ true
].
^ false
+
+ "Modified: / 18-06-2015 / 08:06:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
keyInClassListView:key rawKey:rawKey
@@ -62233,7 +62372,7 @@
arguments:#().
^ true
].
- ((key == #Cut) or:[rawKey == #Delete or:[rawKey == #BackSpace]]) ifTrue:[
+ ((key == #Cut) or:[rawKey == #Delete or:[rawKey == #CmdBackSpace]]) ifTrue:[
self
enqueueMessage:#classMenuRemove
for:self
@@ -62250,6 +62389,7 @@
^ false
"Modified: / 27-04-2012 / 13:08:06 / cg"
+ "Modified: / 18-06-2015 / 08:06:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
keyInCodeView:key rawKey:rawKey
--- a/Tools__OrganizerCanvas.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__OrganizerCanvas.st Thu May 12 08:33:55 2016 +0200
@@ -4863,7 +4863,10 @@
and:[ orgMode ~~ OrganizerCanvas organizerModePackageDiagram ]) ifTrue:[
"/ if the organizerMode is project, avoid clobbering the project selection
(orgMode ~~ OrganizerCanvas organizerModeProject
- or:[ (self selectedProjects value includesAll:( selectedClasses value collect:[:each | each package] )) not ]) ifTrue:[
+ "/ or:[ (self selectedProjects value includesAll:( selectedClasses value collect:[:each | each package] )) not ]
+ or:[ (self selectedProjects value includes: self class nameListEntryForChanged)
+ or:[ (self selectedProjects value includes: self class nameListEntryForALL) ]]
+ ) ifTrue:[
self updateOrganizationFromChangedClass.
].
].
@@ -4899,6 +4902,7 @@
super update:something with:aParameter from:changedObject
"Modified: / 27-04-2010 / 16:58:31 / cg"
+ "Modified: / 26-03-2014 / 10:17:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
updateCategorySelectionFromClasses
@@ -5203,5 +5207,10 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- a/Tools__Profiler.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__Profiler.st Thu May 12 08:33:55 2016 +0200
@@ -235,6 +235,12 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__Profiler.st,v 1.5 2012-11-04 21:42:25 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ 'Id: Tools__Profiler.st 7486 2009-10-26 22:06:24Z vranyj1 '
! !
+
--- a/Tools__ProfilerInfoBuilder.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ProfilerInfoBuilder.st Thu May 12 08:33:55 2016 +0200
@@ -140,7 +140,7 @@
!ProfilerInfoBuilder::MethodList class methodsFor:'documentation'!
version
- ^'$Id: Tools__ProfilerInfoBuilder.st,v 1.2 2011-07-03 17:46:45 cg Exp $'
+ ^'$Id: Tools__ProfilerInfoBuilder.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
!ProfilerInfoBuilder::MethodList methodsFor:'accessing'!
@@ -189,9 +189,15 @@
!ProfilerInfoBuilder class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ProfilerInfoBuilder.st,v 1.2 2011-07-03 17:46:45 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__ProfilerInfoBuilder.st,v 1.2 2011/07/03 17:46:45 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__ProfilerInfoBuilder.st 7486 2009-10-26 22:06:24Z vranyj1 '
+ ^ '$Id: Tools__ProfilerInfoBuilder.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__ProfilerInfoItem.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ProfilerInfoItem.st Thu May 12 08:33:55 2016 +0200
@@ -206,6 +206,12 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__ProfilerInfoItem.st,v 1.5 2012-11-04 21:40:34 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ 'Id: Tools__ProfilerInfoItem.st 7486 2009-10-26 22:06:24Z vranyj1 '
! !
+
--- a/Tools__ProjectCheckerBrowser.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ProjectCheckerBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -426,6 +426,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__SendersBrowslet.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__SendersBrowslet.st Thu May 12 08:33:55 2016 +0200
@@ -85,9 +85,15 @@
!SendersBrowslet class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__SendersBrowslet.st,v 1.2 2011-07-03 13:40:50 cg Exp $'
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__SendersBrowslet.st,v 1.2 2011/07/03 13:40:50 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ 'Id: Tools__SendersBrowslet.st 7637 2010-10-04 21:44:44Z vranyj1 '
+ ^ '$Id: Tools__SendersBrowslet.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__SmalltalkDiffTool.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__SmalltalkDiffTool.st Thu May 12 08:33:55 2016 +0200
@@ -927,7 +927,9 @@
self displayChangeOn: aGC x:x y:y.
"Created: / 21-05-2008 / 11:55:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
+!
+
+ !
!SmalltalkDiffTool::DiffItem methodsFor:'queries'!
@@ -1006,6 +1008,11 @@
^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.9 2013-08-19 16:01:16 stefan Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: Tools__SmalltalkDiffTool.st,v 1.9 2013-08-19 16:01:16 stefan Exp $'
! !
--- a/Tools__SmalltalkToolbox.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__SmalltalkToolbox.st Thu May 12 08:33:55 2016 +0200
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
"{ Package: 'stx:libtool' }"
"{ NameSpace: Tools }"
@@ -11,6 +22,20 @@
!SmalltalkToolbox class methodsFor:'documentation'!
+copyright
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
documentation
"
A toolbox for Smalltalk language
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Tools__SpecialCodeView.st Thu May 12 08:33:55 2016 +0200
@@ -0,0 +1,91 @@
+"
+ COPYRIGHT (c) 2000 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+"{ Package: 'stx:libtool' }"
+
+"{ NameSpace: Tools }"
+
+ApplicationModel subclass:#SpecialCodeView
+ instanceVariableNames:'displayMode'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Interface-Browsers-New'
+!
+
+!SpecialCodeView class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2000 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+! !
+
+!SpecialCodeView class methodsFor:'interface specs'!
+
+windowSpec
+ "This resource specification was automatically generated
+ by the UIPainter of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIPainter may not be able to read the specification."
+
+ "
+ UIPainter new openOnClass:SpecialCodeView andSelector:#windowSpec
+ SpecialCodeView new openInterface:#windowSpec
+ SpecialCodeView open
+ "
+
+ <resource: #canvas>
+
+ ^
+ #(#FullSpec
+ #name: #windowSpec
+ #window:
+ #(#WindowSpec
+ #label: 'SpecialCodeView'
+ #name: 'SpecialCodeView'
+ #min: #(#Point 10 10)
+ #bounds: #(#Rectangle 12 22 312 322)
+ )
+ #component:
+ #(#SpecCollection
+ #collection: #()
+ )
+ )
+! !
+
+!SpecialCodeView class methodsFor:'documentation'!
+
+version
+ ^ '$Id: Tools__SpecialCodeView.st 8083 2013-01-14 11:48:37Z vranyj1 $'
+!
+
+version_CVS
+ ^ 'Header: /cvs/stx/stx/libtool/Tools_SpecialCodeView.st,v 1.3 2010/05/07 12:27:43 cg Exp '
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: Tools__SpecialCodeView.st 8083 2013-01-14 11:48:37Z vranyj1 $'
+! !
+
--- a/Tools__StoreProjectBrowser.st Wed May 11 01:38:56 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1300 +0,0 @@
-"{ Package: 'stx:libtool' }"
-
-"{ NameSpace: Tools }"
-
-ApplicationModel subclass:#StoreProjectBrowser
- instanceVariableNames:'dbInfo connection commentTextHolder packagesList
- selectedVersionHolder versionsList selectedPackageHolder
- packagesFilterHolder infoLabelHolder selectedBundleOrPackage
- selectedVersion'
- classVariableNames:''
- poolDictionaries:''
- category:'System-SourceCodeManagement'
-!
-
-Object subclass:#Pundle
- instanceVariableNames:'name'
- classVariableNames:''
- poolDictionaries:''
- privateIn:StoreProjectBrowser
-!
-
-StoreProjectBrowser::Pundle subclass:#Package
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- privateIn:StoreProjectBrowser
-!
-
-StoreProjectBrowser::Pundle subclass:#Bundle
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- privateIn:StoreProjectBrowser
-!
-
-Object subclass:#PundleVersion
- instanceVariableNames:'id pundle version user timestamp comment timestampInt commentId
- isBundle blessingLevel'
- classVariableNames:''
- poolDictionaries:''
- privateIn:StoreProjectBrowser
-!
-
-Object subclass:#StoreProjectChangeSetReader
- instanceVariableNames:'browser dbConnection bundleOrPackage version changeSet'
- classVariableNames:''
- poolDictionaries:''
- privateIn:StoreProjectBrowser
-!
-
-!StoreProjectBrowser class methodsFor:'documentation'!
-
-documentation
-"
- An experimental first attempt to access a Store database.
- As I dont have (and dont want) access to a VW implementation for reference,
- the layout and contents of the tables has been guessed.
- The goal is to be able to read public domain code from a store DB.
-"
-!
-
-examples
-"
- Starting the application:
- [exBegin]
- Tools::StoreProjectBrowser open
-
- [exEnd]
-
- more examples to be added:
- [exBegin]
- ... add code fragment for
- ... executable example here ...
- [exEnd]
-"
-! !
-
-!StoreProjectBrowser class methodsFor:'image specs'!
-
-bundleImage
- "This resource specification was automatically generated
- by the ImageEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the ImageEditor may not be able to read the specification."
-
- "
- self bundleImage inspect
- ImageEditor openOnClass:self andSelector:#bundleImage
- Icon flushCachedIcons
- "
-
- <resource: #image>
-
- ^Icon
- constantNamed:'Tools::StoreProjectBrowser class bundleImage'
- ifAbsentPut:[(Depth8Image new) width: 17; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@BP$IBP$IBP$IBP$IBP@@@@@INS$9A!!\$BQ$YFRDI@@@@@@$9KSX?MP4IFP@*K0$@@@@@BS$C
-E@PIEP$YJ#0VBP@@@@@IA!!PDBQ$IBSL<LP8I@@@@@@$WI@4IFQ$3N \XI $@@@@@BS SGP$@J!!DGL!!@^BP@@@@@IAQ,%BRDIBTMDN3\I@@@@@@%AH2,ABQHI
-JS,(K $@@@@@BT@4OP(Z@ $*LB@''BP@@@@@IJ00\KC8KBRH_C4HI@@@@@@$IBP$IBP$IBP$IBP$@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-@@@b') ; colorMapFromArray:#[229 232 255 221 221 160 202 203 179 252 253 186 222 223 196 240 241 213 247 248 218 219 223 255 255 255 255 0 0 0 216 216 156 200 201 178 209 210 185 219 220 194 192 194 214 178 181 214 209 214 255 224 226 255 212 211 153 240 241 177 249 249 184 217 217 192 194 196 214 245 246 217 214 219 255 241 243 255 212 212 153 235 236 173 206 207 183 216 217 192 186 189 214 181 184 214 194 200 255 227 229 255 199 204 255 231 231 169 245 245 181 214 214 190 189 192 214 178 182 214 199 205 255 231 233 255 227 230 255 226 225 164 204 205 181 255 255 189 180 184 214 196 198 214 198 205 255 219 222 255 215 218 255 240 241 255 225 226 164 245 245 180 253 252 187 183 187 214 243 244 215 249 249 219 223 226 255 204 209 255 223 227 255 221 220 160 202 202 179 250 249 184 235 237 208 238 239 211 176 180 214 215 219 255 210 214 255]; mask:((Depth1Image new) width: 17; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@A?@@A?O?9?O?9?O?9?O?9?O?9?O?9?O?9?O?9?O?9?O?9?O?9?O?9?@@A?@@A?') ; yourself); yourself]
-!
-
-packageImage
- "This resource specification was automatically generated
- by the ImageEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the ImageEditor may not be able to read the specification."
-
- "
- self packageImage inspect
- ImageEditor openOnClass:self andSelector:#packageImage
- Icon flushCachedIcons
- "
-
- <resource: #image>
-
- ^Icon
- constantNamed:'Tools::StoreProjectBrowser class packageImage'
- ifAbsentPut:[(Depth8Image new) width: 17; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@BL#H2L#H2L#@@@@@@@@@@@#ECPRHB0CDQ #@@@@@@@@H20,KB0,KB0XH"L@@@@@@BLT
-A@,''KCLJG0T)H0@@@@@#K!!PTEB TEAP[AR<#@@@@@BLYE18%GQ@IJ2$ECBL@@@@@H24ALPD]@PDHMPTZH0@@@@@#I"P$IA4OIAXSARL@@@@@@BL2@B(0GP\N
-A2D#@@@@@@@@H0H\M!!T]CPX6H0@@@@@@@@@@H2L#H2L#H2L@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-@@@b') ; colorMapFromArray:#[185 185 131 197 197 141 211 212 153 238 239 175 253 253 187 109 109 109 180 180 127 184 185 132 197 198 141 202 203 146 234 234 172 250 249 185 155 155 108 179 180 128 184 185 131 191 191 137 203 202 146 235 235 171 250 250 185 154 155 109 255 255 255 179 179 128 191 190 136 203 202 145 232 232 170 249 249 184 149 149 105 173 172 122 180 179 128 136 136 136 202 202 146 231 231 169 247 247 182 149 150 104 172 172 122 0 0 0 191 191 136 202 202 145 230 231 169 246 246 181 194 194 194 167 167 118 185 185 132 203 203 145 165 165 165 241 241 177 255 255 189 160 160 113 185 184 131 197 197 142 221 221 160 238 238 175 253 253 188 161 161 113 180 180 128]; mask:((Depth1Image new) width: 17; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@A?@@A?@?1?A?9?C?9?G?9?O?9?O?9?O?9?O?1?O?!!?O?A?G>A?@@A?@@A?@@A?') ; yourself); yourself]
-! !
-
-!StoreProjectBrowser class methodsFor:'interface specs'!
-
-windowSpec
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "
- UIPainter new openOnClass:Tools::StoreProjectBrowser andSelector:#windowSpec
- Tools::StoreProjectBrowser new openInterface:#windowSpec
- Tools::StoreProjectBrowser open
- "
-
- <resource: #canvas>
-
- ^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'Tools::StoreProjectBrowser'
- name: 'Tools::StoreProjectBrowser'
- min: (Point 10 10)
- max: (Point 1024 768)
- bounds: (Rectangle 0 0 527 369)
- menu: mainMenu
- )
- component:
- (SpecCollection
- collection: (
- (VariableHorizontalPanelSpec
- name: 'VariableHorizontalPanel1'
- layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
- snapMode: both
- handlePosition: right
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box1'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Bundles and Packages:'
- name: 'Label1'
- layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- translateLabel: true
- adjust: left
- )
- (InputFieldSpec
- name: 'PackageFilterEntryField'
- layout: (LayoutFrame 2 0 30 0 -2 1 58 0)
- model: packagesFilterHolder
- immediateAccept: true
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: false
- )
- (SequenceViewSpec
- name: 'PackageList'
- layout: (LayoutFrame 0 0 60 0 0 1 0 1)
- model: selectedPackageHolder
- menu: packageListMenu
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- valueChangeSelector: packageSelectionChanged
- useIndex: true
- sequenceList: packagesList
- )
- )
-
- )
- )
- (ViewSpec
- name: 'Box3'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Versions:'
- name: 'Label2'
- layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- translateLabel: true
- adjust: left
- )
- (VariableVerticalPanelSpec
- name: 'VariableVerticalPanel1'
- layout: (LayoutFrame 0 0 30 0 0 1 0 1)
- component:
- (SpecCollection
- collection: (
- (SequenceViewSpec
- name: 'VersionsList'
- model: selectedVersionHolder
- menu: versionsListMenu
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- valueChangeSelector: versionSelectionChanged
- useIndex: true
- sequenceList: versionsList
- )
- (ViewSpec
- name: 'Box2'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Comment:'
- name: 'Label3'
- layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- translateLabel: true
- adjust: left
- )
- (TextEditorSpec
- name: 'CommentTextEditor'
- layout: (LayoutFrame 0 0 30 0 0 1 -1 1)
- model: commentTextHolder
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- )
- )
-
- )
- )
- )
-
- )
- handles: (Any 0.5 1.0)
- )
- )
-
- )
- )
- )
-
- )
- handles: (Any 0.5 1.0)
- )
- (LabelSpec
- name: 'InfoLabel'
- layout: (LayoutFrame 2 0 -28 1 -1 1 -1 1)
- level: -1
- translateLabel: true
- labelChannel: infoLabelHolder
- adjust: left
- )
- )
-
- )
- )
-! !
-
-!StoreProjectBrowser class methodsFor:'internationalization'!
-
-resourcePackName
- ^ 'StoreProjectBrowser'
-! !
-
-!StoreProjectBrowser class methodsFor:'menu specs'!
-
-mainMenu
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
- "
- MenuEditor new openOnClass:Tools::StoreProjectBrowser andSelector:#mainMenu
- (Menu new fromLiteralArrayEncoding:(Tools::StoreProjectBrowser mainMenu)) startUp
- "
-
- <resource: #menu>
-
- ^
- #(Menu
- (
- (MenuItem
- label: 'File'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Fileout As...'
- itemValue: menuFileoutAs
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Update'
- itemValue: menuUpdate
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Exit'
- itemValue: closeRequest
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'Connection'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Connect'
- itemValue: menuConnect
- translateLabel: true
- isVisible: notConnectedHolder
- )
- (MenuItem
- label: 'Disconnect'
- itemValue: menuDisconnect
- translateLabel: true
- isVisible: isConnectedHolder
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'Help'
- translateLabel: true
- startGroup: right
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Documentation'
- itemValue: openDocumentation
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'About this Application...'
- itemValue: openAboutThisApplication
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
- )
-!
-
-packageListMenu
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
- "
- MenuEditor new openOnClass:Tools::StoreProjectBrowser andSelector:#packageListMenu
- (Menu new fromLiteralArrayEncoding:(Tools::StoreProjectBrowser packageListMenu)) startUp
- "
-
- <resource: #menu>
-
- ^
- #(Menu
- (
- (MenuItem
- label: 'Update'
- itemValue: menuUpdatePackageList
- translateLabel: true
- )
- )
- nil
- nil
- )
-!
-
-versionsListMenu
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
- "
- MenuEditor new openOnClass:Tools::StoreProjectBrowser andSelector:#versionsListMenu
- (Menu new fromLiteralArrayEncoding:(Tools::StoreProjectBrowser versionsListMenu)) startUp
- "
-
- <resource: #menu>
-
- ^
- #(Menu
- (
- (MenuItem
- label: 'Load'
- itemValue: versionsListMenuLoad
- translateLabel: true
- )
- (MenuItem
- label: 'Browse'
- itemValue: versionsListMenuBrowse
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Update'
- itemValue: versionsListMenuUpdate
- translateLabel: true
- )
- )
- nil
- nil
- )
-! !
-
-!StoreProjectBrowser class methodsFor:'startup'!
-
-openOn:aDBInfo
- |newApp|
-
- newApp := self new.
- newApp allButOpen.
- newApp dbInfo:aDBInfo.
- newApp open.
- ^ newApp
-! !
-
-!StoreProjectBrowser methodsFor:'actions'!
-
-packageSelectionChanged
- |newest|
-
- self withReadCursorDo:[
- selectedBundleOrPackage := packagesList value at:(selectedPackageHolder value).
- self updateVersionsListFor:selectedBundleOrPackage.
-
- versionsList value notEmptyOrNil ifTrue:[
- newest := versionsList value first.
- self updateCommentFor:newest
- ]
- ].
-!
-
-versionSelectionChanged
- |selIndex|
-
- selIndex := selectedVersionHolder value.
- selIndex isNil ifTrue:[
- self commentTextHolder value:nil.
- selectedVersion := nil.
- ] ifFalse:[
- selectedVersion := versionsList value at:selIndex.
- self withReadCursorDo:[
- self updateBlessingCommentFor:selectedVersion
- ].
- ]
-! !
-
-!StoreProjectBrowser methodsFor:'aspects'!
-
-commentTextHolder
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- commentTextHolder isNil ifTrue:[
- commentTextHolder := '' asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ commentTextHolder addDependent:self.
-"/ commentTextHolder onChangeSend:#commentTextHolderChanged to:self.
- ].
- ^ commentTextHolder.
-!
-
-infoLabelHolder
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- infoLabelHolder isNil ifTrue:[
- infoLabelHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ infoLabelHolder addDependent:self.
-"/ infoLabelHolder onChangeSend:#infoLabelHolderChanged to:self.
- ].
- ^ infoLabelHolder.
-!
-
-isConnected
- ^ connection notNil and:[ connection isConnected ].
-!
-
-isConnectedHolder
- ^ [ self isConnected ]
-!
-
-notConnectedHolder
- ^ [ self isConnected not ]
-!
-
-packagesFilterHolder
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- packagesFilterHolder isNil ifTrue:[
- packagesFilterHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ packagesFilterHolder addDependent:self.
-"/ packagesFilterHolder onChangeSend:#packagesFilterHolderChanged to:self.
- ].
- ^ packagesFilterHolder.
-!
-
-packagesList
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- packagesList isNil ifTrue:[
- packagesList := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ packagesList addDependent:self.
-"/ packagesList onChangeSend:#packagesListChanged to:self.
- ].
- ^ packagesList.
-!
-
-selectedPackageHolder
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- selectedPackageHolder isNil ifTrue:[
- selectedPackageHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ selectedPackageHolder addDependent:self.
-"/ selectedPackageHolder onChangeSend:#selectedPackageHolderChanged to:self.
- ].
- ^ selectedPackageHolder.
-!
-
-selectedVersionHolder
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- selectedVersionHolder isNil ifTrue:[
- selectedVersionHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ selectedVersionHolder addDependent:self.
-"/ selectedVersionHolder onChangeSend:#selectedVersionHolderChanged to:self.
- ].
- ^ selectedVersionHolder.
-!
-
-versionsList
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- versionsList isNil ifTrue:[
- versionsList := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ versionsList addDependent:self.
-"/ versionsList onChangeSend:#versionsListChanged to:self.
- ].
- ^ versionsList.
-! !
-
-!StoreProjectBrowser methodsFor:'db access'!
-
-getBlob:id
- ^ self getBlob:id withPrefix:nil
-!
-
-getBlob:id withPrefix:prefixOrNil
- |item cursor row blobType blobData rawData|
-
- item := Set new.
- cursor := connection
- execute:('SELECT blobtype,blobdata FROM tw_blob where primarykey = %1;' bindWith:id)
- release:false.
-
- cursor next notNil ifTrue:[
- row := cursor rowAsArray.
- blobType := (row at:1).
- rawData := (row at:2).
- blobData := Base64Coder decode:rawData.
- ].
- cursor release.
-
- blobType < 0 ifTrue:[
- "/ this data is a prefix...
-self halt.
- ^ self getBlob:(blobType negated) withPrefix:blobData
- ].
-
- blobType == 1 ifTrue:[
- "binary"
- ^ blobData
- ].
- blobType == 2 ifTrue:[
- "string"
- ^ blobData asString
- ].
- blobType == 3 ifTrue:[
- "2-byte string"
-self halt.
- ^ nil
- ].
-self halt.
- ^ nil
-!
-
-getBundles
- |items cursor row|
-
- items := Set new.
- cursor := connection
- execute:'SELECT DISTINCT name FROM tw_bundle;'
- release:false.
-
- [cursor next notNil] whileTrue:[
- row := cursor rowAsArray.
- Transcript showCR:row.
- items add:(Bundle new name:(row at:1)).
- ].
- cursor release.
- ^ items asOrderedCollection sort:[:a :b| a name < b name]
-!
-
-getConnection
- |session|
-
- dbInfo isNil ifTrue:[
- self askForDatabaseInfo
- ].
-
- session := SQL::ODBCSession new.
- SQL::ODBCError handle:[:ex |
- ^ nil.
- ] do:[
- session
- connectWithUsername:(dbInfo userName)
- password:(dbInfo password)
- dbname:(dbInfo dbName).
- ].
-
- (session isConnected) ifFalse:[
- ^ nil.
- ].
- ^ session.
-!
-
-getPackages
- |items cursor row|
-
- items := Set new.
- cursor := connection
- execute:'SELECT DISTINCT name FROM tw_package;'
- release:false.
-
- [cursor next notNil] whileTrue:[
- row := cursor rowAsArray.
- Transcript showCR:row.
- items add:(Package new name:(row at:1)).
- ].
- cursor release.
- ^ items asOrderedCollection sort:[:a :b| a name < b name]
-!
-
-getVersionsForBundle:aBundle
- ^ self getVersionsForBundleOrPackage:aBundle isBundle:true
-!
-
-getVersionsForBundleOrPackage:aBundle isBundle:isBundle
- |items cursor row table|
-
- connection isNil ifTrue:[^ #() ].
-
- table := isBundle ifTrue:'tw_bundle' ifFalse:'tw_package'.
-
- items := Set new.
- cursor := connection
- execute:'SELECT name,version,username,timestamp,commentid,primarykey,blessinglevel
- FROM ',table,
- "/ ' WHERE name = ''',aBundle name,''' ',
- ';'
- release:false.
-
- [cursor next notNil] whileTrue:[
- |v name version username timestamp commentid primarykey blessinglevel|
-
- row := cursor rowAsArray.
-Transcript showCR:row.
- name := row at:1.
- version := row at:2.
- username := row at:3.
- timestamp := row at:4.
- commentid := row at:5.
- primarykey := row at:6.
- blessinglevel := row at:7.
- name = aBundle name ifTrue:[
- v := PundleVersion new.
- v pundle:aBundle version:version user:username.
- v timestampInt:timestamp commentId:commentid.
- v blessingLevel:blessinglevel.
- v id:primarykey.
- v isBundle:isBundle.
- items add:v.
- ]
- ].
- cursor release.
- ^ items asOrderedCollection sort:[:a :b| a isVersionAfter: b]
-!
-
-getVersionsForPackage:aPackage
- ^ self getVersionsForBundleOrPackage:aPackage isBundle:false
-!
-
-updateBlessingCommentFor:aPundleVersion
- |versionId commentId user comment cursor row recType|
-
- versionId := aPundleVersion id.
- recType := aPundleVersion isBundle ifTrue:'B' ifFalse:'P'.
-
- cursor := connection
- execute:'SELECT username,commentid FROM tw_blessing
-WHERE pkgid = ',versionId printString,' AND rectype = ''',recType,''';'
- release:false.
- cursor isNil ifTrue:[
- commentId :=0
- ] ifFalse:[
- row := cursor next rowAsArray.
- cursor release.
-
- user := row at:1.
- commentId := row at:2.
- ].
-
- commentId == 0 ifTrue:[
- comment := 'No comment' allItalic
- ] ifFalse:[
- comment := self getBlob:commentId.
- comment := comment asCollectionOfSubCollectionsSeparatedBy:Character return.
- comment := comment asStringCollection asString.
- ].
- self commentTextHolder value:comment.
-!
-
-updateCommentFor:aPundleVersion
- |comment id|
-
- id := aPundleVersion commentId.
- id == 0 ifTrue:[
- comment := 'No comment' allItalic
- ] ifFalse:[
- comment := self getBlob:(aPundleVersion commentId).
- ].
- self commentTextHolder value:comment.
-!
-
-updatePackagesList
- |bundles packages|
-
- connection isNil ifTrue:[^ self ].
-
- self withReadCursorDo:[
- bundles := self getBundles.
- packages := self getPackages.
- ].
- packagesList value:(bundles , packages).
-!
-
-updateVersionsListFor:aBundleOrPackage
- |items|
-
- aBundleOrPackage isBundle ifTrue:[
- items := self getVersionsForBundle:aBundleOrPackage
- ] ifFalse:[
- items := self getVersionsForPackage:aBundleOrPackage
- ].
- self selectedVersionHolder value:nil.
- versionsList value:items.
-! !
-
-!StoreProjectBrowser methodsFor:'help'!
-
-aboutThisApplicationText
- ^ super aboutThisApplicationText ,
- '\\Written by Claus Gittinger, eXept Software AG.' withCRs
-! !
-
-!StoreProjectBrowser methodsFor:'initialization & release'!
-
-dbInfo:aDBInfo
- |session|
-
- dbInfo := aDBInfo.
- session := self getConnection.
- (session notNil) ifFalse:[
- ^ self.
- ].
- connection := session.
- self updateInfo.
- ^ self
-!
-
-postOpenWith:aBuilder
- super postOpenWith:aBuilder.
- self updatePackagesList.
-!
-
-release
- connection notNil ifTrue:[
- connection disconnect.
- connection := nil.
- ]
-!
-
-updateInfo
- self isConnected ifTrue:[
- self window label:('Store Browser: ',dbInfo dbName).
- self infoLabelHolder value:('Connected to ',dbInfo dbName).
- ] ifFalse:[
- self window label:'Store Browser'.
- self infoLabelHolder value:nil.
- ]
-! !
-
-!StoreProjectBrowser methodsFor:'menu actions'!
-
-askForDatabaseInfo
- |defaultInfo|
-
- defaultInfo := StoreSourceCodeManager defaultDBInfo.
- defaultInfo dbName isNil ifTrue:[
- defaultInfo := StoreSourceCodeManager repositoryInfoPerModule firstIfEmpty:nil.
- ].
- dbInfo := defaultInfo
-!
-
-menuConnect
- |session|
-
- connection isNil ifTrue:[
- session := self getConnection.
- (session notNil) ifFalse:[
- ^ self.
- ].
- connection := session.
- self updateInfo.
- self updatePackagesList.
- ]
-!
-
-menuDisconnect
- connection notNil ifTrue:[
- connection disconnect.
- connection := nil.
- self updateInfo.
- ]
-!
-
-menuFileoutAs
- "automatically generated by UIPainter ..."
-
- "*** the code below performs no action"
- "*** (except for some feedback on the Transcript)"
- "*** Please change as required and accept in the browser."
-
- "action to be added ..."
-
- Transcript showCR:self class name, ': menu action for menuFileoutAs ...'.
-!
-
-menuOpen
- "This method was generated by the Browser.
- It will be invoked when the menu-item 'open' is selected."
-
- "/ change below and add any actions as required here ...
- self warn:'no action for ''open'' available.'.
-!
-
-menuUpdate
- self updatePackagesList
-!
-
-openDocumentation
- "This method was generated by the Browser.
- It will be invoked when the menu-item 'help-documentation' is selected."
-
- "/ change below as required ...
-
- "/ to open an HTML viewer on some document (under 'doc/online/<language>/' ):
- HTMLDocumentView openFullOnDocumentationFile:'TOP.html'.
-
- "/ add application-specific help files under the 'doc/online/<language>/help/appName'
- "/ directory, and open a viewer with:
- "/ HTMLDocumentView openFullOnDocumentationFile:'help/<MyApplication>/TOP.html'.
-!
-
-versionsListMenuBrowse
- |reader changeSet environment|
-
- reader := StoreProjectChangeSetReader new.
- reader
- browser:self dbConnection:connection
- bundleOrPackage:selectedBundleOrPackage version:selectedVersion.
- changeSet :=reader changeSet.
- ChangeSetBrowser openOn:changeSet.
-self halt.
-
- environment := StoreProjectEnvironment for:selectedVersion connection:connection.
- SystemBrowser
- openOn:environment
- label:(resources string:'%1' with:selectedBundleOrPackage name , ' ' , selectedVersion version)
-!
-
-versionsListMenuLoad
-self halt.
-!
-
-versionsListMenuUpdate
-self halt.
-! !
-
-!StoreProjectBrowser::Pundle methodsFor:'accessing'!
-
-name
- ^ name
-!
-
-name:something
- name := something.
-! !
-
-!StoreProjectBrowser::Pundle methodsFor:'printing'!
-
-displayString
- ^ name
-! !
-
-!StoreProjectBrowser::Pundle methodsFor:'testing'!
-
-isBundle
- ^ false
-!
-
-isPackage
- ^ false
-! !
-
-!StoreProjectBrowser::Package methodsFor:'testing'!
-
-isPackage
- ^ true
-! !
-
-!StoreProjectBrowser::Bundle methodsFor:'printing'!
-
-displayString
- ^ name ,' (Bundle)'
-! !
-
-!StoreProjectBrowser::Bundle methodsFor:'testing'!
-
-isBundle
- ^ true
-! !
-
-!StoreProjectBrowser::PundleVersion methodsFor:'accessing'!
-
-blessingLevel
- ^ blessingLevel
-!
-
-blessingLevel:something
- blessingLevel := something.
-!
-
-commentId
- ^ commentId
-!
-
-id
- ^ id
-!
-
-id:something
- id := something.
-!
-
-isBundle
- ^ isBundle
-!
-
-isBundle:aBoolean
- isBundle := aBoolean
-!
-
-isPackage
- ^ isBundle not
-!
-
-pundle
- ^ pundle
-!
-
-pundle:pundleArg version:versionArg user:userArg
- pundle := pundleArg.
- version := versionArg.
- user := userArg.
-!
-
-timestamp
- |deltaSeconds|
-
- timestamp isNil ifTrue:[
- "/ to compute the timestamp, we have to do this:
- "/ the timestampInt are seconds since 1993 + 10d + 19min + 47sec"
- "/ can anyone explain this ????
- deltaSeconds := 23*365 * 24*60*60. "/ 23 years
- deltaSeconds := deltaSeconds + (233*24*60*60). "/ 10 days
- deltaSeconds := deltaSeconds + (19*60). "/ 19 minutes
- deltaSeconds := deltaSeconds + (47). "/ 47 seconds
-
- timestamp := Timestamp secondsSince1970:(timestampInt + deltaSeconds).
- ].
- ^ timestamp
-!
-
-timestampInt:timestampIntArg commentId:commentIdArg
- timestampInt := timestampIntArg.
- commentId := commentIdArg.
-!
-
-user
- ^ user
-!
-
-version
- ^ version
-! !
-
-!StoreProjectBrowser::PundleVersion methodsFor:'comparing'!
-
-isVersionAfter:anotherVersion
- |myMajor othersMajor myMinor othersMinor|
-
- myMajor := self majorVersion.
- othersMajor := anotherVersion majorVersion.
-
- myMajor > othersMajor ifTrue:[^ true].
- myMajor < othersMajor ifTrue:[^ false].
-
- myMinor := self minorVersion.
- othersMinor := anotherVersion minorVersion.
-
- myMinor > othersMinor ifTrue:[^ true].
- myMinor < othersMinor ifTrue:[^ false].
-
- ^ version > anotherVersion version
-!
-
-majorVersion
- ^ Integer readFrom:(version upTo:$:)
-!
-
-minorVersion
- ^ Integer readFrom:((version restAfter:$.) upTo:$.)
-! !
-
-!StoreProjectBrowser::PundleVersion methodsFor:'printing'!
-
-displayString
- ^ version , ' (',user,') ' , self timestamp printString
-! !
-
-!StoreProjectBrowser::StoreProjectChangeSetReader methodsFor:'accessing'!
-
-browser:browserArg dbConnection:dbConnectionArg bundleOrPackage:bundleOrPackageArg version:versionArg
- browser := browserArg.
- dbConnection := dbConnectionArg.
- bundleOrPackage := bundleOrPackageArg.
- version := versionArg.
-! !
-
-!StoreProjectBrowser::StoreProjectChangeSetReader methodsFor:'reading'!
-
-allClassesDo:aBlock
- |packageId cursor row entries classes|
-
- packageId := bundleOrPackage id.
-
- entries := OrderedCollection new.
- cursor := dbConnection
- execute:('SELECT classref,metaclassref,definitionorder FROM tw_pkgclasses WHERE packageref = %1'
- bindWith:packageId)
- release:false.
-
- [cursor next notNil] whileTrue:[
- row := cursor rowAsObject.
- entries add:row.
- ].
- cursor release.
-
- classes := entries collect:[:entry |
- |records classRecord metaclassRecord|
-
- "/ entry classref
- "/ entry metaclassref
- "/ entry definitionorder
- cursor := dbConnection
- execute:('SELECT name,definitionid,commentid,environmentstring,superclass
- FROM tw_classrecord WHERE primarykey = %1'
- bindWith:entry classref)
- release:false.
- records := OrderedCollection new.
- [cursor next notNil] whileTrue:[
- row := cursor rowAsObject.
- records add:row.
- ].
- cursor release.
- self assert:(records size == 1).
- classRecord := records first.
-
- cursor := dbConnection
- execute:('SELECT name,definitionid,commentid,environmentstring,superclass
- FROM tw_classrecord WHERE primarykey = %1'
- bindWith:entry metaclassref)
- release:false.
- records := OrderedCollection new.
- [cursor next notNil] whileTrue:[
- row := cursor rowAsObject.
- records add:row.
- ].
- cursor release.
- self assert:(records size == 1).
- metaclassRecord := records first.
-
- { classRecord. metaclassRecord. entry definitionorder }
- ].
-!
-
-changeSet
- "build a changeSet from the bundle or package
- Return the changeSet."
-
- changeSet := ChangeSet new.
- self fetchClassDefinitions.
-"/ changesFromStream:aStream
-"/ for:changeSet
-"/ reader:(ChangeFileReader new)
-"/ do:[:aChange :lineNumberOrNil :posOrNil |
-"/ changeSet add:aChange.
-"/ (aConditionBlock value:aChange) ifFalse:[^ changeSet].
-"/ ].
-
- ^ changeSet
-!
-
-fetchClassDefinitions
- |packageId cursor row entries classes change|
-
- packageId := version id.
-
- entries := OrderedCollection new.
- cursor := dbConnection
- execute:('SELECT classref,metaclassref,definitionorder FROM tw_pkgclasses WHERE packageref = %1'
- bindWith:packageId)
- release:false.
-
- [cursor next notNil] whileTrue:[
- row := cursor rowAsObject.
- entries add:row.
- ].
- cursor release.
-
- classes := entries collect:[:entry |
- |records classRecord metaclassRecord definitionString|
-
- "/ entry classref
- "/ entry metaclassref
- "/ entry definitionorder
- cursor := dbConnection
- execute:('SELECT name,definitionid,commentid,environmentstring,superclass
- FROM tw_classrecord WHERE primarykey = %1'
- bindWith:entry classref)
- release:false.
- records := OrderedCollection new.
- [cursor next notNil] whileTrue:[
- row := cursor rowAsObject.
- records add:row.
- ].
- cursor release.
- self assert:(records size == 1).
- classRecord := records first.
-
- cursor := dbConnection
- execute:('SELECT name,definitionid,commentid,environmentstring,superclass
- FROM tw_classrecord WHERE primarykey = %1'
- bindWith:entry metaclassref)
- release:false.
- records := OrderedCollection new.
- [cursor next notNil] whileTrue:[
- row := cursor rowAsObject.
- records add:row.
- ].
- cursor release.
- self assert:(records size == 1).
- metaclassRecord := records first.
-
- change := ClassDefinitionChange new.
- definitionString := browser getBlob:(classRecord definitionid).
- change source:definitionString.
- change className:classRecord name.
- "/ change superClassName:metaclassRecord name.
- change package:bundleOrPackage name.
- changeSet add:change.
-
- { classRecord. metaclassRecord. entry definitionorder }
- ].
-! !
-
-!StoreProjectBrowser class methodsFor:'documentation'!
-
-version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__StoreProjectBrowser.st,v 1.13 2009-09-21 21:29:29 cg Exp $'
-! !
--- a/Tools__Tag.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__Tag.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -1479,6 +1477,11 @@
^ '$Header$'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
--- a/Tools__TestRunnerEmbedded.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__TestRunnerEmbedded.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,14 @@
-"{ Encoding: utf8 }"
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
"{ Package: 'stx:libtool' }"
"{ NameSpace: Tools }"
@@ -11,6 +20,21 @@
category:'SUnit-UI'
!
+!TestRunnerEmbedded class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 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
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+! !
!TestRunnerEmbedded class methodsFor:'plugIn spec'!
--- a/Tools__TextDiff3Tool.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__TextDiff3Tool.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2006 by eXept Software AG
All Rights Reserved
@@ -24,7 +22,7 @@
!
CodeViewService subclass:#MergeService
- instanceVariableNames:'dataHolder data sectionIntervalHolder'
+ instanceVariableNames:'dataHolder data sectionIntervalHolder ignoreLinesModifiedFromTo'
classVariableNames:''
poolDictionaries:''
privateIn:TextDiff3Tool
@@ -1036,7 +1034,7 @@
^ self "/not yet registered
].
data isNil ifTrue:[
- textView list: #().
+ textView list: StringCollection new.
^self.
].
@@ -1044,14 +1042,19 @@
changed := data listInfos
select:[:info|info isConflict]
thenCollect:[:info|info line].
-
- textView changedLines: changed.
- textView diffMode: true.
- textView list: data list.
+ [
+ ignoreLinesModifiedFromTo := true.
+ textView changedLines: changed.
+ textView diffMode: true.
+ textView list: data list.
+ ] ensure:[
+ ignoreLinesModifiedFromTo := false.
+ ].
textView invalidate.
gutterView invalidate.
"Created: / 19-03-2012 / 12:41:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2015 / 13:16:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
dataHolderChanged
@@ -1178,6 +1181,7 @@
linesModifiedFrom: start to: end
+ ignoreLinesModifiedFromTo ifTrue:[ ^ self ].
start to: end do:[:i|
(data listInfos at:i) resolution: #Merged.
].
@@ -1185,6 +1189,17 @@
"Created: / 06-07-2011 / 17:14:36 / jv"
"Created: / 20-03-2012 / 22:57:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2015 / 12:36:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!TextDiff3Tool::MergeService methodsFor:'initialization'!
+
+initialize
+ "Invoked when a new instance is created."
+ super initialize.
+ ignoreLinesModifiedFromTo := false.
+
+ "Created: / 16-11-2015 / 12:36:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TextDiff3Tool::MergeService methodsFor:'registering'!
--- a/Tools__ToDoList.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ToDoList.st Thu May 12 08:33:55 2016 +0200
@@ -180,7 +180,13 @@
!ToDoList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ToDoList.st,v 1.4 2008-08-20 19:41:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ToDoList.st,v 1.4 2008/08/20 19:41:31 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
ToDoList initialize!
--- a/Tools__ToDoListBrowser.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ToDoListBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -641,4 +641,10 @@
version
^ '$Header: /cvs/stx/stx/libtool/Tools__ToDoListBrowser.st,v 1.18 2012-11-03 16:16:49 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/Tools__ToDoListEntry.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ToDoListEntry.st Thu May 12 08:33:55 2016 +0200
@@ -228,5 +228,15 @@
!ToDoListEntry class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ToDoListEntry.st,v 1.8 2008-08-20 19:41:35 cg Exp $'
+ ^ '$Id: Tools__ToDoListEntry.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: Tools__ToDoListEntry.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/Tools__ToDoNotification.st Wed May 11 01:38:56 2016 +0200
+++ b/Tools__ToDoNotification.st Thu May 12 08:33:55 2016 +0200
@@ -39,5 +39,11 @@
!ToDoNotification class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ToDoNotification.st,v 1.2 2008-08-20 19:41:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ToDoNotification.st,v 1.2 2008/08/20 19:41:37 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/TraitsInspectorView.st Wed May 11 01:38:56 2016 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-"
- COPYRIGHT (c) 2009 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
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-"{ Package: 'stx:libtool' }"
-
-SmalltalkInspectorView subclass:#TraitsInspectorView
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Interface-Inspector'
-!
-
-!TraitsInspectorView class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 2009 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
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-!
-
-documentation
-"
- same as a smalltalk inspector, but filters only traits
-
- [author:]
- Claus Gittinger
-"
-! !
-
-!TraitsInspectorView methodsFor:'private'!
-
-indexList
- "redefined to only show class variables"
-
- keys := OrderedCollection new.
- inspectedObject keysAndValuesDo:[:k :v |
- v isTrait ifTrue:[
- keys add:k
- ]
- ].
- keys := keys asSortedCollection:[:a :b | a displayString < b displayString].
- ^ keys
-! !
-
-!TraitsInspectorView class methodsFor:'documentation'!
-
-version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/TraitsInspectorView.st,v 1.1 2009-10-12 20:00:25 cg Exp $'
-! !
--- a/VersionRevisionItem.st Wed May 11 01:38:56 2016 +0200
+++ b/VersionRevisionItem.st Thu May 12 08:33:55 2016 +0200
@@ -9,8 +9,9 @@
other person. No title to or ownership of the software is
hereby transferred.
"
+"{ Package: 'stx:libtool' }"
-
+"{ NameSpace: Smalltalk }"
AbstractRevisionItem subclass:#VersionRevisionItem
instanceVariableNames:''
@@ -114,5 +115,11 @@
!VersionRevisionItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/VersionRevisionItem.st,v 1.6 2000-02-18 14:08:03 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/VersionRevisionItem.st,v 1.6 2000/02/18 14:08:03 cg Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
+
--- a/XTermView.st Wed May 11 01:38:56 2016 +0200
+++ b/XTermView.st Thu May 12 08:33:55 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
XEmbedContainerView subclass:#XTermView
instanceVariableNames:'pid wid wd'
classVariableNames:'XTermType XTermExecutable'
--- a/abbrev.stc Wed May 11 01:38:56 2016 +0200
+++ b/abbrev.stc Thu May 12 08:33:55 2016 +0200
@@ -41,6 +41,7 @@
MemoryMonitorView MemoryMonitorView stx:libtool 'Monitors-ST/X' 2
MemoryUsageView MemoryUsageView stx:libtool 'Monitors-ST/X' 2
MultiViewToolApplication MultiViewToolApplication stx:libtool 'Interface-Smalltalk' 7
+NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
PerforceSourceCodeManagerUtilities PerforceSourceCodeManagerUtilities stx:libtool 'System-SourceCodeManagement' 0
ProcessMonitorV2 ProcessMonitorV2 stx:libtool 'Monitors-ST/X' 1
SyntaxElement SyntaxElement stx:libtool 'Interface-CodeView-Syntax' 0
@@ -205,7 +206,6 @@
HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
Launcher Launcher stx:libtool 'Interface-Smalltalk' 7
LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
-NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
ProjectView ProjectView stx:libtool 'Interface-Tools' 2
--- a/bc.mak Wed May 11 01:38:56 2016 +0200
+++ b/bc.mak Thu May 12 08:33:55 2016 +0200
@@ -266,3 +266,12 @@
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Autoload.$(H) $(INCLUDE_TOP)\stx\libbasic\Bag.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\Date.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Filename.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Geometric.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Interval.$(H) $(INCLUDE_TOP)\stx\libbasic\KeyedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\MethodDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Point.$(H) $(INCLUDE_TOP)\stx\libbasic\ProgrammingLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadOnlySequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Rectangle.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\SmallInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\Smalltalk.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\Timestamp.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\Warning.$(H) $(INCLUDE_TOP)\stx\libbasic2\Iterator.$(H) $(INCLUDE_TOP)\stx\libbasic2\RunArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SocketAddress.$(H) $(INCLUDE_TOP)\stx\libbasic2\Text.$(H) $(INCLUDE_TOP)\stx\libbasic2\UUID.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic3\ChangeSet.$(H) $(INCLUDE_TOP)\stx\libbasic3\CompositeChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ProfileTree.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Breakpoint.$(H) $(INCLUDE_TOP)\stx\libcomp\BreakpointDescription.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libview\Color.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\Form.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\MultiImage.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\PopUpMenu.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libtool.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/bmake.bat Wed May 11 01:38:56 2016 +0200
+++ b/bmake.bat Thu May 12 08:33:55 2016 +0200
@@ -4,6 +4,9 @@
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
make.exe -N -f bc.mak %DEFINES% %*
--- a/extensions.st Wed May 11 01:38:56 2016 +0200
+++ b/extensions.st Thu May 12 08:33:55 2016 +0200
@@ -19,6 +19,16 @@
"Created: / 25-07-2010 / 08:58:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!AbstractSyntaxHighlighter class methodsFor:'api highlighting'!
+
+formatStatements:aString in:aClass elementsInto: aCollection
+ "Format (recolor) a list of statements with optional temporaries in a given class.
+ Return the text containing font changes and color information."
+ ^ self formatStatements:aString in:aClass
+
+ "Created: / 22-02-2016 / 20:59:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!AbstractTime class methodsFor:'misc ui support'!
iconInBrowserSymbol
@@ -920,7 +930,7 @@
implementors := SystemBrowser
findImplementorsOf:aMethod selector
- in:(environment allClasses)
+ in:("environment"Smalltalk allClasses)
ignoreCase:false.
implementors notEmpty ifTrue:[
@@ -939,7 +949,7 @@
false ifTrue:[ "/ too slow
senders := SystemBrowser
findSendersOf:aMethod selector
- in:(environment allClasses)
+ in:("environment"Smalltalk allClasses)
ignoreCase:false.
senders notEmpty ifTrue:[
msg2 := 'Sent from ' , senders size printString, ' methods.'.
@@ -2225,12 +2235,13 @@
inspectorExtraAttributes
"extra (pseudo instvar) entries to be shown in an inspector."
- |extra|
+ |extra int |
+ int := self.
extra := super inspectorExtraAttributes.
self < 0 ifTrue:[
extra
- add:'-hexadecimal (unsigned)' -> [ self asUnsignedInt radixPrintStringRadix:16 ].
+ add:'-hexadecimal (unsigned)' -> [ int asUnsignedInt radixPrintStringRadix:16 ].
].
^ extra
@@ -3065,14 +3076,7 @@
!stx_libtool class methodsFor:'documentation'!
-extensionsVersion_CVS
- ^ '$Header$'
-! !
-
-!stx_libtool class methodsFor:'documentation'!
-
extensionsVersion_HG
^ '$Changeset: <not expanded> $'
! !
-
--- a/make.bat Wed May 11 01:38:56 2016 +0200
+++ b/make.bat Thu May 12 08:33:55 2016 +0200
@@ -1,1 +1,1 @@
-nmake /nologo -f nt.mak
+nmake /nologo -f nt.mak
--- a/mingwmake.bat Wed May 11 01:38:56 2016 +0200
+++ b/mingwmake.bat Thu May 12 08:33:55 2016 +0200
@@ -4,6 +4,9 @@
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
@pushd ..\rules
@call find_mingw.bat
--- a/resources/DebugView.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/DebugView.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/DebugView.rs,v 1.1 2010-03-10 23:52:43 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/DebugView.rs,v 1.1 2010/03/10 23:52:43 cg Exp $
;
; additional debugView-specific translations
--- a/resources/ProcessMonitor.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/ProcessMonitor.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/ProcessMonitor.rs,v 1.1 2010-03-10 23:57:35 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/ProcessMonitor.rs,v 1.1 2010/03/10 23:57:35 cg Exp $
;
; additional processmonitor-specific translations
--- a/resources/af.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/af.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/af.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/af.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Help please !
--- a/resources/cs.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/cs.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf8
-; $Header: /cvs/stx/stx/libtool/resources/cs.rs,v 1.5 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/cs.rs,v 1.5 2008/11/28 16:41:56 cg Exp $
;
; notice, that cs is the code for the czech the language,
; while cz/sk are codes for the countries.
--- a/resources/da.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/da.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/da.rs,v 1.2 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/da.rs,v 1.2 2008/11/28 16:41:56 cg Exp $
;
; Launcher
--- a/resources/el.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/el.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/el.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/el.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Launcher: Greek
;
--- a/resources/fi.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/fi.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/fi.rs,v 1.1 2006-09-18 14:55:22 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/fi.rs,v 1.1 2006/09/18 14:55:22 cg Exp $
;
; Launcher: Finish
;
--- a/resources/hr.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/hr.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/hr.rs,v 1.1 2006-09-18 14:55:18 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/hr.rs,v 1.1 2006/09/18 14:55:18 cg Exp $
;
; Launcher: Croatian
;
--- a/resources/hu.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/hu.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/hu.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/hu.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Launcher: Hungarian
;
--- a/resources/ja.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/ja.rs Thu May 12 08:33:55 2016 +0200
@@ -17,23 +17,23 @@
; SystemBrowser resources
;
-search '捜す'
-create '生成'
-browse 'ブラウズ'
-find '捜す'
-accept '応じる'
-continue '続ける'
-copy '複写'
+search ''
+create ''
+browse ''
+find ''
+accept ''
+continue ''
+copy ''
-compare '合わせる'
+compare ''
;--------------------------------------------------------------------------------------------
;
; AboutBox
;
-'Version' '版'
-'Distributor' 'ディストリビューター'
-'Configuration' '構成'
+'Version' ''
+'Distributor' ''
+'Configuration' ''
"/ 'Release ID' '?'
"/ 'Running on' '?'
@@ -41,11 +41,11 @@
;
; DebugView
;
-'terminate' '果てる'
-'return' '帰る'
-'step' '単一段階'
-'send' '言づける'
-'restart' '再出発'
+'terminate' ''
+'return' ''
+'step' ''
+'send' ''
+'restart' ''
;--------------------------------------------------------------------------------------------
;
@@ -58,109 +58,109 @@
;
; 'Afrikaans'
-'Arabic' 'アラビア語'
-'Chinese' '中国語'
-'Chinese (simplified)' '中国語 (simplified)'
-'Chinese (traditional)' '中国語 (traditional)'
+'Arabic' ''
+'Chinese' ''
+'Chinese (simplified)' ' (simplified)'
+'Chinese (traditional)' ' (traditional)'
; 'Croatian'
-'Czech' 'チェコ'
+'Czech' ''
; 'Danish'
-'German' 'ドイツ語'
-'Greek' 'ギリシャ'
-'English (US)' '英語 (US)'
-'English (UK)' '英語 (UK)'
-'Esperanto' 'エスペラント語'
-'Spanish' 'スペイン語'
+'German' ''
+'Greek' ''
+'English (US)' ' (US)'
+'English (UK)' ' (UK)'
+'Esperanto' ''
+'Spanish' ''
; 'Finnish'
-'French' 'フランスの'
-'Italian' 'イタリア語'
-'Japanese' '日本語'
-'Latin' 'ラテン語'
+'French' ''
+'Italian' ''
+'Japanese' ''
+'Latin' ''
; 'Hindi'
-'Dutch' 'オランダ語'
+'Dutch' ''
; 'Norwegian'
-'Polish' 'ポーランド語'
-'Portuguese' 'ポルトガル語'
-'Portuguese (Brazilian)' 'ポルトガル語 (ブラジル)'
-'Russian' 'ロシア語'
+'Polish' ''
+'Portuguese' ''
+'Portuguese (Brazilian)' ' ()'
+'Russian' ''
; 'Swedish'
-'Thai' 'タイ語'
-'Turkish' 'トルコ語'
+'Thai' ''
+'Turkish' ''
; 'Ukrainian'
-'projects' '事業'
-'demos' '用例'
+'projects' ''
+'demos' ''
-'about Smalltalk/X' 'ついて Smalltalk/X'
+'about Smalltalk/X' ' Smalltalk/X'
-; 'senders' '提供側'
+; 'senders' ''
-'language' '言語'
+'language' ''
-'ST/X documentation' '取扱説明書 ST/X'
-'ST/X online documentation' '取扱説明書 ST/X'
-'class documentation' '取扱説明書 類'
-'index' '索引'
-'what''s new' '特報'
+'ST/X documentation' ' ST/X'
+'ST/X online documentation' ' ST/X'
+'class documentation' ' '
+'index' ''
+'what''s new' ''
-'version' 'バ?ジ??'
-'copyright' '著作権'
+'version' '???'
+'copyright' ''
-'snapshot...' '規保'
-'snapshot & exit...' '規保 & 済む'
-'exit smalltalk' '済む Smalltalk/X'
+'snapshot...' ''
+'snapshot & exit...' ' & '
+'exit smalltalk' ' Smalltalk/X'
-'hardcopy' '写真'
+'hardcopy' ''
-'views' '表示'
-'destroy view' '崩す 表示'
-'select & destroy view' '崩す 表示'
-'view tree' '表示階層'
-'view tree (all views)' '表示階層 (すっかり)'
-'find & raise' '捜す & raise' "/ '見える' ???
-'find & destroy' '捜す & 崩す'
+'views' ''
+'destroy view' ' '
+'select & destroy view' ' '
+'view tree' ''
+'view tree (all views)' ' ()'
+'find & raise' ' & raise' "/ '' ???
+'find & destroy' ' & '
-'workspace' '作業表示'
-'semaphores' '信号機'
-'memory' '記憶'
+'workspace' ''
+'semaphores' ''
+'memory' ''
-'view' '表示'
-'area' '地域'
+'view' ''
+'area' ''
-'new project' '樹立 事業'
-'select project' '選ぶ 事業'
+'new project' ' '
+'select project' ' '
-'view style' '表示型'
-'misc' '雑用'
-'messages' 'お知らせ'
+'view style' ''
+'misc' ''
+'messages' ''
-'games' '競技'
+'games' ''
-'geometric designs' '線画'
-'Pen demo' '発揮 Pen'
-'Commander demo' '発揮 Commander'
+'geometric designs' ''
+'Pen demo' ' Pen'
+'Commander demo' ' Commander'
-'goodies' '馳走'
+'goodies' ''
-'clock' '時計'
-'calendar' '時刻表日'
-'calculator' '計算機'
+'clock' ''
+'calendar' ''
+'calculator' ''
-'Animation' '歩男'
-'Globe demo' '球'
-'3D graphics' '絵 [三次元]'
-'Paint Demo' '絵'
-'Tic Tac Toe (2 players)' 'Tic Tac Toe (二 選手)'
+'Animation' ''
+'Globe demo' ''
+'3D graphics' ' []'
+'Paint Demo' ''
+'Tic Tac Toe (2 players)' 'Tic Tac Toe ( )'
-'plane' '平面'
-'planet' '惑星'
-'sphere (wireframe)' '球 (線)'
-'doughnut (wireframe)' 'doughnut (線)'
-'cube (wireframe)' '立方 (線)'
-'cube (solid)' '立方 (立体)'
-'rubics cube' '立方 Rubics'
-'teapot' '茶鍋'
-'cube (light)' '立方 (灯り)'
-'cube (light & texture)' '立方 (灯り & ?)'
-'sphere (light)' '球 (灯り)'
-'colored octahedron' 'octahedron (仰々し)'
+'plane' ''
+'planet' ''
+'sphere (wireframe)' ' ()'
+'doughnut (wireframe)' 'doughnut ()'
+'cube (wireframe)' ' ()'
+'cube (solid)' ' ()'
+'rubics cube' ' Rubics'
+'teapot' ''
+'cube (light)' ' ()'
+'cube (light & texture)' ' ( & ?)'
+'sphere (light)' ' ()'
+'colored octahedron' 'octahedron ()'
--- a/resources/ko.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/ko.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/ko.rs,v 1.1 2006-09-18 14:55:12 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/ko.rs,v 1.1 2006/09/18 14:55:12 cg Exp $
;
; Launcher: Korean
;
--- a/resources/la.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/la.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/la.rs,v 1.1 2006-09-18 14:55:10 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/la.rs,v 1.1 2006/09/18 14:55:10 cg Exp $
;
; Launcher
--- a/resources/nl.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/nl.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/nl.rs,v 1.2 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/nl.rs,v 1.2 2008/11/28 16:41:56 cg Exp $
;
; Launcher
;
--- a/resources/no.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/no.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/no.rs,v 1.2 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/no.rs,v 1.2 2008/11/28 16:41:56 cg Exp $
;
; Launcher
;
--- a/resources/pl.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/pl.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/pl.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/pl.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Launcher
--- a/resources/pt.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/pt.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/pt.rs,v 1.2 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/pt.rs,v 1.2 2008/11/28 16:41:56 cg Exp $
;
; Launcher
--- a/resources/pt_br.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/pt_br.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/pt_br.rs,v 1.1 2006-09-18 14:55:00 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/pt_br.rs,v 1.1 2006/09/18 14:55:00 cg Exp $
;
; Launcher: Brasilian Portuguese
;
--- a/resources/ro.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/ro.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/ro.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/ro.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Launcher
;
--- a/resources/ru.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/ru.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf8
-; $Header: /cvs/stx/stx/libtool/resources/ru.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/ru.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
'directory' 'каталог'
--- a/resources/sk.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/sk.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/sk.rs,v 1.2 2006-09-18 16:02:54 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/sk.rs,v 1.2 2006/09/18 16:02:54 cg Exp $
;
; Launcher: Slovak
;
--- a/resources/sl.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/sl.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/sl.rs,v 1.2 2006-09-18 16:29:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/sl.rs,v 1.2 2006/09/18 16:29:56 cg Exp $
;
; Launcher: Slovenian
;
--- a/resources/sv.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/sv.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding iso8859-1
-; $Header: /cvs/stx/stx/libtool/resources/sv.rs,v 1.2 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/sv.rs,v 1.2 2008/11/28 16:41:56 cg Exp $
;
; Launcher: Swedisch
--- a/resources/th.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/th.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/th.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/th.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Launcher: Thai
;
--- a/resources/tr.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/tr.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/tr.rs,v 1.2 2006-09-18 16:29:34 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/tr.rs,v 1.2 2006/09/18 16:29:34 cg Exp $
;
; Launcher: Turkish
;
--- a/resources/uk.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/uk.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/uk.rs,v 1.3 2008-11-28 16:41:56 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/uk.rs,v 1.3 2008/11/28 16:41:56 cg Exp $
;
; Launcher: Ukrainian
;
--- a/resources/zh.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/zh.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/zh.rs,v 1.5 2009-02-25 16:56:32 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/zh.rs,v 1.5 2009/02/25 16:56:32 cg Exp $
;
; Translated by Guo, Peng <peng.guo.cn@gmail.com>
;
--- a/resources/zh_trad.rs Wed May 11 01:38:56 2016 +0200
+++ b/resources/zh_trad.rs Thu May 12 08:33:55 2016 +0200
@@ -1,6 +1,6 @@
#encoding utf-8
-; $Header: /cvs/stx/stx/libtool/resources/zh_trad.rs,v 1.3 2008-11-28 23:14:26 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/zh_trad.rs,v 1.3 2008/11/28 23:14:26 cg Exp $
;
; Launcher: Chinese traditional
;
--- a/stx_libtool.st Wed May 11 01:38:56 2016 +0200
+++ b/stx_libtool.st Thu May 12 08:33:55 2016 +0200
@@ -230,6 +230,7 @@
MemoryMonitorView
MemoryUsageView
MultiViewToolApplication
+ (NewChangesBrowser autoload)
PerforceSourceCodeManagerUtilities
ProcessMonitorV2
SyntaxElement
@@ -657,5 +658,9 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+ ^ '$Changeset: <not expanded> $'
! !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tccmake.bat Thu May 12 08:33:55 2016 +0200
@@ -0,0 +1,8 @@
+@REM -------
+@REM make using tcc compiler
+@REM type tccmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+make.exe -N -f bc.mak USETCC=1 %1 %2
+
+
--- a/vcmake.bat Wed May 11 01:38:56 2016 +0200
+++ b/vcmake.bat Thu May 12 08:33:55 2016 +0200
@@ -10,6 +10,10 @@
popd
)
@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
--- a/vms.mak Wed May 11 01:38:56 2016 +0200
+++ b/vms.mak Thu May 12 08:33:55 2016 +0200
@@ -2,7 +2,7 @@
# DO NOT EDIT
# automatically generated from Make.proto
#
-# $Header: /cvs/stx/stx/libtool/vms.mak,v 1.3 1999-09-18 14:34:21 cg Exp $
+# $Header: /cvs/stx/stx/libtool/vms.mak,v 1.3 1999/09/18 14:34:21 cg Exp $
#
TOP=..
LIBNAME=libtool