# HG changeset patch
# User tz
# Date 885910157 -3600
# Node ID 6c336c18333000d3fd3022c2bcbbdd7344a33d9a
# Parent  2a1024483349ca6d6a81d8c010945d52c9cdfe43
info bar as subSpec to class ToolApplicationModel moved

diff -r 2a1024483349 -r 6c336c183330 ImageEditor.st
--- a/ImageEditor.st	Tue Jan 27 14:56:15 1998 +0100
+++ b/ImageEditor.st	Tue Jan 27 15:09:17 1998 +0100
@@ -162,6 +162,9 @@
 #colorMap
 'Increases or reduces size of color map of the image.'
 
+#colorMapTable
+'Shows a list of used colors of the current image.'
+
 #drawModeBox
 'Switches to mode drawing boxes.'
 
@@ -243,6 +246,21 @@
 #inputFieldOfSelector
 'Selector of the class returning the image.'
 
+#magnificationNumber
+'Shows current number of magnification.'
+
+#magnifyImageDown
+'Magnifies down current image.'
+
+#magnifyImageUp
+'Magnifies up current image.'
+
+#mouseKeyColorMode
+'Toggles between left and right mouse key color.'
+
+#previewView
+'Shows preview of the current image.'
+
 )
 ! !
 
@@ -664,11 +682,11 @@
           #'window:' 
            #(#WindowSpec
               #'name:' 'Image Editor'
-              #'layout:' #(#LayoutFrame 127 0 279 0 626 0 624 0)
+              #'layout:' #(#LayoutFrame 70 0 346 0 569 0 691 0)
               #'label:' 'Image Editor'
               #'min:' #(#Point 400 320)
               #'max:' #(#Point 1152 900)
-              #'bounds:' #(#Rectangle 127 279 627 625)
+              #'bounds:' #(#Rectangle 70 346 570 692)
               #'menu:' #menu
               #'usePreferredExtent:' false
           )
@@ -706,6 +724,7 @@
                                                #(#ArrowButtonSpec
                                                   #'name:' 'magnifyDownButton'
                                                   #'layout:' #(#LayoutFrame 13 0 20 0 35 0 42 0)
+                                                  #'activeHelpKey:' #magnifyImageDown
                                                   #'model:' #magnifyDown
                                                   #'enableChannel:' #imageIsLoaded
                                                   #'isTriggerOnDown:' true
@@ -714,6 +733,7 @@
                                                #(#ArrowButtonSpec
                                                   #'name:' 'magnifyUpButton'
                                                   #'layout:' #(#LayoutFrame 73 0 20 0 95 0 42 0)
+                                                  #'activeHelpKey:' #magnifyImageUp
                                                   #'model:' #magnifyUp
                                                   #'enableChannel:' #imageIsLoaded
                                                   #'isTriggerOnDown:' true
@@ -722,6 +742,7 @@
                                                #(#InputFieldSpec
                                                   #'name:' 'magnificationInputField'
                                                   #'layout:' #(#LayoutFrame 36 0 20 0.0 72 0 42 0)
+                                                  #'activeHelpKey:' #magnificationNumber
                                                   #'enableChannel:' #imageIsLoaded
                                                   #'model:' #valueOfMagnification
                                                   #'type:' #number
@@ -745,6 +766,7 @@
                                                #(#DataSetSpec
                                                   #'name:' 'colorDataSetView'
                                                   #'layout:' #(#LayoutFrame 11 0.0 19 0.0 20 1.0 -10 1.0)
+                                                  #'activeHelpKey:' #colorMapTable
                                                   #'model:' #selectionOfColor
                                                   #'style:' #(#FontDescription #helvetica #medium #roman 12)
                                                   #'hasHorizontalScrollBar:' true
@@ -780,6 +802,7 @@
                                                #(#MenuPanelSpec
                                                   #'name:' 'menuColorAssignmentPanel'
                                                   #'layout:' #(#LayoutFrame 11 0 -10 1 18 1 17 1)
+                                                  #'activeHelpKey:' #mouseKeyColorMode
                                                   #'enableChannel:' #imageIsLoaded
                                                   #'menu:' #menuColorAssignment
                                                   #'style:' #(#FontDescription #helvetica #medium #roman 10)
@@ -834,7 +857,7 @@
                                                   #'activeHelpKey:' #inputFieldOfClass
                                                   #'model:' #valueOfResourceClass
                                                   #'immediateAccept:' false
