AbstractSettingsApplication.st
changeset 16317 936828ad0b35
parent 16312 e4480574be19
child 16321 e6a4ab0da993
child 16324 5f36246be507
--- a/AbstractSettingsApplication.st	Sun Apr 24 15:13:19 2016 +0200
+++ b/AbstractSettingsApplication.st	Sun Apr 24 15:13:35 2016 +0200
@@ -575,27 +575,68 @@
 !
 
 quickSearchStrings
-    "keywords to match in the quickSearch.
+    "returns a set of words to match in the quickSearch.
      Here, as a fallback, the keys from the help spec,
-     the widget names and model aspects are returned
-     Notice that both the word and its current language translation are matched against
-     the text in the quick search field"
+     the widget names and label aspects are returned
+     Notice that both all words and its current language translation are included 
+     in the set and will be matched against the word in the quick search field"
      
-    |words|
-    
-    words := Set new.
+    |words helpKeys resources addEachWord addEachWordXLated|
+
+    "/ translate
+    resources := self classResources.
+
+    addEachWord := 
+        [:aString |
+            aString asCollectionOfWordsDo:[:w |
+                true "(w first isLetter)" ifTrue:[ 
+                    words add:w asLowercase
+                ].
+            ].    
+        ].    
     
-    self windowSpec decodeAsLiteralArray do:[:spec |
-        |helpKey|
-
-        (helpKey := spec activeHelpKey) notNil ifTrue:[
+    addEachWordXLated := 
+        [:aString |
+            |xlation|
+
+            aString notNil ifTrue:[
+                addEachWord value:aString.
+                (xlation := resources string:aString) notNil ifTrue:[
+                    xlation ~= aString ifTrue:[
+                        addEachWord value:xlation.
+                    ].    
+                ].    
+            ].    
+        ].    
+
+    words := Set new.
+    helpKeys := Set new.
+
+    self windowSpec decodeAsLiteralArray do:[:eachSpec |
+        |helpKey label|
+
+        label := eachSpec perform:#label ifNotUnderstood:nil.
+        label notNil ifTrue:[
+            addEachWordXLated value:label.
+        ].
+        
+        (helpKey := eachSpec activeHelpKey) notNil ifTrue:[
+            helpKeys add:helpKey.
             words add:helpKey string asLowercase
         ].
     ].
     self flyByHelpSpec keys do:[:k |
+        helpKeys add:k.
         words add:k asLowercase
     ].
-    ^ words asOrderedCollection
+    
+    helpKeys do:[:eachKey |
+        |helpText|
+        
+        helpText := self flyByHelpSpec at:eachKey ifAbsent:nil.
+        addEachWordXLated value:helpText.
+    ].    
+    ^ words 
     
     "
      AbstractSettingsApplication::BuildSettingsAppl quickSearchStrings
@@ -976,7 +1017,7 @@
 !
 
 quickSearchStrings
-    "keywords to match in the quickSearch.
+    "returns a set of keywords to match in the quickSearch.
      Notice that both the word and its current language translation is matched against
      the text in the quick search field"
 
@@ -2035,10 +2076,10 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
          label: 'Byte Code Compiler Settings'
          name: 'Byte Code Compiler Settings'
@@ -2046,7 +2087,7 @@
          min: (Point 10 10)
          bounds: (Rectangle 0 0 665 706)
        )
-       component:
+       component: 
       (SpecCollection
          collection: (
           (VerticalPanelViewSpec
@@ -2056,7 +2097,7 @@
              verticalLayout: top
              horizontalSpace: 3
              verticalSpace: 3
-             component:
+             component: 
             (SpecCollection
                collection: (
                 (CheckBoxSpec
@@ -2072,7 +2113,7 @@
                  )
                 (ViewSpec
                    name: 'Box1'
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (VerticalPanelViewSpec
@@ -2082,7 +2123,7 @@
                          verticalLayout: top
                          horizontalSpace: 3
                          verticalSpace: 0
-                         component:
+                         component: 
                         (SpecCollection
                            collection: (
                             (CheckBoxSpec
@@ -2142,7 +2183,7 @@
                                extent: (Point 313 22)
                              )
                             )
-
+                          
                          )
                        )
                       (VerticalPanelViewSpec
@@ -2152,7 +2193,7 @@
                          verticalLayout: top
                          horizontalSpace: 3
                          verticalSpace: 0
-                         component:
+                         component: 
                         (SpecCollection
                            collection: (
                             (CheckBoxSpec
@@ -2204,11 +2245,11 @@
                                extent: (Point 665 22)
                              )
                             )
-
-                         )
-                       )
-                      )
-
+                          
+                         )
+                       )
+                      )
+                    
                    )
                    extent: (Point 665 157)
                  )
@@ -2226,7 +2267,7 @@
                  )
                 (ViewSpec
                    name: 'Box2'
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (VerticalPanelViewSpec
@@ -2236,7 +2277,7 @@
                          verticalLayout: top
                          horizontalSpace: 3
                          verticalSpace: 0
-                         component:
+                         component: 
                         (SpecCollection
                            collection: (
                             (CheckBoxSpec
@@ -2321,7 +2362,7 @@
                                extent: (Point 313 22)
                              )
                             )
-
+                          
                          )
                        )
                       (VerticalPanelViewSpec
@@ -2331,7 +2372,7 @@
                          verticalLayout: top
                          horizontalSpace: 3
                          verticalSpace: 0
-                         component:
+                         component: 
                         (SpecCollection
                            collection: (
                             (CheckBoxSpec
@@ -2399,17 +2440,17 @@
                                extent: (Point 600 22)
                              )
                             )
-
-                         )
-                       )
-                      )
-
+                          
+                         )
+                       )
+                      )
+                    
                    )
                    extent: (Point 665 206)
                  )
                 (ViewSpec
                    name: 'Box4'
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (ActionButtonSpec
@@ -2420,9 +2461,9 @@
                          model: reenableSuppressedWarnings
                        )
                       )
