diff -r 10afc79658a6 -r a291fc248a8b UIPainter.st
--- a/UIPainter.st	Mon Jun 29 17:01:33 1998 +0200
+++ b/UIPainter.st	Mon Jun 29 17:06:28 1998 +0200
@@ -1503,7 +1503,7 @@
                 #value: #doStepUp
                 #activeHelpKey: #moveWidgetUp
                 #enabled: #canChangeOrderInContainer
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #upIcon 'Up')
+                #labelImage: #(#ResourceRetriever #Icon #upIcon 'Up')
             )
              #(#MenuItem
                 #label: 'Down'
@@ -1511,7 +1511,7 @@
                 #value: #doStepDown
                 #activeHelpKey: #moveWidgetDown
                 #enabled: #canChangeOrderInContainer
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #downIcon 'Down')
+                #labelImage: #(#ResourceRetriever #Icon #downIcon 'Down')
             )
              #(#MenuItem
                 #label: 'Into'
@@ -1519,7 +1519,7 @@
                 #value: #doStepIn
                 #activeHelpKey: #moveWidgetInto
                 #enabled: #canMoveSelectionIntoContainer
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #downRightIcon 'Into')
+                #labelImage: #(#ResourceRetriever #Icon #downRightIcon 'Into')
             )
              #(#MenuItem
                 #label: 'Out'
@@ -1527,13 +1527,11 @@
                 #value: #doStepOut
                 #activeHelpKey: #moveWidgetOut
                 #enabled: #canMoveSelectionOutOfContainer
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #leftDownIcon 'Out')
+                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon 'Out')
             )
           ) nil
           nil
       )
-
-    "Modified: / 20.5.1998 / 01:47:48 / cg"
 !
 
 menuToolbar
@@ -1560,7 +1558,7 @@
                 #isButton: true
                 #value: #doStartApplication
                 #activeHelpKey: #testStartApplication
-                #labelImage: #(#ResourceRetriever nil #startIcon)
+                #labelImage: #(#ResourceRetriever #Icon #startIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -1570,21 +1568,21 @@
                 #isButton: true
                 #value: #doNew
                 #activeHelpKey: #fileNew
-                #labelImage: #(#ResourceRetriever nil #newIcon)
+                #labelImage: #(#ResourceRetriever #Icon #newIcon)
             )
              #(#MenuItem
                 #label: 'Load'
                 #isButton: true
                 #value: #doLoad
                 #activeHelpKey: #fileLoad
-                #labelImage: #(#ResourceRetriever nil #loadIcon)
+                #labelImage: #(#ResourceRetriever #Icon #loadIcon)
             )
              #(#MenuItem
                 #label: 'Save'
                 #isButton: true
                 #value: #doSave
                 #activeHelpKey: #fileSave
-                #labelImage: #(#ResourceRetriever nil #saveIcon)
+                #labelImage: #(#ResourceRetriever #Icon #saveIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -1595,7 +1593,7 @@
                 #value: #deleteSelection
                 #activeHelpKey: #editCut
                 #enabled: #valueOfCanCut
-                #labelImage: #(#ResourceRetriever nil #cutIcon)
+                #labelImage: #(#ResourceRetriever #Icon #cutIcon)
             )
              #(#MenuItem
                 #label: 'Copy'
@@ -1603,7 +1601,7 @@
                 #value: #copySelection
                 #activeHelpKey: #editCopy
                 #enabled: #valueOfCanCopy
-                #labelImage: #(#ResourceRetriever nil #copyIcon)
+                #labelImage: #(#ResourceRetriever #Icon #copyIcon)
             )
              #(#MenuItem
                 #label: 'Paste With Layout'
@@ -1611,7 +1609,7 @@
                 #value: #pasteWithLayout
                 #activeHelpKey: #editPaste
                 #enabled: #valueOfCanPasteWithKeepingLayout
-                #labelImage: #(#ResourceRetriever nil #pasteIcon)
+                #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
             )
              #(#MenuItem
                 #label: 'Delete'
@@ -1619,7 +1617,7 @@
                 #value: #deleteTotalSelection
                 #activeHelpKey: #editDelete
                 #enabled: #valueOfCanCut
-                #labelImage: #(#ResourceRetriever nil #deleteIcon)
+                #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -1630,7 +1628,7 @@
                 #value: #doStepUp
                 #activeHelpKey: #moveWidgetUp
                 #enabled: #canChangeOrderInContainer
-                #labelImage: #(#ResourceRetriever nil #upIcon)
+                #labelImage: #(#ResourceRetriever #Icon #upIcon)
             )
              #(#MenuItem
                 #label: 'Move Down'
