hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:a301eabbab46
+:41f4128c029c
 ^ super helpSpec addPairsFrom:#(
 #align
 'Widget alignment functions'
+#alignResizeSelectionBottom
+'Resize the selected widgets'' bottom edges to align them with the bottom of the dominant widget'
+#alignResizeSelectionLeft
+'Resize the selected widgets'' left edges to align them with the left edge of the dominant widget'
+#alignResizeSelectionRight
+'Resize the selected widgets'' right edges to align them with the right edge of the dominant widget'
+#alignResizeSelectionTop
+'Resize the selected widgets'' top edges to align them with the top edge of the dominant widget'
 #alignSelectionBottom
 'Aligns the selected widgets'' bottom edges with the bottom of the dominant widget'
-#alignResizeSelectionBottom
-'Resize the selected widgets'' bottom edges to align them with the bottom of the dominant widget'
 #alignSelectionCenterHor
 'Aligns the selected widgets'' centers vertically with the center of the dominant widget'
 #alignSelectionCenterVer
 'Aligns the selected widgets'' centers horizontally with the center of the dominant widget'
 #alignSelectionLeft
 'Aligns the selected widgets'' left edges with the left edge of the dominant widget'
-#alignResizeSelectionLeft
-'Resize the selected widgets'' left edges to align them with the left edge of the dominant widget'
 #alignSelectionLeftAndRight
 'Aligns the selected widgets'' left & right edges with the dominant widget'
 #alignSelectionRight
 'Aligns the selected widgets'' right edges with the right edge of the dominant widget'
-#alignResizeSelectionRight
-'Resize the selected widgets'' right edges to align them with the right edge of the dominant widget'
 #alignSelectionTop
 'Aligns the selected widgets'' top edges with the top edge of the dominant widget'
-#alignResizeSelectionTop
-'Resize the selected widgets'' top edges to align them with the top edge of the dominant widget'
 #alignSelectionTopAndBottom
 'Aligns the selected widgets'' top and bottom edges with the dominant widget'
+#alignToGrid
+'Am Raster ausrichten'
 #centerSelectionHor
 'Centers the selected widgets horizontally within their containing widget'
 #centerSelectionVer
 'Centers the selected widgets vertically within their containing widget'
 'Opens an inspector on the selected widget'
 #editOpenSpecDocumentation
 'Opens the documentation of the selected widget'
+#editSaveSpecForSelection
+'Generate a sub-spec method for the selected element only.\Useful when refactoring an existing spec into sub specifications.'
 #fileBrowseAspectMethods
 'Opens a System Browser on the application''s aspect methods'
 #fileBrowseClass
 'Open a System Browser on the application''s class'
 'Generates aspect methods for defined aspect selectors of the widgets'
 #generateHookMethods
 'Generates startup/release methods. (#closeRequest, #postBuildWith:, #postOpenWith:)'
-#group
+"/ #group
-''
+"/ ''
 #helpExamples
 'Show some examples uses of the GUI Painter'
 #helpFunctions
 'Moves the selected widget out of its parent widget'
 #moveWidgetUp
 'Moves the selected widget up in the list (brings it to the back)'
+#openColorEditor
+'Open a color editor'
 #pasteBuffer
 'Pastes the widgets of the clipboard at the current mouse position'
 #pasteWithLayout
 'Pastes the widgets of the clipboard without changing their layouts'
-#referToCOnfigDatabase
+#pickColorFromScreen
+'Pick a color from the screen'
+#recentlyUsedColors
+'Pick a recently used color'
+#referToConfigDatabase
 ''
 #settingsAspectsAsInstances
 'Generate aspects as instance variables (or bindings, if off)'
 #settingsGallery
 'Shows or hides the gallery window'
 #settingsGenerateCommentedCode
-''
+'Enables/disables comments in the generated code, especially in aspect and hook methods'
 #settingsGridManager
 'Opens a dialog to toggle grid display or to change the grids spacing'
 #settingsRedefineAspectMethods
 'Toggles display of help texts (after opening a new GUI Painter)'
 #settingsUndoManager
 'Opens a dialog to undo modifications'
+#shadesOfBlue
+'Blue color tones'
+#shadesOfCyan
+'Cyan color tones'
+#shadesOfGray
+'Gray color tones'
+#shadesOfGreen
+'Green color tones'
+#shadesOfMagenta
+'Magenta color tones'
+#shadesOfRed
+'Red color tones'
+#shadesOfYellow
+'Yellow color tones'
 #showGrid
 'Raster zeigen'
-#alignToGrid
-'Am Raster ausrichten'
 #sortItems
 'Sort the selected items by position (left to right, top to bottom)'
 #spreadSelectionHor
 'Sets the horizontal spaces between the selected widgets to the same value'
 'Toggles geometry test mode (to define ratios of variable panels and top-window dimension)'
 #testStartApplication
 'Starts the application with the current window spec'
