#OTHER by cg
class: AbstractSettingsApplication
MiscDisplaySettings - conflict in shouldRememberLastEvent
(query from appModel overwritten)
--- a/AbstractSettingsApplication.st Thu Apr 28 15:38:47 2016 +0200
+++ b/AbstractSettingsApplication.st Thu Apr 28 17:25:54 2016 +0200
@@ -211,8 +211,8 @@
showRightButtonMenuOnRelease formatHostNameWindowLabel1
formatHostNameWindowLabel2 allowMouseWheelZoom
forceWindowsIntoMonitorBounds button2WithAltKey
- autoRaiseOnFocusIn shouldRememberLastExtent
- menuPanelTakesFocusOnClick'
+ autoRaiseOnFocusIn menuPanelTakesFocusOnClick
+ shouldRememberLastExtentHolder'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -9477,7 +9477,7 @@
label: 'Applications Remember Last Extent as Default'
name: 'CheckBox5'
activeHelpKey: shouldRememberLastExtent
- model: shouldRememberLastExtent
+ model: shouldRememberLastExtentHolder
translateLabel: true
extent: (Point 530 30)
)
@@ -9612,6 +9612,7 @@
basicReadSettings
super basicReadSettings.
+ self shouldRememberLastExtentHolder value:currentUserPrefs shouldRememberLastExtent.
self newWindowLabelFormat value:StandardSystemView windowLabelFormat.
self hostNameInLabelHolder value:StandardSystemView includeHostNameInLabel.
self returnFocus value:StandardSystemView returnFocusWhenClosingModalBoxes.
@@ -9650,6 +9651,7 @@
super basicSaveSettings.
+ currentUserPrefs shouldRememberLastExtent:(self shouldRememberLastExtentHolder value).
StandardSystemView returnFocusWhenClosingModalBoxes:self returnFocus value.
StandardSystemView takeFocusWhenMapped:self takeFocus value.
currentScreen activateOnClick:self activateOnClick value.
@@ -9705,7 +9707,6 @@
allowMouseWheelZoom
forceWindowsIntoMonitorBounds
button2WithAltKey
- shouldRememberLastExtent
menuPanelTakesFocusOnClick
)
@@ -9850,14 +9851,12 @@
^ selectOnRightClick.
!
-shouldRememberLastExtent
- shouldRememberLastExtent isNil ifTrue:[
- shouldRememberLastExtent := true asValue.
- shouldRememberLastExtent onChangeSend:#updateModifiedChannel to:self
- ].
- ^ shouldRememberLastExtent.
-
- "Created: / 31-07-2013 / 18:14:29 / cg"
+shouldRememberLastExtentHolder
+ shouldRememberLastExtentHolder isNil ifTrue:[
+ shouldRememberLastExtentHolder := true asValue.
+ shouldRememberLastExtentHolder onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ shouldRememberLastExtentHolder.
!
showAccelerators
@@ -9895,6 +9894,7 @@
hasUnsavedChanges
(super hasUnsavedChanges) ifTrue:[^ true].
+ self shouldRememberLastExtentHolder value ~= currentUserPrefs shouldRememberLastExtent ifTrue:[^ true].
self newWindowLabelFormat value ~= StandardSystemView windowLabelFormat ifTrue:[^ true].
self hostNameInLabelHolder value ~= StandardSystemView includeHostNameInLabel ifTrue:[^ true].
self returnFocus value ~= StandardSystemView returnFocusWhenClosingModalBoxes ifTrue:[^ true].