Merge jv
authorMerge Script
Thu, 03 Mar 2016 06:57:22 +0100
branchjv
changeset 16136 82cbb0e2e904
parent 16133 a4c67f8136ef (current diff)
parent 16135 318878ef7837 (diff)
child 16137 d0dd3f718e92
Merge
DebugView.st
Tools__NewSystemBrowser.st
--- a/DebugView.st	Sat Feb 27 06:57:18 2016 +0100
+++ b/DebugView.st	Thu Mar 03 06:57:22 2016 +0100
@@ -3080,12 +3080,14 @@
 
 initializeAbortButtonIn:bpanel
     abortButton := Button
-		label:(resources string:'Abort')
-		action:[
-		    abortButton turnOffWithoutRedraw.
-		    self doAbort
-		]
-		in:bpanel.
+                label:(resources string:'Abort')
+                action:[
+                    abortButton turnOffWithoutRedraw.
+                    self doAbort
+                ]
+                in:bpanel.
+
+    abortButton name:'abortButton'.
 
     "Created: / 17.11.2001 / 20:56:47 / cg"
     "Modified: / 17.11.2001 / 20:57:17 / cg"
@@ -3368,24 +3370,28 @@
 
 initializeContinueButtonIn:bpanel
     continueButton := Button
-		label:(resources string:'Continue')
-		action:[
-		    continueButton turnOffWithoutRedraw.
-		    self doContinue
-		]
-		in:bpanel.
+                label:(resources string:'Continue')
+                action:[
+                    continueButton turnOffWithoutRedraw.
+                    self doContinue
+                ]
+                in:bpanel.
+
+    continueButton name:'continueButton'.
 
     "Created: / 17.11.2001 / 20:57:34 / cg"
 !
 
 initializeDefineButtonIn:bpanel
     defineButton := Button
-		label:(resources string:'Define')
-		action:[
-		    defineButton turnOffWithoutRedraw.
-		    self doDefine
-		]
-		in:bpanel.
+                label:(resources string:'Define')
+                action:[
+                    defineButton turnOffWithoutRedraw.
+                    self doDefine
+                ]
+                in:bpanel.
+
+    defineButton name:'defineButton'.
     defineButton beInvisible
 
     "Created: / 17.11.2001 / 21:02:48 / cg"
@@ -3393,25 +3399,27 @@
 
 initializeGotoApplicationActionMethodButtonIn:bpanel
     gotoApplicationActionMethodButton := Button
-		label:(resources string:'Goto Responsible Application Method')
-		action:[
-		    gotoApplicationActionMethodButton turnOffWithoutRedraw.
-		    self doGotoApplicationActionMethod
-		]
-		in:bpanel.
-
+                label:(resources string:'Goto Responsible Application Method')
+                action:[
+                    gotoApplicationActionMethodButton turnOffWithoutRedraw.
+                    self doGotoApplicationActionMethod
+                ]
+                in:bpanel.
+
+    gotoApplicationActionMethodButton name:'gotoAppMethodButton'.
     gotoApplicationActionMethodButton beInvisible
 !
 
 initializeGotoDialogOpenerButtonIn:bpanel
     gotoDialogOpenerButton := Button
-		label:(resources string:'Goto Dialog Opener')
-		action:[
-		    gotoDialogOpenerButton turnOffWithoutRedraw.
-		    self doGotoDialogOpener
-		]
-		in:bpanel.
-
+                label:(resources string:'Goto Dialog Opener')
+                action:[
+                    gotoDialogOpenerButton turnOffWithoutRedraw.
+                    self doGotoDialogOpener
+                ]
+                in:bpanel.
+
+    gotoDialogOpenerButton name:'gotoDialogOpenerButton'.
     gotoDialogOpenerButton beInvisible
 !
 
@@ -3435,36 +3443,42 @@
 
 initializeNextButtonIn:bpanel
     nextButton := Button