-shadesOfRed
+#useDefaultColorToggle
-'Red color tones'
-shadesOfGreen
-'Green color tones'
-shadesOfBlue
-'Blue color tones'
-shadesOfCyan
-'Cyan color tones'
-shadesOfMagenta
-'Magenta color tones'
-shadesOfYellow
-'Yellow color tones'
-shadesOfGray
-'Gray color tones'
-openColorEditor
-'Open a color editor'
-pickColorFromScreen
-'Pick a color from the screen'
-recentlyUsedColors
-'Pick a recently used color'
-useDefaultColorToggle
 'Toggle between default and explicit color'
 )
-"Modified: / 09-08-2012 / 09:40:53 / cg"
 ! !
 !UIPainter class methodsFor:'helpers'!
 convertString:aString maxLineSize:maxCharactersPerLine skipLineFeed:skipLineFeed
 by the MenuEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the MenuEditor may not be able to read the specification."
 "
 MenuEditor new openOnClass:UIPainter andSelector:#menuEdit
 (Menu new fromLiteralArrayEncoding:(UIPainter menuEdit)) startUp
 "
 activeHelpKey: editUndo
 enabled: hasUndoHistory
 label: 'Undo'
 itemValue: undoLast
 nameKey: undo
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: editCut
 enabled: canCutHolder
 label: 'Cut'
 itemValue: deleteSelection
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editCopy
 enabled: canCopyHolder
 label: 'Copy'
 itemValue: copySelection
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editPaste
 enabled: canPasteHolder
 label: 'Paste'
 itemValue: pasteBuffer
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: pasteWithLayout
 enabled: canPasteKeepingLayoutHolder
 label: 'Paste with Layout'
 itemValue: pasteWithLayout
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editPaste
 enabled: canPasteKeepingLayoutHolder
 label: 'Paste Keeping Absolute Position'
 itemValue: pasteKeepingPosition
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDelete
 enabled: canCutHolder
 label: 'Delete'
 itemValue: deleteTotalSelection
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: replaceBy
 enabled: canReplaceSelection
 label: 'Replace By...'
 itemValue: doAskAndReplaceWidgetBy
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 enabled: canMoveSelection
 label: 'Move'
-translateLabel: true
 submenuChannel: menuMove
 )
 (MenuItem
 enabled: canMoveOrAlignSelection
 label: 'Align'
-translateLabel: true
 submenuChannel: menuAlign
 )
 (MenuItem
 enabled: hasSelection
 label: 'Dimension'
-translateLabel: true
 submenu:
 (Menu
 (
 (MenuItem
 activeHelpKey: editDimensionCopyLayout
 enabled: hasSingleSelection
 label: 'Copy Layout'
 itemValue: copyLayout
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionPasteLayout
 enabled: canMoveOrAlignSelection
 label: 'Paste Layout'
 itemValue: pasteLayout
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionExchangeLayouts
 enabled: canExchangeSelectionLayouts
 label: 'Exchange Layouts'
 itemValue: exchangeLayouts
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: editDimensionCopyExtent
 enabled: hasSingleSelection
 label: 'Copy Extent'
 itemValue: copyExtent
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionPasteExtent
 enabled: canMoveOrAlignSelection
 label: 'Paste Extent'
 itemValue: pasteExtent
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionPasteWidth
 enabled: canMoveOrAlignSelection
 label: 'Paste Width'
 itemValue: pasteWidth
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionPasteHeight
 enabled: canMoveOrAlignSelection
 label: 'Paste Height'
 itemValue: pasteHeight
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: editDimensionDefaultExtent
 enabled: canMoveOrAlignSelection
 label: 'Set Default Extent'
 itemValue: setToDefaultExtent
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionDefaultWidth
 enabled: canMoveOrAlignSelection
 label: 'Set Default Width'
 itemValue: setToDefaultWidth
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editDimensionDefaultHeight
 enabled: canMoveOrAlignSelection
 label: 'Set Default Height'
 itemValue: setToDefaultHeight
-translateLabel: true
 )
 )
 nil
 nil
 )
 )
 (MenuItem
 activeHelpKey: editOpenSpecDocumentation
 label: 'Open Widget Documentation'
 itemValue: doOpenWidgetDocumentation
-translateLabel: true
+)
-)
+(MenuItem
-(MenuItem
+activeHelpKey: referToConfigDatabase
-activeHelpKey: referToCOnfigDatabase
 label: 'Refer to Config Database'
 itemValue: configSelection
-translateLabel: true
 isVisible: false
 )
 (MenuItem
 label: '-'
 isVisible: false
 )
 (MenuItem
 activeHelpKey: drawEdit
 label: 'Draw Edit'
 itemValue: shapeEdit
-translateLabel: true
 isVisible: false
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: sortItems
 label: 'Sort Selected Items by Position'
 itemValue: doSortItems
-translateLabel: true
+)
-)
-"/         (MenuItem
-"/            label: 'Action'
-"/            translateLabel: true
-"/          )
 (MenuItem
 activeHelpKey: groupWithLayout
 enabled: canGroup
 label: 'Group with Layout'
 itemValue: groupWithLayout
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: ungroup
 enabled: canUngroup
 label: 'Ungroup'
 itemValue: ungroup
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: ungroupWithLayout
 enabled: canGroup
 label: 'Ungroup with Layout'
 itemValue: ungroupWithLayout
-translateLabel: true
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 activeHelpKey: editBrowseViewClass
 enabled: hasOneSelectionOtherThanCanvas
 label: 'Browse Widget Class'
 itemValue: doBrowseViewClass
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editInspectView
 enabled: hasOneSelectionOtherThanCanvas
 label: 'Inspect Widget'
 itemValue: doInspectView
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editBrowseViewClass
 label: 'Browse Specification Class'
 itemValue: doBrowseSpecificationClass
-translateLabel: true
 )
 (MenuItem
 activeHelpKey: editInspectSpec
 label: 'Inspect Spec'
 itemValue: doInspectSpec
-translateLabel: true
+)
+(MenuItem
+label: '-'
+)
+(MenuItem
+activeHelpKey: editSaveSpecForSelection
+enabled: hasOneSelectionOtherThanCanvas
+label: 'Save Spec of Selection...'
+itemValue: doSaveElementSpecAs
 )
 )
 nil
 nil
 )
 self askForModification ifFalse: [^nil].
 self loadFromMessage:
 (ResourceSelectionBrowser
-request: 'Load Window Spec From Class'
+request: 'Load Window Spec from Class'
 onSuperclass: nil
 andClass: self specClass
 andSelector: specSelector ? #windowSpec
 withResourceTypes: #(canvas))
 |classAndSelector class selector|
 self askForSectionModification.
 classAndSelector := ResourceSelectionBrowser
-request: 'Load Subspec From Class'
+request: 'Load Subspec from Class'
 onSuperclass: nil
 andClass: self specClass
 andSelector: specSelector
 withResourceTypes: #(canvas).
 ]
 ].
 specClass := self resolveName:specClassName.
 (specClass notNil and:[ specClass isClass ]) ifFalse:[
-self warn:('Oops - cannot save - class not found: ' , specClassName).
+self warn:('Oops - cannot save. Class not found: ' , specClassName).
 ^ nil
 ].
 painter := self painter.
 painter
 "/    self hasSpecClassAndSelector ifTrue:[
 "/        self askForModification ifFalse:[^ false].
 "/    ].
 classAndSelector := ResourceSelectionBrowser
