--- a/UIPainter.st Wed Oct 22 15:55:15 1997 +0200
+++ b/UIPainter.st Wed Oct 22 16:42:42 1997 +0200
@@ -11,7 +11,7 @@
"
-'From Smalltalk/X, Version:3.2.1 on 18-oct-1997 at 4:31:48 pm' !
+'From Smalltalk/X, Version:3.2.1 on 22-oct-1997 at 2:41:23 pm' !
ApplicationModel subclass:#UIPainter
instanceVariableNames:'treeView selectionPanel tabSelection specClass specSelector
@@ -317,6 +317,12 @@
!
+iconInstall
+ ^ Image fromFile:'SaveButton.tiff'
+
+
+!
+
iconStepDown
"returns image assigned to step down (change hierarchy).
"
@@ -495,11 +501,11 @@
#'window:'
#(#WindowSpec
#'name:' 'Tree-View'
- #'layout:' #(#LayoutFrame 143 0 224 0 656 0 684 0)
+ #'layout:' #(#LayoutFrame 216 0 173 0 729 0 633 0)
#'label:' 'Tree-View'
#'min:' #(#Point 10 10)
#'max:' #(#Point 1160 870)
- #'bounds:' #(#Rectangle 143 224 657 685)
+ #'bounds:' #(#Rectangle 216 173 730 634)
)
#'component:'
#(#SpecCollection
@@ -511,26 +517,6 @@
#'tabable:' true
#'menu:' #menuPullDown
)
- #(#ToggleSpec
- #'name:' 'galleryLabel'
- #'layout:' #(#LayoutFrame -162 1.0 1 0 -82 1.0 23 0)
- #'activeHelpKey:' #galleryShown
- #'label:' 'Gallery'
- #'model:' #galleryShown
- #'isTriggerOnDown:' true
- #'showLamp:' true
- #'lampColor:' #(#Color 100.0 100.0 0.0)
- )
- #(#ToggleSpec
- #'name:' 'painterLabel'
- #'layout:' #(#LayoutFrame -81 1.0 1 0 -1 1.0 23 0)
- #'activeHelpKey:' #painterShown
- #'label:' 'Painter'
- #'model:' #painterShown
- #'isTriggerOnDown:' true
- #'showLamp:' true
- #'lampColor:' #(#Color 100.0 100.0 0.0)
- )
#(#HorizontalPanelViewSpec
#'name:' 'menuContainer'
#'layout:' #(#LayoutFrame 0 0.0 26 0 0 1.0 58 0)
@@ -544,7 +530,7 @@
#'enableChannel:' #hasOneSelectionOtherThanCanvas
#'menu:' #menuChangeHierarchy
#'showSeparatingLines:' true
- #'extent:' #(#Point 123 32)
+ #'extent:' #(#Point 103 32)
)
#(#MenuPanelSpec
#'name:' 'menuAlignment'
@@ -648,13 +634,9 @@
#'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -30 1.0)
#'enableChannel:' #enableChannel
#'tabable:' true
+ #'model:' #tabModel
#'menu:' #tabList
- #'style:'
- #(#FontDescription
- #helvetica #medium
- #roman 10
- )
- #'model:' #tabModel
+ #'style:' #(#FontDescription #helvetica #medium #roman 10)
#'canvas:' #noteBookView
)
#(#HorizontalPanelViewSpec
@@ -680,7 +662,7 @@
#'tabable:' true
#'model:' #accept
#'enableChannel:' #modifiedChannel
- #'extent:' #(#Point 165 24)
+ #'extent:' #(#Point 166 24)
)
)
)
@@ -1086,39 +1068,24 @@
#(#MenuItem
#'label:' 'stepUp'
#'value:' #doStepUp
- #'labelImage:'
- #(#ResourceRetriever
- #UIPainter #iconStepUp
- )
+ #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepUp)
)
#(#MenuItem
#'label:' 'stepDown'
#'value:' #doStepDown
- #'labelImage:'
- #(#ResourceRetriever
- #UIPainter #iconStepDown
- )
- )
- #(#MenuItem
- #'label:' '-'
+ #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepDown)
)
#(#MenuItem
#'label:' 'stepIn'
#'value:' #doStepIn
#'enabled:' #canMoveSelectionIntoContainer
- #'labelImage:'
- #(#ResourceRetriever
- #UIPainter #iconStepIn
- )
+ #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepIn)
)
#(#MenuItem
#'label:' 'stepOut'
#'value:' #doStepOut
#'enabled:' #canMoveSelectionOutOfContainer
- #'labelImage:'
- #(#ResourceRetriever
- #UIPainter #iconStepOut
- )
+ #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepOut)
)
) nil
nil
@@ -1244,12 +1211,11 @@
#'value:' #defineClassAndSelector
)
#(#MenuItem
- #'label:' '='
+ #'label:' '-'
)
#(#MenuItem
#'label:' 'install window spec.'
#'value:' #doInstallSpec
- #'enabled:' #hasSpecClassAndSelector
)
#(#MenuItem
#'label:' 'install help spec.'
@@ -1257,33 +1223,22 @@
#'enabled:' #hasSpecClass
)
#(#MenuItem
- #'label:' '-'
- )
- #(#MenuItem
#'label:' 'install aspects'
#'value:' #doInstallAspects
#'enabled:' #hasSpecClass
)
#(#MenuItem
- #'label:' '='
+ #'label:' '-'
)
#(#MenuItem
#'label:' 'show window spec.'
#'value:' #doWindowSpec
)
#(#MenuItem
- #'label:' '='
- )
- #(#MenuItem
#'label:' 'browse application'
#'value:' #doBrowseAppClass
#'enabled:' #hasSpecClass
)
- #(#MenuItem
- #'label:' 'start application'
- #'value:' #doStartApplication
- #'enabled:' #hasSpecClass
- )
) nil
nil
)
@@ -1304,6 +1259,38 @@
nil
)
)
+ #(#MenuItem
+ #'label:' ''
+ )
+ #(#MenuItem
+ #'label:' 'Gallery'
+ #'indication:' #galleryShown
+ )
+ #(#MenuItem
+ #'label:' 'Canvas'
+ #'indication:' #painterShown
+ )
+ #(#MenuItem
+ #'label:' ''
+ )
+ #(#MenuItem
+ #'label:' '-'
+ )
+ #(#MenuItem
+ #'label:' 'Install'
+ #'value:' #doInstallSpec
+ #'labelImage:' #(#ResourceRetriever nil #iconInstall 'Install')
+ )
+ #(#MenuItem
+ #'label:' '-'
+ )
+ #(#MenuItem
+ #'label:' 'Run'
+ #'value:' #doStartApplication
+ )
+ #(#MenuItem
+ #'label:' '-'
+ )
) nil
nil
)
@@ -2068,10 +2055,10 @@
].
!
-openInterface
+openInterface:aSymbol
"open interfaces
"
- |painterView painter cls topView w icon|
+ |painterView painter cls topView|
aspects := IdentityDictionary new.
@@ -2108,11 +2095,12 @@
painter treeView:treeView.
treeView model addDependent:self.
- super openInterface.
+ super openInterface:aSymbol.
+
transcript := (self builder componentAt:#Transcript) scrolledView.
topView := self window.
topView bePartner.
- topView label:'GUI Builder'.
+ topView label:'GUI Painter'.
painterView openInGroup:(topView windowGroup).
painterView bePartner.
@@ -2122,24 +2110,21 @@
painterView application:self.
selectionPanel := UISelectionPanel new.
selectionPanel allButOpenInterface:#windowSpec.
- w := selectionPanel window.
- w openInGroup:(topView windowGroup).
- w bePartner.
+ selectionPanel window openInGroup:(topView windowGroup).
+ selectionPanel window bePartner.
selectionPanel openWindow.
selectionPanel masterApplication:self.
- icon := Image fromFile:'bitmaps/UIPainter.xbm' resolution:100.
-
- topView iconLabel:'Builder'.
- topView icon:icon.
-
- painterView iconLabel:'Builder'.
- painterView icon:icon.
-
- w iconLabel:'Builder'.
- w icon:icon.
-
- "Modified: 18.10.1997 / 15:09:42 / cg"
+ topView iconLabel:'GUI Painter'.
+ topView icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
+
+ painterView iconLabel:'GUI Painter'.
+ painterView icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
+
+ selectionPanel window iconLabel:'GUI Painter'.
+ selectionPanel window icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
+
+ "Modified: 1.8.1997 / 14:22:10 / cg"
!
openNewWindowCanvas
@@ -3065,8 +3050,6 @@
"
super initialize.
self multipleSelectOk:true.
-
- "Modified: 19.9.1997 / 16:57:12 / stefan"
! !
!UIPainter::TreeView methodsFor:'private'!