-		label:(resources string:'Debug_Next')
-		action:[
-		    stepButton turnOff.
-		    self doNext
-		]
-		in:bpanel.
-
-    "Created: / 17.11.2001 / 20:59:38 / cg"
+                label:(resources string:'Debug_Next')
+                action:[
+                    stepButton turnOff.
+                    self doNext
+                ]
+                in:bpanel.
+
+    nextButton name:'nextButton'.
+    
+    "Created: / 17.11.2001 / 20:59:38 / cg" 
 !
 
 initializeReportButtonIn:bpanel
     reportButton := Button
-		label:(resources string:'Report by Mail...')
-		action:[
-		    reportButton turnOffWithoutRedraw.
-		    self doOpenReportMailApp.
-		]
-		in:bpanel.
+                label:(resources string:'Report by Mail...')
+                action:[
+                    reportButton turnOffWithoutRedraw.
+                    self doOpenReportMailApp.
+                ]
+                in:bpanel.
+
+    reportButton name:'reportButton'.
 
     "Created: / 17.11.2001 / 21:02:20 / cg"
 !
 
 initializeResendButtonIn:bpanel
     resendButton := Button
-		label:(resources string:'Resend')
-		action:[
-		    resendButton turnOff.
-		    self doResend
-		]
-		in:bpanel.
+                label:(resources string:'Resend')
+                action:[
+                    resendButton turnOff.
+                    self doResend
+                ]
+                in:bpanel.
+
+    resendButton name:'resendButton'.
 
     "/ if we have this, we do not need the restart button
     restartButton beInvisible.
@@ -3472,61 +3486,70 @@
 
 initializeRestartButtonIn:bpanel
     restartButton := Button
-		label:(resources string:'Restart')
-		action:[
-		    restartButton turnOff.
-		    self doRestart
-		]
-		in:bpanel.
-
+                label:(resources string:'Restart')
+                action:[
+                    restartButton turnOff.
+                    self doRestart
+                ]
+                in:bpanel.
+
+    restartButton name:'restartButton'
+    
     "Created: / 17.11.2001 / 20:58:52 / cg"
 !
 
 initializeReturnButtonIn:bpanel
     returnButton := Button
-		label:(resources string:'Return')
-		action:[
-		    returnButton turnOff.
-		    self doReturn
-		]
-		in:bpanel.
+                label:(resources string:'Return')
+                action:[
+                    returnButton turnOff.
+                    self doReturn
+                ]
+                in:bpanel.
+
+    returnButton name:'returnButton'.
 
     "Created: / 17.11.2001 / 20:58:22 / cg"
 !
 
 initializeSendButtonIn:bpanel
     sendButton := Button
-		label:(resources string:'Send')
-		action:[
-		    sendButton turnOff.
-		    self doSend
-		]
-		in:bpanel.
+                label:(resources string:'Send')
+                action:[
+                    sendButton turnOff.
+                    self doSend
+                ]
+                in:bpanel.
+
+    sendButton name:'sendButton'.
 
     "Created: / 17.11.2001 / 21:01:20 / cg"
 !
 
 initializeStepButtonIn:bpanel
     stepButton := Button
-		label:(resources string:'Debug_Step')
-		action:[
-		    stepButton turnOff.
-		    self doStep
-		]
-		in:bpanel.
+                label:(resources string:'Debug_Step')
+                action:[
+                    stepButton turnOff.
+                    self doStep
+                ]
+                in:bpanel.
+
+    stepButton name:'stepButton'.
 
     "Created: / 17.11.2001 / 21:00:13 / cg"
 !
 
 initializeTerminateButtonIn:bpanel
     terminateButton := Button
-		label:(resources string:'Debug_Terminate')
-		action:[
-		    terminateButton turnOffWithoutRedraw.
-		    self doTerminate
-		]
-		in:bpanel.
-
+                label:(resources string:'Debug_Terminate')
+                action:[
+                    terminateButton turnOffWithoutRedraw.
+                    self doTerminate
+                ]
+                in:bpanel.
+
+    terminateButton name:'terminateButton'.
     terminateButton backgroundColor:Color red lightened.
     "/ terminateButton foregroundColor:Color red.
 
--- a/Tools__NewSystemBrowser.st	Sat Feb 27 06:57:18 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Thu Mar 03 06:57:22 2016 +0100
@@ -59230,44 +59230,49 @@
 
     newNavigationState := self navigationState.
     self assert:newNavigationState canvasType notNil.
