preps for toolBar
authorClaus Gittinger <cg@exept.de>
Fri, 07 Dec 2001 12:10:34 +0100
changeset 3488 af0c4a5e9c85
parent 3487 6f116facbc99
child 3489 ee0a0cfe990d
preps for toolBar
NewSystemBrowser.st
Tools__NewSystemBrowser.st
--- a/NewSystemBrowser.st	Fri Dec 07 02:06:04 2001 +0100
+++ b/NewSystemBrowser.st	Fri Dec 07 12:10:34 2001 +0100
@@ -2180,13 +2180,19 @@
           #label: 'NewSystemBrowser'
           #name: 'NewSystemBrowser'
           #min: #(#Point 0 0)
-          #bounds: #(#Rectangle 16 46 694 562)
+          #bounds: #(#Rectangle 13 23 691 539)
           #menu: #mainMenu
           #icon: #defaultIcon
         )
         #component: 
        #(#SpecCollection
           #collection: #(
+           #(#MenuPanelSpec
+              #name: 'ToolBar'
+              #layout: #(#LayoutFrame 0 0 0 0 0 1 30 0)
+              #visibilityChannel: #toolBarVisibleHolder
+              #textDefault: true
+            )
            #(#NoteBookViewSpec
               #name: 'NoteBook'
               #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
@@ -2200,8 +2206,8 @@
               #canvas: #browserCanvas
               #canvasInset: 0
               #canvasFrameLevel: 0
+              #keepCanvasAlive: true
               #tabLevel: 2
-              #keepCanvasAlive: true
             )
            )
          
@@ -5648,6 +5654,15 @@
             #indication: #showClassPackages
           )
          #(#MenuItem
+            #label: '-'
+          )
+         #(#MenuItem
+            #label: 'Toolbar'
+            #translateLabel: true
+            #hideMenuOnActivated: false
+            #indication: #toolBarVisibleHolder
+          )
+         #(#MenuItem
             #label: 'Info'
             #translateLabel: true
             #hideMenuOnActivated: false
@@ -9625,6 +9640,20 @@
 
     "Created: / 18.2.2000 / 17:44:17 / cg"
     "Modified: / 31.10.2001 / 11:09:32 / cg"
+!
+
+toolBarVisibleHolder
+    |holder|
+
+    (holder := builder bindingAt:#toolBarVisibleHolder) isNil ifTrue:[
+        holder := false asValue.
+        builder aspectAt:#toolBarVisibleHolder put: holder.
+        holder addDependent:self.
+    ].
+    ^ holder
+
+    "Created: / 18.2.2000 / 17:44:17 / cg"
+    "Modified: / 31.10.2001 / 11:09:32 / cg"
 ! !
 
 !NewSystemBrowser methodsFor:'aspects-queries'!
@@ -11255,7 +11284,7 @@
 !
 
 update:something with:aParameter from:changedObject
-    |codeView mthd codeAspect isForAspect cFrame bottomOffset|
+    |codeView mthd codeAspect isForAspect|
 
 "/    (navigationState notNil
 "/    and:[changedObject == navigationState codeModifiedHolder]) ifTrue:[
@@ -11264,18 +11293,11 @@
 "/    ].
 
     changedObject == self codeInfoVisible ifTrue:[
-        cFrame := builder findComponentAt:#CodeView.
-        changedObject value ifFalse:[
-            "/ info not visible
-            bottomOffset := 0.   
-        ] ifTrue:[
-            "/ info visible
-            bottomOffset := -25.   
-        ].
-        cFrame layout bottomOffset:bottomOffset.   
-        cFrame container notNil ifTrue:[
-            cFrame containerChangedSize.
-        ].
+        self infoVisibilityChanged.
+        ^ self
+    ].
+    changedObject == self toolBarVisibleHolder ifTrue:[
+        self toolBarVisibilityChanged.
         ^ self
     ].
 
@@ -30819,6 +30841,21 @@
     self updateBufferLabel.
 !
 
+infoVisibilityChanged
+    |cFrame bottomOffset|
+
+    cFrame := builder findComponentAt:#CodeView.
+    self codeInfoVisible value ifFalse:[
+        bottomOffset := 0.   
+    ] ifTrue:[
+        bottomOffset := -25.   
+    ].
+    cFrame layout bottomOffset:bottomOffset.   
+    cFrame container notNil ifTrue:[
+        cFrame containerChangedSize.
+    ].
+!
+
 methodDoubleClicked
     |currentMethod|
 
@@ -31042,6 +31079,22 @@
     ]
 !
 
+toolBarVisibilityChanged
+    |toolBar noteBook topOffset|
+
+    toolBar := self builder componentAt:#ToolBar.
+    noteBook := self builder componentAt:#NoteBook.
+    self toolBarVisibleHolder value ifTrue:[
+        topOffset := toolBar height.
+    ] ifFalse:[
+        topOffset := 0.
+    ].
+    noteBook layout topOffset:topOffset.
+    noteBook container notNil ifTrue:[
+        noteBook containerChangedSize.
+    ].
+!
+
 variableDoubleClicked
     "double click on a variable:
         add a buffer showing all references to this variable"
