--- a/AbstractSettingsApplication.st Mon Feb 04 23:58:23 2013 +0100
+++ b/AbstractSettingsApplication.st Fri Feb 08 08:51:42 2013 +0100
@@ -193,7 +193,7 @@
selectOnRightClick popUpMenuOnRelease
showRightButtonMenuOnRelease formatHostNameWindowLabel1
formatHostNameWindowLabel2 allowMouseWheelZoom
- forceWindowsIntoMonitorBounds'
+ forceWindowsIntoMonitorBounds button2WithAltKey'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -363,7 +363,8 @@
useNewSystemBrowser useNewFileDialog useNewSettingsApplication
useProcessMonitorV2 useSmalltalkDocumentViewer useTestRunner2
showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus
- useNewChangeSetBrowser useCodeView2InTools'
+ useNewChangeSetBrowser useCodeView2InTools
+ externalDiffCommandTemplate'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -3552,122 +3553,111 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'Editor Settings'
- name: 'Editor Settings'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 600 320)
- )
- component:
+ label: 'Editor Settings'
+ name: 'Editor Settings'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 600 320)
+ )
+ component:
(SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel1'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- horizontalLayout: fit
- verticalLayout: top
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Use the new Code Editor 2 (experimental)'
- name: 'UserCodeView2'
- model: useCodeView2InTools
- aktiveHelpKey: useCodeView2InTools
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Accept/Cancel Bar in Editor'
- name: 'ShowAcceptCancelBarInBrowser'
- model: showAcceptCancelBarInBrowser
- aktiveHelpKey: showAcceptCancelBarInBrowser
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'CTRL-Key to Start TextDrag'
- name: 'CTRLKeyStTextDragCheckBox'
- model: startTextDragWithControl
- aktiveHelpKey: startTextDragWithControl
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Always Paste the Contents when Dropping a File (Do not Ask) '
- name: 'EnforceContentsDropForFiles'
- model: enforceContentsDropForFiles
- aktiveHelpKey: enforceContentsDropForFiles
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'SearchBox is Modal'
- name: 'SearchBoxModalCheckBox'
- model: searchDialogIsModal
- aktiveHelpKey: searchDialogIsModal
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Tab Stops in Multiples of 4'
- name: 'TabStopsMultiples4CheckBox'
- model: tabsIs4
- aktiveHelpKey: tabsIs4
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Double Click Select Behavior as in ST80'
- name: 'DoubleClickSelectBehaviorST80CheckBox'
- model: st80DoubleClickSelectMode
- aktiveHelpKey: st80DoubleClickSelectMode
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Cursor has ST80 Line-end Behavior'
- name: 'CursorST80LineEndBehaviorCheckBox'
- model: st80EditMode
- aktiveHelpKey: st80EditMode
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Select all when Clicking beyond the Text''s End'
- name: 'CheckBox2'
- model: selectAllWhenClickingBeyondEnd
- aktiveHelpKey: selectAllWhenClickingBeyondEnd
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Treat Underscore as Letter in Word-Select'
- name: 'UnderscoreIsLetterCheckBox'
- model: extendedWordSelectMode
- aktiveHelpKey: extendedWordSelectMode
- translateLabel: true
- extent: (Point 600 25)
- )
- (CheckBoxSpec
- label: 'Any non-Whitespace in Word-Select'
- name: 'CheckBox1'
- model: whitespaceWordSelectMode
- aktiveHelpKey: whitespaceWordSelectMode
- translateLabel: true
- extent: (Point 600 25)
- )
- )
-
- )
- )
- )
-
- )
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel1'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Use the new Code Editor2 (experimental)'
+ name: 'UserCodeView2'
+ model: useCodeView2InTools
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Accept/Cancel Bar in Editor'
+ name: 'ShowAcceptCancelBarInBrowser'
+ model: showAcceptCancelBarInBrowser
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'CTRL-Key to Start TextDrag'
+ name: 'CTRLKeyStTextDragCheckBox'
+ model: startTextDragWithControl
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Always Paste the Contents when Dropping a File (Do not Ask) '
+ name: 'EnforceContentsDropForFiles'
+ model: enforceContentsDropForFiles
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'SearchBox is Modal'
+ name: 'SearchBoxModalCheckBox'
+ model: searchDialogIsModal
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Tab Stops in Multiples of 4'
+ name: 'TabStopsMultiples4CheckBox'
+ model: tabsIs4
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Double Click Select Behavior as in ST80'
+ name: 'DoubleClickSelectBehaviorST80CheckBox'
+ model: st80DoubleClickSelectMode
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Cursor has ST80 Line-end Behavior'
+ name: 'CursorST80LineEndBehaviorCheckBox'
+ model: st80EditMode
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Select all when Clicking beyond the Text''s End'
+ name: 'CheckBox2'
+ model: selectAllWhenClickingBeyondEnd
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Treat Underscore as Letter in Word-Select'
+ name: 'UnderscoreIsLetterCheckBox'
+ model: extendedWordSelectMode
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (CheckBoxSpec
+ label: 'Any non-Whitespace in Word-Select'
+ name: 'CheckBox1'
+ model: whitespaceWordSelectMode
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
)
! !
@@ -8646,6 +8636,30 @@
! !
+!AbstractSettingsApplication::MiscDisplaySettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+ "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::MiscDisplaySettingsAppl
+ "
+
+ <resource: #help>
+
+ ^ super flyByHelpSpec addPairsFrom:#(
+
+#button2WithAltKey
+'Use with single button mice to get a right-button emulation'
+
+)
+! !
+
+
!AbstractSettingsApplication::MiscDisplaySettingsAppl class methodsFor:'image specs'!
defaultIcon
@@ -8692,227 +8706,235 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'Display settings'
- name: 'Display settings'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 445 497)
- )
- component:
+ label: 'Display settings'
+ name: 'Display settings'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 445 497)
+ )
+ component:
(SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel1'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- horizontalLayout: fitSpace
- verticalLayout: topSpace
- horizontalSpace: 5
- verticalSpace: 1
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Beeper enabled'
- name: 'beepEnabled'
- visibilityChannel: false
- model: beepEnabled
- translateLabel: true
- extent: (Point 435 22)
- )
- (CheckBoxSpec
- label: 'Show Accelerator Keys in Menus'
- name: 'showAccelerators'
- model: showAccelerators
- translateLabel: true
- extent: (Point 435 22)
- )
- (ViewSpec
- name: 'SeparatingSpace1'
- extent: (Point 435 4)
- )
- (DividerSpec
- name: 'Separator1'
- extent: (Point 435 3)
- )
- (ViewSpec
- name: 'SeparatingSpace2'
- extent: (Point 435 3)
- )
- (CheckBoxSpec
- label: 'Keyboard Focus Follows Mouse'
- name: 'focusFollowsMouse'
- model: focusFollowsMouse
- translateLabel: true
- extent: (Point 435 22)
- )
- (CheckBoxSpec
- label: 'Views Catch Focus when Mapped'
- name: 'takeFocus'
- model: takeFocus
- translateLabel: true
- extent: (Point 435 22)
- )
- (CheckBoxSpec
- label: 'Boxes Return Focus to Previously Active View'
- name: 'returnFocus'
- model: returnFocus
- translateLabel: true
- extent: (Point 435 22)
- )
- (CheckBoxSpec
- label: 'Raise & Activate Windows on Click'
- name: 'activateOnClick'
- model: activateOnClick
- translateLabel: true
- extent: (Point 435 22)
- )
- (CheckBoxSpec
- label: 'Force Windows into Monitor''s Bounds'
- name: 'CheckBox2'
- activeHelpKey: forceWindowsIntoMonitorBounds
- model: forceWindowsIntoMonitorBounds
- translateLabel: true
- extent: (Point 435 22)
- )
- (ViewSpec
- name: 'SeparatingSpace3'
- extent: (Point 435 4)
- )
- (DividerSpec
- name: 'Separator2'
- extent: (Point 435 3)
- )
- (ViewSpec
- name: 'SeparatingSpace4'
- extent: (Point 435 3)
- )
- (CheckBoxSpec
- label: 'MouseWheel Focus Follows Mouse'
- name: 'mouseWheelFocusFollowsMouse'
- enableChannel: mouseWheelFocusFollowsMouseEnabled
- model: mouseWheelFocusFollowsMouse
- translateLabel: true
- extent: (Point 435 22)
- )
- (CheckBoxSpec
- label: 'CTRL-MouseWheel is Zoom'
- name: 'CheckBox1'
- model: allowMouseWheelZoom
- translateLabel: true
- extent: (Point 435 22)
- )
- (ViewSpec
- name: 'SeparatingSpace5'
- extent: (Point 435 4)
- )
- (DividerSpec
- name: 'Separator3'
- extent: (Point 435 4)
- )
- (ViewSpec
- name: 'SeparatingSpace6'
- extent: (Point 435 3)
- )
- (CheckBoxSpec
- label: 'Select on Right-Button-Press'
- name: 'selectOnRightClick'
- model: selectOnRightClick
- translateLabel: true
- extent: (Point 435 21)
- )
- (CheckBoxSpec
- label: 'Menu on Right-Button-Release'
- name: 'showRightButtonMenuOnRelease'
- model: showRightButtonMenuOnRelease
- translateLabel: true
- extent: (Point 435 21)
- )
- (ViewSpec
- name: 'SeparatingSpace7'
- extent: (Point 435 4)
- )
- (DividerSpec
- name: 'Separator4'
- extent: (Point 435 4)
- )
- (ViewSpec
- name: 'SeparatingSpace8'
- extent: (Point 435 4)
- )
- (ViewSpec
- name: 'Box1'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Label'
- name: 'Label1'
- layout: (LayoutFrame 0 0 0 0 170 0 17 0)
- translateLabel: true
- labelChannel: formatHostNameWindowLabel
- adjust: right
- useDefaultExtent: true
- )
- (LabelSpec
- label: 'Label'
- name: 'Label2'
- layout: (LayoutFrame 0 0.3 30 0 0 0.6 0 1)
- translateLabel: true
- labelChannel: formatHostNameWindowLabel1
- adjust: left
- )
- (LabelSpec
- label: 'Label'
- name: 'Label3'
- layout: (LayoutFrame 0 0.6 30 0 0 1 0 1)
- translateLabel: true
- labelChannel: formatHostNameWindowLabel2
- adjust: left
- )
- )
-
- )
- extent: (Point 435 92)
- )
- (ViewSpec
- name: 'WindowLabelBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Window Label Format'
- name: 'hostNameInLabelHolder'
- layout: (LayoutFrame 0 0 -22 1 216 0 0 1)
- model: hostNameInLabelHolder
- translateLabel: true
- )
- (InputFieldSpec
- name: 'hostNameInLabelEntryField'
- layout: (LayoutFrame 218 0 -22 1 -5 1 0 1)
- enableChannel: hostNameInLabelHolder
- model: newWindowLabelFormat
- immediateAccept: true
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- )
-
- )
- extent: (Point 435 30)
- )
- )
-
- )
- )
- )
-
- )
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel1'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: fitSpace
+ verticalLayout: topSpace
+ horizontalSpace: 5
+ verticalSpace: 1
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Beeper enabled'
+ name: 'beepEnabled'
+ visibilityChannel: false
+ model: beepEnabled
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'Show Accelerator Keys in Menus'
+ name: 'showAccelerators'
+ model: showAccelerators
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace1'
+ extent: (Point 435 4)
+ )
+ (DividerSpec
+ name: 'Separator1'
+ extent: (Point 435 3)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace2'
+ extent: (Point 435 3)
+ )
+ (CheckBoxSpec
+ label: 'Keyboard Focus Follows Mouse'
+ name: 'focusFollowsMouse'
+ model: focusFollowsMouse
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'Views Catch Focus when Mapped'
+ name: 'takeFocus'
+ model: takeFocus
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'Boxes Return Focus to Previously Active View'
+ name: 'returnFocus'
+ model: returnFocus
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'Raise & Activate Windows on Click'
+ name: 'activateOnClick'
+ model: activateOnClick
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'Force Windows into Monitor''s Bounds'
+ name: 'CheckBox2'
+ activeHelpKey: forceWindowsIntoMonitorBounds
+ model: forceWindowsIntoMonitorBounds
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace3'
+ extent: (Point 435 4)
+ )
+ (DividerSpec
+ name: 'Separator2'
+ extent: (Point 435 3)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace4'
+ extent: (Point 435 3)
+ )
+ (CheckBoxSpec
+ label: 'MouseWheel Focus Follows Mouse'
+ name: 'mouseWheelFocusFollowsMouse'
+ enableChannel: mouseWheelFocusFollowsMouseEnabled
+ model: mouseWheelFocusFollowsMouse
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'CTRL-MouseWheel is Zoom'
+ name: 'CheckBox1'
+ model: allowMouseWheelZoom
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (CheckBoxSpec
+ label: 'ALT-Leftclick is RightClick'
+ name: 'CheckBox3'
+ activeHelpKey: button2WithAltKey
+ model: button2WithAltKey
+ translateLabel: true
+ extent: (Point 435 22)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace5'
+ extent: (Point 435 4)
+ )
+ (DividerSpec
+ name: 'Separator3'
+ extent: (Point 435 4)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace6'
+ extent: (Point 435 3)
+ )
+ (CheckBoxSpec
+ label: 'Select on Right-Button-Press'
+ name: 'selectOnRightClick'
+ model: selectOnRightClick
+ translateLabel: true
+ extent: (Point 435 21)
+ )
+ (CheckBoxSpec
+ label: 'Menu on Right-Button-Release'
+ name: 'showRightButtonMenuOnRelease'
+ model: showRightButtonMenuOnRelease
+ translateLabel: true
+ extent: (Point 435 21)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace7'
+ extent: (Point 435 4)
+ )
+ (DividerSpec
+ name: 'Separator4'
+ extent: (Point 435 4)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace8'
+ extent: (Point 435 4)
+ )
+ (ViewSpec
+ name: 'Box1'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Label'
+ name: 'Label1'
+ layout: (LayoutFrame 0 0 0 0 170 0 17 0)
+ translateLabel: true
+ labelChannel: formatHostNameWindowLabel
+ adjust: right
+ useDefaultExtent: true
+ )
+ (LabelSpec
+ label: 'Label'
+ name: 'Label2'
+ layout: (LayoutFrame 0 0.3 30 0 0 0.6 0 1)
+ translateLabel: true
+ labelChannel: formatHostNameWindowLabel1
+ adjust: left
+ )
+ (LabelSpec
+ label: 'Label'
+ name: 'Label3'
+ layout: (LayoutFrame 0 0.6 30 0 0 1 0 1)
+ translateLabel: true
+ labelChannel: formatHostNameWindowLabel2
+ adjust: left
+ )
+ )
+
+ )
+ extent: (Point 435 92)
+ )
+ (ViewSpec
+ name: 'WindowLabelBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Window Label Format'
+ name: 'hostNameInLabelHolder'
+ layout: (LayoutFrame 0 0 -22 1 216 0 0 1)
+ model: hostNameInLabelHolder
+ translateLabel: true
+ )
+ (InputFieldSpec
+ name: 'hostNameInLabelEntryField'
+ layout: (LayoutFrame 218 0 -22 1 -5 1 0 1)
+ enableChannel: hostNameInLabelHolder
+ model: newWindowLabelFormat
+ immediateAccept: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ extent: (Point 435 30)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
)
! !
@@ -8921,13 +8943,14 @@
aspectsFromUserPreferences
^ #(
- beepEnabled
- focusFollowsMouse
- mouseWheelFocusFollowsMouse
- showRightButtonMenuOnRelease
- selectOnRightClick
- allowMouseWheelZoom
- forceWindowsIntoMonitorBounds
+ beepEnabled
+ focusFollowsMouse
+ mouseWheelFocusFollowsMouse
+ showRightButtonMenuOnRelease
+ selectOnRightClick
+ allowMouseWheelZoom
+ forceWindowsIntoMonitorBounds
+ button2WithAltKey
)
"Modified: / 22-10-2010 / 14:25:54 / cg"
@@ -9025,6 +9048,14 @@
^ beepEnabled.
!
+button2WithAltKey
+ button2WithAltKey isNil ifTrue:[
+ button2WithAltKey := false asValue.
+ button2WithAltKey onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ button2WithAltKey.
+!
+
displaySupportsNativeDialogs
^ Screen current supportsNativeDialogs
!
@@ -17603,216 +17634,244 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'Tool Settings'
- name: 'Tool Settings'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 607 786)
- )
- component:
+ label: 'Tool Settings'
+ name: 'Tool Settings'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 594 786)
+ )
+ component:
(SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel1'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 451 0)
- horizontalLayout: fit
- verticalLayout: top
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
-"/ (CheckBoxSpec
-"/ label: 'Use the new Code Editor 2 (experimental)'
-"/ name: 'UserCodeView2'
-"/ model: useCodeView2InTools
-"/ translateLabel: true
-"/ extent: (Point 607 25)
-"/ )
- (CheckBoxSpec
- label: 'Use the New System Browser'
- name: 'NewSystemBrowser'
- activeHelpKey: useNewSystemBrowser
- visibilityChannel: false
- model: useNewSystemBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New File Browser'
- name: 'NewFileBrowser'
- activeHelpKey: useNewFileBrowser
- visibilityChannel: false
- model: useNewFileBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New VersionDiff Browser'
- name: 'VersionDiffBrowser'
- model: useNewVersionDiffBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New FileTree File Dialog'
- name: 'UseNewFileDialogCheckBox'
- model: useNewFileDialog
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New Settings Dialog'
- name: 'UseNewSettinsApplicationCheckBox'
- visibilityChannel: false
- model: useNewSettingsApplication
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New Process Monitor'
- name: 'UseNewProcessMonitor'
- model: useProcessMonitorV2
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New TestRunner2'
- name: 'CheckBox3'
- model: useTestRunner2
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New Changes Browser for Changefiles (not yet recommended)'
- name: 'ChangesBrowser'
- model: useNewChangesBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the New ChangeSet Browser for Internal ChangeSets'
- name: 'CheckBox5'
- model: useNewChangeSetBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use Hierarchical Inspector (not yet recommended)'
- name: 'HierarchicalInspector'
- activeHelpKey: useHierarchicalInspector
- model: useNewInspector
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the Smalltalk Document Viewer'
- name: 'UseSmalltalkDocumentViewer'
- activeHelpKey: useSmalltalkDocumentView
- model: useSmalltalkDocumentViewer
- translateLabel: true
- extent: (Point 607 25)
- )
- (ViewSpec
- name: 'Box2'
- extent: (Point 607 20)
- )
- (CheckBoxSpec
- label: 'Show "Tip Of The Day" at Startup'
- name: 'CheckBox1'
- activeHelpKey: showDidYouKnowTips
- model: showTipOfTheDayAtStartup
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Clock in Launcher'
- name: 'Clock'
- activeHelpKey: showClockInLauncher
- model: showClockInLauncher
- translateLabel: true
- extent: (Point 607 25)
- )
- (ViewSpec
- name: 'Box3'
- extent: (Point 607 19)
- )
- (HorizontalPanelViewSpec
- name: 'HorizontalPanel1'
- horizontalLayout: left
- verticalLayout: center
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box4'
- extent: (Point 20 10)
- )
- (LabelSpec
- label: 'Transcript''s Buffer Size:'
- name: 'Label1'
- activeHelpKey: transcriptBufferSize
- translateLabel: true
- resizeForLabel: true
- adjust: right
- useDefaultExtent: true
- )
- (InputFieldSpec
- name: 'Transcripts Buffer Size'
- activeHelpKey: transcriptBufferSize
- model: transcriptBufferSize
- type: number
- immediateAccept: true
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- numChars: 8
- acceptOnPointerLeave: true
- extent: (Point 78 22)
- )
- (LabelSpec
- label: '(Lines)'
- name: 'Label2'
- activeHelpKey: transcriptBufferSize
- translateLabel: true
- resizeForLabel: true
- adjust: right
- useDefaultExtent: true
- )
- )
-
- )
- extent: (Point 607 35)
- )
- (CheckBoxSpec
- label: 'Autoraise Transcript'
- name: 'CheckBox2'
- activeHelpKey: autoRaiseTranscript
- model: autoRaiseTranscript
- translateLabel: true
- extent: (Point 607 24)
- )
- (CheckBoxSpec
- label: 'Eclipse Style Menus (where implemented)'
- name: 'CheckBox4'
- activeHelpKey: eclipseStyleMenus
- model: eclipseStyleMenus
- translateLabel: true
- extent: (Point 607 24)
- )
- )
-
- )
- )
- )
-
- )
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel1'
+ layout: (LayoutFrame 0 0.0 0 0 0 1.0 451 0)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Use the New System Browser'
+ name: 'NewSystemBrowser'
+ activeHelpKey: useNewSystemBrowser
+ visibilityChannel: false
+ model: useNewSystemBrowser
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New File Browser'
+ name: 'NewFileBrowser'
+ activeHelpKey: useNewFileBrowser
+ visibilityChannel: false
+ model: useNewFileBrowser
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New VersionDiff Browser'
+ name: 'VersionDiffBrowser'
+ model: useNewVersionDiffBrowser
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New FileTree File Dialog'
+ name: 'UseNewFileDialogCheckBox'
+ model: useNewFileDialog
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New Settings Dialog'
+ name: 'UseNewSettinsApplicationCheckBox'
+ visibilityChannel: false
+ model: useNewSettingsApplication
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New Process Monitor'
+ name: 'UseNewProcessMonitor'
+ model: useProcessMonitorV2
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New TestRunner2'
+ name: 'CheckBox3'
+ model: useTestRunner2
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New Changes Browser for Changefiles (not yet recommended)'
+ name: 'ChangesBrowser'
+ model: useNewChangesBrowser
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the New ChangeSet Browser for Internal ChangeSets'
+ name: 'CheckBox5'
+ model: useNewChangeSetBrowser
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use Hierarchical Inspector (not yet recommended)'
+ name: 'HierarchicalInspector'
+ activeHelpKey: useHierarchicalInspector
+ model: useNewInspector
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the Smalltalk Document Viewer'
+ name: 'UseSmalltalkDocumentViewer'
+ activeHelpKey: useSmalltalkDocumentView
+ model: useSmalltalkDocumentViewer
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel2'
+ horizontalLayout: leftFit
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'External Diff Tool:'
+ name: 'Label3'
+ activeHelpKey: transcriptBufferSize
+ translateLabel: true
+ resizeForLabel: true
+ adjust: left
+ extent: (Point 99 18)
+ )
+ (InputFieldSpec
+ name: 'EntryField1'
+ activeHelpKey: transcriptBufferSize
+ model: externalDiffCommandTemplate
+ type: string
+ immediateAccept: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ extent: (Point 490 22)
+ )
+ )
+
+ )
+ extent: (Point 594 35)
+ )
+ (ViewSpec
+ name: 'Box2'
+ extent: (Point 594 20)
+ )
+ (CheckBoxSpec
+ label: 'Show "Tip Of The Day" at Startup'
+ name: 'CheckBox1'
+ activeHelpKey: showDidYouKnowTips
+ model: showTipOfTheDayAtStartup
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Clock in Launcher'
+ name: 'Clock'
+ activeHelpKey: showClockInLauncher
+ model: showClockInLauncher
+ translateLabel: true
+ extent: (Point 594 25)
+ )
+ (ViewSpec
+ name: 'Box3'
+ extent: (Point 594 19)
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ horizontalLayout: left
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box4'
+ extent: (Point 20 10)
+ )
+ (LabelSpec
+ label: 'Transcript''s Buffer Size:'
+ name: 'Label1'
+ activeHelpKey: transcriptBufferSize
+ translateLabel: true
+ resizeForLabel: true
+ adjust: right
+ useDefaultExtent: true
+ )
+ (InputFieldSpec
+ name: 'Transcripts Buffer Size'
+ activeHelpKey: transcriptBufferSize
+ model: transcriptBufferSize
+ type: number
+ immediateAccept: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ numChars: 8
+ acceptOnPointerLeave: true
+ extent: (Point 78 22)
+ )
+ (LabelSpec
+ label: '(Lines)'
+ name: 'Label2'
+ activeHelpKey: transcriptBufferSize
+ translateLabel: true
+ resizeForLabel: true
+ adjust: right
+ useDefaultExtent: true
+ )
+ )
+
+ )
+ extent: (Point 594 35)
+ )
+ (CheckBoxSpec
+ label: 'Autoraise Transcript'
+ name: 'CheckBox2'
+ activeHelpKey: autoRaiseTranscript
+ model: autoRaiseTranscript
+ translateLabel: true
+ extent: (Point 594 24)
+ )
+ (CheckBoxSpec
+ label: 'Eclipse Style Menus (where implemented)'
+ name: 'CheckBox4'
+ activeHelpKey: eclipseStyleMenus
+ model: eclipseStyleMenus
+ translateLabel: true
+ extent: (Point 594 24)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
)
! !
@@ -17820,22 +17879,23 @@
!AbstractSettingsApplication::ToolsSettingsAppl methodsFor:'actions'!
aspects
- ^ #(
- #eclipseStyleMenus
- #useTestRunner2
- "/ #useCodeView2InTools
- #useNewInspector
- #useNewChangesBrowser
- #useNewChangeSetBrowser
- "/ #useNewSystemBrowser -- no longer an option
- #useNewVersionDiffBrowser
- "/ #useNewFileBrowser -- no longer an option
- #useNewFileDialog
- "/ #useNewSettingsApplication -- no longer an option
- #useProcessMonitorV2
- #useSmalltalkDocumentViewer
- #showClockInLauncher
- #showTipOfTheDayAtStartup
+ ^ #(
+ #eclipseStyleMenus
+ #useTestRunner2
+ "/ #useCodeView2InTools
+ #useNewInspector
+ #useNewChangesBrowser
+ #useNewChangeSetBrowser
+ "/ #useNewSystemBrowser -- no longer an option
+ #useNewVersionDiffBrowser
+ "/ #useNewFileBrowser -- no longer an option
+ #useNewFileDialog
+ "/ #useNewSettingsApplication -- no longer an option
+ #useProcessMonitorV2
+ #useSmalltalkDocumentViewer
+ #showClockInLauncher
+ #showTipOfTheDayAtStartup
+ #externalDiffCommandTemplate
)
"Created: / 27-07-2012 / 20:48:18 / cg"
@@ -17944,6 +18004,14 @@
"Created: / 08-07-2011 / 13:42:13 / cg"
!
+externalDiffCommandTemplate
+ externalDiffCommandTemplate isNil ifTrue:[
+ externalDiffCommandTemplate := UserPreferences current externalDiffCommandTemplate asValue.
+ externalDiffCommandTemplate onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ externalDiffCommandTemplate.
+!
+
showClockInLauncher
showClockInLauncher isNil ifTrue:[
showClockInLauncher := false asValue.
@@ -18119,11 +18187,11 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.451 2013-01-07 15:44:36 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.454 2013-02-01 14:13:20 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.451 2013-01-07 15:44:36 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.454 2013-02-01 14:13:20 cg Exp $'
!
version_SVN
--- a/DiffListUtility.st Mon Feb 04 23:58:23 2013 +0100
+++ b/DiffListUtility.st Fri Feb 08 08:51:42 2013 +0100
@@ -55,20 +55,12 @@
!DiffListUtility class methodsFor:'defaults'!
diffCommand
- "return the diff-command (with argument placeHolders)"
+ "return the diff-command (with argument placeHolders).
+ By default, diff is used with windows, diff -b with Unix.
+ You can change this via the diffCommandTemplate"
DiffCommandTemplate notNil ifTrue:[ ^ DiffCommandTemplate ].
-
- OperatingSystem isMSDOSlike ifTrue:[
- (OperatingSystem canExecuteCommand:'diff') ifFalse:[
- 'DiffTextView [warning]: no diff command found (please download and unzip "UnxUtils.zip" from "unxutils.sourceforge.net")' infoPrintCR.
- ^ nil
- ].
- ^ 'diff %1 %2'
- ].
- ^ 'diff -b %1 %2'
-
- "Modified: / 30.1.1998 / 12:12:49 / cg"
+ ^ UserPreferences current externalDiffCommandTemplate
!
diffCommandTemplate:aCommandTemplateString
@@ -93,16 +85,20 @@
(line includes:Character return) ifTrue: [
(line endsWith:Character return) ifTrue:[
lOut := line copyWithoutLast:1.
- ] ifFalse:[
- i := line indexOf:Character return.
- (line at:i+1) == Character nl ifTrue:[
- "/ crnl endings
- lOut := line copyReplaceString:(String crlf) withString:(String lf).
- ] ifFalse:[
- "/ cr endings
- lOut := line copyReplaceAll:Character return with:Character nl.
- ].
+ ].
+ ] ifFalse:[
+ (line endsWith:(String crlf)) ifTrue: [
+ lOut := line copyWithoutLast:2.
]
+"/ i := line indexOf:Character return.
+"/ (line at:i+1) == Character nl ifTrue:[
+"/ "/ crnl endings
+"/ lOut := line copyReplaceString:(String crlf) withString:(String lf).
+"/ ] ifFalse:[
+"/ "/ cr endings
+"/ lOut := line copyReplaceAll:(Character return) with:Character nl.
+"/ ].
+"/ ]
].
lOut isWideString ifTrue:[
(lOut first = (Character value:16rFEFF)) ifTrue:[
@@ -168,7 +164,7 @@
stream := PipeStream readingFrom:diffCmd.
stream isNil ifTrue:[
- stream := PipeStream readingFrom:('support' , Filename separator , diffCmd).
+ stream := PipeStream readingFrom:('support' asFilename / diffCmd).
stream isNil ifTrue:[
self error:'cannot execute diff' mayProceed:true.
^ nil.
@@ -214,8 +210,12 @@
!DiffListUtility class methodsFor:'documentation'!
+version
+ ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.6 2013-02-01 15:13:18 cg Exp $'
+!
+
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.4 2012-12-12 23:00:48 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffListUtility.st,v 1.6 2013-02-01 15:13:18 cg Exp $'
!
version_SVN
--- a/DiffTextView.st Mon Feb 04 23:58:23 2013 +0100
+++ b/DiffTextView.st Fri Feb 08 08:51:42 2013 +0100
@@ -100,6 +100,7 @@
"
! !
+
!DiffTextView class methodsFor:'instance creation'!
openOnClass:classA labelA:lblA andClass:classB labelB:lblB title:title ifSame:sameAction
@@ -160,6 +161,7 @@
^ v
! !
+
!DiffTextView class methodsFor:'defaults'!
diffCommand
@@ -176,6 +178,7 @@
DiffListUtility diffCommandTemplate:aCommandTemplateString
! !
+
!DiffTextView methodsFor:'accessing'!
text1:t1 text2:t2
@@ -184,8 +187,8 @@
|text1 text2 diffList|
- text1 := (t1 copyReplaceAll:Character return with:Character cr) asStringCollection.
- text2 := (t2 copyReplaceAll:Character return with:Character cr) asStringCollection.
+ text1 := t1 asStringCollection.
+ text2 := t2 asStringCollection.
diffList := self diffListFor:text1 and:text2.
@@ -226,6 +229,7 @@
"Modified: / 27-03-2007 / 12:06:46 / cg"
! !
+
!DiffTextView methodsFor:'initialization'!
addNextPreviousButtons
@@ -269,6 +273,7 @@
"Modified: 14.6.1996 / 16:14:39 / cg"
! !
+
!DiffTextView methodsFor:'private'!
diffListFor:text1 and:text2
@@ -580,16 +585,18 @@
textView2 list:lists second.
! !
+
!DiffTextView class methodsFor:'documentation'!
version
- ^ '$Id: DiffTextView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.57 2013-02-01 15:13:02 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.56 2009/10/10 10:09:23 cg Exp §'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.57 2013-02-01 15:13:02 cg Exp $'
!
version_SVN
^ '$Id: DiffTextView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
! !
+
--- a/DirectoryContentsBrowser.st Mon Feb 04 23:58:23 2013 +0100
+++ b/DirectoryContentsBrowser.st Fri Feb 08 08:51:42 2013 +0100
@@ -2080,9 +2080,9 @@
fromMaster ifFalse:[
self currentFileNameHolderChangedForCommon.
].
+ self startUpdateTask.
self currentFileNameHolderChanged.
self viewedColumnsChanged.
- self startUpdateTask.
self windowGroup addPreEventHook:self.
!
@@ -2419,7 +2419,7 @@
self setBrowserItemList:#().
directoryContentsChangeFlag := true.
-^ self.
+"/ ^ self.
self createItemList.
@@ -2510,7 +2510,6 @@
select:[:eachItem |
|isDir showIt|
- filterChangeFlag ifTrue:[^ nil].
isDir := eachItem isDirectory.
isDir ifFalse:[noOfFiles := noOfFiles + 1].
@@ -3483,11 +3482,11 @@
!DirectoryContentsBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.252 2013-01-19 14:24:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.253 2013-01-29 10:49:08 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.252 2013-01-19 14:24:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.253 2013-01-29 10:49:08 cg Exp $'
!
version_SVN
--- a/FileApplicationNoteBook.st Mon Feb 04 23:58:23 2013 +0100
+++ b/FileApplicationNoteBook.st Fri Feb 08 08:51:42 2013 +0100
@@ -82,7 +82,7 @@
textEditorModificationTime checkModifiedBlock fileEncodingHolder
doNotShowFontDialog lockFileEncodingHolder enableSelectInBrowser
tagsBrowserVisibleHolder tagsBrowser'
- classVariableNames:'DefaultTagsBrowserVisible'
+ classVariableNames:'DefaultTagsBrowserVisible MaxFileSizeLoadedWithoutAsking'
poolDictionaries:''
privateIn:FileApplicationNoteBook
!
@@ -5067,7 +5067,8 @@
!
getContents
- |file fileSize contents presentation alreadyConfirmed answer sizeLimit showLastPart|
+ |file fileSize contents presentation alreadyConfirmed answer sizeLimit showLastPart
+ dontAskAgainHolder|
file := self fileName.
file isNil ifTrue:[
@@ -5082,16 +5083,37 @@
presentation := self presentation.
presentation == #asText ifTrue:[
- fileSize > (8 * 1024 * 1024) ifTrue:[
- answer := OptionBox
- request:(resources
+ fileSize > (MaxFileSizeLoadedWithoutAsking ? (8 * 1024 * 1024)) ifTrue:[
+ dontAskAgainHolder := false asValue.
+ answer := Dialog
+ confirmWithCancel:(resources
stringWithCRs:'%1 is very large (%2).\\Show all or only the first 8 Mb ?'
with:file baseName allBold
with:(UnitConverter fileSizeStringFor:fileSize))
- label:(resources string:'Large File')
- buttonLabels:(resources array:#('Cancel' 'Show All' 'Show Last Part' 'Show First Part' ))
- values:#(#abort #all #last #first)
- default:#abort.
+ labels:(resources array:#('Cancel' 'Show All' 'Show Last Part' 'Show First Part' ))
+ values:#(#abort #all #last #first)
+ default:#abort
+ check:(resources string:'Don''t ask again up to this size') on:dontAskAgainHolder
+ title:(resources string:'Large File').
+
+ answer == #all ifTrue:[
+ dontAskAgainHolder value ifTrue:[
+ MaxFileSizeLoadedWithoutAsking := fileSize + 4096
+ ]
+ ].
+
+"/ old
+"/ answer := OptionBox
+"/ request:(resources
+"/ stringWithCRs:'%1 is very large (%2).\\Show all or only the first 8 Mb ?'
+"/ with:file baseName allBold
+"/ with:(UnitConverter fileSizeStringFor:fileSize))
+"/ label:(resources string:'Large File')
+"/ buttonLabels:(resources array:#('Cancel' 'Show All' 'Show Last Part' 'Show First Part' ))
+"/ values:#(#abort #all #last #first)
+"/ default:#abort.
+
+"/ very old
"/ answer := Dialog
"/ confirmWithCancel:(resources
"/ stringWithCRs:'%1 is very large (%2).\\Show all or only the first 4 Mb ?'
@@ -6865,11 +6887,11 @@
!FileApplicationNoteBook class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.273 2013-01-18 11:29:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.275 2013-01-29 14:20:07 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.273 2013-01-18 11:29:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.275 2013-01-29 14:20:07 cg Exp $'
!
version_SVN
--- a/FindFileApplication.st Mon Feb 04 23:58:23 2013 +0100
+++ b/FindFileApplication.st Fri Feb 08 08:51:42 2013 +0100
@@ -1290,14 +1290,14 @@
setOfFilesToSearchFor remember cache fn dirSearchedRelative easyCheck|
contentsString := contentsStringArg.
- (contentsString notNil and:[ ignCaseInContents ]) ifTrue:[
+ (contentsString notEmptyOrNil and:[ ignCaseInContents ]) ifTrue:[
contentsString := contentsString asLowercase
].
notContentsString := notContentsStringArg.
- (notContentsString notNil and:[ ignCaseInNotContents ]) ifTrue:[
+ (notContentsString notEmptyOrNil and:[ ignCaseInNotContents ]) ifTrue:[
notContentsString := notContentsString asLowercase
].
- filenameToCompareContentsOrNil notNil ifTrue:[
+ filenameToCompareContentsOrNil notEmptyOrNil ifTrue:[
fileSizesToSearchFor := OrderedCollection new.
filesToSearchFor := OrderedCollection new.
fileMD5sToSearchFor := OrderedCollection new.
@@ -1344,7 +1344,7 @@
resultList := self resultList.
- filenameToCompareContentsOrNil notNil ifTrue:[
+ filenameToCompareContentsOrNil notEmptyOrNil ifTrue:[
doesFileMatch :=
[:f |
|contentsMatches mustValidateExistance
@@ -1423,13 +1423,13 @@
contentsMatches
].
] ifFalse:[
- (contentsString isNil and:[notContentsString isNil]) ifTrue:[
+ (contentsString isEmptyOrNil and:[notContentsString isEmptyOrNil]) ifTrue:[
doesFileMatch := [:f | true].
] ifFalse:[
(self canUseGrep and:[self useGrep value]) ifTrue:[
(ignCaseInContents not and:[ignCaseInNotContents not]) ifTrue:[
- contentsString notNil ifTrue:[
- notContentsString notNil ifTrue:[
+ contentsString notEmptyOrNil ifTrue:[
+ notContentsString notEmptyOrNil ifTrue:[
grepCommand := '(grep "',contentsString,'" %1) && (grep -v "',notContentsString,'" %1)'.
] ifFalse:[
grepCommand := 'grep "' , contentsString , '" %1'.
@@ -1446,38 +1446,28 @@
].
doesFileMatch isNil ifTrue:[
- contentsString notNil ifTrue:[
+ contentsString notEmptyOrNil ifTrue:[
ignCaseInContents ifTrue:[
check := easyCheck := [:l | l includesString:contentsString caseSensitive:false]
] ifFalse:[
check := easyCheck := [:l | l includesString:contentsString]
].
].
- notContentsString notNil ifTrue:[
+ notContentsString notEmptyOrNil ifTrue:[
ignCaseInNotContents ifTrue:[
- checkNot := [:l | l asLowercase includesString:notContentsString]
+ checkNot := [:l | (l includesString:notContentsString caseSensitive:false)]
] ifFalse:[
- checkNot := [:l | l includesString:notContentsString]
+ checkNot := [:l | (l includesString:notContentsString)]
].
].
doesFileMatch :=
[:f |
- |contentsMatches hugeFile bigFile realCheckAction|
+ |contentsMatches contentsNotMatches hugeFile bigFile|
hugeFile := f fileSize > (4024*1024).
bigFile := f fileSize > (512*1024).
- check notNil ifTrue:[
- checkNot isNil ifTrue:[
- realCheckAction := check. "/ [:text | check value:text]
- ] ifFalse:[
- realCheckAction := [:text | (check value:text) and:[(checkNot value:text) not]].
- ]
- ] ifFalse:[
- realCheckAction := [:text | (checkNot value:text) not].
- ].
-
"/ string search ...
contentsMatches := true.
(f exists and:[f isReadable]) ifFalse:[
@@ -1489,10 +1479,8 @@
Stream lineTooLongErrorSignal handle:[:ex |
|cont|
+"/ "/ this typically happens, when a binary file is read linewise ...
resultList add: (('*** ' , f pathName , ' skipped - binary/long line ***') colorizeAllWith:(Color red darkened)).
-"/ "/ this typically happens, when a binary file is read linewise ...
-"/ cont := f readStream binary contentsOfEntireFile asString.
-"/ contentsMatches := realCheckAction value:cont
] do:[
bigFile ifTrue:[
Stream lineTooLongErrorSignal handle:[:ex |
@@ -1501,18 +1489,41 @@
contentsMatches := false.
(check == easyCheck
and:[ f size < (128*1024) ]) ifTrue:[
- contentsMatches := f contentsAsString includesString: contentsString caseSensitive:ignCaseInContents not.
+ check notNil ifTrue:[
+ contentsMatches := f contentsAsString includesString: contentsString caseSensitive:ignCaseInContents not.
+ (contentsMatches and:[ checkNot notNil ]) ifTrue:[
+ contentsMatches := (f contentsAsString includesString: notContentsString caseSensitive:ignCaseInNotContents not) not.
+ ].
+ ] ifFalse:[
+ checkNot notNil ifTrue:[
+ contentsMatches := (f contentsAsString includesString: notContentsString caseSensitive:ignCaseInNotContents not) not.
+ ].
+ ].
] ifFalse:[
+ contentsNotMatches := false.
f readingFileDo:[:stream |
- [contentsMatches or:[stream atEnd]] whileFalse:[
- contentsMatches := realCheckAction value:(stream nextLine)
+ [contentsMatches or:[contentsNotMatches or:[stream atEnd]]] whileFalse:[
+ |line|
+
+ line := stream nextLine.
+ check notNil ifTrue:[
+ contentsMatches := check value:line
+ ].
+ checkNot notNil ifTrue:[
+ contentsNotMatches := checkNot value:line
+ ].
]
].
].
].
] ifFalse:[
lines := f contents ? #().
- contentsMatches := lines contains:realCheckAction
+ check notNil ifTrue:[
+ contentsMatches := lines contains:check
+ ].
+ (contentsMatches and:[ checkNot notNil ]) ifTrue:[
+ contentsMatches := (lines contains:checkNot) not
+ ]
]
].
].
@@ -1594,7 +1605,7 @@
contentsToCompare := bytesToCompareContentsOrNil
].
- filenameToCompareContentsOrNil notNil ifTrue:[
+ filenameToCompareContentsOrNil notEmptyOrNil ifTrue:[
self searchOnlyInCache value ifTrue:[
cache notEmptyOrNil ifTrue:[
cache keysAndValuesDo:[:fn :info |
@@ -1822,11 +1833,11 @@
!FindFileApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.104 2013-01-26 21:37:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.105 2013-02-01 23:33:23 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.104 2013-01-26 21:37:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.105 2013-02-01 23:33:23 cg Exp $'
!
version_SVN
--- a/Makefile Mon Feb 04 23:58:23 2013 +0100
+++ b/Makefile Fri Feb 08 08:51:42 2013 +0100
@@ -15,5 +15,7 @@
#only needed for the definition of $(TOP)
include Make.proto
-makefile:
+makefile: mf
+
+mf:
$(TOP)/rules/stmkmf
--- a/SyntaxHighlighter2.st Mon Feb 04 23:58:23 2013 +0100
+++ b/SyntaxHighlighter2.st Fri Feb 08 08:51:42 2013 +0100
@@ -546,81 +546,7 @@
"Created: / 16-02-2012 / 21:56:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-binaryExpressionFor:receiverArg
- "parse a binary-expression; return a node-tree, nil or #Error"
- |receiver expr arg sel pos1 pos2 lno|
-
- receiver := receiverArg.
- (receiver == #Error) ifTrue:[^ #Error].
-
- "special kludge: since Scanner cannot know if -digit is a binary
- expression or a negative constant, handle cases here"
-
- [(tokenType == #BinaryOperator)
- or:[(tokenType == $|)
- or:[(tokenType == $^ and:[parserFlags allowCaretAsBinop])
- or:[((tokenType == #Integer) or:[tokenType == #Float])
- and:[tokenValue < 0]]]]
- ] whileTrue:[
- "/ kludge alarm: in a function-call argList, #, is not a binarySelector
- inFunctionCallArgument == true ifTrue:[
- ((tokenType == #BinaryOperator) and:[tokenName = ',']) ifTrue:[
- ^ receiver
- ].
- ].
-
- pos1 := tokenPosition.
- lno := tokenLineNr.
-
- "/ kludge alarm: bar, caret and minus are not scanned as binop
- (tokenType == $|) ifTrue:[
- sel := '|'.
- sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
- self nextToken.
- ] ifFalse:[
- (tokenType == $^) ifTrue:[
- sel := '^'.
- sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
- self nextToken.
- ] ifFalse:[
- (tokenType == #BinaryOperator) ifTrue:[
- sel := tokenName.
- sel := self selectorCheck:sel for:receiver position:tokenPosition to:(tokenPosition + tokenName size - 1).
- self nextToken
- ] ifFalse:[
- sel := '-'.
- token := tokenValue := tokenValue negated.
- tokenPosition := tokenPosition + 1. "/ to skip the sign
- ]
- ].
- ].
-
- pos2 := pos1 + sel size - 1.
- self markSelector:sel from:pos1 to:pos2 receiverNode:receiver.
- lastSelectorElement := nil.
-
- arg := self unaryExpression.
- (arg == #Error) ifTrue:[^ #Error].
-
- expr := BinaryNode receiver:receiver selector:sel arg:arg fold:foldConstants.
- expr isErrorNode ifTrue:[
- self parseError:(expr errorString) position:pos1 to:tokenPosition.
- errorFlag := false. "ok, user wants it - so he'll get it"
- expr := BinaryNode receiver:receiver selector:sel arg:arg fold:nil.
- ].
- expr lineNumber:lno.
- expr selectorPosition:pos1.
-
- self checkPlausibilityOf:expr from:pos1 to:pos2.
- receiver := expr. "/ for next message
- ].
- ^ receiver
-
- "Modified: / 09-01-1998 / 19:05:18 / stefan"
- "Modified: / 14-02-2010 / 17:54:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 19-01-2012 / 10:46:49 / cg"
-!
expression
| node savedLastSelectorElement |
@@ -641,8 +567,6 @@
"Modified: / 16-02-2012 / 23:39:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
unaryExpressionFor:receiverArg
"parse a unary-expression; return a node-tree, nil or #Error"
@@ -754,8 +678,6 @@
"Created: / 17-03-2012 / 19:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
markLocalIdentifierFrom:pos1 to:pos2
| node el prevEl |
@@ -803,8 +725,6 @@
"Modified: / 19-04-2012 / 09:53:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
markUnknownIdentifierFrom:pos1 to:pos2
ignoreBadIdentifier == true ifTrue:[ ^ self ].
@@ -815,8 +735,6 @@
"Modified: / 31.3.1998 / 19:10:30 / cg"
!
-
-
rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2
|element prev|
--- a/Tools__ChangeList.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__ChangeList.st Fri Feb 08 08:51:42 2013 +0100
@@ -781,10 +781,6 @@
!ChangeList methodsFor:'event processing'!
-
-
-
-
handlesKeyPress:key inView:aView
<resource: #keyboard (#Accept #Ctrls)>
--- a/Tools__ChangeSetBrowser2.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__ChangeSetBrowser2.st Fri Feb 08 08:51:42 2013 +0100
@@ -2351,9 +2351,7 @@
"Created: / 07-09-2011 / 15:54:03 / cg"
"Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
- !
+! !
!ChangeSetBrowser2 methodsFor:'aspects-queries'!
--- a/Tools__CodeNavigationService.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__CodeNavigationService.st Fri Feb 08 08:51:42 2013 +0100
@@ -89,7 +89,7 @@
defaultSelectorEmphasis
DefaultSelectorEmphasis isNil ifTrue:[
DefaultSelectorEmphasis :=
- Array with:(#backgroundColor -> (Color rgbValue:16rDBEEFF))
+ Array with:(#backgroundColor -> (Color rgbValue:16rADD9FF "16rDBEEFF"))
].
^ DefaultSelectorEmphasis
@@ -98,13 +98,12 @@
defaultVariableEmphasis
DefaultVariableEmphasis isNil ifTrue:[
- DefaultVariableEmphasis := Array with:(#backgroundColor -> (Color redByte: 240 greenByte: 216 blueByte: 168))
+ DefaultVariableEmphasis := Array with:(#backgroundColor -> (Color gray: 80 "90"))
].
^ DefaultVariableEmphasis
"Created: / 25-06-2010 / 13:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 21-08-2011 / 11:04:20 / cg"
- "Modified: / 15-02-2012 / 19:38:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -246,7 +245,7 @@
If the method returns true, the event will not be processed
by the view."
- (view == textView and:[ textView sensor ctrlDown ]) ifTrue:[
+ (view == textView and:[ textView sensor metaDown ]) ifTrue:[
self highlightElementAtX:x y:y.
^ true
].
@@ -263,13 +262,14 @@
by the view."
(view == textView) ifTrue:[
- codeView sensor ctrlDown ifTrue:[
- button == 1 ifTrue: [self button1Press.^true].
- button == #paste ifTrue: [self button2Press.^true].
- button == 2 ifTrue: [self button2Press.^true]
- ].
- button == 1 ifTrue:[
- self highlightVariableAtX:x y:y.
+ textView isQuickMenuModifierPressed ifTrue:[
+ button == 1 ifTrue: [^self button1Press].
+ button == #paste ifTrue: [^self button2Press].
+ button == 2 ifTrue: [^self button2Press]
+ ] ifFalse:[
+ button == 1 ifTrue:[
+ self highlightVariableAtX:x y:y.
+ ]
]
].
^false
@@ -279,6 +279,20 @@
"Modified (format): / 21-08-2011 / 10:06:54 / cg"
!
+isQuickMenuModifierPressed
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[
+ ^ textView sensor ctrlDown
+ ].
+ ^ textView sensor metaDown
+!
+
+isQuickMenuModifierReleased
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[
+ ^ textView sensor ctrlDown not
+ ].
+ ^ textView sensor metaDown not
+!
+
keyPress:key x:x y:y in:view
"Handles an event in given view (a subview of codeView).
If the method returns true, it has eaten the event and it will not be processed
@@ -289,13 +303,17 @@
|ev p|
- (view == textView) ifTrue:[
- (key == #'Control_L' or:[ key == #Ctrl ]) ifTrue:[
+ (view == textView) ifTrue:[
+ "/ ("ctrlDown" "key == #'Control_L' or:[ key == #Ctrl ]") ifTrue:[
+ (textView isQuickMenuModifierPressed) ifTrue:[
"/ because it is delegated, the position is not correct
ev := WindowGroup lastEventQuerySignal query.
p := view device translatePoint:(ev x @ ev y) fromView:ev view toView:view.
- view sensor pushUserEvent:#highlightElementAtX:y: for: self withArguments:{p x. p y.}.
- ^ true.
+ view sensor
+ pushUserEvent:#highlightElementAtX:y:
+ for: self
+ withArguments:{p x. p y.}.
+ ^ false "/ true. -- no, dont eat the key
].
"/ codeView reallyModified "textView modified" ifTrue:[
@@ -327,13 +345,14 @@
|ev p|
- (view == textView and:[key == #'Control_L' or:[key == #Ctrl]]) ifTrue:[
+ (view == textView and:[textView isQuickMenuModifierReleased]) ifTrue:[
+ "/ (view == textView and:[key == #'Control_L' or:[key == #Ctrl]]) ifTrue:[
"/ because it is delegated, the position is not correct
ev := WindowGroup lastEventQuerySignal query.
p := view device translatePoint:(ev x @ ev y) fromView:ev view toView:view.
self highlightClear.
"/ view sensor pushUserEvent:#highlightClear for:self.
- ^ true
+ ^ false "/ true -- do not eat the event
].
^ false
@@ -647,7 +666,7 @@
!CodeNavigationService class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.19 2013-01-17 10:35:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.20 2013-01-30 17:54:04 cg Exp $'
!
version_SVN
--- a/Tools__CodeView2.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__CodeView2.st Fri Feb 08 08:51:42 2013 +0100
@@ -1418,11 +1418,7 @@
"Created: / 06-07-2011 / 17:12:58 / jv"
"Modified: / 06-10-2011 / 14:13:44 / cg"
-!
-
-
-
- !
+! !
!CodeView2 methodsFor:'diff mode'!
@@ -2769,6 +2765,23 @@
! !
+!CodeView2::TextView methodsFor:'delegation-events'!
+
+isQuickMenuModifierPressed
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[
+ ^ self sensor ctrlDown
+ ].
+ ^ self sensor metaDown
+!
+
+isQuickMenuModifierReleased
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl ifTrue:[
+ ^ self sensor ctrlDown not
+ ].
+ ^ self sensor metaDown not
+! !
+
+
!CodeView2::TextView methodsFor:'drawing'!
backgroundForVisibleLine:visLineNr default:bg
@@ -2872,8 +2885,6 @@
"Modified: / 17-03-2012 / 10:04:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
redrawLines
|i pom|
@@ -3417,7 +3428,7 @@
Thats the true modified value (in case user undid its changes,
and the displayed text is actually original"
- |modified changedSource originalSource|
+ |modified changedSource originalSource lastLineOfChangedSource lastLineOfOriginalSource|
reallyModifiedChannel isNil ifTrue:[^self].
"JV@2011-10-27: Idea is not to do anything if nobody is
@@ -3431,24 +3442,59 @@
list size ~~ listOriginal size ifTrue:[
modified := true.
] ifFalse:[
+ "/ cg: don't do that (collecting original/changedSource);
+ "/ for huge files (>8Mb), this makes editing annoying slow (editing a trace output, for example)
+"/ changedSource := list ? #().
+"/ changedSource := changedSource collect:[:line | line isEmptyOrNil ifTrue:[nil] ifFalse:[line]].
+"/ [changedSource size > 0 and:[changedSource last isNil]] whileTrue:[
+"/ changedSource := changedSource removeLast.
+"/ ].
+"/
+"/ originalSource := listOriginal ? #() "self model value ? ''".
+"/ originalSource := originalSource collect:[:line | line isEmptyOrNil ifTrue:[nil] ifFalse:[line]].
+"/ [originalSource size > 0 and:[originalSource last isNil]] whileTrue:[
+"/ originalSource := originalSource removeLast
+"/ ].
+"/ originalSource size ~~ changedSource size ifTrue:[
+"/ modified := true.
+"/ ] ifFalse:[
+"/ | i stopIndex |
+"/
+"/ i := 1.
+"/ stopIndex := originalSource size + 1.
+"/ [ modified not and:[ i < stopIndex ] ] whileTrue:[
+"/ | originalL changedL |
+"/
+"/ originalL := ((originalSource at: i) ? '') string.
+"/ changedL := ((changedSource at: i) ? '') string.
+"/ originalL ~= changedL ifTrue:[
+"/ originalL withoutTrailingSeparators ~= changedL withoutTrailingSeparators ifTrue:[
+"/ modified := true.
+"/ ]
+"/ ].
+"/ i := i + 1.
+"/ ]
+"/ ].
+ "/ instead, do everything without collecting a new stringcollection.
changedSource := list ? #().
- changedSource := changedSource collect:[:line | line isEmptyOrNil ifTrue:[nil] ifFalse:[line]].
- [changedSource size > 0 and:[changedSource last isNil]] whileTrue:[
- changedSource := changedSource removeLast.
- ].
-
- originalSource := listOriginal ? #() "self model value ? ''".
- originalSource := originalSource collect:[:line | line isEmptyOrNil ifTrue:[nil] ifFalse:[line]].
- [originalSource size > 0 and:[originalSource last isNil]] whileTrue:[
- originalSource := originalSource removeLast
- ].
- originalSource size ~~ changedSource size ifTrue:[
+ lastLineOfChangedSource := changedSource size.
+ [lastLineOfChangedSource > 0 and:[(changedSource at:lastLineOfChangedSource) isEmptyOrNil]] whileTrue:[
+ lastLineOfChangedSource := lastLineOfChangedSource - 1.
+ ].
+ originalSource := listOriginal ? #().
+ lastLineOfOriginalSource := originalSource size.
+ [lastLineOfOriginalSource > 0 and:[(originalSource at:lastLineOfOriginalSource) isEmptyOrNil]] whileTrue:[
+ lastLineOfOriginalSource := lastLineOfOriginalSource - 1.
+ ].
+
+ lastLineOfOriginalSource ~~ lastLineOfChangedSource ifTrue:[
modified := true.
] ifFalse:[
- | i s |
+ | i stopIndex |
+
i := 1.
- s := originalSource size + 1.
- [ modified not and:[ i < s ] ] whileTrue:[
+ stopIndex := lastLineOfOriginalSource + 1.
+ [ modified not and:[ i < stopIndex ] ] whileTrue:[
| originalL changedL |
originalL := ((originalSource at: i) ? '') string.
@@ -3460,7 +3506,8 @@
].
i := i + 1.
]
- ]
+ ].
+
].
reallyModifiedChannel value: modified
@@ -3480,8 +3527,6 @@
!CodeView2::TextView methodsFor:'scrolling'!
-
-
basicScrollTo:anOrigin redraw:doRedraw
super scrollTo:anOrigin redraw:doRedraw
@@ -3490,8 +3535,6 @@
"Created: / 19-03-2012 / 17:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
originChanged:delta
super originChanged:delta.
@@ -3501,8 +3544,6 @@
"Created: / 07-12-2009 / 21:50:49 / Jindra <a>"
!
-
-
scrollTo:anOrigin redraw:doRedraw
codeView scrollTo:anOrigin redraw:doRedraw in: self.
@@ -3511,9 +3552,7 @@
"Modified: / 06-04-2010 / 14:04:28 / Jakub <zelenja7@fel.cvut.cz>"
"Modified: / 17-03-2012 / 10:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 19-03-2012 / 17:05:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
- !
+! !
!CodeView2::TextView methodsFor:'undo & again'!
@@ -3538,11 +3577,11 @@
!CodeView2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.67 2012-11-01 14:20:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.69 2013-01-30 17:54:06 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.67 2012-11-01 14:20:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.69 2013-01-30 17:54:06 cg Exp $'
!
version_SVN
--- a/Tools__CodeView2SettingsAppl.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__CodeView2SettingsAppl.st Fri Feb 08 08:51:42 2013 +0100
@@ -16,7 +16,8 @@
AbstractSettingsApplication subclass:#CodeView2SettingsAppl
instanceVariableNames:'useCodeView2InTools useCodeView2InDebugger useCodeView2InBrowser
useCodeView2InToolEnabled useCodeView2InWorkspace
- codeView2AutoIndent codeView2ShowAcceptCancel'
+ codeView2AutoIndent codeView2ShowAcceptCancel
+ codeView2QuickSendersAndImplementorsOnControl'
classVariableNames:''
poolDictionaries:''
category:'Interface-CodeView'
@@ -57,17 +58,25 @@
^ super flyByHelpSpec addPairsFrom:#(
#showAcceptCancelBarInGutter
-'Show the Gutterview''s own Accept/Cancel Bar (disabled if outer Accept/Cancel Bar is enabled)'
+'Show the Gutterview''s own Accept/Cancel Bar (disabled if outer Accept/Cancel bar is enabled)'
#useCodeView2InBrowser
-'Use the new Editor in SystemBrowsers (disabled if the global use of Code Editor 2 is disabled in the tools settings)'
+'Use the new editor in SystemBrowsers (disabled if the global use of CodeEditor2 is disabled in the tools settings)'
#useCodeView2InWorkspace
-'Use the new Editor in Workspaces (disabled if the global use of Code Editor 2 is disabled in the tools settings)'
+'Use the new editor in Workspaces (disabled if the global use of Code Editor2 is disabled in the tools settings)'
#useCodeView2InDebugger
-'Use the new Editor in the Debugger (disabled if the global use of Code Editor 2 is disabled in the tools settings)'
+'Use the new editor in the Debugger (disabled if the global use of Code Editor2 is disabled in the tools settings)'
+
+#codeView2QuickSendersAndImplementorsOnControl
+'If on, the CTRL (Control) key is used to get the quick implementors/senders menus via left/right mouse click. If off, the ALT key is used.'
+#codeView2AutoIndent
+'Automatically indent (prettyprint) code. This is experimental and not yet enabled by default,
+as it uses the refactory browser''s prettyprint function, which is known to loose comments and generate
+ugly layout occasionally. For now, it is recommended to manually prettyprint code (using the format button),
+and check if it looks good enough to be accepted.'
)
! !
@@ -142,6 +151,7 @@
(FramedBoxSpec
label: 'Individual Tool Support'
name: 'ToolSupport'
+ visibilityChannel: false
labelPosition: topLeft
translateLabel: true
component:
@@ -160,35 +170,35 @@
(CheckBoxSpec
label: 'Use Advanced Code Editor in Class Browser'
name: 'CheckBox2'
+ activeHelpKey: useCodeView2InBrowser
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InBrowser
- activeHelpKey: useCodeView2InBrowser
translateLabel: true
extent: (Point 551 25)
)
(CheckBoxSpec
label: 'Use Advanced Code Editor in Debugger (experimental)'
name: 'CheckBox3'
+ activeHelpKey: useCodeView2InDebugger
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InDebugger
- activeHelpKey: useCodeView2InDebugger
translateLabel: true
extent: (Point 551 25)
)
(CheckBoxSpec
label: 'Use Advanced Code Editor in Workspace'
name: 'CheckBox4'
+ activeHelpKey: useCodeView2InWorkspace
enableChannel: useCodeView2InToolEnabled
model: useCodeView2InWorkspace
- activeHelpKey: useCodeView2InWorkspace
translateLabel: true
extent: (Point 551 25)
)
)
)
+ usePreferredHeight: true
useDynamicPreferredHeight: true
- usePreferredHeight: true
)
)
@@ -236,7 +246,42 @@
)
)
- extent: (Point 585 77)
+ extent: (Point 585 82)
+ )
+ (FramedBoxSpec
+ label: 'Keyboard Shortcuts'
+ name: 'FramedBox1'
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel2'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Quick Senders/Implementors Menu with CTRL key (as opposed to ALT key)'
+ name: 'CheckBox7'
+ activeHelpKey: codeView2QuickSendersAndImplementorsOnControl
+ model: codeView2QuickSendersAndImplementorsOnControl
+ translateLabel: true
+ extent: (Point 551 25)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 585 55)
)
)
@@ -261,7 +306,6 @@
codeView2AutoIndent isNil ifTrue:[
codeView2AutoIndent := ValueHolder new.
codeView2AutoIndent onChangeSend:#updateModifiedChannel to:self
-
].
^ codeView2AutoIndent
@@ -269,6 +313,16 @@
"Created: / 07-08-2011 / 12:52:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+codeView2QuickSendersAndImplementorsOnControl
+ codeView2QuickSendersAndImplementorsOnControl isNil ifTrue:[
+ codeView2QuickSendersAndImplementorsOnControl := ValueHolder new.
+ codeView2QuickSendersAndImplementorsOnControl onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ codeView2QuickSendersAndImplementorsOnControl
+
+ "Modified: / 11-03-2010 / 10:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
codeView2ShowAcceptCancel
"return/create the 'codeView2ShowAcceptCancel' value holder (automatically generated)"
@@ -287,7 +341,6 @@
useCodeView2InBrowser isNil ifTrue:[
useCodeView2InBrowser := ValueHolder new.
useCodeView2InBrowser onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InBrowser
@@ -301,7 +354,6 @@
useCodeView2InDebugger isNil ifTrue:[
useCodeView2InDebugger := ValueHolder new.
useCodeView2InDebugger onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InDebugger
@@ -315,7 +367,6 @@
useCodeView2InTools isNil ifTrue:[
useCodeView2InTools := ValueHolder new.
useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InTools
@@ -328,7 +379,6 @@
useCodeView2InWorkspace isNil ifTrue:[
useCodeView2InWorkspace := ValueHolder new.
useCodeView2InWorkspace onChangeSend:#updateModifiedChannel to:self
-
].
^ useCodeView2InWorkspace
@@ -366,6 +416,7 @@
"/Editing support
#codeView2AutoIndent
"/ #codeView2ShowAcceptCancel
+ #codeView2QuickSendersAndImplementorsOnControl
)
"Modified: / 10-10-2011 / 16:43:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -410,11 +461,11 @@
!CodeView2SettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.6 2012-11-01 13:55:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.7 2013-02-01 14:49:02 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.6 2012-11-01 13:55:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.7 2013-02-01 14:49:02 cg Exp $'
!
version_SVN
--- a/Tools__Inspector2.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__Inspector2.st Fri Feb 08 08:51:42 2013 +0100
@@ -456,7 +456,7 @@
(Menu
(
(MenuItem
- label: 'Expand Arrays in All-List'
+ label: 'Expand Arrays in "all xxx"-Lists'
itemValue: expandArraysInAllList:
translateLabel: true
indication: expandArraysInAllList
@@ -1068,7 +1068,7 @@
!Inspector2::NavigationState class methodsFor:'documentation'!
version
- ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.32 2012-10-24 13:04:30 cg Exp $'
+ ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.33 2013-02-01 13:20:56 cg Exp $'
!
version_SVN
@@ -1293,11 +1293,11 @@
!Inspector2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.32 2012-10-24 13:04:30 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.33 2013-02-01 13:20:56 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.32 2012-10-24 13:04:30 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.33 2013-02-01 13:20:56 cg Exp $'
!
version_CVS_jvrany
--- a/Tools__NewSystemBrowser.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__NewSystemBrowser.st Fri Feb 08 08:51:42 2013 +0100
@@ -299,19 +299,19 @@
newEntry isNil ifTrue:[^ historyOrNil].
(history := historyOrNil) isNil ifTrue:[
- history := OrderedCollection new.
+ history := OrderedCollection new.
].
history := history
- select:[:entry |
- entry className ~= newEntry className
- or:[entry selector ~= newEntry selector
- or:[entry meta ~= newEntry meta]]
- ].
+ select:[:entry |
+ entry className ~= newEntry className
+ or:[entry selector ~= newEntry selector
+ or:[entry meta ~= newEntry meta]]
+ ].
history addFirst:newEntry.
history size > 30 ifTrue:[
- history removeLast.
+ history removeLast.
].
^ history
@@ -8685,124 +8685,132 @@
^
#(Menu
- (
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Remove from ChangeSet'
- itemValue: classMenuCleanUpChangeSet
- )
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Entries in ChangeSet'
- itemValue: classMenuShowEntriesInChangeSet
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasAnyUnloadedClassSelectedHolder
- label: 'Load'
- itemValue: classMenuLoad
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectDefinitionWithAnyUnloadedClassSelectedHolder
- label: 'Load Project'
- itemValue: classMenuLoadProject
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Unload'
- itemValue: classMenuUnload
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Initialize Class(es)'
- itemValue: classMenuInitialize
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Compile Lazy Methods'
- itemValue: classMenuCompileLazyMethods
- isVisible: false
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Reload'
- itemValue: classMenuReload
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasClassSelectedWhichCanBeIncludedInProjectHolder
- label: 'Include in Project as Compiled Class'
- itemValue: classMenuIncludeInProject
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasClassSelectedWhichCanBeMadeAutoloadedInProject
- label: 'Include in Project as Autoloaded Class'
- itemValue: classMenuMakeAutoloadedInProject
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasClassSelectedWhichCanBeExcludedFromProject
- label: 'Exclude from Project'
- itemValue: classMenuExcludeFromProject
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleLoadedClassSelectedHolder
- label: 'Primitive Definitions'
- itemValue: classMenuPrimitiveDefinitions
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleLoadedClassSelectedHolder
- label: 'Primitive Functions'
- itemValue: classMenuPrimitiveFunctions
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleLoadedClassSelectedHolder
- label: 'Primitive Variables'
- itemValue: classMenuPrimitiveVariables
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleLoadedClassSelectedHolder
- label: 'Edit Resource File(s)...'
- itemValue: classMenuEditResourceFiles
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasClassSelectedHolder
- label: 'Do...'
- itemValue: classMenuDoUserProvidedAction
- )
- (MenuItem
- label: 'Special ClassOPS'
- submenuChannel: classOperationsMenu
- isMenuSlice: true
- )
- )
- nil
- nil
- )
+ (
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Remove from ChangeSet'
+ itemValue: classMenuCleanUpChangeSet
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Entries in ChangeSet'
+ itemValue: classMenuShowEntriesInChangeSet
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasAnyUnloadedClassSelectedHolder
+ label: 'Load'
+ itemValue: classMenuLoad
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectDefinitionWithAnyUnloadedClassSelectedHolder
+ label: 'Load Project'
+ itemValue: classMenuLoadProject
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Unload'
+ itemValue: classMenuUnload
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Initialize Class(es)'
+ itemValue: classMenuInitialize
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Compile Lazy Methods'
+ itemValue: classMenuCompileLazyMethods
+ isVisible: false
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Load Sources'
+ itemValue: classMenuLoadSources
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Reload'
+ itemValue: classMenuReload
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasClassSelectedWhichCanBeIncludedInProjectHolder
+ label: 'Include in Project as Compiled Class'
+ itemValue: classMenuIncludeInProject
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedWhichCanBeMadeAutoloadedInProject
+ label: 'Include in Project as Autoloaded Class'
+ itemValue: classMenuMakeAutoloadedInProject
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasClassSelectedWhichCanBeExcludedFromProject
+ label: 'Exclude from Project'
+ itemValue: classMenuExcludeFromProject
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleLoadedClassSelectedHolder
+ label: 'Primitive Definitions'
+ itemValue: classMenuPrimitiveDefinitions
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleLoadedClassSelectedHolder
+ label: 'Primitive Functions'
+ itemValue: classMenuPrimitiveFunctions
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleLoadedClassSelectedHolder
+ label: 'Primitive Variables'
+ itemValue: classMenuPrimitiveVariables
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleLoadedClassSelectedHolder
+ label: 'Edit Resource File(s)...'
+ itemValue: classMenuEditResourceFiles
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolder
+ label: 'Do...'
+ itemValue: classMenuDoUserProvidedAction
+ )
+ (MenuItem
+ label: 'Special ClassOPS'
+ submenuChannel: classOperationsMenu
+ isMenuSlice: true
+ )
+ )
+ nil
+ nil
+ )
+
+ "Modified: / 26-07-2012 / 11:48:32 / cg"
!
codeMenu
@@ -8979,112 +8987,121 @@
^
#(Menu
- (
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'bc.mak'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'bc.mak'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'Make.proto'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'Make.proto'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'Make.spec'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'Make.spec'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'app.nsi'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'app.nsi'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'abbrev.stc'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'abbrev.stc'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'libInit.cc'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'libInit.cc'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'lib.rc / app.rc'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'lib.rc'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'loadAll'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'loadAll'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'modules.stx'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'modules.stx'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'bmake.bat'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'bmake.bat'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'tccmake.bat'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'tccmake.bat'
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleProjectOrProjectDefinitionSelected
- label: 'vcmake.bat'
- itemValue: projectMenuShowGeneratedBuildFile:
- translateLabel: true
- argument: 'vcmake.bat'
- showBusyCursorWhilePerforming: true
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'bc.mak'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'bc.mak'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'Make.proto'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'Make.proto'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'Make.spec'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'Make.spec'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'app.nsi'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'app.nsi'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'abbrev.stc'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'abbrev.stc'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'libInit.cc'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'libInit.cc'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'lib.rc / app.rc'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'lib.rc'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'loadAll'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'loadAll'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'modules.stx'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'modules.stx'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'bmake.bat'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'bmake.bat'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ isVisible: false
+ label: 'tccmake.bat'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'tccmake.bat'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'vcmake.bat'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'vcmake.bat'
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleProjectOrProjectDefinitionSelected
+ label: 'mingwmake.bat'
+ itemValue: projectMenuShowGeneratedBuildFile:
+ translateLabel: true
+ argument: 'mingwmake.bat'
+ showBusyCursorWhilePerforming: true
+ )
+ )
+ nil
+ nil
)
"Modified: / 04-09-2012 / 13:13:55 / cg"
@@ -9936,372 +9953,372 @@
^
#(Menu
- (
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'File out'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'as...'
- itemValue: projectMenuFileOutAs
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedAndCanFileOutXMLHolder
- label: 'XML as...'
- itemValue: projectMenuFileOutXMLAs
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedAndCanFileOutSIFHolder
- label: 'SIF as...'
- itemValue: projectMenuFileOutSIFAs
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
+ (
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'File out'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'as...'
+ itemValue: projectMenuFileOutAs
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedAndCanFileOutXMLHolder
+ label: 'XML as...'
+ itemValue: projectMenuFileOutXMLAs
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedAndCanFileOutSIFHolder
+ label: 'SIF as...'
+ itemValue: projectMenuFileOutSIFAs
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
enabled: hasProjectSelectedAndCanFileOutCypressHolder
label: 'Cypress as...'
itemValue: projectMenuFileOutCypressAs
)
(MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Each in...'
- itemValue: projectMenuFileOutEachIn
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Build Support File in...'
- itemValue: projectMenuFileOutBuildSupportFiles
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedAndCanFileOutXMLHolder
- label: 'Each XML in...'
- itemValue: projectMenuFileOutEachXMLIn
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedAndCanFileOutSIFHolder
- label: 'Each SIF in...'
- itemValue: projectMenuFileOutEachSIFIn
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Each Binary in...'
- itemValue: projectMenuFileOutEachBinaryIn
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Mail To...'
- itemValue: projectMenuMailTo
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'Repository'
- translateLabel: true
- submenuChannel: projectMenuSCMSlice
- isMenuSlice: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Documentation'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Generate Project Documentation'
- itemValue: projectMenuDocumentation
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasOOMPackageLoadedAndSingleRealProjectSelectedHolder
- label: 'Metrics Summary Report'
- itemValue: projectMenuMetricsSummary
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Spawn'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Buffer'
- itemValue: projectMenuSpawnBuffer
- translateLabel: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Buffer with Extensions'
- itemValue: projectMenuSpawnExtensionsBuffer
- translateLabel: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Buffer with Projects Requiring this Project'
- itemValue: projectMenuSpawnPreRequirerBuffer
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Browser'
- itemValue: projectMenuSpawn
- translateLabel: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Browser on Extensions'
- itemValue: projectMenuSpawnExtensionsBrowser
- translateLabel: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Browser on Projects Requiring this Project'
- itemValue: projectMenuSpawnPreRequirerBrowser
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Find'
- translateLabel: true
- submenuChannel: searchMenu
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'New...'
- itemValue: projectMenuNew
- translateLabel: true
- )
- (MenuItem
- label: 'Load...'
- itemValue: projectMenuLoad
- translateLabel: true
- isVisible: hasNoProjectSelectedHolder
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: 'Load'
- itemValue: projectMenuLoad
- translateLabel: true
- isVisible: hasProjectSelectedHolder
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Rename...'
- itemValue: projectMenuRename
- translateLabel: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Remove...'
- itemValue: projectMenuRemove
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Build'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Build Package for Deployment'
- itemValue: projectMenuBuild
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Build Binaries for Execution'
- itemValue: projectMenuBuildExeOnly
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Build with Interactive Application Packager...'
- itemValue: projectMenuBuildWithApplicationPackager
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Generate Build Support Files in...'
- itemValue: projectMenuGenerateBuildSupportFiles
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Patch-Set...'
- itemValue: projectMenuGeneratePatchSet
- translateLabel: true
- showBusyCursorWhilePerforming: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- enabled: hasProjectSelectedHolder
- label: 'Generate'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Generate Project Definition Methods'
- itemValue: projectMenuGenerateProjectDefinitions
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Update Project Contents Definition Methods'
- itemValue: projectMenuUpdateProjectContentsDefinitions
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Regenerate Project Contents Definition Methods'
- itemValue: projectMenuRegenerateProjectContentsDefinitions
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- enabled: hasProjectSelectedAndSourceCodeManagerHolder
- label: 'Package Integrity Check...'
- itemValue: projectMenuCheckPackageIntegrity
- translateLabel: true
- )
- (MenuItem
- label: 'Static Analysis (Lint)'
- translateLabel: true
- submenuChannel: projectCheckMenu
- labelImage: (ResourceRetriever ToolbarIconLibrary lint16x16Icon 'Static Analysis (Lint)')
- )
- (MenuItem
- label: 'Debug'
- translateLabel: true
- submenuChannel: projectDebugMenu
- keepLinkedMenu: true
- )
- (MenuItem
- label: 'Special'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Remove from ChangeSet'
- itemValue: projectMenuCleanUpChangeSet
- translateLabel: true
- )
- (MenuItem
- label: '-'
- isVisible: false
- )
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Make Current Project'
- itemValue: projectMenuMakeCurrentProject
- translateLabel: true
- isVisible: false
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleRealProjectSelectedHolder
- label: 'Properties...'
- itemValue: projectMenuProperties
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Update'
- itemValue: projectMenuUpdate
- translateLabel: true
- )
- )
- nil
- nil
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Each in...'
+ itemValue: projectMenuFileOutEachIn
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Build Support File in...'
+ itemValue: projectMenuFileOutBuildSupportFiles
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedAndCanFileOutXMLHolder
+ label: 'Each XML in...'
+ itemValue: projectMenuFileOutEachXMLIn
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedAndCanFileOutSIFHolder
+ label: 'Each SIF in...'
+ itemValue: projectMenuFileOutEachSIFIn
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Each Binary in...'
+ itemValue: projectMenuFileOutEachBinaryIn
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Mail To...'
+ itemValue: projectMenuMailTo
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Repository'
+ translateLabel: true
+ submenuChannel: projectMenuSCMSlice
+ isMenuSlice: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Documentation'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Generate Project Documentation'
+ itemValue: projectMenuDocumentation
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasOOMPackageLoadedAndSingleRealProjectSelectedHolder
+ label: 'Metrics Summary Report'
+ itemValue: projectMenuMetricsSummary
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Spawn'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Buffer'
+ itemValue: projectMenuSpawnBuffer
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Buffer with Extensions'
+ itemValue: projectMenuSpawnExtensionsBuffer
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Buffer with Projects Requiring this Project'
+ itemValue: projectMenuSpawnPreRequirerBuffer
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Browser'
+ itemValue: projectMenuSpawn
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Browser on Extensions'
+ itemValue: projectMenuSpawnExtensionsBrowser
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Browser on Projects Requiring this Project'
+ itemValue: projectMenuSpawnPreRequirerBrowser
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Find'
+ translateLabel: true
+ submenuChannel: searchMenu
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'New...'
+ itemValue: projectMenuNew
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Load...'
+ itemValue: projectMenuLoad
+ translateLabel: true
+ isVisible: hasNoProjectSelectedHolder
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: 'Load'
+ itemValue: projectMenuLoad
+ translateLabel: true
+ isVisible: hasProjectSelectedHolder
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Rename...'
+ itemValue: projectMenuRename
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Remove...'
+ itemValue: projectMenuRemove
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Build'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Build Package for Deployment'
+ itemValue: projectMenuBuild
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Build Binaries for Execution'
+ itemValue: projectMenuBuildExeOnly
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Build with Interactive Application Packager...'
+ itemValue: projectMenuBuildWithApplicationPackager
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Generate Build Support Files in...'
+ itemValue: projectMenuGenerateBuildSupportFiles
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Patch-Set...'
+ itemValue: projectMenuGeneratePatchSet
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ enabled: hasProjectSelectedHolder
+ label: 'Generate'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Generate Project Definition Methods'
+ itemValue: projectMenuGenerateProjectDefinitions
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Update Project Contents Definition Methods'
+ itemValue: projectMenuUpdateProjectContentsDefinitions
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Regenerate Project Contents Definition Methods'
+ itemValue: projectMenuRegenerateProjectContentsDefinitions
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ enabled: hasProjectSelectedAndSourceCodeManagerHolder
+ label: 'Package Integrity Check...'
+ itemValue: projectMenuCheckPackageIntegrity
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Static Analysis (Lint)'
+ translateLabel: true
+ submenuChannel: projectCheckMenu
+ labelImage: (ResourceRetriever ToolbarIconLibrary lint16x16Icon 'Static Analysis (Lint)')
+ )
+ (MenuItem
+ label: 'Debug'
+ translateLabel: true
+ submenuChannel: projectDebugMenu
+ keepLinkedMenu: true
+ )
+ (MenuItem
+ label: 'Special'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Remove from ChangeSet'
+ itemValue: projectMenuCleanUpChangeSet
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ isVisible: false
+ )
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Make Current Project'
+ itemValue: projectMenuMakeCurrentProject
+ translateLabel: true
+ isVisible: false
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleRealProjectSelectedHolder
+ label: 'Properties...'
+ itemValue: projectMenuProperties
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Update'
+ itemValue: projectMenuUpdate
+ translateLabel: true
+ )
+ )
+ nil
+ nil
)
"Modified: / 24-07-2012 / 15:20:51 / cg"
@@ -14553,28 +14570,28 @@
^
#(Menu
- (
- (MenuItem
- enabled: hasClassSelectedAndCVSSourceCodeManagerHolder
- isVisible: cvsRepositoryMenusAreShown
- label: 'CVS'
- translateLabel: true
- submenuChannel: classMenuSCMFor:
- labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCVSIcon 'CVS')
- argument: CVSSourceCodeManager
- keepLinkedMenu: true
- )
- (MenuItem
- enabled: hasClassesSelectedAndSubversionRepositoryExistsHolder
- isVisible: svnRepositoryMenusAreShown
- label: 'SubVersion'
- translateLabel: true
- submenuChannel: classMenuSCMFor:
- labelImage: (ResourceRetriever ToolbarIconLibrary repositorySVNIcon 'SubVersion')
- argument: SVNSourceCodeManager
- )
- (MenuItem
- enabled: hasClassSelectedAndSourceCodeManagerHolder
+ (
+ (MenuItem
+ enabled: hasClassSelectedAndCVSSourceCodeManagerHolder
+ isVisible: cvsRepositoryMenusAreShown
+ label: 'CVS'
+ translateLabel: true
+ submenuChannel: classMenuSCMFor:
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCVSIcon 'CVS')
+ argument: CVSSourceCodeManager
+ keepLinkedMenu: true
+ )
+ (MenuItem
+ enabled: hasClassesSelectedAndSubversionRepositoryExistsHolder
+ isVisible: svnRepositoryMenusAreShown
+ label: 'SubVersion'
+ translateLabel: true
+ submenuChannel: classMenuSCMFor:
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositorySVNIcon 'SubVersion')
+ argument: SVNSourceCodeManager
+ )
+ (MenuItem
+ enabled: hasClassSelectedAndSourceCodeManagerHolder
label: 'Mercurial+'
isVisible: hgRepositoryMenusAreShown
submenuChannel: classMenuSCMFor:
@@ -14591,24 +14608,24 @@
)
(MenuItem
enabled: hasClassSelectedAndSourceCodeManagerHolder
- label: 'Mercurial'
- translateLabel: true
- submenuChannel: classMenuSCMFor:
- labelImage: (ResourceRetriever ToolbarIconLibrary repositoryHGIcon 'Mercurial')
- argument: MercurialSourceCodeManager
- )
- (MenuItem
- enabled: hasClassSelectedAndSourceCodeManagerHolder
- isVisible: perforceRepositoryMenusAreShown
- label: 'Perforce'
- translateLabel: true
- submenuChannel: classMenuSCMFor:
- labelImage: (ResourceRetriever ToolbarIconLibrary repositorySVNIcon 'Perforce')
- argument: PerforceSourceCodeManager
- )
- )
- nil
- nil
+ label: 'Mercurial'
+ translateLabel: true
+ submenuChannel: classMenuSCMFor:
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryHGIcon 'Mercurial')
+ argument: MercurialSourceCodeManager
+ )
+ (MenuItem
+ enabled: hasClassSelectedAndSourceCodeManagerHolder
+ isVisible: perforceRepositoryMenusAreShown
+ label: 'Perforce'
+ translateLabel: true
+ submenuChannel: classMenuSCMFor:
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositorySVNIcon 'Perforce')
+ argument: PerforceSourceCodeManager
+ )
+ )
+ nil
+ nil
)
!
@@ -27907,7 +27924,7 @@
(TextBox openOn:allMessages title:'Errors and Warnings' readOnly:true).
badMethods notEmpty ifTrue:[
- self spawnMethodBrowserFor:badMethods in:#newBuffer label:'Uncompilable Methods'
+ self spawnMethodBrowserFor:badMethods in:#newBuffer label:'Uncompilable Methods'
].
"Created: / 16-11-2006 / 14:53:21 / cg"
@@ -29165,6 +29182,18 @@
"Modified: / 12-09-2006 / 13:50:41 / cg"
!
+classMenuLoadSources
+ "fetches the source for all methods and keeps them in the method as string
+ (i.e. replacing the file+position reference by a real in-image string).
+ Needed when you want to overwrite the source file, to which the source-reference points to"
+
+ self selectedClassesDo:[:eachClass |
+ eachClass instAndClassMethodsDo:[:mthd |
+ mthd source:(mthd source)
+ ]
+ ]
+!
+
classMenuMailTo
"fileOut selected classes (chunk format) and eMail to someone"
@@ -34119,112 +34148,112 @@
collectionOfClasses size == 1 ifTrue:[
- self compareAgainstNewestInRepository:(collectionOfClasses first theNonMetaclass) usingManager:aManagerOrNil.
- ^ self.
+ self compareAgainstNewestInRepository:(collectionOfClasses first theNonMetaclass) usingManager:aManagerOrNil.
+ ^ self.
].
classesToUnload := IdentitySet new.
classes :=
- collectionOfClasses
- collect:[:eachClass |
- |loadedClass|
-
- eachClass isLoaded ifFalse:[
- loadedClass := eachClass autoload.
- loadedClass notNil ifTrue:[classesToUnload add:loadedClass].
- ] ifTrue:[
- loadedClass := eachClass
- ].
- loadedClass isNil
- ifTrue:nil
- ifFalse:[loadedClass theNonMetaclass]]
- thenSelect:[:cls | cls notNil].
+ collectionOfClasses
+ collect:[:eachClass |
+ |loadedClass|
+
+ eachClass isLoaded ifFalse:[
+ loadedClass := eachClass autoload.
+ loadedClass notNil ifTrue:[classesToUnload add:loadedClass].
+ ] ifTrue:[
+ loadedClass := eachClass
+ ].
+ loadedClass isNil
+ ifTrue:nil
+ ifFalse:[loadedClass theNonMetaclass]]
+ thenSelect:[:cls | cls notNil].
classes do:[:eachClass |
- eachClass isLoaded ifFalse:[
- Transcript showCR:('Cannot compare unloaded class: ' , eachClass name).
- ] ifTrue:[
- aStream := self sourceStreamForRepositorySourceOfClass:eachClass usingManager:aManagerOrNil.
- aStream notNil ifTrue:[
- aStream class readErrorSignal handle:[:ex |
- self warn:('read error while reading extracted source\\' , ex description) withCRs.
- aStream close.
- ^ self
- ] do:[
- comparedSource := aStream contents asString.
- ].
- aStream close.
-
- self busyLabel:'generating current source ...' with:nil.
-
- aStream := '' writeStream.
- Method flushSourceStreamCache.
- "/ eachClass fileOutOn:aStream withTimeStamp:false.
- "/ currentSource := aStream contents asString.
- currentSource := eachClass source asString.
- aStream close.
-
- self busyLabel:'comparing ...' with:nil.
-
- comparedSource = currentSource ifTrue:[
- ((eachClass revision = ((aManagerOrNil ? eachClass sourceCodeManager) newestRevisionOf:eachClass))
- and:[eachClass hasUnsavedChanges]) ifTrue:[
- (self confirm:'Versions are identical.\\Remove entries from changeSet ?' withCRs) ifTrue:[
- ChangeSet current condenseChangesForClass:eachClass.
- ].
- ] ifFalse:[
- self information:'Versions are identical.'.
- ]
- ] ifFalse:[
- thisRevString := eachClass revision.
- thisRevString isNil ifTrue:[
- thisRevString := 'no revision'
- ].
-
- self busyLabel:'comparing ...' with:nil.
-
- current := ChangeSet fromStream:(s := currentSource readStream). s close.
- repository := ChangeSet fromStream:(s := comparedSource readStream). s close.
-
- diffs := repository diffSetsAgainst:current.
- allDiffs isNil ifTrue:[
- allDiffs := diffs.
- ] ifFalse:[
- allDiffs changed addAll:(diffs changed).
- allDiffs onlyInArg addAll:(diffs onlyInArg).
- allDiffs onlyInReceiver addAll:(diffs onlyInReceiver).
- ].
- ].
- ].
- ].
+ eachClass isLoaded ifFalse:[
+ Transcript showCR:('Cannot compare unloaded class: ' , eachClass name).
+ ] ifTrue:[
+ aStream := self sourceStreamForRepositorySourceOfClass:eachClass usingManager:aManagerOrNil.
+ aStream notNil ifTrue:[
+ aStream class readErrorSignal handle:[:ex |
+ self warn:('read error while reading extracted source\\' , ex description) withCRs.
+ aStream close.
+ ^ self
+ ] do:[
+ comparedSource := aStream contents asString.
+ ].
+ aStream close.
+
+ self busyLabel:'generating current source ...' with:nil.
+
+ aStream := '' writeStream.
+ Method flushSourceStreamCache.
+ "/ eachClass fileOutOn:aStream withTimeStamp:false.
+ "/ currentSource := aStream contents asString.
+ currentSource := eachClass source asString.
+ aStream close.
+
+ self busyLabel:'comparing ...' with:nil.
+
+ comparedSource = currentSource ifTrue:[
+ ((eachClass revision = ((aManagerOrNil ? eachClass sourceCodeManager) newestRevisionOf:eachClass))
+ and:[eachClass hasUnsavedChanges]) ifTrue:[
+ (self confirm:'Versions are identical.\\Remove entries from changeSet ?' withCRs) ifTrue:[
+ ChangeSet current condenseChangesForClass:eachClass.
+ ].
+ ] ifFalse:[
+ self information:'Versions are identical.'.
+ ]
+ ] ifFalse:[
+ thisRevString := eachClass revision.
+ thisRevString isNil ifTrue:[
+ thisRevString := 'no revision'
+ ].
+
+ self busyLabel:'comparing ...' with:nil.
+
+ current := ChangeSet fromStream:(s := currentSource readStream). s close.
+ repository := ChangeSet fromStream:(s := comparedSource readStream). s close.
+
+ diffs := repository diffSetsAgainst:current.
+ allDiffs isNil ifTrue:[
+ allDiffs := diffs.
+ ] ifFalse:[
+ allDiffs changed addAll:(diffs changed).
+ allDiffs onlyInArg addAll:(diffs onlyInArg).
+ allDiffs onlyInReceiver addAll:(diffs onlyInReceiver).
+ ].
+ ].
+ ].
+ ].
].
allDiffs isEmpty ifTrue:[
- (classes contains:[:someClass |
- (someClass hasUnsavedChanges)])
- ifTrue:[
- (self confirm:(resources
- stringWithCRs:'The classes are up-to-date.\\Remove entries from changeSet ?'))
- ifTrue:[
- classes do:[:eachClass |
- ChangeSet current condenseChangesForClass:eachClass.
- ]
- ].
- ] ifFalse:[
- self information:'The classes are up-to-date.'.
- ChangeSet current unrememberChangedClasses.
- ].
- ] ifFalse:[
- title := collectionOfClasses size == 1
- ifTrue:['Differences of %1' bindWith:collectionOfClasses first name]
- ifFalse:['Differences of %1 classes' bindWith:collectionOfClasses size].
-
- VersionDiffBrowser
- openOnDiffSet:allDiffs
- labelA:'Repository'
- labelB:'Image'
- title:title
- ignoreExtensions:true.
+ (classes contains:[:someClass |
+ (someClass hasUnsavedChanges)])
+ ifTrue:[
+ (self confirm:(resources
+ stringWithCRs:'The classes are up-to-date.\\Remove entries from changeSet ?'))
+ ifTrue:[
+ classes do:[:eachClass |
+ ChangeSet current condenseChangesForClass:eachClass.
+ ]
+ ].
+ ] ifFalse:[
+ self information:'The classes are up-to-date.'.
+ ChangeSet current unrememberChangedClasses.
+ ].
+ ] ifFalse:[
+ title := collectionOfClasses size == 1
+ ifTrue:['Differences of %1' bindWith:collectionOfClasses first name]
+ ifFalse:['Differences of %1 classes' bindWith:collectionOfClasses size].
+
+ VersionDiffBrowser
+ openOnDiffSet:allDiffs
+ labelA:'Repository'
+ labelB:'Image'
+ title:title
+ ignoreExtensions:true.
].
self normalLabel.
@@ -40606,88 +40635,89 @@
|package defClass newFile oldFile editor differ theFile missingName|
self hasProjectDefinitionSelected ifTrue:[
- self hasSingleClassSelected ifTrue:[
- defClass := self theSingleSelectedClass
- ].
- defClass isNil ifTrue:[
- self warn:(resources string:'Please select a single project definition class').
- ^ self.
- ].
- defClass := defClass theNonMetaclass.
- package := defClass package.
- ] ifFalse:[
- self hasSingleProjectSelected ifTrue:[
- package := self theSingleSelectedProject.
- defClass := ProjectDefinition definitionClassForPackage:package.
- defClass isNil ifTrue:[
- self warn:(resources string:'Missing project definition class (%1)\for package: %2.'
- with:(ProjectDefinition initialClassNameForDefinitionOf:package)
- with:package allBold).
- ^ self.
- ].
- ]
+ self hasSingleClassSelected ifTrue:[
+ defClass := self theSingleSelectedClass
+ ].
+ defClass isNil ifTrue:[
+ self warn:(resources string:'Please select a single project definition class').
+ ^ self.
+ ].
+ defClass := defClass theNonMetaclass.
+ package := defClass package.
+ ] ifFalse:[
+ self hasSingleProjectSelected ifTrue:[
+ package := self theSingleSelectedProject.
+ defClass := ProjectDefinition definitionClassForPackage:package.
+ defClass isNil ifTrue:[
+ self warn:(resources string:'Missing project definition class (%1)\for package: %2.'
+ with:(ProjectDefinition initialClassNameForDefinitionOf:package)
+ with:package allBold).
+ ^ self.
+ ].
+ ]
].
theFile := whichFile.
theFile = 'lib.rc' ifTrue:[
- theFile := defClass rcFilename.
+ theFile := defClass rcFilename.
].
theFile = 'app.nsi' ifTrue:[
- theFile := defClass nsiFilename.
+ theFile := defClass nsiFilename.
].
(missingName := defClass allClassNames "compiled_classNames"
- detect:[:aName |
- |cls|
-
- cls := Smalltalk at:aName asSymbol.
- cls isNil
- ]
- ifNone:nil)
+ detect:[:aName |
+ |cls|
+
+ cls := Smalltalk at:aName asSymbol.
+ cls isNil
+ ]
+ ifNone:nil)
notNil ifTrue:[
- (Dialog confirm:(resources stringWithCRs:'Some class (%1) from the list of compiled classes is missing in the image!!\\Continue anyway ?'
- with:missingName))
- ifFalse:[^ self ].
+ (Dialog confirm:(resources stringWithCRs:'Some class (%1) from the list of compiled classes is missing in the image!!\\Continue anyway ?'
+ with:missingName))
+ ifFalse:[^ self ].
].
whichFile = 'abbrev.stc' ifTrue:[
- (defClass compiled_classNames
- contains:[:aName |
- |cls|
-
- cls := Smalltalk at:aName asSymbol.
- cls notNil and:[cls isLoaded not]
- ])
- ifTrue:[
- (Dialog confirm:'Autoload missing class(es) ?\\Notice: generated abbrev.stc file is wrong if autoloaded classes are unloaded' withCRs) ifTrue:[
- defClass compiled_classNames do:[:aName |
- (Smalltalk at:aName asSymbol) autoload
- ].
- ].
- ].
+ (defClass compiled_classNames
+ contains:[:aName |
+ |cls|
+
+ cls := Smalltalk at:aName asSymbol.
+ cls notNil and:[cls isLoaded not]
+ ])
+ ifTrue:[
+ (Dialog confirm:'Autoload missing class(es) ?\\Notice: generated abbrev.stc file is wrong if autoloaded classes are unloaded' withCRs) ifTrue:[
+ defClass compiled_classNames do:[:aName |
+ (Smalltalk at:aName asSymbol) autoload
+ ].
+ ].
+ ].
].
[
- newFile := defClass generateFile:theFile.
+ newFile := defClass generateFile:theFile.
] on:Error do:[:ex|
- self errorNotify:ex description.
- ^ self.
+ self errorNotify:ex description.
+ ^ self.
].
SourceCodeManager notNil ifTrue:[
- oldFile := SourceCodeManager
- getFile:theFile
- revision:#newest
- directory:(package asPackageId directory)
- module:(package asPackageId module).
+ oldFile := SourceCodeManager
+ getFile:theFile
+ revision:#newest
+ directory:(package asPackageId directory)
+ module:(package asPackageId module).
].
oldFile isNil ifTrue:[
- editor := EditTextView openOnModel:newFile.
- editor topView label:(resources string:'Generated %1' with:theFile).
- ] ifFalse:[
- differ := DiffCodeView
- openOn:oldFile label:(resources string:'Newest %1 in Repository' with:theFile)
- and:newFile label:(resources string:'Generated %1' with:theFile).
+ editor := EditTextView openOnModel:newFile.
+ editor topView label:(resources string:'Generated %1' with:theFile).
+ ] ifFalse:[
+ differ := DiffCodeView
+ openOn:oldFile label:(resources string:'Newest %1 in Repository' with:theFile)
+ and:newFile label:(resources string:'Generated %1' with:theFile)
+ title:(resources string:'Comparing %1' with:whichFile).
].
"Created: / 29-08-2006 / 15:35:44 / cg"
@@ -51001,34 +51031,34 @@
"JV@2012-07-05: Some class definitions could be quite big, such as Java classes.
Don't format the code here, do it in background instead..."
definition size < 2500 ifTrue:[
- self doSyntaxColoring value ~~ false ifTrue:[
- highlighter := aClass syntaxHighlighterClass.
- highlighter notNil ifTrue:[
- definition := highlighter formatClassDefinition:definition in:nil.
- ]
- ].
+ self doSyntaxColoring value ~~ false ifTrue:[
+ highlighter := aClass syntaxHighlighterClass.
+ highlighter notNil ifTrue:[
+ definition := highlighter formatClassDefinition:definition in:nil.
+ ]
+ ].
].
self showCode:definition.
self normalLabel.
aClass isLoaded ifTrue:[
- "/ continue fetching the documentation,
- "/ which may take longer, if the source must be fetched
- "/ from the repository.
-
- "
- add documentation as a comment, if there is any
- "
- info := self commentOrDocumentationStringFromClass:aClass.
- text := definition.
- info notNil ifTrue:[
- text := text,(Character cr),info.
- ].
- self codeHolder setValue:text.
- self codeView notNil ifTrue:[
- self codeView setContents:text
- ].
+ "/ continue fetching the documentation,
+ "/ which may take longer, if the source must be fetched
+ "/ from the repository.
+
+ "
+ add documentation as a comment, if there is any
+ "
+ info := self commentOrDocumentationStringFromClass:aClass.
+ text := definition.
+ info notNil ifTrue:[
+ text := text,(Character cr),info.
+ ].
+ self codeHolder setValue:text.
+ self codeView notNil ifTrue:[
+ self codeView setContents:text
+ ].
].
self updatePackageInfoForClass:aClass.
@@ -58807,11 +58837,11 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1832 2013-01-26 21:08:14 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1834 2013-02-01 14:52:49 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1832 2013-01-26 21:08:14 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1834 2013-02-01 14:52:49 cg Exp $'
!
version_HG
--- a/Tools__NewSystemBrowserCodeView.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__NewSystemBrowserCodeView.st Fri Feb 08 08:51:42 2013 +0100
@@ -395,10 +395,10 @@
!
keyRelease: key x: x y: y
- (key = #Control_L) ifTrue:
- [ selectedNode := nil. self highlightClear; redraw ].
- "(key = #Alt_L) ifTrue:
- [ parseTreeNode := nil. self highlightClear; redraw ]."
+"/ textView isQuickMenuModifierReleased ifTrue:[
+"/ selectedNode := nil.
+"/ self highlightClear; redraw
+"/ ].
^ super
keyRelease: key
@@ -1044,7 +1044,7 @@
!NewSystemBrowserCodeView class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowserCodeView.st,v 1.12 2013-01-17 10:35:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowserCodeView.st,v 1.13 2013-01-30 17:56:09 cg Exp $'
!
version_SVN
--- a/Tools__TagList.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__TagList.st Fri Feb 08 08:51:42 2013 +0100
@@ -1621,7 +1621,7 @@
|lcSuffix shellCommand isCSuffix isCPlusPlusSuffix isJavaSuffix isEiffelSuffix isFortranSuffix
isTCLSuffix isRubySuffix isPythonSuffix isPhpSuffix isJavaScriptSuffix
- showOnly response suff fn|
+ showOnly response suff fn langValue langOption moreOptions|
ctagsCommand isNil ifTrue:[
remoteTarget isNil ifTrue:[
@@ -1674,16 +1674,29 @@
].
].
+ ctagsIsExCtags5x ifTrue:[
+ langOption := '--language-force=%1'.
+ ] ifFalse:[ ctagsIsExCtags ifTrue:[
+ langOption := '--lang=%1'.
+ ]].
+
shellCommand := ctagsCommand.
(shellCommand includes:Character space) ifTrue:[
shellCommand := '"',shellCommand,'"'.
].
+ moreOptions := ''.
showOnly := self showOnly.
lcSuffix := aFilenameString asFilename suffix asLowercase.
-
isCSuffix := self class isCSuffix:lcSuffix.
+
+ "/ a hack for temporary files generated by stc
+ lcSuffix = 'sc' ifTrue:[
+ (aFilenameString asFilename asAbsoluteFilename components includes:'stx') ifTrue:[
+ isCSuffix := true
+ ].
+ ].
isCPlusPlusSuffix := self class isCPlusPlusSuffix:lcSuffix.
(shellCommand notNil and:[(ctagsIsExCtags ? false)]) ifTrue:[
@@ -1718,122 +1731,130 @@
(isCSuffix or:[isCPlusPlusSuffix]) ifTrue:[
isCPlusPlusSuffix
- ifTrue:[ shellCommand := shellCommand, ' --lang=c++']
- ifFalse:[ shellCommand := shellCommand, ' --lang=c'].
+ ifTrue:[ langValue := 'c++']
+ ifFalse:[ langValue := 'c'].
showOnly == #classes ifTrue:[
- shellCommand := shellCommand, ' --c-types=c'
+ moreOptions := moreOptions, ' --c-types=c'
] ifFalse:[
showOnly == #functions ifTrue:[
- shellCommand := shellCommand, ' --c-types=f'
+ moreOptions := moreOptions, ' --c-types=f'
] ifFalse:[
showOnly == #functionsAndVariables ifTrue:[
- shellCommand := shellCommand, ' --c-types=fv'
+ moreOptions := moreOptions, ' --c-types=fv'
] ifFalse:[
showOnly == #classesFunctionsAndVariables ifTrue:[
- shellCommand := shellCommand, ' --c-types=cfv'
+ moreOptions := moreOptions, ' --c-types=cfv'
] ifFalse:[
showOnly == #variables ifTrue:[
- shellCommand := shellCommand, ' --c-types=v'
+ moreOptions := moreOptions, ' --c-types=v'
] ifFalse:[
showOnly == #types ifTrue:[
- shellCommand := shellCommand, ' --c-types=t'
+ moreOptions := moreOptions, ' --c-types=t'
]
]
]
]
]
].
- hideStructMembers == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-m'].
- hideDefines == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-d' ].
- hideTypedefs == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-t' ].
- hideStructures == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-s'].
- hideVariables == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-v'].
- hideFunctions == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-f'].
- hideClasses == true ifTrue:[ shellCommand := shellCommand, ' --c-types=-c'].
+ hideStructMembers == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-m'].
+ hideDefines == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-d' ].
+ hideTypedefs == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-t' ].
+ hideStructures == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-s'].
+ hideVariables == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-v'].
+ hideFunctions == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-f'].
+ hideClasses == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-c'].
].
isJavaSuffix ifTrue:[
- shellCommand := shellCommand, ' --lang=java'.
+ langValue := 'java'.
showOnly == #javaClasses ifTrue:[
- shellCommand := shellCommand, ' --java-types=c'
+ moreOptions := moreOptions, ' --java-types=c'
] ifFalse:[
showOnly == #javaMethods ifTrue:[
- shellCommand := shellCommand, ' --java-types=m'
+ moreOptions := moreOptions, ' --java-types=m'
] ifFalse:[
showOnly == #javaClassesAndMethods ifTrue:[
- shellCommand := shellCommand, ' --java-types=mc'
+ moreOptions := moreOptions, ' --java-types=mc'
]
]
].
- hideJavaClasses == true ifTrue:[ shellCommand := shellCommand, ' --java-types=-c' ].
- hideJavaMethods == true ifTrue:[ shellCommand := shellCommand, ' --java-types=-m' ].
- hideJavaInterfaces == true ifTrue:[ shellCommand := shellCommand, ' --java-types=-i' ].
- hideJavaFields == true ifTrue:[ shellCommand := shellCommand, ' --java-types=-f' ].
- hideJavaPackages == true ifTrue:[ shellCommand := shellCommand, ' --java-types=-p' ].
+ hideJavaClasses == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-c' ].
+ hideJavaMethods == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-m' ].
+ hideJavaInterfaces == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-i' ].
+ hideJavaFields == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-f' ].
+ hideJavaPackages == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-p' ].
].
isEiffelSuffix ifTrue:[
- shellCommand := shellCommand, ' --lang=eiffel'.
+ langValue := 'eiffel'.
showOnly == #classes ifTrue:[
- shellCommand := shellCommand, ' --eiffel-types=c'
+ moreOptions := moreOptions, ' --eiffel-types=c'
] ifFalse:[
showOnly == #features ifTrue:[
- shellCommand := shellCommand, ' --eiffel-types=f'
+ moreOptions := moreOptions, ' --eiffel-types=f'
]
].
"/ hideEiffelClasses == true ifTrue:[
-"/ shellCommand := shellCommand, ' --eiffel-types=-c'
+"/ moreOptions := moreOptions, ' --eiffel-types=-c'
"/ ].
"/ hideEiffelFeatures == true ifTrue:[
-"/ shellCommand := shellCommand, ' --eiffel-types=-m'
+"/ moreOptions := moreOptions, ' --eiffel-types=-m'
"/ ].
].
isFortranSuffix ifTrue:[
- shellCommand := shellCommand, ' --lang=fortran'.
+ langValue := 'fortran'.
showOnly == #functions ifTrue:[
- shellCommand := shellCommand, ' --fortran-types=f'
+ moreOptions := moreOptions, ' --fortran-types=f'
] ifFalse:[
showOnly == #interfaces ifTrue:[
- shellCommand := shellCommand, ' --fortran-types=i'
+ moreOptions := moreOptions, ' --fortran-types=i'
] ifFalse:[
showOnly == #subroutines ifTrue:[
- shellCommand := shellCommand, ' --fortran-types=s'
+ moreOptions := moreOptions, ' --fortran-types=s'
] ifFalse:[
showOnly == #commonBlocks == true ifTrue:[
- shellCommand := shellCommand, ' --fortran-types=c'
+ moreOptions := moreOptions, ' --fortran-types=c'
]
]
]
].
"/ hideFortranFunctions == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-f'
+"/ moreOptions := moreOptions, ' --fortran-types=-f'
"/ ].
"/ hideFortranInterfaces == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-i'
+"/ moreOptions := moreOptions, ' --fortran-types=-i'
"/ ].
"/ hideFortranSubroutines == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-s'
+"/ moreOptions := moreOptions, ' --fortran-types=-s'
"/ ].
"/ hideFortranCommonBlocks == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-c'
+"/ moreOptions := moreOptions, ' --fortran-types=-c'
"/ ].
"/ hideFortranEntryPoints == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-e'
+"/ moreOptions := moreOptions, ' --fortran-types=-e'
"/ ].
"/ hideFortranLabels == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-l'
+"/ moreOptions := moreOptions, ' --fortran-types=-l'
"/ ].
"/ hideFortranDerivedTypes == true ifTrue:[
-"/ shellCommand := shellCommand, ' --fortran-types=-t'
+"/ moreOptions := moreOptions, ' --fortran-types=-t'
"/ ].
].
"/ shellCommand := shellCommand, ' -f -'.
+ langValue notNil ifTrue:[
+ langOption notNil ifTrue:[
+ shellCommand := shellCommand , ' ' , (langOption bindWith:langValue)
+ ].
+ ].
+ moreOptions notEmptyOrNil ifTrue:[
+ shellCommand := shellCommand , moreOptions
+ ].
shellCommand := shellCommand, ' "%1"'.
remoteTarget notNil ifTrue:[
^ (remoteTarget makeRemoteCommandFrom:shellCommand inDirectory:'./').
@@ -2061,7 +2082,7 @@
list := self getTagListFromFile:aFile usingCommand:shellCmd mode:nil in:aTempDirectory
].
- "/ incase ctags could not find anything, try our own, naive fallback (not too bad either)
+ "/ in case ctags could not find anything, try our own, naive fallback (not too bad either)
list isEmptyOrNil ifTrue:[
list := self getSimpleTagListFromFile:aFile in:aTempDirectory.
].
@@ -3656,11 +3677,11 @@
!TagList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.22 2013-01-24 17:07:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.25 2013-01-29 11:10:00 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.22 2013-01-24 17:07:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.25 2013-01-29 11:10:00 cg Exp $'
!
version_SVN
--- a/Tools__TextDiffTool.st Mon Feb 04 23:58:23 2013 +0100
+++ b/Tools__TextDiffTool.st Fri Feb 08 08:51:42 2013 +0100
@@ -97,16 +97,6 @@
!TextDiffTool class methodsFor:'interface specs'!
-
-
-
-
-
-
-
-
-
-
windowSpec
"This resource specification was automatically generated
by the UIPainter of ST/X."
@@ -302,8 +292,6 @@
"Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
versionCLabelSpec
"This resource specification was automatically generated
by the UIPainter of ST/X."
@@ -391,11 +379,10 @@
!
labelA: aString
+
^self labelAHolder value: aString
- "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 30-08-2011 / 09:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 27-07-2012 / 21:57:10 / cg"
+ "Created: / 16-03-2012 / 13:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
labelB: aString
@@ -541,10 +528,6 @@
].
!
-
-
-
-
diffView
"/ diffView isNil ifTrue:[
diffView := self initializeDiffView.
@@ -582,13 +565,7 @@
diffView notNil ifTrue:[diffView languageHolder: aValueHolder].
"Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-
-
-
-
- !
+! !
!TextDiffTool methodsFor:'aspects-versions'!
@@ -782,12 +759,7 @@
!TextDiffTool methodsFor:'change & update'!
-codeAspect
- ^self codeAspectHolder value
- "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 27-07-2012 / 21:56:52 / cg"
-!
codeAspect:aSymbol
self codeAspectHolder value:aSymbol
@@ -821,29 +793,23 @@
"Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
updateAfterAorBorCChanged
"Called whenever one of the texts changes"
^ self subclassResponsibility
"Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
- !
+! !
!TextDiffTool methodsFor:'hooks'!
-
+postBuildDiffView:aScrollableView
-postBuildDiffView:aScrollableView
diffView := aScrollableView.
self setupCodeView: aScrollableView.
"Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 27-07-2012 / 21:57:21 / cg"
!
setupCodeView: codeView2
@@ -861,11 +827,11 @@
!TextDiffTool methodsFor:'initialization'!
initialize
- super initialize.
- textAChanged := textBChanged := false.
- "Modified: / 19-07-2011 / 19:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 27-07-2012 / 21:57:08 / cg"
+ super initialize.
+ textAChanged := textBChanged := textBChanged := false.
+
+ "Modified: / 16-03-2012 / 12:40:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
initializeDiffView
@@ -878,19 +844,6 @@
!TextDiffTool methodsFor:'private'!
-
-
-showNothing
- self diffSpecHolder value: #nothingSpec
-
- "Created: / 19-07-2011 / 19:34:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 27-07-2012 / 21:57:28 / cg"
-!
-
-
-
-
-
!
--- a/WorkspaceApplication.st Mon Feb 04 23:58:23 2013 +0100
+++ b/WorkspaceApplication.st Fri Feb 08 08:51:42 2013 +0100
@@ -1667,14 +1667,11 @@
!WorkspaceApplication class methodsFor:'private'!
createWorkspaceView
- ^(UserPreferences current useCodeView2In:#Workspace) ifTrue:[
- Tools::CodeView2 new
- ] ifFalse:[
- HVScrollableView for:Workspace
- ]
+ ^(UserPreferences current useCodeView2In:#Workspace)
+ ifTrue:[Tools::CodeView2 new]
+ ifFalse:[HVScrollableView for:Workspace]
"Modified: / 26-07-2011 / 10:28:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 21-08-2012 / 17:18:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -2530,13 +2527,11 @@
autoDefineVariablesChanged
|autoDefine|
- autoDefine := self autoDefineVariables value.
+ autoDefine := autoDefineVariables value.
UserPreferences current autoDefineWorkspaceVariables:(autoDefine == #workspace).
workspaces do:[:each |
- each autoDefineVariables:autoDefine
+ each autoDefineVariables:autoDefine
].
-
- "Modified: / 18-03-2012 / 23:34:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
basicInspectIt
--- a/extensions.st Mon Feb 04 23:58:23 2013 +0100
+++ b/extensions.st Fri Feb 08 08:51:42 2013 +0100
@@ -9,7 +9,6 @@
"Created: / 25-07-2010 / 08:57:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 04-10-2011 / 19:47:20 / cg"
! !
-
!AbstractSyntaxHighlighter class methodsFor:'api highlighting'!
formatMethod:aString in:aClass using:preferencesOrNil elementsInto: elements
@@ -18,7 +17,6 @@
"Created: / 25-07-2010 / 08:58:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ArrayedCollection methodsFor:'inspecting'!
inspector2TabForHexDump
@@ -86,7 +84,6 @@
"Created: / 13-02-2012 / 15:08:42 / cg"
! !
-
!Behavior methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -99,7 +96,6 @@
ifTrue:[ '-nonMeta' -> [ self theNonMetaclass ] ]);
yourself
! !
-
!Behavior methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -112,7 +108,6 @@
].
^ super inspectorValueStringInListFor:anInspector
! !
-
!Block methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -134,7 +129,6 @@
"Created: / 15-11-2011 / 14:24:10 / cg"
! !
-
!Breakpoint methodsFor:'accessing'!
icon
@@ -143,7 +137,6 @@
"Created: / 11-07-2011 / 18:21:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!BreakpointDescription methodsFor:'accessing'!
icon
@@ -167,7 +160,6 @@
"Created: / 28-06-2011 / 08:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 27-01-2012 / 13:46:23 / cg"
! !
-
!ByteArray methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -196,13 +188,11 @@
"Created: / 18-09-2006 / 21:29:59 / cg"
"Modified: / 06-10-2006 / 13:57:20 / cg"
! !
-
!Change methodsFor:'private'!
flattenOnto: aCollection
aCollection add: self
! !
-
!Change methodsFor:'private'!
flattenedChanges
@@ -211,7 +201,6 @@
self flattenOnto: changes.
^changes
! !
-
!Change methodsFor:'accessing'!
removed
@@ -220,7 +209,6 @@
"Created: / 24-10-2009 / 21:10:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!Change methodsFor:'accessing'!
removed: aBoolean
@@ -229,7 +217,6 @@
"Created: / 24-10-2009 / 21:11:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet methodsFor:'utilities'!
condenseChangesForRemoved
@@ -251,14 +238,12 @@
"Created: / 05-11-2001 / 14:21:17 / cg"
"Modified: / 12-10-2006 / 16:51:27 / cg"
! !
-
!ChangeSet methodsFor:'private'!
flattenOnto: aCollection
self do:[:change|change flattenOnto: aCollection]
! !
-
!ChangeSet methodsFor:'private'!
flattenedChanges
@@ -267,7 +252,6 @@
self flattenOnto: changes.
^changes
! !
-
!ChangeSet methodsFor:'inspecting'!
inspector2TabBrowser
@@ -284,7 +268,6 @@
"Modified: / 06-08-2011 / 21:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 13-09-2011 / 11:55:53 / cg"
! !
-
!ChangeSet methodsFor:'inspecting'!
inspector2Tabs
@@ -292,7 +275,6 @@
"Created: / 05-07-2011 / 13:40:19 / cg"
! !
-
!Character methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -312,7 +294,6 @@
"Created: / 22-10-2006 / 03:52:20 / cg"
! !
-
!Character methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -323,7 +304,6 @@
].
^ self storeString,(' "%1"' bindWith:asciivalue)
! !
-
!CharacterArray methodsFor:'inspecting'!
inspector2TabBytes
@@ -338,7 +318,6 @@
"Created: / 20-07-2011 / 16:36:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 21-08-2011 / 07:32:57 / cg"
! !
-
!CharacterArray methodsFor:'inspecting'!
inspector2TabHTML
@@ -351,7 +330,6 @@
"Created: / 17-02-2008 / 10:10:50 / janfrog"
"Created: / 07-11-2011 / 12:35:15 / cg"
! !
-
!CharacterArray methodsFor:'inspecting'!
inspector2TabText
@@ -364,7 +342,6 @@
"Created: / 17-02-2008 / 10:10:50 / janfrog"
"Modified: / 21-08-2011 / 08:02:57 / cg"
! !
-
!CharacterArray methodsFor:'inspecting'!
inspector2Tabs
@@ -377,7 +354,6 @@
"Created: / 05-07-2011 / 13:40:27 / cg"
! !
-
!CharacterArray methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -402,7 +378,6 @@
"Created: / 22-10-2006 / 03:52:20 / cg"
! !
-
!CharacterArray methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -410,7 +385,17 @@
^ self basicStoreString contractTo:30.
! !
+!Class methodsFor:'misc'!
+inspectorClass
+ "redefined to launch a ClassInspector, which knows about classVariables
+ (instead of the default InspectorView)."
+
+ ClassInspectorView notNil ifTrue:[
+ ^ ClassInspectorView
+ ].
+ ^ super inspectorClass
+! !
!Collection methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -423,7 +408,6 @@
].
^ (super inspectorValueStringInListFor:anInspector),' size=',sz printString
! !
-
!Color methodsFor:'inspecting'!
inspectorClass
@@ -434,7 +418,6 @@
"Modified: 23.4.1996 / 13:39:50 / cg"
! !
-
!Color methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -450,7 +433,6 @@
Color red inspect
"
! !
-
!Color methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -458,35 +440,30 @@
^ self htmlPrintString
! !
-
!CompositeChange methodsFor:'utilities'!
condenseChangesForRemoved
self changes condenseChangesForRemoved
! !
-
!CompositeChange methodsFor:'private'!
flattenOnto: aCollection
changes do:[:change|change flattenOnto: aCollection]
! !
-
!CompositeChange methodsFor:'accessing'!
removed
^changes allSatisfy: [:e|e removed]
! !
-
!CompositeChange methodsFor:'accessing'!
removed: aBoolean
changes do:[:e|e removed: aBoolean]
! !
-
!Date methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -507,7 +484,6 @@
"Created: / 20-01-2011 / 12:19:05 / cg"
! !
-
!Dictionary methodsFor:'inspecting'!
inspector2TabLabel
@@ -515,7 +491,6 @@
"Created: / 14-07-2011 / 11:57:18 / cg"
! !
-
!Dictionary methodsFor:'inspecting'!
inspectorClass
@@ -524,7 +499,6 @@
^ DictionaryInspectorView
! !
-
!EditTextView methodsFor:'accessing-dimensions'!
absoluteXOfPosition:positionInText
@@ -542,7 +516,6 @@
"Created: / 16-02-2010 / 10:05:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!EditTextView methodsFor:'accessing-dimensions'!
absoluteYOfCursor
@@ -561,7 +534,6 @@
"Created: / 27-05-2005 / 07:45:53 / janfrog"
"Modified: / 27-05-2005 / 23:03:40 / janfrog"
! !
-
!EditTextView methodsFor:'accessing-dimensions'!
xOfPosition: positionInText
@@ -575,7 +547,6 @@
"Created: / 16-02-2010 / 10:04:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!EditTextView methodsFor:'accessing-dimensions'!
yOfCursor
@@ -584,7 +555,6 @@
"Created: / 27-05-2005 / 07:43:41 / janfrog"
! !
-
!EditTextView methodsFor:'accessing-dimensions'!
yOfPosition: positionInText
@@ -595,7 +565,6 @@
"Created: / 16-02-2010 / 10:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ExecutableFunction methodsFor:'printing & storing'!
printStringForBrowserWithSelector:selector
@@ -603,7 +572,6 @@
^ self printStringForBrowserWithSelector:selector inClass:nil
! !
-
!Form methodsFor:'inspecting'!
inspectorClass
@@ -612,7 +580,6 @@
^ ImageInspectorView
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-22x22'!
bookmarks22x22
@@ -642,7 +609,6 @@
"Modified: / 05-05-2011 / 12:45:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
bug16x16Icon
@@ -667,7 +633,6 @@
?_????????????7=W5=_W5?=O/7???????>L?PLC@0LC?_????????7=/4S[7S 8TY/=?VC?????L#L.>JI3I+A%H#[?????GA3_]U*/M3_;BPRLD_????7=
?_B@M>DE-04>?U/??????2_=HEXYQ7:R<Q_???????4>G2$%Q9QEL?5_??????????<=?\;M??????????????????=-H????????0@a') ; colorMapFromArray:#[205 205 205 227 35 35 106 106 106 98 98 98 135 135 135 163 34 34 101 5 5 124 124 124 48 2 2 227 11 11 173 173 173 218 54 54 241 241 241 235 19 19 225 225 225 219 18 18 245 58 58 214 214 214 249 46 46 90 90 90 254 61 61 36 36 36 176 176 176 233 233 233 114 114 114 255 78 78 212 33 33 230 57 57 61 61 61 94 94 94 76 76 76 19 19 19 255 57 57 161 161 161 83 83 83 217 217 217 249 249 249 255 65 65 139 2 2 27 27 27 169 169 169 253 53 53 210 28 28 251 251 251 154 154 154 117 117 117 195 1 1 245 245 245 145 145 145 218 5 5 230 230 230 69 2 2 181 181 181 11 11 11 141 141 141 249 61 61 205 21 21 165 165 165 157 157 157 241 28 28 223 223 223 109 109 109 2 2 2 245 45 45 146 0 0 69 69 69 137 137 137 140 40 40 188 1 1 206 24 24 219 33 33 255 76 76 249 49 49 249 56 56 236 236 236 121 121 121 248 53 53 171 1 1 111 40 40 237 41 41 178 21 21 205 16 16 129 129 129 163 1 1 155 18 18 85 4 4 243 68 68 73 73 73 45 45 45 202 51 51 241 40 40 86 86 86 114 1 1 210 4 4 246 41 41 148 148 148 189 189 189 209 209 209 210 17 17 158 28 28 213 5 5 205 1 1 53 53 53 217 9 9 69 40 40 187 10 10 255 74 74 218 28 28 146 11 11 65 65 65 232 37 37 101 101 101 196 26 26 245 53 53 188 26 26 213 10 10 184 184 184 206 5 5 249 65 65 172 21 21 206 34 34 195 195 195 237 32 32 131 12 12 233 29 29 179 36 36 241 37 37 139 13 13 245 49 49 180 1 1 168 37 37 198 198 198 202 202 202 228 21 21 206 10 10 206 29 29 229 30 30 255 80 80 188 20 20 245 37 37 57 57 57 252 50 50 87 42 42 172 10 10 209 13 13 155 4 4 164 11 11 242 44 44 255 70 70 225 25 25 222 14 14 237 24 24 240 49 49 205 13 13 202 44 44 201 0 0 225 17 17 186 42 42 255 72 72 122 1 1 40 40 40 157 10 10 209 8 8 222 8 8 195 41 41 223 21 21 180 11 11 255 68 68 162 28 28 194 11 11 232 25 25 131 1 1 241 32 32 246 246 246 49 49 49 224 44 44 208 2 2 227 227 227 239 239 239 239 46 46 162 20 20 245 33 33 219 219 219 238 29 29 237 37 37 171 29 29 36 46 46 250 68 68 147 16 16 182 26 26 187 187 187 24 1 1 185 32 32 229 24 24 232 33 33 150 150 150 122 12 12 229 17 17 204 27 27 242 52 52 213 2 2 200 15 15 191 191 191 217 43 43 217 12 12 115 10 10 140 16 16 200 28 28 202 6 6 215 13 13 182 41 41 57 46 46 40 46 46 233 40 40 252 70 70 173 40 40 226 28 28 46 54 54 202 22 22 203 18 18 245 72 72 191 17 17 200 37 37 10 0 0 50 52 52 252 74 74 252 72 72 247 38 38 160 40 40 231 14 14 252 68 68 200 10 10 15 15 15 211 47 47 254 254 254 253 76 76 23 23 23 237 69 69 7 7 7 144 7 7 196 8 7 32 32 32 59 59 59 90 93 93 67 67 67 70 28 28 50 56 56 232 15 16 208 4 4 237 35 35 220 12 11 232 20 20 223 62 62 0 0 0 255 255 255 255 255 255]; mask:((ImageMask new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@L@@0@C8AO C?0O<C?>G?0??#?>C?0_?@O@@L@b') ; yourself); yourself]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-24x24'!
bug24x24Icon
@@ -696,7 +661,6 @@
<Q_???????????4XO!!?DJRU*Q9P%QSL5?U<-?????????3T5???=F$ EB@?L37?G3;=????????????????O_7D3,7=??????????????????????????<(
[RO?????????????????????????????????????????????') ; colorMapFromArray:#[205 205 205 227 35 35 106 106 106 98 98 98 135 135 135 163 34 34 101 5 5 124 124 124 48 2 2 227 11 11 173 173 173 218 54 54 241 241 241 235 19 19 225 225 225 219 18 18 245 58 58 214 214 214 249 46 46 90 90 90 254 61 61 36 36 36 176 176 176 233 233 233 114 114 114 255 78 78 212 33 33 230 57 57 61 61 61 94 94 94 76 76 76 19 19 19 255 57 57 161 161 161 83 83 83 217 217 217 249 249 249 255 65 65 139 2 2 27 27 27 169 169 169 253 53 53 210 28 28 251 251 251 154 154 154 117 117 117 195 1 1 245 245 245 145 145 145 218 5 5 230 230 230 69 2 2 181 181 181 11 11 11 141 141 141 249 61 61 205 21 21 165 165 165 157 157 157 241 28 28 223 223 223 109 109 109 2 2 2 245 45 45 146 0 0 69 69 69 137 137 137 140 40 40 188 1 1 206 24 24 219 33 33 255 76 76 249 49 49 249 56 56 236 236 236 121 121 121 248 53 53 171 1 1 111 40 40 237 41 41 178 21 21 205 16 16 129 129 129 163 1 1 155 18 18 85 4 4 243 68 68 73 73 73 45 45 45 202 51 51 241 40 40 86 86 86 114 1 1 210 4 4 246 41 41 148 148 148 189 189 189 209 209 209 210 17 17 158 28 28 213 5 5 205 1 1 53 53 53 217 9 9 69 40 40 187 10 10 255 74 74 218 28 28 146 11 11 65 65 65 232 37 37 101 101 101 196 26 26 245 53 53 188 26 26 213 10 10 184 184 184 206 5 5 249 65 65 172 21 21 206 34 34 195 195 195 237 32 32 131 12 12 233 29 29 179 36 36 241 37 37 139 13 13 245 49 49 180 1 1 168 37 37 198 198 198 202 202 202 228 21 21 206 10 10 206 29 29 229 30 30 255 80 80 188 20 20 245 37 37 57 57 57 252 50 50 87 42 42 172 10 10 209 13 13 155 4 4 164 11 11 242 44 44 255 70 70 225 25 25 222 14 14 237 24 24 240 49 49 205 13 13 202 44 44 201 0 0 225 17 17 186 42 42 255 72 72 122 1 1 40 40 40 157 10 10 209 8 8 222 8 8 195 41 41 223 21 21 180 11 11 255 68 68 162 28 28 194 11 11 232 25 25 131 1 1 241 32 32 246 246 246 49 49 49 224 44 44 208 2 2 227 227 227 239 239 239 239 46 46 162 20 20 245 33 33 219 219 219 238 29 29 237 37 37 171 29 29 36 46 46 250 68 68 147 16 16 182 26 26 187 187 187 24 1 1 185 32 32 229 24 24 232 33 33 150 150 150 122 12 12 229 17 17 204 27 27 242 52 52 213 2 2 200 15 15 191 191 191 217 43 43 217 12 12 115 10 10 140 16 16 200 28 28 202 6 6 215 13 13 182 41 41 57 46 46 40 46 46 233 40 40 252 70 70 173 40 40 226 28 28 46 54 54 202 22 22 203 18 18 245 72 72 191 17 17 200 37 37 10 0 0 50 52 52 252 74 74 252 72 72 247 38 38 160 40 40 231 14 14 252 68 68 200 10 10 15 15 15 211 47 47 254 254 254 253 76 76 23 23 23 237 69 69 7 7 7 144 7 7 196 8 7 32 32 32 59 59 59 90 93 93 67 67 67 70 28 28 50 56 56 232 15 16 208 4 4 237 35 35 220 12 11 232 20 20 223 62 62 0 0 0 255 255 255 255 255 255]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@H@@HH@@FH@@FH@@CX@@G<@BO<HGO>8A??0@??@@??@G??<C??8@??@G??<G??<G??XA??0C??8CO>8@G8@@A0@@@@@') ; yourself); yourself]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-32x32'!
bug32x32Icon
@@ -748,7 +712,6 @@
yourself
]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
lint16x16Icon
@@ -773,7 +736,6 @@
@XS??????????3<)-;^76.Z5A0O???????<P@W!!8>-3J<0+??????0\JI1,;7^?57-[;''T????<JS0P"PN3'':-V>8L??????V5@''G57.1,!!#X-''R_O???1(R
@RMW:Y*KY6+7*RW??????3P*ZU[;.:#!!/:7???????<A@6AV2?S:9+>5??????????< BC &?????;?Z??????????<XU_?????X<P@a') ; colorMapFromArray:#[0 1 0 0 2 0 1 4 0 3 6 2 30 1 0 6 9 5 34 2 2 10 12 8 43 4 2 13 15 12 15 17 13 77 0 0 16 18 15 35 14 12 17 19 16 67 6 1 19 20 18 75 7 10 21 23 20 86 9 4 25 27 24 111 4 7 103 7 10 96 10 12 32 29 28 29 30 28 31 33 30 153 2 0 33 35 33 35 36 34 110 16 16 173 0 1 36 38 35 41 37 36 165 4 0 155 7 7 128 15 14 39 41 39 157 12 16 51 42 42 207 0 4 43 45 42 58 41 39 141 19 15 199 4 0 210 3 0 221 1 4 48 49 47 231 0 12 211 7 8 172 19 10 172 19 18 52 54 51 53 55 53 234 5 23 59 54 53 176 24 21 56 57 55 57 59 56 204 19 22 195 22 24 103 47 48 227 16 9 60 61 59 198 25 19 216 20 21 61 63 60 119 48 45 228 20 20 63 65 62 211 30 27 68 69 67 69 71 68 212 32 34 242 25 29 72 74 71 74 76 74 191 45 50 245 31 38 76 78 75 77 79 76 79 80 78 138 66 66 248 36 40 240 41 43 83 85 82 216 50 52 241 43 50 195 58 61 86 88 85 244 46 46 87 89 86 89 91 88 214 58 58 193 65 67 92 93 91 248 51 49 109 90 87 185 68 87 194 67 80 87 95 125 250 54 57 173 74 96 202 67 84 159 78 103 253 56 52 188 72 90 87 99 135 129 89 121 99 101 98 73 104 148 255 59 60 159 83 106 175 81 94 94 102 132 187 78 98 215 71 85 255 61 67 169 84 104 251 66 66 104 106 103 90 106 147 151 92 119 200 81 93 107 108 106 140 99 131 162 94 119 255 72 76 144 100 128 96 112 153 228 80 83 159 97 120 111 113 110 191 90 111 206 87 104 113 115 112 87 118 163 115 117 114 83 122 166 179 100 117 118 120 117 199 99 101 231 91 88 138 113 147 120 122 119 196 101 119 123 125 122 115 123 167 213 100 113 119 123 162 180 109 128 127 129 126 208 108 109 115 131 173 185 115 140 158 122 154 173 119 144 131 133 130 130 130 163 178 122 124 181 119 147 106 139 178 136 138 135 120 139 175 126 138 175 204 121 132 132 139 172 113 146 186 136 143 176 144 146 143 121 149 184 153 142 173 135 150 181 148 150 147 125 153 188 130 153 182 179 140 167 150 152 149 205 136 148 181 145 146 136 159 189 155 157 154 140 163 193 159 161 158 161 163 160 143 166 196 162 164 161 148 167 192 164 166 163 165 165 187 197 159 173 167 169 166 152 171 196 191 163 180 157 172 191 169 171 168 216 159 166 171 173 170 208 163 179 187 169 190 217 162 175 174 176 173 159 178 203 186 173 174 207 167 175 163 178 198 213 166 176 179 181 178 198 176 192 169 185 204 183 185 182 216 175 184 209 177 189 212 180 192 204 183 198 208 183 193 188 190 187 180 192 206 194 196 193 215 191 201 187 199 213 204 198 197 211 196 210 199 201 198 190 202 216 191 203 217 201 202 212 202 204 201 208 203 201 219 201 210 205 207 203 217 203 217 206 208 205 213 207 206 223 205 214 203 211 220 211 213 210 211 212 222 214 216 213 221 215 227 217 219 216 219 221 218 228 218 224 217 222 225 221 223 220 231 221 227 216 225 233 220 226 228 224 226 223 221 229 238 231 233 230 228 234 236 233 235 232 235 238 234 249 251 248 255 255 255]; mask:((ImageMask new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@L@@0@C8AO0C?0O>C?>O?0??#?>C?0O?@OC@LLb') ; yourself); yourself]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-24x24'!
lint24x24Icon
@@ -802,7 +764,6 @@
/:6D??????????<)@PLSXEY?2?S<>.Y-/;V-?????????1$A??<GRU)/]8JMT"_?/;>5#O??????????????H@ +NBXQ??????>:/=*L??????????????<9
FEU_????????6OF5????????????????????????????-]K?') ; colorMapFromArray:#[0 1 0 0 2 0 1 4 0 3 6 2 30 1 0 6 9 5 34 2 2 10 12 8 43 4 2 13 15 12 15 17 13 77 0 0 16 18 15 35 14 12 17 19 16 67 6 1 19 20 18 75 7 10 21 23 20 86 9 4 25 27 24 111 4 7 103 7 10 96 10 12 32 29 28 29 30 28 31 33 30 153 2 0 33 35 33 35 36 34 110 16 16 173 0 1 36 38 35 41 37 36 165 4 0 155 7 7 128 15 14 39 41 39 157 12 16 51 42 42 207 0 4 43 45 42 58 41 39 141 19 15 199 4 0 210 3 0 221 1 4 48 49 47 231 0 12 211 7 8 172 19 10 172 19 18 52 54 51 53 55 53 234 5 23 59 54 53 176 24 21 56 57 55 57 59 56 204 19 22 195 22 24 103 47 48 227 16 9 60 61 59 198 25 19 216 20 21 61 63 60 119 48 45 228 20 20 63 65 62 211 30 27 68 69 67 69 71 68 212 32 34 242 25 29 72 74 71 74 76 74 191 45 50 245 31 38 76 78 75 77 79 76 79 80 78 138 66 66 248 36 40 240 41 43 83 85 82 216 50 52 241 43 50 195 58 61 86 88 85 244 46 46 87 89 86 89 91 88 214 58 58 193 65 67 92 93 91 248 51 49 109 90 87 185 68 87 194 67 80 87 95 125 250 54 57 173 74 96 202 67 84 159 78 103 253 56 52 188 72 90 87 99 135 129 89 121 99 101 98 73 104 148 255 59 60 159 83 106 175 81 94 94 102 132 187 78 98 215 71 85 255 61 67 169 84 104 251 66 66 104 106 103 90 106 147 151 92 119 200 81 93 107 108 106 140 99 131 162 94 119 255 72 76 144 100 128 96 112 153 228 80 83 159 97 120 111 113 110 191 90 111 206 87 104 113 115 112 87 118 163 115 117 114 83 122 166 179 100 117 118 120 117 199 99 101 231 91 88 138 113 147 120 122 119 196 101 119 123 125 122 115 123 167 213 100 113 119 123 162 180 109 128 127 129 126 208 108 109 115 131 173 185 115 140 158 122 154 173 119 144 131 133 130 130 130 163 178 122 124 181 119 147 106 139 178 136 138 135 120 139 175 126 138 175 204 121 132 132 139 172 113 146 186 136 143 176 144 146 143 121 149 184 153 142 173 135 150 181 148 150 147 125 153 188 130 153 182 179 140 167 150 152 149 205 136 148 181 145 146 136 159 189 155 157 154 140 163 193 159 161 158 161 163 160 143 166 196 162 164 161 148 167 192 164 166 163 165 165 187 197 159 173 167 169 166 152 171 196 191 163 180 157 172 191 169 171 168 216 159 166 171 173 170 208 163 179 187 169 190 217 162 175 174 176 173 159 178 203 186 173 174 207 167 175 163 178 198 213 166 176 179 181 178 198 176 192 169 185 204 183 185 182 216 175 184 209 177 189 212 180 192 204 183 198 208 183 193 188 190 187 180 192 206 194 196 193 215 191 201 187 199 213 204 198 197 211 196 210 199 201 198 190 202 216 191 203 217 201 202 212 202 204 201 208 203 201 219 201 210 205 207 203 217 203 217 206 208 205 213 207 206 223 205 214 203 211 220 211 213 210 211 212 222 214 216 213 221 215 227 217 219 216 219 221 218 228 218 224 217 222 225 221 223 220 231 221 227 216 225 233 220 226 228 224 226 223 221 229 238 231 233 230 228 234 236 233 235 232 235 238 234 249 251 248 255 255 255]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@LL@@FH@@FH@@CX@@G<@BG>HGO>XA??8@?? @?? G??<G??8@??0G??<G??<G??<@??8A??8CO><@G8O@A8G@@@F') ; yourself); yourself]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-32x32'!
lint32x32Icon
@@ -839,7 +800,6 @@
@@@@@@@@D@@@NC @@A 8@@@\L@@@CC@@@@Y0@@@G8@@@C? @AA?<H@8??G@G???0@???8@G??8@@??>@C???>A???? O???0@O??0@C??<@O???8G???>@??
?? @???@@_??8@O???@GO?38@!!?8_@@O<C8@@>@^@@@@C@@@@@@b') ; yourself); yourself]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
smalllintWarning16x16
@@ -870,7 +830,6 @@
@@@@@@@@????????????9\^ 1(T.1(T.1(T.1(T.1(T.9\^ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@????????????????????????????@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@_@C>@_<A?0G?0_? ?>C?<G?0_?!!?>G?8O?@G<@@@b') ; yourself); yourself]
! !
-
!GenericToolbarIconLibrary class methodsFor:'image specs-versions'!
versionMerged24x24
@@ -899,7 +858,6 @@
UEQNS30GLFI,\V11\W!!,X&I"Y&I!!W%9^T5MSWS0HLH]:^&93[798[G9/\V1,X&I!!WFA\Y30EMIF,%9RK_G%9\&=/[6=1[&91[GV@]DHDJ9>6+)2P"8"A!!7=?
_7=?_7=?\7Q.^4@CA"X-I2\''I2</JR$)JR (JB (K"4,J"T@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[28 1 19 26 0 23 36 0 35 57 0 48 55 1 50 58 0 51 61 0 54 57 3 52 56 0 54 63 0 57 64 0 58 63 0 62 67 3 66 66 0 68 69 5 67 70 6 68 70 0 72 71 0 73 57 15 60 65 17 63 72 9 70 79 0 77 70 0 74 72 0 75 61 25 59 81 2 79 74 13 71 74 1 77 76 4 79 70 15 72 66 23 68 78 7 81 75 19 76 81 12 83 61 25 67 75 21 77 78 23 79 91 5 94 114 6 111 122 0 119 124 0 121 130 0 123 118 0 120 110 25 104 119 0 122 119 17 114 120 0 123 125 20 115 129 2 127 135 0 131 137 0 134 139 0 136 125 26 118 138 1 141 137 22 130 142 9 143 138 16 142 139 31 136 142 22 145 145 26 147 147 16 155 154 0 166 159 22 161 128 73 126 148 48 147 186 0 187 155 40 156 187 0 189 196 0 193 188 0 190 188 0 191 156 31 162 189 0 192 180 0 187 157 32 163 198 0 197 164 20 172 191 4 193 200 0 200 182 3 189 156 57 155 193 9 194 202 0 202 203 0 204 196 13 195 152 66 152 194 0 199 205 0 206 164 41 168 206 0 207 197 17 195 195 0 201 207 0 208 188 16 192 196 0 202 198 20 195 207 0 209 196 0 203 197 0 204 167 45 171 199 23 196 198 0 205 208 0 211 192 23 194 200 26 196 189 0 201 199 2 206 201 29 196 203 7 208 202 31 197 192 5 203 200 0 210 173 52 176 206 13 209 201 0 211 195 11 204 199 33 198 214 18 211 204 36 198 201 0 212 208 17 210 202 0 213 197 15 205 190 33 195 203 0 214 184 47 187 210 21 211 202 39 200 208 41 201 211 24 212 200 22 207 202 25 208 214 28 214 204 28 209 198 1 216 207 47 203 207 31 211 200 45 202 185 65 187 208 33 212 198 32 208 209 35 213 210 38 214 212 40 215 213 42 216 207 55 208 202 40 211 193 73 194 214 44 217 205 42 213 216 46 218 213 28 223 206 44 214 208 47 215 220 49 221 214 62 214 221 51 222 192 87 193 210 50 217 206 83 201 215 64 215 211 51 218 224 55 224 213 53 219 217 67 217 227 58 226 218 68 218 215 56 221 218 58 223 213 80 212 220 71 220 219 60 224 229 62 229 220 61 225 231 64 230 223 74 222 201 96 202 222 63 226 224 75 223 225 76 224 218 85 217 224 65 228 226 78 224 224 67 229 218 77 222 228 80 226 229 82 227 226 70 231 230 83 228 223 81 226 211 105 211 225 92 223 233 85 230 226 93 224 224 84 228 231 75 235 227 95 225 234 87 232 219 94 223 230 98 228 228 89 232 217 106 222 234 102 232 225 100 229 226 101 230 228 104 232 213 116 219 229 105 233 231 107 235 224 114 229 199 149 203 242 102 244 216 137 220 205 135 215 237 113 241 234 128 234 238 114 242 223 126 229 226 134 228 236 130 236 225 128 231 229 131 234 240 134 239 233 117 242 230 133 236 239 128 243 236 143 238 238 145 239 238 123 247 243 133 247 238 146 240 215 161 223 241 148 243 250 144 249 235 156 239 225 155 235 237 158 241 229 163 235 249 142 255 242 161 245 247 149 252 238 154 246 246 170 245 249 151 254 249 153 255 238 170 243 230 176 238 245 161 253 247 163 255 236 181 244 245 166 255 243 172 253 245 190 253 243 184 254 246 193 255 238 193 253]; yourself]
! !
-
!Image methodsFor:'inspecting'!
inspector2TabImage
@@ -911,7 +869,6 @@
"Created: / 11-10-2011 / 17:12:01 / cg"
! !
-
!Image methodsFor:'inspecting'!
inspector2Tabs
@@ -919,7 +876,6 @@
"Created: / 11-10-2011 / 17:11:21 / cg"
! !
-
!Image methodsFor:'inspecting'!
inspectorClass
@@ -933,7 +889,6 @@
"Modified: 10.6.1996 / 18:23:55 / cg"
! !
-
!Integer methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -953,7 +908,6 @@
"Created: / 18-09-2006 / 21:22:46 / cg"
"Modified: / 06-10-2006 / 13:57:28 / cg"
! !
-
!Iterator methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -962,7 +916,6 @@
^ self classNameWithArticle
! !
-
!LimitedPrecisionReal methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -984,7 +937,6 @@
"Created: / 20-03-2012 / 22:34:46 / cg"
! !
-
!MenuView methodsFor:'accessing-behavior'!
shortKeys
@@ -992,7 +944,6 @@
"Created: / 18-10-2008 / 19:16:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
-
!Method methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -1011,7 +962,6 @@
"Created: / 18-09-2006 / 21:34:01 / cg"
"Modified: / 06-10-2006 / 13:57:33 / cg"
! !
-
!Method methodsFor:'printing & storing'!
printStringForBrowserWithSelector:selector inClass:aClass
@@ -1137,13 +1087,11 @@
"Modified: / 05-03-2007 / 16:18:53 / cg"
"Modified: / 20-07-2010 / 15:39:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!Method methodsFor:'printing & storing'!
selectorPrintStringInBrowserFor:selector
^ selector
! !
-
!Method methodsFor:'printing & storing'!
selectorPrintStringInBrowserFor:selector class:aClass
@@ -1161,7 +1109,6 @@
"Modified: / 20-07-2010 / 10:33:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!MethodDictionary methodsFor:'inspecting'!
inspectorClass
@@ -1172,7 +1119,6 @@
"Created: 12.6.1996 / 12:29:13 / stefan"
! !
-
!NameSpace class methodsFor:'inspecting'!
inspectorClass
@@ -1185,7 +1131,6 @@
! !
-
!Object methodsFor:'debugging'!
inspect
@@ -1214,7 +1159,6 @@
(Image fromFile:'bitmaps/garfield.gif') inspect
"
! !
-
!Object methodsFor:'inspecting'!
inspector2TabCommon
@@ -1225,7 +1169,6 @@
"Created: / 24-05-2011 / 14:56:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 05-07-2011 / 14:06:28 / cg"
! !
-
!Object methodsFor:'inspecting'!
inspector2TabForBasicInspect
@@ -1239,7 +1182,6 @@
"Created: / 05-07-2011 / 13:59:59 / cg"
! !
-
!Object methodsFor:'inspecting'!
inspector2TabForInspectorClass
@@ -1253,7 +1195,6 @@
"Created: / 05-07-2011 / 14:06:16 / cg"
! !
-
!Object methodsFor:'inspecting'!
inspector2TabLabel
@@ -1263,7 +1204,6 @@
"Created: / 14-07-2011 / 11:56:23 / cg"
! !
-
!Object methodsFor:'inspecting'!
inspector2Tabs
@@ -1275,7 +1215,6 @@
"Created: / 05-07-2011 / 13:39:24 / cg"
! !
-
!Object methodsFor:'debugging'!
inspectorExtraAttributes
@@ -1296,7 +1235,6 @@
"Modified: / 02-09-2005 / 19:00:01 / janfrog"
"Modified: / 04-10-2006 / 14:33:34 / cg"
! !
-
!Object methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -1306,7 +1244,6 @@
"Created: / 13-06-2012 / 12:50:26 / cg"
! !
-
!Object methodsFor:'testing'!
isTestCaseLike
@@ -1315,7 +1252,6 @@
"Created: / 28-02-2011 / 21:30:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!Object methodsFor:'debugging'!
newInspector2Tab
@@ -1326,7 +1262,6 @@
ifNil:[self error:'Inspector2 not available!! Something is rotten...']
ifNotNil:[(Smalltalk at: #'Tools::Inspector2Tab') new]
! !
-
!OrderedCollection methodsFor:'inspecting'!
inspectorClass
@@ -1341,7 +1276,6 @@
#(0 8 15 3 99 2) asSortedCollection inspect
"
! !
-
!PopUpMenu methodsFor:'converting'!
asMenu
@@ -1368,7 +1302,6 @@
"Created: / 18-10-2008 / 19:01:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 09-09-2012 / 13:10:25 / cg"
! !
-
!ProfileTree methodsFor:'accessing'!
method
@@ -1379,7 +1312,6 @@
"Created: / 01-12-2007 / 22:50:16 / janfrog"
"Modified: / 07-11-2008 / 08:40:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
-
!ProfileTree methodsFor:'accessing'!
package
@@ -1390,7 +1322,6 @@
"Created: / 01-12-2007 / 22:50:28 / janfrog"
"Modified: / 07-11-2008 / 08:40:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
-
!RunArray methodsFor:'user interface'!
inspectorClass
@@ -1401,19 +1332,16 @@
"Modified: / 30.10.1997 / 14:28:20 / cg"
! !
-
!SelectionInListModelView methodsFor:'accessing'!
textStartLeft
^ textStartLeft
! !
-
!SelectionInListModelView methodsFor:'accessing'!
textStartLeft:something
textStartLeft := something.
! !
-
!Set methodsFor:'inspecting'!
inspectorClass
@@ -1422,7 +1350,6 @@
^ SetInspectorView
! !
-
!SimpleView methodsFor:'testing'!
isCodeView2
@@ -1431,7 +1358,6 @@
"Created: / 20-07-2010 / 15:42:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!StringCollection methodsFor:'inspecting'!
inspector2TabText
@@ -1443,7 +1369,6 @@
"Created: / 17-02-2008 / 10:13:07 / janfrog"
! !
-
!StringCollection methodsFor:'inspecting'!
inspector2Tabs
@@ -1451,7 +1376,6 @@
"Created: / 05-07-2011 / 13:40:43 / cg"
! !
-
!Symbol methodsFor:'accessing'!
formattedCode
@@ -1462,7 +1386,6 @@
"Created: / 07-07-2009 / 20:03:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
-
!Symbol methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -1470,7 +1393,6 @@
^ self storeString
! !
-
!Text methodsFor:'inspecting'!
inspector2TabText
@@ -1484,7 +1406,6 @@
"Modified: / 17-02-2008 / 10:28:33 / janfrog"
"Modified: / 21-08-2011 / 08:02:46 / cg"
! !
-
!Text methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -1502,7 +1423,6 @@
"Created: / 18-09-2006 / 21:25:52 / cg"
"Modified: / 06-10-2006 / 13:57:38 / cg"
! !
-
!Timestamp methodsFor:'inspecting'!
inspectorExtraAttributes
@@ -1523,7 +1443,6 @@
"Created: / 20-01-2011 / 12:19:05 / cg"
! !
-
!UndefinedObject methodsFor:'inspecting'!
inspectorValueStringInListFor:anInspector
@@ -1531,7 +1450,6 @@
^ 'nil'
! !
-
!UninterpretedBytes methodsFor:'inspecting'!
inspector2Tabs
@@ -1539,7 +1457,6 @@
"Created: / 27-02-2012 / 21:51:36 / cg"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
alwaysOpenNewTabWhenCtrlClick
@@ -1554,7 +1471,6 @@
"Created: / 19-10-2008 / 08:00:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 14-02-2010 / 19:37:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
alwaysOpenNewTabWhenCtrlClick: aBoolean
@@ -1563,7 +1479,6 @@
"Created: / 19-10-2008 / 08:01:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-pref''d tools'!
changesBrowserClassName
@@ -1574,7 +1489,6 @@
"Created: / 03-04-2012 / 11:02:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
codeView2AutoIndent
@@ -1589,7 +1503,6 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 07-08-2011 / 12:46:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
codeView2AutoIndent: aBoolean
@@ -1604,7 +1517,6 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 07-08-2011 / 12:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
codeView2ShowAcceptCancel
@@ -1618,7 +1530,6 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 10-10-2011 / 16:41:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
codeView2ShowAcceptCancel: aBoolean
@@ -1632,7 +1543,6 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 10-10-2011 / 16:40:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
confirmRefactorings
@@ -1653,7 +1563,6 @@
"Created: / 04-04-2012 / 14:02:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
confirmRefactorings:aBoolean
@@ -1674,7 +1583,6 @@
"Created: / 04-04-2012 / 14:02:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-pref''d tools'!
fileBrowserClass
@@ -1694,7 +1602,6 @@
"Modified: / 03-04-2012 / 10:59:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-pref''d tools'!
fileBrowserClass: aClass
@@ -1709,7 +1616,6 @@
"Created: / 03-04-2012 / 10:57:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-pref''d tools'!
fileBrowserClassName
@@ -1720,7 +1626,6 @@
"Created: / 03-04-2012 / 11:01:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showBookmarkBar
@@ -1737,7 +1642,6 @@
"Created: / 18-05-2011 / 16:48:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 03-06-2011 / 11:01:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showBookmarkBar: aBoolean
@@ -1753,7 +1657,6 @@
"Created: / 18-05-2011 / 17:28:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showEmbeddedTestRunnerInBrowser
@@ -1769,7 +1672,6 @@
"Created: / 11-03-2010 / 10:11:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showEmbeddedTestRunnerInBrowser:aBoolean
@@ -1784,7 +1686,6 @@
"Created: / 11-03-2010 / 10:11:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showGlobalHistory
@@ -1801,7 +1702,6 @@
"Created: / 07-07-2011 / 00:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (comment): / 26-07-2012 / 16:35:54 / cg"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showGlobalHistory: aBoolean
@@ -1818,7 +1718,6 @@
"Created: / 07-07-2011 / 00:02:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (comment): / 26-07-2012 / 16:35:57 / cg"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showLocalHistory
@@ -1835,7 +1734,6 @@
"Created: / 07-07-2011 / 00:02:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (comment): / 26-07-2012 / 16:35:31 / cg"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showLocalHistory: aBoolean
@@ -1852,7 +1750,6 @@
"Created: / 07-07-2011 / 00:02:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (comment): / 26-07-2012 / 16:35:41 / cg"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showMethodTemplate
@@ -1868,7 +1765,6 @@
"Created: / 12-02-2010 / 12:06:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
showMethodTemplate:aBoolean
@@ -1883,7 +1779,6 @@
"Created: / 12-02-2010 / 12:05:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
sortAndIndentClassesByInheritance
@@ -1898,7 +1793,6 @@
"Created: / 06-07-2011 / 19:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
sortAndIndentClassesByInheritance: aBoolean
@@ -1913,7 +1807,6 @@
"Created: / 06-07-2011 / 19:09:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
sourceCodeManagementMenuLayout
@@ -1936,7 +1829,6 @@
"Created: / 06-10-2011 / 18:42:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
sourceCodeManagementMenuLayout: aSymbol
@@ -1960,12 +1852,13 @@
"Created: / 06-10-2011 / 18:44:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2In: appSymbol
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
- ^self useCodeView2InTools or:[self perform: ('useCodeView2In' , appSymbol) asSymbol].
+ ^self useCodeView2InTools "/ or:[self perform: ('useCodeView2In' , appSymbol) asSymbol].
"
@@ -1980,11 +1873,13 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 26-07-2011 / 10:26:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InBrowser
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
+ <resource: #obsolete>
^self at:#useCodeView2InBrowser ifAbsent: false
"
@@ -1995,11 +1890,13 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 26-07-2011 / 10:22:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InBrowser: aBoolean
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
+ <resource: #obsolete>
^self at:#useCodeView2InBrowser put: aBoolean
"
@@ -2010,11 +1907,13 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 26-07-2011 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InDebugger
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
+ <resource: #obsolete>
^self at:#useCodeView2InDebugger ifAbsent: false
"
@@ -2025,11 +1924,13 @@
"Created: / 26-07-2011 / 10:22:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InDebugger: aBoolean
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
+ <resource: #obsolete>
^self at:#useCodeView2InDebugger put: aBoolean
"
@@ -2040,7 +1941,6 @@
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 26-07-2011 / 10:22:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InTools
@@ -2054,7 +1954,6 @@
"Created: / 12-02-2010 / 12:13:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InTools:aBoolean
@@ -2065,11 +1964,13 @@
UserPreferences current useCodeView2InBrowser:false"
"Created: / 12-02-2010 / 12:14:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InWorkspace
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
+ <resource: #obsolete>
^self at:#useCodeView2InWorkspace ifAbsent: false
"
@@ -2080,11 +1981,13 @@
"Created: / 26-07-2011 / 10:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-code view'!
useCodeView2InWorkspace: aBoolean
+ "no longer used - will vanish.
+ Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
+ <resource: #obsolete>
^self at:#useCodeView2InWorkspace put: aBoolean
"
@@ -2095,7 +1998,6 @@
"Created: / 26-07-2011 / 10:22:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
useInPlaceSearchInBrowserLists
@@ -2110,7 +2012,6 @@
"Created: / 28-07-2011 / 09:34:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
useInPlaceSearchInBrowserLists: aBoolean
@@ -2125,7 +2026,6 @@
"Created: / 28-07-2011 / 09:35:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
webBrowserLikeLayout
@@ -2141,7 +2041,6 @@
"Created: / 07-06-2011 / 14:33:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!UserPreferences methodsFor:'accessing-prefs-browser'!
webBrowserLikeLayout: aBoolean
@@ -2157,10 +2056,19 @@
"Created: / 07-06-2011 / 14:31:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!stx_libtool class methodsFor:'documentation'!
+extensionsVersion_CVS
+ ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.94 2013-02-01 14:51:22 cg Exp $'
+! !
!stx_libtool class methodsFor:'documentation'!
extensionsVersion_HG
^ '$Changeset: <not expanded> $'
-! !
\ No newline at end of file
+! !
+!stx_libtool class methodsFor:'documentation'!
+
+extensionsVersion_SVN
+ ^ '$Id:: extensions.st 8086 2013-01-15 12:03:21Z vranyj1 $'
+! !
--- a/libtool.rc Mon Feb 04 23:58:23 2013 +0100
+++ b/libtool.rc Fri Feb 08 08:51:42 2013 +0100
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libtool.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1,83
- PRODUCTVERSION 6,2,2,1
+ FILEVERSION 6,2,1,86
+ PRODUCTVERSION 6,2,2,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Tools (LIB)\0"
- VALUE "FileVersion", "6.2.1.83\0"
+ VALUE "FileVersion", "6.2.1.86\0"
VALUE "InternalName", "stx:libtool\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.2.1\0"
- VALUE "ProductDate", "Thu, 26 Jul 2012 12:06:06 GMT\0"
+ VALUE "ProductVersion", "6.2.2.0\0"
+ VALUE "ProductDate", "Fri, 01 Feb 2013 15:11:43 GMT\0"
END
END
--- a/mingwmake.bat Mon Feb 04 23:58:23 2013 +0100
+++ b/mingwmake.bat Fri Feb 08 08:51:42 2013 +0100
@@ -7,6 +7,8 @@
@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 -DUSEMINGW=1 %DEFINES% %*
+@call ..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG %DEFINES%% %*
+
--- a/resources/de.rs Mon Feb 04 23:58:23 2013 +0100
+++ b/resources/de.rs Fri Feb 08 08:51:42 2013 +0100
@@ -1,6 +1,6 @@
#encoding utf8
-; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.201 2012-12-13 10:07:25 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.203 2013-02-01 14:55:12 cg Exp $
;
; German Workspace (and other tools) resources
;
@@ -919,6 +919,7 @@
'Recently visited' 'Vor kurzem besucht'
'Initialize Class(es)' 'Klasse(n) initialisieren'
'Run static code analysis (lint) on the selected classes' 'Statische Codeanalyse auf selektierte Klassen durchfhren'
+'Run static code analysis (lint) on the selected classes/protocols/methods' 'Statische Codeanalyse auf selektierte Klassen/Protokolle/Methoden durchfhren'
'Operations' 'Operationen'
'Undo: %1' 'Rckgngig: %1'
@@ -1048,8 +1049,8 @@
'Launch the selected application' 'Selektierte Anwendung starten'
'Execute the Selected Class Method. Show Execution Time and Answer on the Transcript' 'Selektierte Klassenmethode ausfhren. Laufzeit und Antwort auf dem Transcript zeigen'
'Go back in global visited history' 'Zur vorigen Methode (in globaler Historie)'
-'Go back in lokal visited history' 'Zur vorigen Methode (in lokaler Historie)'
-'Go forward in lokal visited history' 'Zur nchsten Methode (in lokaler Historie)'
+'Go back in local visited history' 'Zur vorigen Methode (in lokaler Historie)'
+'Go forward in local visited history' 'Zur nchsten Methode (in lokaler Historie)'
'View' 'Ansicht'
'Class Inheritance' 'Vererbung der Klasse'
@@ -2298,10 +2299,23 @@
'Group by Type' 'Gruppierung nach Typ'
'Methods Only' 'Nur Methoden'
+'Functions Only' 'Nur Funktionen'
+'Variables Only' 'Nur Variablen'
+'Types Only' 'Nur Typen'
+'Structs Only' 'Nur Strukturen'
+'Defines Only' 'Nur Defines'
+'Classes, Functions && Variables Only' 'Nur Klassen, Funktionen und Variable'
'Classes && Methods Only' 'Nur Klassen und Methoden'
'Hide Methods' 'Methoden nicht zeigen'
'Hide Interfaces' 'Interfaces nicht zeigen'
'Hide Fields' 'Felder nicht zeigen'
+'Hide Functions' 'Funktionen nicht zeigen'
+'Hide Variables' 'Variablen nicht zeigen'
+'Hide Typedefs' 'Typedefs nicht zeigen'
+'Hide Structures' 'Strukturen nicht zeigen'
+'Hide Struct Members' 'Struktur Member nicht zeigen'
+'Hide Defines' 'Defines nicht zeigen'
+'Hide Static' 'Static Elemente nicht zeigen'
'Unix Command' 'Unix Befehl'
'DOS Command' 'DOS Befehl'
--- a/stx_libtool.st Mon Feb 04 23:58:23 2013 +0100
+++ b/stx_libtool.st Fri Feb 08 08:51:42 2013 +0100
@@ -43,9 +43,7 @@
extensionsVersion_CVS
^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.81 2012/09/09 20:44:34 cg Exp $'
-!
-
- !
+! !
!stx_libtool class methodsFor:'description'!
@@ -562,11 +560,11 @@
!stx_libtool class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.85 2012-10-23 13:59:10 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.87 2013-02-01 15:11:58 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.85 2012-10-23 13:59:10 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.87 2013-02-01 15:11:58 cg Exp $'
!
version_SVN
--- a/vcmake.bat Mon Feb 04 23:58:23 2013 +0100
+++ b/vcmake.bat Fri Feb 08 08:51:42 2013 +0100
@@ -5,7 +5,7 @@
@REM -------
@if not defined VSINSTALLDIR (
- call ..\rules\vcsetup.bat
+ call ..\rules\vcsetup.bat
)
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
@@ -14,3 +14,5 @@
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
+
+