--- a/AbstractSettingsApplication.st Wed Sep 16 14:40:19 2009 +0200
+++ b/AbstractSettingsApplication.st Wed Sep 16 15:35:18 2009 +0200
@@ -149,7 +149,8 @@
beepEnabled takeFocus activateOnClick nativeWidgets nativeDialogs
shadows opaqueVariablePanelResize formatHostNameinWindowLabels
opaqueTableColumnResize hostNameInLabelHolder showAccelerators
- newWindowLabelFormat formatHostNameWindowLabel'
+ newWindowLabelFormat formatHostNameWindowLabel selectOnRightClick
+ popUpMenuOnRelease showRightButtonMenuOnRelease'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -2728,7 +2729,7 @@
extent: (Point 600 23)
)
(CheckBoxSpec
- label: 'Take Any Non-Whitespace in Word-Select'
+ label: 'Any non-Whitespace in Word-Select'
name: 'CheckBox1'
model: whitespaceWordSelectMode
translateLabel: true
@@ -4922,7 +4923,7 @@
self withWaitCursorDo:[
languageString := translatedLanguages at:(self languageIndexHolder value).
- language := self languageHolder value.
+ language := self languageHolder value asString string.
(language includes:$-) ifTrue:[
l := language asCollectionOfSubstringsSeparatedBy:$-.
language := l at:1.
@@ -6970,6 +6971,32 @@
extent: (Point 435 22)
)
(ViewSpec
+ name: 'SeparatingSpace7'
+ extent: (Point 435 4)
+ )
+ (DividerSpec
+ name: 'Separator4'
+ extent: (Point 435 4)
+ )
+ (ViewSpec
+ name: 'SeparatingSpace8'
+ extent: (Point 435 3)
+ )
+ (CheckBoxSpec
+ label: 'Select on Right-Button-Press'
+ name: 'selectOnRightClick'
+ model: selectOnRightClick
+ translateLabel: true
+ extent: (Point 435 21)
+ )
+ (CheckBoxSpec
+ label: 'Menu on Right-Button-Release'
+ name: 'showRightButtonMenuOnRelease'
+ model: showRightButtonMenuOnRelease
+ translateLabel: true
+ extent: (Point 435 21)
+ )
+ (ViewSpec
name: 'SeparatingSpace5'
extent: (Point 435 4)
)
@@ -7029,6 +7056,18 @@
!AbstractSettingsApplication::MiscDisplaySettingsAppl methodsFor:'actions'!
+aspectsFromUserPreferences
+ ^ #(
+ beepEnabled
+ focusFollowsMouse
+ mouseWheelFocusFollowsMouse
+ opaqueVariablePanelResizing
+ opaqueTableColumnResizing
+ showRightButtonMenuOnRelease
+ selectOnRightClick
+ )
+!
+
basicReadSettings
self
readAspects:
@@ -7039,12 +7078,7 @@
from:Screen current.
self
- readAspects:
- #(
- beepEnabled
- opaqueVariablePanelResizing
- opaqueTableColumnResizing
- )
+ readAspects:(self aspectsFromUserPreferences)
from:currentUserPrefs.
self shadows value:PopUpView shadows.
@@ -7052,8 +7086,6 @@
self hostNameInLabelHolder value:StandardSystemView includeHostNameInLabel.
self returnFocus value:StandardSystemView returnFocusWhenClosingModalBoxes.
self takeFocus value:StandardSystemView takeFocusWhenMapped.
- self focusFollowsMouse value:(currentUserPrefs focusFollowsMouse ? true).
- self mouseWheelFocusFollowsMouse value:(currentUserPrefs mouseWheelFocusFollowsMouse ? true).
self activateOnClick value:(Display activateOnClick:nil).
self showAccelerators value:MenuView showAcceleratorKeys.
!
@@ -7096,14 +7128,7 @@
].
self
- writeAspects:
- #(
- beepEnabled
- focusFollowsMouse
- mouseWheelFocusFollowsMouse
- opaqueVariablePanelResizing
- opaqueTableColumnResizing
- )
+ writeAspects:(self aspectsFromUserPreferences)
to:currentUserPrefs.
StandardSystemView returnFocusWhenClosingModalBoxes:self returnFocus value.
@@ -7248,6 +7273,14 @@
^ returnFocus.
!
+selectOnRightClick
+ selectOnRightClick isNil ifTrue:[
+ selectOnRightClick := true asValue.
+ selectOnRightClick onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ selectOnRightClick.
+!
+
shadows
shadows isNil ifTrue:[
shadows := PopUpView shadows asValue.
@@ -7264,6 +7297,14 @@
^ showAccelerators.
!
+showRightButtonMenuOnRelease
+ showRightButtonMenuOnRelease isNil ifTrue:[
+ showRightButtonMenuOnRelease := true asValue.
+ showRightButtonMenuOnRelease onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ showRightButtonMenuOnRelease.
+!
+
takeFocus
takeFocus isNil ifTrue:[
takeFocus := true asValue.
@@ -7290,12 +7331,7 @@
asComparedTo:Screen current) ifTrue:[^ true].
(self
- hasChangedAspectIn:
- #(
- beepEnabled
- opaqueVariablePanelResizing
- opaqueTableColumnResizing
- )
+ hasChangedAspectIn:(self aspectsFromUserPreferences)
asComparedTo:currentUserPrefs) ifTrue:[^ true].
self newWindowLabelFormat value ~= StandardSystemView windowLabelFormat ifTrue:[^ true].
@@ -7303,8 +7339,6 @@
self hostNameInLabelHolder value ~= StandardSystemView includeHostNameInLabel ifTrue:[^ true].
self returnFocus value ~= StandardSystemView returnFocusWhenClosingModalBoxes ifTrue:[^ true].
self takeFocus value ~= StandardSystemView takeFocusWhenMapped ifTrue:[^ true].
- self focusFollowsMouse value ~= (currentUserPrefs focusFollowsMouse ? true) ifTrue:[^ true].
- self mouseWheelFocusFollowsMouse value ~= (currentUserPrefs mouseWheelFocusFollowsMouse ? true) ifTrue:[^ true].
self activateOnClick value ~= (Display activateOnClick:nil) ifTrue:[^ true].
self showAccelerators value ~= MenuView showAcceleratorKeys ifTrue:[^ true].
^ false
@@ -15191,5 +15225,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.323 2009-09-04 12:19:32 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.324 2009-09-16 13:35:18 cg Exp $'
+! !