-    newNavigationState isFullClassSourceBrowser
-        ifTrue:[self hidePrivateClasses value:true.].
+    newNavigationState isFullClassSourceBrowser ifTrue:[
+        self hidePrivateClasses value:true.
+    ].
 
     "/ newNavigationState setUpScrollableCodeView.
 
-    self editorNoteBookCanvasHolder
-        value:(newNavigationState scrollableCodeView).
+    self editorNoteBookCanvasHolder value:(newNavigationState scrollableCodeView).
     self codeView formatAction:[:code | self formatCode].
     (self codeView)
         menuHolder:self;
         menuMessage:#codeViewMenu.
 
-    (UserPreferences current useCodeView2In: #Browser)
-        ifTrue:[self codeView browserHolder value:self].
+    (UserPreferences current useCodeView2In: #Browser) ifTrue:[
+        self codeView browserHolder value:self
+    ].
 
     UserPreferences current useSearchBarInBrowser
-        ifTrue:
-            ["/        self stringSearchToolVisibleHolder value:true.          "/ Initially hidden. Show search bar after pressing CTRL+f or clicking view menu
-            self codeView searchBarActionBlock:self searchBarActionBlock.].
+        ifTrue:[
+            "/        self stringSearchToolVisibleHolder value:true.          "/ Initially hidden. Show search bar after pressing CTRL+f or clicking view menu
+            self codeView searchBarActionBlock:self searchBarActionBlock.
+    ].
     self normalLabel.
     orgModeHolder := self organizerMode.
-    newNavigationState isNameSpaceBrowser
-        ifTrue:[orgModeHolder value:(OrganizerCanvas organizerModeNamespace)]
-        ifFalse:
-            [newNavigationState isCategoryBrowser
-                ifTrue:[orgModeHolder value:(OrganizerCanvas organizerModeCategory)]
-                ifFalse:
-                    [newNavigationState isProjectBrowser
-                        ifTrue:[orgModeHolder value:(OrganizerCanvas organizerModeProject)].].].
-    self theSingleSelectedMethod notNil
-        ifTrue:
-            ["/ fetch the initially selected methods code
-            self methodsSelectionChanged.]
-        ifFalse:
-            [self theSingleSelectedClass notNil
-                ifTrue:
-                    ["/ to show the classes definition initially
-                    self classSelectionChanged.].].
+    newNavigationState isNameSpaceBrowser ifTrue:[
+        orgModeHolder value:(OrganizerCanvas organizerModeNamespace)
+    ] ifFalse:[
+            newNavigationState isCategoryBrowser ifTrue:[
+                orgModeHolder value:(OrganizerCanvas organizerModeCategory)
+            ] ifFalse: [
+                newNavigationState isProjectBrowser ifTrue:[
+                    orgModeHolder value:(OrganizerCanvas organizerModeProject)
+                ].
+            ].
+    ].
+    self theSingleSelectedMethod notNil ifTrue:[
+        "/ fetch the initially selected methods code
+        self methodsSelectionChanged.
+    ] ifFalse: [
+        self theSingleSelectedClass notNil ifTrue:[
+            "/ to show the classes definition initially
+            self classSelectionChanged.
+        ].
+    ].
     newNavigationState codeModifiedHolder addDependent:self.
 
     "Modified (format): / 05-07-2011 / 10:32:23 / cg"
@@ -59321,8 +59326,9 @@
     environment addDependent:self.
 
     self codeInfoVisible value ifTrue:[ self codeInfoVisibilityChanged ].
-    (self toolBarVisibleHolder value or:[self bookmarkBarVisibleHolder value])
-            ifTrue:[ self toolBarOrBookmarkBarVisibilityChanged ].
+    (self toolBarVisibleHolder value or:[self bookmarkBarVisibleHolder value]) ifTrue:[ 
+        self toolBarOrBookmarkBarVisibilityChanged 
+    ].
 
 
 "/    self editorNoteBookCanvasHolder value:(navigationState scrollableCodeView).