-
-                   )
-                   extent: (Point 665 30)
+                    
+                   )
+                   extent: (Point 665 32)
                  )
                 (DividerSpec
                    name: 'Separator5'
@@ -2458,36 +2499,37 @@
                  )
                 (ViewSpec
                    name: 'Box3'
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (LabelSpec
                          label: 'Constant Folding:'
                          name: 'ConstantFoldingLabel'
-                         layout: (LayoutFrame 0 0 0 0 306 0 22 0)
+                         layout: (LayoutFrame 0 0 0 0 328 0 22 0)
                          translateLabel: true
                          adjust: right
                        )
                       (PopUpListSpec
                          label: 'PopUp List'
                          name: 'ConstantFolding'
-                         layout: (LayoutFrame 313 0 0 0 -5 1 22 0)
+                         layout: (LayoutFrame 330 0 0 0 -5 1 22 0)
+                         translateLabel: true
                          tabable: true
                          model: constantFoldingSelection
                          menu: constantFolding
                          useIndex: true
                        )
                       )
-
+                    
                    )
                    extent: (Point 665 22)
                  )
                 )
-
+              
              )
            )
           )
-
+        
        )
      )
 ! !
@@ -3104,17 +3146,17 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
          label: 'Changes Settings'
          name: 'Changes Settings'
          min: (Point 10 10)
          bounds: (Rectangle 0 0 561 478)
        )
