--- a/.hgtags Fri Jun 26 06:37:06 2015 +0200
+++ b/.hgtags Sun Jun 28 06:56:37 2015 +0200
@@ -29,6 +29,7 @@
596696438e67fee735ba71f62177ccc091b9a0bb expecco_1_7_2rc1
5aa270837e0ab5e0fa19d2c02d46c864cc41c859 expeccoNET_1_5_1rc1
5c469b9c566c86e39278a3c810840bd037cefb62 expecco_2_7_5
+5c469b9c566c86e39278a3c810840bd037cefb62 expecco_2_7_5a
62451ecb3d3bbf1f6067c931eda2cdb57aa67ead expeccoNET_1_7_0_0
6ae442626f2090b5275b777f1a9d09ef0e092628 rel3_4_1_2
6ea7ea821b44f30ae3737d4703af910788f4c854 rel3-1-2
--- a/InspectorView.st Fri Jun 26 06:37:06 2015 +0200
+++ b/InspectorView.st Sun Jun 28 06:56:37 2015 +0200
@@ -2665,6 +2665,14 @@
"Created: / 13-06-2012 / 09:27:45 / cg"
!
+showAlphabetical:aBoolean
+ aBoolean ifTrue:[
+ self setSortOrderToAlphabetical
+ ] ifFalse:[
+ self setSortOrderToInstvarOrder
+ ].
+!
+
showInWindowsExplorer
"show in explorer"
@@ -2988,12 +2996,17 @@
!
stringWithAllInstVarValuesFor:anObject level:lvl
- |s names maxLen|
+ |s names instVarOffsets maxLen|
s := CharacterWriteStream on:''.
names := anObject class allInstVarNames.
+ instVarOffsets := 1 to:names size.
+ sortOrder == #alphabetical ifTrue:[
+ instVarOffsets := instVarOffsets asArray.
+ names := names copy sortWith:instVarOffsets
+ ].
maxLen := (names collect:[:eachName | eachName size]) max.
- names keysAndValuesDo:[:eachInstVarIndex :eachInstVarName |
+ names with:instVarOffsets do:[:eachInstVarName :eachInstVarIndex |
|val valString|
IsDebuggingQuery answer:true do:[
@@ -4100,10 +4113,10 @@
!InspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.348 2015-06-05 16:10:05 stefan Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.348 2015-06-05 16:10:05 stefan Exp $'
+ ^ '$Header$'
! !
--- a/NewLauncher.st Fri Jun 26 06:37:06 2015 +0200
+++ b/NewLauncher.st Sun Jun 28 06:56:37 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1997-1998 by eXept Software AG
All Rights Reserved
@@ -4540,7 +4542,7 @@
^ self
].
- subMenuPath first isEmptyOrNil ifTrue:[
+ (subMenuPath isEmptyOrNil or:[subMenuPath first isEmptyOrNil]) ifTrue:[
"add to top menu"
menuPanel := mainMenuPanel.
] ifFalse:[
--- a/SyntaxHighlighter2.st Fri Jun 26 06:37:06 2015 +0200
+++ b/SyntaxHighlighter2.st Sun Jun 28 06:56:37 2015 +0200
@@ -968,7 +968,6 @@
!
markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode
-
| element selectorSymbol |
"Special hack for Java class references - I would like to have them
@@ -986,7 +985,7 @@
"don't create symbols for partial typed selectors"
selectorSymbol := selectorString asSymbolIfInterned.
- element := elements newElementFor: (SelectorNode value: selectorString from: pos1 to: pos2).
+ element := elements newElementFor: (SelectorNode value: selectorSymbol ? selectorString from: pos1 to: pos2).
(lastSelectorElement notNil "and:[lastSelectorElement value = selectorString]") ifTrue:[
lastSelectorElement nextElement: element.
@@ -1082,14 +1081,14 @@
!SyntaxHighlighter2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.27 2015-04-20 09:05:32 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.27 2015-04-20 09:05:32 cg Exp $'
+ ^ '$Header$'
!
version_SVN
- ^ '$Id: SyntaxHighlighter2.st,v 1.27 2015-04-20 09:05:32 cg Exp $'
+ ^ '$Id$'
! !
--- a/Tools__CodeView2.st Fri Jun 26 06:37:06 2015 +0200
+++ b/Tools__CodeView2.st Sun Jun 28 06:56:37 2015 +0200
@@ -671,13 +671,6 @@
"Modified: / 07-07-2011 / 12:15:39 / Jan Vrany <jan.vrant@fit.cvut,cz>"
!
-scrolledView
-
- ^self
-
- "Created: / 14-02-2010 / 22:54:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
services
^ services ? #()
@@ -4266,11 +4259,11 @@
!CodeView2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.190 2015-05-18 14:49:30 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.190 2015-05-18 14:49:30 cg Exp $'
+ ^ '$Header$'
!
version_HG
@@ -4279,7 +4272,7 @@
!
version_SVN
- ^ '$Id: Tools__CodeView2.st,v 1.190 2015-05-18 14:49:30 cg Exp $'
+ ^ '$Id$'
! !
--- a/Tools__Inspector2.st Fri Jun 26 06:37:06 2015 +0200
+++ b/Tools__Inspector2.st Sun Jun 28 06:56:37 2015 +0200
@@ -470,6 +470,69 @@
!Inspector2 class methodsFor:'menu specs'!
+fileMenu
+ "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::Inspector2 andSelector:#mainMenu
+ (Menu new fromLiteralArrayEncoding:(Tools::Inspector2 mainMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(Menu
+ (
+ (MenuItem
+ label: 'Exit'
+ itemValue: closeRequest
+ )
+ )
+ nil
+ nil
+ )
+!
+
+helpMenu
+ "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::Inspector2 andSelector:#mainMenu
+ (Menu new fromLiteralArrayEncoding:(Tools::Inspector2 mainMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(Menu
+ (
+ (MenuItem
+ label: 'Inspector Documentation'
+ itemValue: openDocumentation
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'About this Application...'
+ itemValue: openAboutThisApplication
+ )
+ )
+ nil
+ nil
+ )
+!
+
mainMenu
"This resource specification was automatically generated
by the MenuEditor of ST/X."
@@ -490,61 +553,16 @@
(
(MenuItem
label: 'File'
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Exit'
- itemValue: closeRequest
- )
- )
- nil
- nil
- )
+ submenuChannel: viewMenu
)
(MenuItem
label: 'View'
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Expand Arrays in "all xxx"-Lists'
- itemValue: expandArraysInAllList:
- indication: expandArraysInAllList
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Color Setting'
- submenuChannel: settingsMenu
- )
- )
- nil
- nil
- )
+ submenuChannel: viewMenu
)
(MenuItem
label: 'MENU_Help'
startGroup: conditionalRight
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Inspector Documentation'
- itemValue: openDocumentation
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'About this Application...'
- itemValue: openAboutThisApplication
- )
- )
- nil
- nil
- )
+ submenuChannel: helpMenu
)
)
nil
@@ -716,6 +734,47 @@
nil
nil
)
+!
+
+viewMenu
+ "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::Inspector2 andSelector:#viewMenu
+ (Menu new fromLiteralArrayEncoding:(Tools::Inspector2 viewMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(Menu
+ (
+ (MenuItem
+ label: 'Expand Arrays in "all xxx"-Lists'
+ itemValue: expandArraysInAllList:
+ indication: expandArraysInAllList
+ )
+ (MenuItem
+ label: 'Alphabetical'
+ itemValue: showAlphabeticalHolderChanged
+ indication: showAlphabeticalHolder
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Color Setting'
+ submenuChannel: settingsMenu
+ )
+ )
+ nil
+ nil
+ )
! !
!Inspector2 class methodsFor:'startup'!
@@ -944,6 +1003,10 @@
"Modified (format): / 19-08-2011 / 08:59:10 / cg"
!
+showAlphabeticalHolder
+ ^ builder booleanValueAspectFor:#showAlphabeticalHolder
+!
+
tabLabelsAspect
^ (AspectAdaptor forAspect:#tabLabels)
subjectChannel:self navigationStateAspect
@@ -1080,7 +1143,6 @@
#todo
! !
-
!Inspector2 methodsFor:'hooks'!
postBuildEvaluationLanguageCombo: aComboBoxView
@@ -1151,9 +1213,9 @@
"/ ^ self.
"/ ].
"/ ].
+
"/ if that fails, open a new one
-
- browser := UserPreferences systemBrowserClass
+ UserPreferences systemBrowserClass
openInClass:class selector:nil "/ browseSingleClass: class
"Modified: / 23-07-2011 / 11:28:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1210,6 +1272,14 @@
"/ self selectionIndex:sel.
"Created: / 21-08-2011 / 08:23:00 / cg"
+!
+
+showAlphabeticalHolderChanged
+ self navigationHistoryHolder currentItem tabViews do:[:each |
+ (each isKindOf:InspectorView) ifTrue:[
+ each showAlphabetical:(self showAlphabeticalHolder value)
+ ]
+ ].
! !
!Inspector2 methodsFor:'opening'!
@@ -1286,6 +1356,11 @@
newSelectionIndex ~~ 0 ifTrue:[
new selectionIndex: newSelectionIndex.
].
+ new tabViews do:[:each |
+ (each isKindOf:InspectorView) ifTrue:[
+ each showAlphabetical:(self showAlphabeticalHolder value)
+ ]
+ ].
].
^ new
@@ -1323,6 +1398,7 @@
"Modified: / 10-03-2015 / 09:46:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!Inspector2::NavigationState class methodsFor:'creating classes'!
for:anObject
@@ -1338,11 +1414,11 @@
!Inspector2::NavigationState class methodsFor:'documentation'!
version
- ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.64 2015-03-10 10:06:41 vrany Exp $'
+ ^'$Header$'
!
version_SVN
- ^'$Id: Tools__Inspector2.st,v 1.64 2015-03-10 10:06:41 vrany Exp $'
+ ^'$Id$'
! !
!Inspector2::NavigationState methodsFor:'accessing'!
@@ -1529,19 +1605,19 @@
!Inspector2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.64 2015-03-10 10:06:41 vrany Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.64 2015-03-10 10:06:41 vrany Exp $'
+ ^ '$Header$'
!
version_CVS_jvrany
- ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.64 2015-03-10 10:06:41 vrany Exp $'
+ ^ '$Header$'
!
version_SVN
- ^ '$Id: Tools__Inspector2.st,v 1.64 2015-03-10 10:06:41 vrany Exp $'
+ ^ '$Id$'
! !
--- a/Tools__TagList.st Fri Jun 26 06:37:06 2015 +0200
+++ b/Tools__TagList.st Sun Jun 28 06:56:37 2015 +0200
@@ -3013,6 +3013,9 @@
"/ xsd tags - simulated
^ self xsdTagsInFile:pathName
].
+ (suffix = 'rs') ifTrue:[
+ ^ self stxResourceTagsInFile:pathName
+ ].
"/ could add more here ...
^ nil.
@@ -3910,6 +3913,38 @@
"Created: / 05-01-2012 / 10:56:26 / cg"
!
+stxResourceTagsInFile:aFilePath
+ "resource tags:
+ scan for translated entries to show them alphabetically"
+
+ |rsrcPack|
+
+ rsrcPack := ResourcePack fromFile:aFilePath.
+ ^ self
+ linewiseNaiveTagsInFile:aFilePath
+ using:[:rawLine :lineNr |
+ |line key tag|
+
+ line := rawLine withoutSeparators.
+ (line isEmpty or:[line startsWithAnyOf:'#;']) ifFalse:[
+ (line startsWith:$') ifTrue:[
+ "read as smalltalk string"
+ key := String readFrom:line.
+ ] ifFalse:[
+ key := line upToSeparator.
+ ].
+ (rsrcPack includesKey:key) ifTrue:[
+ tag := Tag::TLabel
+ label:key
+ pattern:nil
+ type:nil
+ lineNumber:lineNr.
+ ]
+ ].
+ tag
+ ].
+!
+
tclTagFromLine:line lineNr:lineNr
"tcl tags:
naive, q&d scan for lines matching:
@@ -3966,7 +4001,7 @@
!
xsdTagFromLine:line lineNr:lineNr
- "tcl tags:
+ "xsd schema tags:
naive, q&d scan for lines matching:
<xsd:complexType...
<xsd:simpleType ...
--- a/stx_libtool.st Fri Jun 26 06:37:06 2015 +0200
+++ b/stx_libtool.st Sun Jun 28 06:56:37 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2006 by eXept Software AG
All Rights Reserved
@@ -623,7 +625,7 @@
legalCopyright
"Return a copyright string which will appear in <lib>.rc"
- ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012'
+ ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012'
"Modified: / 18-07-2012 / 19:11:53 / cg"
!
@@ -655,10 +657,10 @@
!stx_libtool class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.129 2015-03-26 10:24:11 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.129 2015-03-26 10:24:11 cg Exp $'
+ ^ '$Header$'
! !