@@ -51124,6 +51177,6 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.278 2001-12-04 09:41:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.279 2001-12-07 11:10:34 cg Exp $'
 ! !
 NewSystemBrowser initialize!
--- a/Tools__NewSystemBrowser.st	Fri Dec 07 02:06:04 2001 +0100
+++ b/Tools__NewSystemBrowser.st	Fri Dec 07 12:10:34 2001 +0100
@@ -2180,13 +2180,19 @@
           #label: 'NewSystemBrowser'
           #name: 'NewSystemBrowser'
           #min: #(#Point 0 0)
-          #bounds: #(#Rectangle 16 46 694 562)
+          #bounds: #(#Rectangle 13 23 691 539)
           #menu: #mainMenu
           #icon: #defaultIcon
         )
         #component: 
        #(#SpecCollection
           #collection: #(
+           #(#MenuPanelSpec
+              #name: 'ToolBar'
+              #layout: #(#LayoutFrame 0 0 0 0 0 1 30 0)
+              #visibilityChannel: #toolBarVisibleHolder
+              #textDefault: true
+            )
            #(#NoteBookViewSpec
               #name: 'NoteBook'
               #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
@@ -2200,8 +2206,8 @@
               #canvas: #browserCanvas
               #canvasInset: 0
               #canvasFrameLevel: 0
+              #keepCanvasAlive: true
               #tabLevel: 2
-              #keepCanvasAlive: true
             )
            )
          
@@ -5648,6 +5654,15 @@
             #indication: #showClassPackages
           )
          #(#MenuItem
+            #label: '-'
+          )
+         #(#MenuItem
+            #label: 'Toolbar'
+            #translateLabel: true
+            #hideMenuOnActivated: false
+            #indication: #toolBarVisibleHolder
+          )
+         #(#MenuItem
             #label: 'Info'
             #translateLabel: true
             #hideMenuOnActivated: false
@@ -9625,6 +9640,20 @@
 
     "Created: / 18.2.2000 / 17:44:17 / cg"
     "Modified: / 31.10.2001 / 11:09:32 / cg"
+!
+
+toolBarVisibleHolder
+    |holder|
+
+    (holder := builder bindingAt:#toolBarVisibleHolder) isNil ifTrue:[
+        holder := false asValue.
+        builder aspectAt:#toolBarVisibleHolder put: holder.
+        holder addDependent:self.
+    ].
+    ^ holder
+
+    "Created: / 18.2.2000 / 17:44:17 / cg"
+    "Modified: / 31.10.2001 / 11:09:32 / cg"
 ! !
 
 !NewSystemBrowser methodsFor:'aspects-queries'!
@@ -11255,7 +11284,7 @@
 !
 
 update:something with:aParameter from:changedObject
-    |codeView mthd codeAspect isForAspect cFrame bottomOffset|
+    |codeView mthd codeAspect isForAspect|
 
 "/    (navigationState notNil
 "/    and:[changedObject == navigationState codeModifiedHolder]) ifTrue:[
@@ -11264,18 +11293,11 @@
 "/    ].
 
     changedObject == self codeInfoVisible ifTrue:[
-        cFrame := builder findComponentAt:#CodeView.
-        changedObject value ifFalse:[
-            "/ info not visible
-            bottomOffset := 0.   
-        ] ifTrue:[
-            "/ info visible
-            bottomOffset := -25.   
-        ].
-        cFrame layout bottomOffset:bottomOffset.   
-        cFrame container notNil ifTrue:[
-            cFrame containerChangedSize.
-        ].
+        self infoVisibilityChanged.
+        ^ self
+    ].
+    changedObject == self toolBarVisibleHolder ifTrue:[
+        self toolBarVisibilityChanged.
         ^ self
     ].
 
@@ -30819,6 +30841,21 @@
     self updateBufferLabel.
 !
 
+infoVisibilityChanged
+    |cFrame bottomOffset|
+
+    cFrame := builder findComponentAt:#CodeView.
+    self codeInfoVisible value ifFalse:[
+        bottomOffset := 0.   
+    ] ifTrue:[
+        bottomOffset := -25.   
+    ].
+    cFrame layout bottomOffset:bottomOffset.   
+    cFrame container notNil ifTrue:[
+        cFrame containerChangedSize.
+    ].
+!
+
 methodDoubleClicked
     |currentMethod|
 
@@ -31042,6 +31079,22 @@
     ]
 !
 
+toolBarVisibilityChanged
+    |toolBar noteBook topOffset|
+
+    toolBar := self builder componentAt:#ToolBar.
+    noteBook := self builder componentAt:#NoteBook.
+    self toolBarVisibleHolder value ifTrue:[
+        topOffset := toolBar height.
+    ] ifFalse:[
+        topOffset := 0.
+    ].
+    noteBook layout topOffset:topOffset.
+    noteBook container notNil ifTrue:[
+        noteBook containerChangedSize.
+    ].
+!
+
 variableDoubleClicked
     "double click on a variable:
         add a buffer showing all references to this variable"
@@ -51124,6 +51177,6 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.278 2001-12-04 09:41:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.279 2001-12-07 11:10:34 cg Exp $'
 ! !
 NewSystemBrowser initialize!