-       component:
+       component: 
       (SpecCollection
          collection: (
           (VerticalPanelViewSpec
@@ -3124,7 +3166,7 @@
              verticalLayout: topSpace
              horizontalSpace: 5
              verticalSpace: 5
-             component:
+             component: 
             (SpecCollection
                collection: (
                 (FramedBoxSpec
@@ -3132,7 +3174,7 @@
                    name: 'FramedBox2'
                    labelPosition: topLeft
                    translateLabel: true
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
@@ -3151,36 +3193,46 @@
                          model: logDoits
                          translateLabel: true
                        )
-                      (LabelSpec
-                         label: 'Changefile Name:'
-                         name: 'ChangefileNameLabel'
-                         layout: (AlignmentOrigin 239 0 80 0 1 0.5)
-                         activeHelpKey: changeFileName
-                         translateLabel: true
-                         adjust: right
-                       )
-                      (FilenameInputFieldSpec
-                         name: 'FilenameEntryField1'
-                         layout: (LayoutFrame 237 0 65 0 0 1 95 0)
-                         activeHelpKey: changeFileName
-                         model: changeFileName
-                         immediateAccept: true
-                         acceptOnReturn: true
-                         acceptOnTab: true
-                         acceptOnLostFocus: true
-                         acceptOnPointerLeave: true
-                       )
-                      )
-
-                   )
-                   extent: (Point 551 136)
+                      (ViewSpec
+                         name: 'Box1'
+                         layout: (LayoutFrame 5 0 73 0 -5 1 105 0)
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (LabelSpec
+                               label: 'Changefile Name:'
+                               name: 'ChangefileNameLabel'
+                               layout: (LayoutFrame 21 0 0 0 236 0 30 0)
+                               activeHelpKey: changeFileName
+                               translateLabel: true
+                               adjust: right
+                             )
+                            (FilenameInputFieldSpec
+                               name: 'FilenameEntryField1'
+                               layout: (LayoutFrame 237 0 0 0 0 1 30 0)
+                               activeHelpKey: changeFileName
+                               model: changeFileName
+                               immediateAccept: true
+                               acceptOnReturn: true
+                               acceptOnTab: true
+                               acceptOnLostFocus: true
+                               acceptOnPointerLeave: true
+                             )
+                            )
+                          
+                         )
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 551 147)
                  )
                 )
-
+              
              )
            )
           )
-
+        
        )
      )
 ! !
@@ -3628,17 +3680,17 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
          label: 'Debugger Settings'
          name: 'Debugger Settings'
          min: (Point 10 10)
          bounds: (Rectangle 0 0 600 320)
        )
-       component:
+       component: 
       (SpecCollection
          collection: (
           (VerticalPanelViewSpec
@@ -3648,110 +3700,110 @@
              verticalLayout: top
              horizontalSpace: 3
              verticalSpace: 0
-             component:
+             component: 
             (SpecCollection
                collection: (
                 (ViewSpec
                    name: 'ShowErrorNotifierBox'
                    activeHelpKey: showErrorNotifier
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
                          label: 'Show Error Notifier before Opening Debugger'
                          name: 'ShowErrorNotifierCheckBox'
-                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
                          activeHelpKey: showErrorNotifier
                          model: showErrorNotifier
                          translateLabel: true
                        )
                       )
-
-                   )
-                   extent: (Point 600 30)
+                    
+                   )
+                   extent: (Point 600 34)
                  )
                 (ViewSpec
                    name: 'UseNewLayoutInDebuggerBox'
                    activeHelpKey: useNewLayout
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
                          label: 'Use New Layout'
                          name: 'UseNewLayoutInDebuggerCheckBox'
-                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
                          activeHelpKey: useNewLayout
                          model: useNewLayoutInDebugger
                          translateLabel: true
                        )
                       )
-
-                   )
-                   extent: (Point 600 30)
+                    
+                   )
+                   extent: (Point 600 34)
                  )
                 (ViewSpec
                    name: 'ShowVerboseStackBox'
                    activeHelpKey: showVerboseStack
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
                          label: 'Verbose Backtrace by Default in Debugger'
                          name: 'ShowVerboseStackCheckBox'
-                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
                          activeHelpKey: showVerboseStack
                          model: verboseBacktraceInDebugger
                          translateLabel: true
                        )
                       )
-
-                   )
-                   extent: (Point 600 30)
+                    
+                   )
+                   extent: (Point 600 34)
                  )
                 (ViewSpec
                    name: 'HideEnumerationCodeBox'
                    activeHelpKey: hideSupportCode
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
                          label: 'Hide Support Code (Implementation of Enumerations, Exceptions, etc.)'
                          name: 'CheckBox1'
-                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
                          activeHelpKey: hideSupportCode
                          model: hideSupportCodeInDebugger
                          translateLabel: true
                        )
                       )
