diff -r 1ee573adcbc0 -r bccb26bfe2d7 NewLauncher.st --- a/NewLauncher.st Sun Sep 29 14:26:17 2002 +0200 +++ b/NewLauncher.st Sun Sep 29 15:14:45 2002 +0200 @@ -1,6 +1,6 @@ " COPYRIGHT (c) 1997-1998 by eXept Software AG - All Rights Reserved + All Rights Reserved This software is furnished under a license and may be used only in accordance with the terms of that license and with the @@ -15,17 +15,17 @@ "{ Package: 'stx:libtool' }" AbstractLauncherApplication subclass:#NewLauncher - instanceVariableNames:'isMainLauncher helpIsOn' - classVariableNames:'UserAddedMenuItems UserAddedToolBarItems' - poolDictionaries:'' - category:'Interface-Smalltalk' + instanceVariableNames:'isMainLauncher helpIsOn' + classVariableNames:'UserAddedMenuItems UserAddedToolBarItems' + poolDictionaries:'' + category:'Interface-Smalltalk' ! Object subclass:#AddedToolInfo - instanceVariableNames:'item where positionSpec space before menuWithNewItem' - classVariableNames:'' - poolDictionaries:'' - privateIn:NewLauncher + instanceVariableNames:'item where positionSpec space before menuWithNewItem' + classVariableNames:'' + poolDictionaries:'' + privateIn:NewLauncher ! !NewLauncher class methodsFor:'documentation'! @@ -33,7 +33,7 @@ copyright " COPYRIGHT (c) 1997-1998 by eXept Software AG - All Rights Reserved + All Rights Reserved This software is furnished under a license and may be used only in accordance with the terms of that license and with the @@ -824,10 +824,10 @@ (where isNil or: [where = 'toolbar']) ifTrue:[ UserAddedToolBarItems isNil ifTrue: [UserAddedToolBarItems := Dictionary new]. - (UserAddedToolBarItems contains:[:info | info item nameKey = newItem nameKey]) - ifFalse:[ + (UserAddedToolBarItems contains:[:info | info item nameKey = newItem nameKey]) + ifFalse:[ UserAddedToolBarItems - at:newItem put:(AddedToolInfo new + at:newItem put:(AddedToolInfo new item:newItem; where:where; positionSpec:positionSpecOrNilArg; @@ -835,14 +835,14 @@ before:before; menuWithNewItem:nil; yourself) - ] + ] ]. (where isNil or:[where startsWith:'menu']) ifTrue:[ UserAddedMenuItems isNil ifTrue: [UserAddedMenuItems := Dictionary new]. - (UserAddedMenuItems contains:[:info | info item nameKey = newItem nameKey]) - ifFalse:[ + (UserAddedMenuItems contains:[:info | info item nameKey = newItem nameKey]) + ifFalse:[ UserAddedMenuItems - at:newItem put:(AddedToolInfo new + at:newItem put:(AddedToolInfo new item:newItem; where:where; positionSpec:positionSpecOrNilArg; @@ -850,7 +850,7 @@ before:before; menuWithNewItem:nil; yourself) - ] + ] ] ! @@ -1669,7 +1669,6 @@ #label: 'File Browser' #translateLabel: true #nameKey: #fileBrowser - #isVisible: #fileBrowserItemVisible #value: #openApplication: #activeHelpKey: #fileFileBrowser #argument: 'FileBrowser' @@ -2966,7 +2965,12 @@ ! fileBrowserItemVisible - ^ self visibleHolderFor:#fileBrowser + |holder| + + (holder := builder bindingAt:#fileBrowserItemVisible) isNil ifTrue:[ + builder aspectAt:#fileBrowserItemVisible put:(holder := true asValue). + ]. + ^ holder ! isMainLauncherHolder @@ -3002,13 +3006,12 @@ ! systemBrowserItemVisible - ^ self visibleHolderFor:#systemBrowser -! - -visibleHolderFor:anAspectSymbol - "missing method, return true for now" - - ^ true + |holder| + + (holder := builder bindingAt:#systemBrowserItemVisible) isNil ifTrue:[ + builder aspectAt:#systemBrowserItemVisible put:(holder := true asValue). + ]. + ^ holder ! ! !NewLauncher methodsFor:'change & update'! @@ -3949,11 +3952,11 @@ "save image, after asking for a file name" self saveImageAs: ( - FileSelectionBrowser - request: (resources string:'Save Image As') - fileName: ObjectMemory nameForSnapshot - inDirectory: Filename currentDirectory name - withFileFilters: #('*.img')) + FileSelectionBrowser + request: (resources string:'Save Image As') + fileName: ObjectMemory nameForSnapshot + inDirectory: Filename currentDirectory name + withFileFilters: #('*.img')) "Modified: / 23.4.1998 / 18:25:17 / cg" ! ! @@ -4019,13 +4022,13 @@ let user specify a widget and save its contents." Processor - addTimedBlock:[ - |v| - (v := Screen current viewFromUser) notNil ifTrue:[ - self saveScreenImage:(Image fromView:v) defaultName:'hardcopy' - ] - ] - afterSeconds:1 + addTimedBlock:[ + |v| + (v := Screen current viewFromUser) notNil ifTrue:[ + self saveScreenImage:(Image fromView:v) defaultName:'hardcopy' + ] + ] + afterSeconds:1 "Created: / 21.8.1998 / 20:44:12 / cg" ! ! @@ -4107,5 +4110,5 @@ !NewLauncher class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.265 2002-09-27 12:00:53 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.266 2002-09-29 13:14:45 cg Exp $' ! !