-                                                  #'extent:' #(#Point 129 21)
+                                                  #'extent:' #(#Point 153 21)
                                               )
                                                #(#InputFieldSpec
                                                   #'name:' 'resourceSelectorInputField'
@@ -842,7 +865,7 @@
                                                   #'model:' #valueOfResourceSelector
                                                   #'immediateAccept:' false
                                                   #'acceptOnTab:' false
-                                                  #'extent:' #(#Point 129 20)
+                                                  #'extent:' #(#Point 153 20)
                                               )
                                                #(#InputFieldSpec
                                                   #'name:' 'fileNameInputField'
@@ -850,7 +873,7 @@
                                                   #'model:' #valueOfFileName
                                                   #'immediateAccept:' false
                                                   #'acceptOnTab:' false
-                                                  #'extent:' #(#Point 129 21)
+                                                  #'extent:' #(#Point 153 21)
                                               )
                                             )
                                         )
@@ -862,6 +885,7 @@
                                      #(#ArbitraryComponentSpec
                                         #'name:' 'imagePreView'
                                         #'layout:' #(#LayoutFrame 111 0.0 9 0.0 -6 1 60 0)
+                                        #'activeHelpKey:' #previewView
                                         #'hasHorizontalScrollBar:' true
                                         #'hasVerticalScrollBar:' true
                                         #'miniScrollerHorizontal:' true
@@ -881,12 +905,18 @@
                                    #(
                                      #(#ArbitraryComponentSpec
                                         #'name:' 'imageEditView'
-                                        #'layout:' #(#LayoutFrame 2 0.0 2 0.0 -2 1.0 1 1.0)
+                                        #'layout:' #(#LayoutFrame 2 0.0 2 0.0 -2 1.0 -24 1.0)
                                         #'hasHorizontalScrollBar:' true
                                         #'hasVerticalScrollBar:' true
                                         #'component:' #ImageEditView
                                         #'hasBorder:' false
                                     )
+                                     #(#LabelSpec
+                                        #'name:' 'coordLabel'
+                                        #'layout:' #(#LayoutFrame 2 0.0 -22 1 -4 1.0 0 1.0)
+                                        #'level:' -1
+                                        #'adjust:' #left
+                                    )
                                   )
                               )
                               #'level:' -1
@@ -894,28 +924,13 @@
                         )
                     )
                     #'level:' 1
-                    #'handles:' #(#Any 0.45082 1.0)
-                )
-                 #(#LabelSpec
-                    #'name:' 'infoLabel'
-                    #'layout:' #(#LayoutFrame 0 0 -22 1 -170 1 0 1.0)
-                    #'labelChannel:' #valueOfInfoLabel
-                    #'level:' 1
-                    #'adjust:' #left
+                    #'handles:' #(#Any 0.5 1.0)
                 )
-                 #(#LabelSpec
-                    #'name:' 'timeLabel'
-                    #'layout:' #(#LayoutFrame -80 1 -22 1 0 1.0 0 1.0)
-                    #'labelChannel:' #valueOfTimeLabel
-                    #'level:' 1
-                    #'adjust:' #right
-                )
-                 #(#LabelSpec
-                    #'name:' 'coordLabel'
-                    #'layout:' #(#LayoutFrame -170 1 -22 1 -80 1 0 1.0)
-                    #'labelChannel:' #valueOfCoordLabel
-                    #'level:' 1
-                    #'adjust:' #left
+                 #(#UISubSpecification
+                    #'name:' 'infoBarSubSpec'
+                    #'layout:' #(#LayoutFrame 0 0.0 -22 1 0 1.0 0 1.0)
+                    #'majorKey:' #ToolApplicationModel
+                    #'minorKey:' #windowSpecForInfoBar
                 )
               )
           )
@@ -1089,6 +1104,11 @@
 
 !ImageEditor methodsFor:'accessing - views'!
 
+coordLabel
+
+    ^builder componentAt: #coordLabel
+!
+
 fileNameInputField
 
     ^builder componentAt: #fileNameInputField
@@ -1407,7 +1427,6 @@
     self image isNil ifTrue: [^nil].
 
     self updateInfoLabel.
-    self imageEditView coordInfoBlock: [:value| self valueOfCoordLabel value: value].
 
     self valueOfFileName removeDependent: self.
     self valueOfFileName value: self image fileName.