--- a/AbstractSettingsApplication.st	Sun Aug 25 23:36:29 2013 +0200
+++ b/AbstractSettingsApplication.st	Mon Aug 26 00:39:57 2013 +0200
@@ -196,7 +196,8 @@
 		showRightButtonMenuOnRelease formatHostNameWindowLabel1
 		formatHostNameWindowLabel2 allowMouseWheelZoom
 		forceWindowsIntoMonitorBounds button2WithAltKey
-		autoRaiseOnFocusIn shouldRememberLastExtent'
+		autoRaiseOnFocusIn shouldRememberLastExtent
+		menuPanelTakesFocusOnClick'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:AbstractSettingsApplication
@@ -8869,6 +8870,9 @@
 #focusFollowsMouse
 'Keyboard focus follows the mouse position (no need to click into fields for focus)'
 
+#menuPanelTakesFocusOnClick
+'Menupanel takes the keyboard focus when clicked. If off, the focus remains unchanged'
+
 #mouseWheelFocusFollowsMouse
 'Mousewheel focus follows the mouse position (no need to click into fields for focus)'
 
@@ -8914,6 +8918,27 @@
 'Restrict the position and size of windows to ensure they are (at least partially)
 within the screen''s bounds. Especially useful when switching the screen''s resolution.'
 )
+!
+
+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::MiscDisplaySettingsAppl    
+    "
+
+    <resource: #help>
+
+    ^ super helpSpec addPairsFrom:#(
+
+#menuPanelTakesFocusOnClick
+''
+
+)
 ! !
 
 !AbstractSettingsApplication::MiscDisplaySettingsAppl class methodsFor:'image specs'!
@@ -9021,6 +9046,14 @@
                    extent: (Point 435 22)
                  )
                 (CheckBoxSpec
+                   label: 'Menu Panels take Focus on Click'
+                   name: 'CheckBox7'
+                   activeHelpKey: menuPanelTakesFocusOnClick
+                   model: menuPanelTakesFocusOnClick
+                   translateLabel: true
+                   extent: (Point 435 22)
+                 )
+                (CheckBoxSpec
                    label: 'Views Catch Focus when Mapped'
                    name: 'takeFocus'
                    activeHelpKey: takeFocus
@@ -9153,7 +9186,7 @@
                       (LabelSpec
                          label: 'Label'
                          name: 'Label1'
-                         layout: (LayoutFrame 0 0 0 0 173 0 17 0)
+                         layout: (LayoutFrame 0 0 0 0 198 0 18 0)
                          activeHelpKey: hostNameInLabel
                          translateLabel: true
                          labelChannel: formatHostNameWindowLabel
@@ -9213,6 +9246,14 @@
                    )
                    extent: (Point 435 30)
                  )
+                (CheckBoxSpec
+                   label: 'Keyboard Focus Follows Mouse'
+                   name: 'CheckBox6'
+                   activeHelpKey: focusFollowsMouse
+                   model: focusFollowsMouse
+                   translateLabel: true
+                   extent: (Point 435 22)
+                 )
                 )
               
              )
@@ -9236,6 +9277,7 @@
         forceWindowsIntoMonitorBounds
         button2WithAltKey
         shouldRememberLastExtent
+        menuPanelTakesFocusOnClick
     )
 
     "Modified: / 31-07-2013 / 18:14:44 / cg"
@@ -9422,6 +9464,14 @@
     ^ hostNameInLabelHolder.
 !
 
+menuPanelTakesFocusOnClick
+    menuPanelTakesFocusOnClick isNil ifTrue:[
+        menuPanelTakesFocusOnClick := false asValue.
+        menuPanelTakesFocusOnClick onChangeSend:#updateModifiedChannel to:self
+    ].
+    ^ menuPanelTakesFocusOnClick.
+!
+
 mouseWheelFocusFollowsMouse
     mouseWheelFocusFollowsMouse isNil ifTrue:[
         mouseWheelFocusFollowsMouse := true asValue.
@@ -18041,10 +18091,10 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.488 2013-08-22 21:07:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.489 2013-08-25 22:39:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.488 2013-08-22 21:07:41 cg Exp $'
-! !
-
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.489 2013-08-25 22:39:57 cg Exp $'
+! !
+