-request: 'Save Window Spec In Class'
+request: 'Save Window Spec in Class'
 onSuperclass: #Object
 andClass: (specClassName ? #ApplicationModel) asSymbol
 andSelector: specSelector ? #windowSpec
 withResourceTypes: #(canvas).
 specClass := classAndSelector methodClass.
 specClassName := classAndSelector methodClass name.
 specSelector := classAndSelector methodSelector.
 specSuperclassName := specClass superclass name.
 self doSave.
+^ true
+!
+doSaveElementSpecAs
+"opens a ResourceSelectionBrowser for saving a spec for the selected
+elements on a class.
+Useful to save parts for refactoring a spec into
+subSpecifications, for example when putting parts into a tab"
+|spec fullSpec classAndSelector subSpecClass subSpecClassName subSpecSelector code|
+self askForSectionModification.
+(spec := self painter specForSelection) isNil ifTrue:[
+self warn:('Select a single item first').
+^ false
+].
+classAndSelector := ResourceSelectionBrowser
+request: 'Save Subspec in Class'
+onSuperclass: #Object
+andClass: specClassName
+andSelector: #subSpec
+withResourceTypes: #(canvas).
+classAndSelector isNil ifTrue:[^ false].
+self clearModified.
+self painter resetModification.
+subSpecClass := classAndSelector methodClass.
+subSpecClassName := classAndSelector methodClass name.
+subSpecSelector := classAndSelector methodSelector.
+subSpecClass := self resolveName:subSpecClassName.
+(subSpecClass notNil and:[ subSpecClass isClass ]) ifFalse:[
+self warn:('Oops - cannot save - class not found: ' , subSpecClassName).
+^ false
+].
+spec := painter fullSpecFor:(painter singleSelection).
+fullSpec := treeView generateFullSpecForComponents:(Array with:spec) named:subSpecSelector asUppercaseFirst.
+code := painter generateWindowSpecMethodSourceFor:fullSpec class:subSpecClassName selector:subSpecSelector.
+(ReadStream on:code) fileIn.
 ^ true
 !
 doSelectAspectMethod:aspectSelector
 "open a dialog to select an existing aspect method and enter in the field"

changeset 3032	41f4128c029c
parent 3025	7509aa3559e9
child 3051	ebb32d3a997e