-
-                   )
-                   extent: (Point 600 30)
+                    
+                   )
+                   extent: (Point 600 34)
                  )
                 (ViewSpec
                    name: 'AllowSendingMailFromDebuggerBox'
                    activeHelpKey: allowSendingMail
-                   component:
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
                          label: 'Allow Sending of Error Reports from Debugger'
                          name: 'AllowSendingMailFromDebuggerCheckBox'
-                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
                          activeHelpKey: allowSendingMail
                          model: allowSendMailFromDebugger
                          translateLabel: true
                        )
                       )
-
-                   )
-                   extent: (Point 600 30)
+                    
+                   )
+                   extent: (Point 600 34)
                  )
                 )
-
+              
              )
            )
           )
-
+        
        )
      )
 ! !
@@ -4661,6 +4713,27 @@
 
     "Created: / 17-03-2012 / 11:37:51 / cg"
     "Modified: / 27-03-2014 / 10:19:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+helpSpec
+    "This resource specification was automatically generated
+     by the UIHelpTool of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIHelpTool may not be able to read the specification."
+
+    "
+     UIHelpTool openOnClass:AbstractSettingsApplication::EditSettingsAppl    
+    "
+
+    <resource: #help>
+
+    ^ super helpSpec addPairsFrom:#(
+
+#codeCompletionOnControlKey
+''
+
+)
 ! !
 
 !AbstractSettingsApplication::EditSettingsAppl class methodsFor:'image specs'!
@@ -4688,10 +4761,10 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
          label: 'Editor Settings'
          name: 'Editor Settings'
@@ -4699,7 +4772,7 @@
          min: (Point 10 10)
          bounds: (Rectangle 0 0 658 543)
        )