@@ -1638,7 +1636,7 @@
                 #value: #doStepDown
                 #activeHelpKey: #moveWidgetDown
                 #enabled: #canChangeOrderInContainer
-                #labelImage: #(#ResourceRetriever nil #downIcon)
+                #labelImage: #(#ResourceRetriever #Icon #downIcon)
             )
              #(#MenuItem
                 #label: 'Move Into'
@@ -1646,7 +1644,7 @@
                 #value: #doStepIn
                 #activeHelpKey: #moveWidgetInto
                 #enabled: #canMoveSelectionIntoContainer
-                #labelImage: #(#ResourceRetriever nil #downRightIcon)
+                #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
             )
              #(#MenuItem
                 #label: 'Move Out'
@@ -1654,7 +1652,7 @@
                 #value: #doStepOut
                 #activeHelpKey: #moveWidgetOut
                 #enabled: #canMoveSelectionOutOfContainer
-                #labelImage: #(#ResourceRetriever nil #leftDownIcon)
+                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -1814,6 +1812,11 @@
     ^ builder booleanValueAspectFor:#hasOneSelectionOtherThanCanvas
 !
 
+helpIcon
+
+    ^Icon helpIcon
+!
+
 modifiedChannel
     "returns a boolean value holder which is set to true if something is modified
      and not accepted"
@@ -2144,6 +2147,38 @@
     ].
 
     "Modified: / 29.10.1997 / 17:48:19 / cg"
+!
+
+updateChannels
+    "updates the channels"
+
+    |canCutOrCopy canPaste clipboard sel|
+
+    self canMoveOrAlignSelection        value:(treeView canMoveOrAlignSelection).
+    self canChangeOrderInContainer      value:(treeView canChangeOrderInContainer).
+    self canMoveSelectionIntoContainer  value:(treeView canMoveSelectionIntoContainer).
+    self canMoveSelectionOutOfContainer value:(treeView canMoveSelectionOutOfContainer).
+    self hasOneSelectionOtherThanCanvas value:(treeView hasOneSelectionOtherThanCanvas).
+
+    treeView notNil
+    ifTrue:
+    [
+        canCutOrCopy := treeView selection size >= 1 and:[treeView selection first ~~ 1].
+        clipboard := self getSelection.
+
+        clipboard isCollection ifTrue:[clipboard notEmpty ifTrue:[sel := clipboard first]]
+                              ifFalse:[sel := clipboard].
+
+        canPaste := (sel isKindOf:UISpecification) and: 
+                    [treeView selection size  = 1 
+                    and:[treeView selection first == 1 
+                    or: [self canPasteInto: treeView selectedNode contents view]]]
+    ].
+
+    self valueOfCanCut value: canCutOrCopy.
+    self valueOfCanCopy value: canCutOrCopy.
+    self valueOfCanPaste value: canPaste.            
+    self valueOfCanPasteWithKeepingLayout value: (canPaste "&  self canKeepLayoutInSelection").
 ! !
 
 !UIPainter methodsFor:'event handling'!
@@ -2516,12 +2551,6 @@
         ]
     ].
 
-    self canMoveOrAlignSelection        value:(treeView canMoveOrAlignSelection).
-    self canChangeOrderInContainer      value:(treeView canChangeOrderInContainer).
-    self canMoveSelectionIntoContainer  value:(treeView canMoveSelectionIntoContainer).
-    self canMoveSelectionOutOfContainer value:(treeView canMoveSelectionOutOfContainer).
-    self hasOneSelectionOtherThanCanvas value:(treeView hasOneSelectionOtherThanCanvas).
-
     treeView isCanvasSelected ifTrue:[
         spec := treeView canvasSpec.
         view := self painter topView.
@@ -2576,25 +2605,7 @@
     ].
     self modifiedChannel value:false.
 
-    treeView notNil
-    ifTrue:
-    [
-        canCutOrCopy := treeView selection size >= 1 and:[treeView selection first ~~ 1].
-        clipboard := self getSelection.
-
-        clipboard isCollection ifTrue:[clipboard notEmpty ifTrue:[sel := clipboard first]]
-                              ifFalse:[sel := clipboard].
-
-        canPaste := (sel isKindOf:UISpecification) and: 
-                    [treeView selection size  = 1 
-                    and:[treeView selection first == 1 
-                    or: [self canPasteInto: treeView selectedNode contents view]]]
-    ].
-
-    self valueOfCanCut value: canCutOrCopy.
-    self valueOfCanCopy value: canCutOrCopy.
-    self valueOfCanPaste value: canPaste.            
-    self valueOfCanPasteWithKeepingLayout value: (canPaste &  self canKeepLayoutInSelection).
+    self updateChannels
 ! !
 
 !UIPainter methodsFor:'settings'!