-       component:
+       component: 
       (SpecCollection
          collection: (
           (VerticalPanelViewSpec
@@ -4709,7 +4782,7 @@
              verticalLayout: top
              horizontalSpace: 3
              verticalSpace: 3
-             component:
+             component: 
             (SpecCollection
                collection: (
                 (CheckBoxSpec
@@ -4717,16 +4790,16 @@
                    name: 'UserCodeView2'
                    activeHelpKey: useNewCodeView2
                    model: useCodeView2InTools
-                   extent: (Point 658 25)
-                   translateLabel: true
+                   translateLabel: true
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Show Accept/Cancel Bar in Editor'
                    name: 'ShowAcceptCancelBarInBrowser'
                    activeHelpKey: showAcceptCancelBar
                    model: showAcceptCancelBarInBrowser
-                   extent: (Point 658 25)
-                   translateLabel: true
+                   translateLabel: true
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'SearchBox is Modal'
@@ -4734,7 +4807,7 @@
                    activeHelpKey: searchBoxIsModal
                    model: searchDialogIsModal
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (DividerSpec
                    name: 'Separator6'
@@ -4746,11 +4819,12 @@
                    activeHelpKey: immediateCodeCompletion
                    model: immediateCodeCompletion
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (ViewSpec
                    name: 'Box1'
-                   component:
+                   activeHelpKey: codeCompletionOnControlKey
+                   component: 
                   (SpecCollection
                      collection: (
                       (CheckBoxSpec
@@ -4770,9 +4844,9 @@
                          translateLabel: true
                        )
                       )
-
-                   )
-                   extent: (Point 658 25)
+                    
+                   )
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Shift/CTRL for Navigation in Completion List'
@@ -4780,7 +4854,7 @@
                    activeHelpKey: codeCompletionViewKeyboardNavigationNeedsModifier
                    model: codeCompletionViewKeyboardNavigationNeedsModifier
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (DividerSpec
                    name: 'Separator5'
@@ -4792,7 +4866,7 @@
                    activeHelpKey: tabStops4
                    model: tabsIs4
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (DividerSpec
                    name: 'Separator2'
@@ -4804,7 +4878,7 @@
                    activeHelpKey: startTextDragWithCTRL
                    model: startTextDragWithControl
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Always Paste the Contents when Dropping a File (Do not Ask) '
@@ -4812,7 +4886,7 @@
                    activeHelpKey: alwaysPasteFileContents
                    model: enforceContentsDropForFiles
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (DividerSpec
                    name: 'Separator4'
@@ -4824,7 +4898,7 @@
                    activeHelpKey: autoIndentInCodeView
                    model: autoIndentInCodeView
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Cursor has Standard Line-End Behavior'
@@ -4832,7 +4906,7 @@
                    activeHelpKey: st80EditMode
                    model: st80EditMode
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (DividerSpec
                    name: 'Separator3'
@@ -4844,7 +4918,7 @@
                    activeHelpKey: selectAllWhenClickingBeyondEnd
                    model: selectAllWhenClickingBeyondEnd
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Double Click Select Behavior as in ST80'
@@ -4852,7 +4926,7 @@
                    activeHelpKey: st80DoubleClickSelectMode
                    model: st80DoubleClickSelectMode
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Treat Underscore as Letter in Word-Select'
@@ -4860,7 +4934,7 @@
                    activeHelpKey: extendedWordSelectMode
                    model: extendedWordSelectMode
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Any non-Whitespace in Word-Select'
@@ -4868,7 +4942,7 @@
                    activeHelpKey: whitespaceWordSelectMode
                    model: whitespaceWordSelectMode
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (DividerSpec
                    name: 'Separator7'
@@ -4878,30 +4952,30 @@
                    label: 'Traditional ST/X Selection Mode'
                    name: 'RadioButton1'
                    activeHelpKey: selectionExtensionModelTraditional
+                   translateLabel: true
                    model: selectionExtensionMode
-                   translateLabel: true
                    enableChannel: selectionExtensionModeEnabled
                    isTriggerOnDown: true
                    select: traditional
-                   extent: (Point 658 22)
+                   extent: (Point 658 30)
                  )
                 (RadioButtonSpec
                    label: 'Standard Selection Mode'
                    name: 'RadioButton2'
                    activeHelpKey: selectionExtensionModelStandard
+                   translateLabel: true
                    model: selectionExtensionMode
                    enableChannel: selectionExtensionModeEnabled
                    isTriggerOnDown: true
                    select: standard
-                   extent: (Point 658 22)
-                   translateLabel: true
+                   extent: (Point 658 30)
                  )
                 )
-
+              
              )
            )
           )
-
+        
        )
      )
 ! !
@@ -6697,14 +6771,6 @@
 'If set, the operating system language (LANG variable) is used agaig in the next session\(and the setting here only affects the current session).\If clear, this language is also used in the next session.'
 
 )
-!
-
-quickSearchStrings
-    "keywords to match in the quickSearch.
-     Notice that both the word and its current language translation are matched against
-     the text in the quick search field"
-
-    ^ #('language' 'english')
 ! !
 
 !AbstractSettingsApplication::LanguageSettingsAppl class methodsFor:'image specs'!
@@ -6784,9 +6850,17 @@
              acceptOnLostFocus: true
              acceptOnPointerLeave: true
            )
+          (CheckBoxSpec
+             label: 'Use OS Language on Startup'
+             name: 'CheckBox1'
+             layout: (LayoutFrame 0 0.0 275 0 0 1.0 305 0)
+             activeHelpKey: useSystemLanguage
+             model: useSystemLanguageHolder
+             translateLabel: true
+           )
           (SequenceViewSpec
              name: 'List1'
-             layout: (LayoutFrame 2 0.0 300 0 -2 1.0 -36 1.0)
+             layout: (LayoutFrame 2 0.0 315 0 -2 1.0 -36 1.0)
              model: languageIndexHolder
              hasHorizontalScrollBar: true
              hasVerticalScrollBar: true
@@ -6816,14 +6890,6 @@
               
              )
            )
-          (CheckBoxSpec
-             label: 'Use OS Language on Startup'
-             name: 'CheckBox1'
-             layout: (LayoutFrame 0 0.0 275 0 0 1.0 297 0)
-             activeHelpKey: useSystemLanguage
-             model: useSystemLanguageHolder
-             translateLabel: true
-           )
           )
         
        )
@@ -7315,7 +7381,9 @@
      Notice that both the word and its current language translation is matched against
      the text in the quick search field"
 
-    ^ #('language' 'english')
+    ^ super quickSearchStrings 
+        addAll:#('language' 'english');
+        yourself
 ! !
 
 !AbstractSettingsApplication::MemorySettingsAppl class methodsFor:'help specs'!
@@ -17348,6 +17416,10 @@
 
 #commonStyleSetting
 'Choose a common style'
+
+#sampleOutput
+'Shows a piece of code emphasized as specified in color/emphasis settings'
+
 )
 
     "Created: / 14-02-2012 / 10:44:21 / cg"
@@ -17408,17 +17480,17 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
          label: 'Syntax Color Settings'
          name: 'Syntax Color Settings'
          min: (Point 10 10)
          bounds: (Rectangle 0 0 695 609)
        )
-       component:
+       component: 
       (SpecCollection
          collection: (
           (VerticalPanelViewSpec
@@ -17428,7 +17500,7 @@
              verticalLayout: topSpaceFit
              horizontalSpace: 3
              verticalSpace: 3
-             component:
+             component: 
             (SpecCollection
                collection: (
                 (CheckBoxSpec
@@ -17462,8 +17534,8 @@
                  )
                 (ViewSpec
                    name: 'ElementSelectionBox'
-                   activeHelpKey: individualStyleSetting
-                   component:
+                   activeHelpKey: elementSelection
+                   component: 
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -17477,6 +17549,7 @@
                       (ComboListSpec
                          name: 'ComboList3'
                          layout: (LayoutFrame 140 0 0 0 0 1 30 0)
+                         activeHelpKey: elementSelection
                          enableChannel: syntaxColoring
                          model: syntaxElementSelection
                          comboList: syntaxElementList
@@ -17484,14 +17557,14 @@
                          hidePullDownMenuButton: false
                        )
                       )
-
-                   )
-                   extent: (Point 695 30)
+                    
+                   )
+                   extent: (Point 695 34)
                  )
                 (ViewSpec
                    name: 'ColorBox'
-                   activeHelpKey: individualStyleSetting
-                   component:
+                   activeHelpKey: colorSelection
+                   component: 
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -17505,19 +17578,20 @@
                       (ColorMenuSpec
                          name: 'ColorMenu2'
                          layout: (LayoutFrame 140 0 0 0 0 1 30 0)
+                         activeHelpKey: colorSelection
                          enableChannel: syntaxColoring
                          model: syntaxColor
                          labelsAreColored: true
                        )
                       )
-
-                   )
-                   extent: (Point 695 30)
+                    
+                   )
+                   extent: (Point 695 34)
                  )
                 (ViewSpec
                    name: 'EmphasisBox'
-                   activeHelpKey: individualStyleSetting
-                   component:
+                   activeHelpKey: emphasisSelection
+                   component: 
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -17531,6 +17605,7 @@
                       (ComboListSpec
                          name: 'ComboList5'
                          layout: (LayoutFrame 140 0 0 0 0 1 30 0)
+                         activeHelpKey: emphasisSelection
                          enableChannel: syntaxColoring
                          model: syntaxEmphasisSelection
                          comboList: syntaxEmphasisList
@@ -17538,14 +17613,14 @@
                          hidePullDownMenuButton: false
                        )
                       )
-
-                   )
-                   extent: (Point 695 30)
+                    
+                   )
+                   extent: (Point 695 34)
                  )
                 (ViewSpec
                    name: 'ResetBox'
-                   activeHelpKey: commonStyleSetting
-                   component:
+                   activeHelpKey: resetToCommonStyle
+                   component: 
                   (SpecCollection
                      collection: (
                       (ActionButtonSpec
@@ -17559,7 +17634,7 @@
                        )
                       (ComboListSpec
                          name: 'ComboList4'
-                         layout: (LayoutFrame 150 0 -36 1 0 1 -6 1)
+                         layout: (LayoutFrame 152 0 -36 1 0 1 -6 1)
                          activeHelpKey: commonStyleSelection
                          enableChannel: syntaxColoring
                          model: resetListSelection
@@ -17568,9 +17643,9 @@
                          hidePullDownMenuButton: false
                        )
                       )
-
-                   )
-                   extent: (Point 695 45)
+                    
+                   )
+                   extent: (Point 695 40)
                  )
                 (ViewSpec
                    name: 'SpacingBox1'
@@ -17579,26 +17654,28 @@
                 (LabelSpec
                    label: 'Sample Output:'
                    name: 'SampleLabel3'
+                   activeHelpKey: sampleOutput
                    translateLabel: true
                    adjust: left
                    extent: (Point 695 30)
                  )
                 (TextEditorSpec
                    name: 'TextEditor2'
+                   activeHelpKey: sampleOutput
                    enableChannel: syntaxColoring
                    model: coloredText
                    hasHorizontalScrollBar: true
                    hasVerticalScrollBar: true
                    isReadOnly: true
                    hasKeyboardFocusInitially: false
-                   extent: (Point 695 298)
+                   extent: (Point 695 291)
                  )
                 )
-
+              
              )
            )
           )
-
+        
        )
      )
 ! !
@@ -18718,7 +18795,7 @@
                       (CheckBoxSpec
                          label: 'Beep Generally Enabled'
                          name: 'beepEnabled'
-                         layout: (LayoutFrame 5 0 5 0 0 1 35 0)
+                         layout: (LayoutFrame 5 0 10 0 0 1 40 0)
                          activeHelpKey: beepEnabled
                          model: beepEnabled
                          translateLabel: true
@@ -18726,7 +18803,7 @@
                       (CheckBoxSpec
                          label: 'Beep in Editor'
                          name: 'CheckBox7'
-                         layout: (LayoutFrame 40 0 30 0 0 1 60 0)
+                         layout: (LayoutFrame 40 0 35 0 0 1 65 0)
                          activeHelpKey: beepInEditor
                          enableChannel: beepEnabled
                          model: beepInEditor
@@ -18735,7 +18812,7 @@
                       (CheckBoxSpec
                          label: 'Beep for Info Dialogs'
                          name: 'CheckBox3'
-                         layout: (LayoutFrame 40 0 55 0 0 1 85 0)
+                         layout: (LayoutFrame 40 0 60 0 0 1 90 0)
                          activeHelpKey: beepForInfoDialog
                          enableChannel: beepEnabled
                          model: beepForInfoDialog
@@ -18744,7 +18821,7 @@
                       (CheckBoxSpec
                          label: 'Beep for Warning Dialogs'
                          name: 'CheckBox4'
-                         layout: (LayoutFrame 40 0 80 0 0 1 110 0)
+                         layout: (LayoutFrame 40 0 85 0 0 1 115 0)
                          activeHelpKey: beepForWarningDialog
                          enableChannel: beepEnabled
                          model: beepForWarningDialog
@@ -18753,7 +18830,7 @@
                       (CheckBoxSpec
                          label: 'Beep for Error Dialogs'
                          name: 'CheckBox5'
-                         layout: (LayoutFrame 40 0 106 0 0 1 136 0)
+                         layout: (LayoutFrame 40 0 111 0 0 1 141 0)
                          activeHelpKey: beepForErrorDialog
                          enableChannel: beepEnabled
                          model: beepForErrorDialog
@@ -18762,7 +18839,7 @@
                       )
                     
                    )
-                   extent: (Point 564 171)
+                   extent: (Point 564 178)
                  )
                 (FramedBoxSpec
                    label: 'Help'
@@ -19112,7 +19189,7 @@
                    activeHelpKey: terminalOutputIsUTF8
                    model: terminalOutputIsUTF8
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 (CheckBoxSpec
                    label: 'Shell / Command Input is UTF8 encoded'
@@ -19120,7 +19197,7 @@
                    activeHelpKey: terminalInputIsUTF8
                    model: terminalInputIsUTF8
                    translateLabel: true
-                   extent: (Point 658 25)
+                   extent: (Point 658 30)
                  )
                 )