549bf3bb9c9d — Gerald Klix (speedy) 2 months ago
SUM: Adapted to Juan's latest preference changes.
M environments/EnvironmentAwareness.pck.st.chk.st +0 -1
@@ 10,4 10,3 @@ Smalltalk at: #Symbol ifPresent: [ :clas
 	classVariableNames: ''NewSymbols OneCharacterSymbols SymbolTable''
 	poolDictionaries: ''''
 	category: ''Kernel-Text''' ifFalse: [ self error: 'Class definition mismatch: Symbol'] ].
-Preferences verboseBaseLineChecks ifTrue: [ self inform: 'Baseline check OK' ].
  No newline at end of file

          
M environments/EnvironmentsBase.pck.st.chk.st +0 -2
@@ 1,4 1,3 @@ 
-
 Smalltalk at: #Object ifPresent: [ :class | class definition = 'ProtoObject subclass: #Object
 	instanceVariableNames: ''''
 	classVariableNames: ''''

          
@@ 9,4 8,3 @@ Smalltalk at: #SystemDictionary ifPresen
 	classVariableNames: ''ChangesInitialFileSize EndianCache LastImageName LastQuitLogPosition LowSpaceProcess LowSpaceSemaphore ShutDownList SourceFileVersionString SpecialSelectors StartUpList StartupStamp WordSize''
 	poolDictionaries: ''''
 	category: ''System-Support''' ifFalse: [ self error: 'Class definition mismatch: SystemDictionary'] ].
-Preferences verboseBaseLineChecks ifTrue: [ self inform: 'Baseline check OK' ].
  No newline at end of file

          
M environments/SimpleEnvironments.pck.st.chk.st +0 -2
@@ 1,7 1,5 @@ 
-
 Smalltalk at: #Class ifPresent: [ :class | class definition = 'ClassDescription subclass: #Class
 	instanceVariableNames: ''subclasses name classPool sharedPools''
 	classVariableNames: ''''
 	poolDictionaries: ''''
 	category: ''Kernel-Classes''' ifFalse: [ self error: 'Class definition mismatch: Class'] ].
-Preferences verboseBaseLineChecks ifTrue: [ self inform: 'Baseline check OK' ].
  No newline at end of file

          
M environments/coreChanges/CuisCoreEnvironmentSupport.cs.st.chk.st +1 -2
@@ 130,5 130,4 @@ Smalltalk at: #Class ifPresent: [ :class
 Smalltalk at: #ClassDescription ifPresent: [ :class | class methodDict at: #definitionPreambleWithoutStamp  ifPresent: [ :method | method timeStamp = 'HAW 11/9/2019 10:35:24' ifFalse: [ self error: 'Timestamp mismatch: ClassDescription>>#definitionPreambleWithoutStamp'] ] ].
 Smalltalk at: #SystemDictionary ifPresent: [ :class | class methodDict at: #classNamed:  ifPresent: [ :method | method timeStamp = 'jmv 5/8/2015 16:12' ifFalse: [ self error: 'Timestamp mismatch: SystemDictionary>>#classNamed:'] ] ].
 Smalltalk at: #SystemDictionary ifPresent: [ :class | class methodDict at: #renameClassNamed:as:  ifPresent: [ :method | method timeStamp = 'jmv 3/13/2012 12:50' ifFalse: [ self error: 'Timestamp mismatch: SystemDictionary>>#renameClassNamed:as:'] ] ].
-Smalltalk at: #Class ifPresent: [ :class | class methodDict at: #binding  ifPresent: [ :method | method timeStamp = 'jmv 12/31/2009 09:49' ifFalse: [ self error: 'Timestamp mismatch: Class>>#binding'] ] ].
-Preferences verboseBaseLineChecks ifTrue: [ self inform: 'Baseline check OK' ].
  No newline at end of file
+Smalltalk at: #Class ifPresent: [ :class | class methodDict at: #binding  ifPresent: [ :method | method timeStamp = 'jmv 12/31/2009 09:49' ifFalse: [ self error: 'Timestamp mismatch: Class>>#binding'] ] ]

          
M haver/Haverize.pck.st +7 -6
@@ 1,4 1,4 @@ 
-'From Haver 6.0 [latest update: #5202] on 29 May 2022 at 8:02:04 pm'!
+'From Haver 6.0 [latest update: #5344] on 1 July 2022 at 9:14:05 pm'!
 'Description Convert the running Cuis image to an Haver image.'!
 !provides: 'Haverize' 1 81!
 SystemOrganization addCategory: 'Haverize'!

          
@@ 91,11 91,12 @@ namesOfPackagesToIntegrate
 
 	^ #('PreferencesMenu' 'Accessability' 'KeyboardFocus' 'MoreMouseActions')! !
 
-!HaverizePackage class methodsFor: 'preferences' stamp: 'KLG 5/17/2022 12:10:00'!
+!HaverizePackage class methodsFor: 'preferences' stamp: 'KLG 7/1/2022 21:13:12'!
 ensureHaverPreferences
 	"Ensur ethe proper preferences seetings for Haver."
 
-	PreferenceNG
+	"Do this dynamicly, Preferences may switch from class to instance"
+	Smalltalk at: #Preferences ::
 		at: #menusShowSubSectionTitles put: true;
 		at: #tapAndHoldEmulatesButton2 put: false;
 		at: #checkForSlips put: false;

          
@@ 162,9 163,9 @@ installHaverPackagesFromRepository: aRoo
 	klgPackagesDirectory _ aRootDirectory / 'klg-packages'.
 	self killAllBrowsers.
 	(coreChangesDirectory // 'CuisCoreEnvironmentSupport.cs.st') readStream fileIn.
-	Feature
+    Feature
 		require: (klgPackagesDirectory // 'Accessability.pck.st') pathName;
-		require: (klgPackagesDirectory // 'KeyboardFocus.pck.st') pathName;
+"		require: (klgPackagesDirectory // 'KeyboardFocus.pck.st') pathName;"
 		require: (environmentsDirectory // 'SimpleEnvironments.pck.st') pathName;
 		require: (environmentsDirectory // 'Environments.pck.st') pathName;
 		require: (haverDirectory / 'modules' // 'Modules.pck.st') pathName;

          
@@ 586,7 587,7 @@ recreateDefaultDesktop
 			world: self
 			hand: self activeHand :: buildWorldMenu.
 		menu
-			addTitle: PreferenceNG desktopMenuTitle;
+			addTitle: Preference desktopMenuTitle;
 			popUpInWorld: self;
 			stayUp 	]! !
 

          
M haver/modules/ModuleAwareTools.pck.st +7 -7
@@ 1,11 1,11 @@ 
-'From Haver 6.0 [latest update: #5305] on 21 June 2022 at 1:10:50 pm'!
+'From Haver 6.0 [latest update: #5344] on 1 July 2022 at 8:20:02 pm'!
 'Description I provide extension methods for browser classes and a default environment model with an appropriate widget.'!
-!provides: 'ModuleAwareTools' 1 32!
+!provides: 'ModuleAwareTools' 1 33!
 !requires: 'ClassBuilding' 1 8 nil!
 !requires: 'Cuis-Base' 60 5305 nil!
 !requires: 'ModulesTools' 1 21 nil!
+!requires: 'ActionBuilder' 1 28 nil!
 !requires: 'Modules' 1 99 nil!
-!requires: 'ActionBuilder' 1 28 nil!
 !requires: 'SystemMorphs' 1 4 nil!
 !requires: 'DNDIndentingListItemMorph' 1 1 nil!
 SystemOrganization addCategory: 'ModuleAwareTools'!

          
@@ 593,7 593,7 @@ buildMorphicWidget
 	(modulesListMorph _ self buildModulesList)		doubleClickSelector: #browseSelection.
 	(listAndState _ LayoutMorph newColumn)
 		addMorph: self buildStateMorph
-			fixedHeight: (PreferenceNG at: #standardCodeFont :: lineSpacing * 5);
+			fixedHeight: (Preference at: #standardCodeFont :: lineSpacing * 5);
 		addAdjusterAndMorph: modulesListMorph proportionalHeight: 1.
 	self
 		beRow;

          
@@ 617,7 617,7 @@ moduleListProportionalWidth
 
 	^ 0.5! !
 
-!(Modules>>#ModuleAwareTools>>#DefaultModuleMorph) methodsFor: 'GUI building' stamp: 'KLG 5/17/2022 21:35:58'!
+!(Modules>>#ModuleAwareTools>>#DefaultModuleMorph) methodsFor: 'GUI building' stamp: 'KLG 7/1/2022 20:19:18'!
 buildMorphicWidget
 	"Build the widget."
 

          
@@ 625,7 625,7 @@ buildMorphicWidget
 		doubleClickSelector: #useStaticModuleComputation.
 	self 
 		addMorph: self buildStateMorph
-		fixedHeight: (PreferenceNG at: #standardCodeFont :: lineSpacing * 2);
+		fixedHeight: (Preferences at: #standardCodeFont :: lineSpacing * 2);
 		addMorphUseAll: modulesListMorph! !
 
 !(Modules>>#ModuleAwareTools>>#DefaultModuleMorph) class methodsFor: 'instance creation' stamp: 'KLG 2/25/2021 11:57:15'!

          
@@ 896,7 896,7 @@ buildNoSysCatMorphicWindow
 		performing: #categorizeUnderCategoryAt:selector:.
 
 	self layoutMorph
-		addMorph: mySingletonList fixedHeight: (PreferenceNG at: #standardCodeFont :: lineSpacing + 10);
+		addMorph: mySingletonList fixedHeight: (Preference at: #standardCodeFont :: lineSpacing + 10);
 		addAdjusterAndMorph: upperPanes proportionalHeight: 0.3;
 		addAdjusterAndMorph: self buildLowerPanes proportionalHeight: 0.7.
 

          
M haver/modules/Modules.pck.st +5 -5
@@ 1,6 1,6 @@ 
-'From Haver 6.0 [latest update: #5170] on 17 May 2022 at 9:57:57 pm'!
+'From Haver 6.0 [latest update: #5344] on 1 July 2022 at 9:18:08 pm'!
 'Description I am a package that provides modules with interfaces and import specifications.'!
-!provides: 'Modules' 1 103!
+!provides: 'Modules' 1 104!
 !requires: 'Cuis-Base' 50 4438 nil!
 !requires: 'Environments' 1 11 nil!
 !requires: 'SimpleEnvironments' 1 40 nil!

          
@@ 4202,7 4202,7 @@ modulesChangeSetClass
 
 	^ `Environments >> #Modules >> #ModulesChangeSet`! !
 
-!CodePackageFile methodsFor: '*Modules-services' stamp: 'KLG 5/17/2022 21:45:44'!
+!CodePackageFile methodsFor: '*Modules-services' stamp: 'KLG 7/1/2022 21:16:56'!
 install
 	"Create, install and answer a (sub)instance of CodePackage
 	Replace all existing code in the possibly existing CodePackage, removing any code that is not included in us."

          
@@ 4217,7 4217,7 @@ install
 		currentCS isEmpty ifFalse: [ currentCS _ nil ].
 		pckClass _ CodePackage.
 		classes do: [ :ee |
-			(ee hasDefinition and: [ee superclassName endsWith: 'CodePackage']) ifTrue: [
+			(ee hasDefinition and: [ee superclassName = 'CodePackage']) ifTrue: [
 				((self packageName asIdentifier: true), 'Package') = ee name ifTrue: [
 					ee fileInDefinitionAndMetaclass.
 					pckClass _ Smalltalk at: ee name ]]].

          
@@ 4241,7 4241,7 @@ install
 	"If we are installing an already installed package, zap the change set with possible changes done, 
 	as they are irrelevant now: we have the package from disk"
 	ChangeSet removeChangeSet: (ChangeSet existingOrNewChangeSetForPackage: newCodePackage).
-	PreferenceNG at: #transcriptLogVerbose :: ifTrue: [
+	(Preferences at: #transcriptLogVerbose) ifTrue: [
 		Transcript newLine; show: 'Package ', packageName, ' successfully installed'; newLine.
 		Smalltalk cleanOutUndeclared.
 		Undeclared notEmpty ifTrue: [

          
M haver/ui/LegacyButtons.pck.st +2 -2
@@ 238,7 238,7 @@ drawRoundLookOn: aCanvas
 !(Modules>>#LegacyButtons>>#PluggableButtonMorph) methodsFor: 'drawing' stamp: 'KLG 5/17/2022 21:37:49'!
 fontToUse
 	| fontToUse |
-	fontToUse _ font ifNil: [ PreferenceNG at: #standardButtonFont ].
+	fontToUse _ font ifNil: [ Preferences at: #standardButtonFont ].
 	"
 	Could add emphasis...
 	^(emphasis isNil or: [emphasis = 0]) 

          
@@ 424,7 424,7 @@ extentChanged: oldExtent
 minimumExtent
 
 	| e |
-	e _ PreferenceNG at:  #windowTitleFont :: pointSize + 2.
+	e _ Preference at:  #windowTitleFont :: pointSize + 2.
 	^e @ e! !
 
 !(Modules>>#LegacyButtons>>#PluggableButtonMorph) class methodsFor: 'example' stamp: 'jmv 3/12/2018 17:59:10'!

          
M klg-packages/KeyboardFocus.pck.st +3 -3
@@ 4,7 4,7 @@ 
 
 
 
-!Preferences class methodsFor: '*KeyboardFocus-standard queries' stamp: 'KLG 11/29/2021 12:44:29'!
+!Preference class methodsFor: '*KeyboardFocus-standard queries' stamp: 'KLG 11/29/2021 12:44:29'!
 titlebarIndicatesKeyboardFocus
 	"Answer true if the title bar should indicate the keyboard focus."
 

          
@@ 38,7 38,7 @@ processMouseEnter: aMouseEvent localPosi
 			self mouseEnter: aMouseEvent ]
 		ifFalse: [
 			"Catch the keyboard focus, if we are a catcher."
-			PreferenceNG at: #focusFollowsMouse :: and: [ self catchesKeyboardFocus ] ::
+			Preferences at: #focusFollowsMouse :: and: [ self catchesKeyboardFocus ] ::
 				ifTrue: [ aMouseEvent hand newKeyboardFocus: self ] ]			! !
 
 !Morph methodsFor: '*KeyboardFocus-events-processing' stamp: 'KLG 5/17/2022 21:48:32'!

          
@@ 54,7 54,7 @@ processMouseLeave: anEvent localPosition
 			self mouseLeave: anEvent ]
 		ifFalse: [
 			"Maybe we caught the keyboard focus, release it, just in case."
-			PreferenceNG at: #focusFollowsMouse :: and: [ self catchesKeyboardFocus ] ::
+			Preferences at: #focusFollowsMouse :: and: [ self catchesKeyboardFocus ] ::
 				ifTrue: [ anEvent hand releaseKeyboardFocus: self ] ]
 ! !
 

          
M klg-packages/MorphZooming.pck.st +1 -1
@@ 276,7 276,7 @@ sendEventTo: aMorph
 
 	type == #keystroke ifTrue: [
 		self isFindClassShortcut
-			ifTrue: [ ^ PreferenceNG at: #classFinder :: value ].
+			ifTrue: [ ^ Preferences at: #classFinder :: value ].
 		self isCloseWindowShortcut
 			ifTrue: [ ^ self closeCurrentWindowOf: aMorph ].
 		self isScaleOneWindowShortcut ifTrue: [

          
M klg-packages/PreferencesMenu.pck.st +67 -105
@@ 1,6 1,6 @@ 
-'From Haver 6.0 [latest update: #5170] on 17 May 2022 at 9:59:14 pm'!
+'From Haver 6.0 [latest update: #5344] on 1 July 2022 at 9:06:27 pm'!
 'Description I implement a bew perferences menu.'!
-!provides: 'PreferencesMenu' 1 23!
+!provides: 'PreferencesMenu' 1 26!
 !requires: 'PackageIntegrators' 1 4 nil!
 SystemOrganization addCategory: 'PreferencesMenu'!
 

          
@@ 26,13 26,13 @@ I am package that installs a class varia
 classesAndClassVariableNamesToAdd
 	"Answer an mapping of class names to sets of class variable names to add"
 
-	^ { #Preferences -> #(BooleanPreferencesByCategory) asSet } asDictionary! !
+	^ { #Preference -> #(BooleanPreferencesByCategory) asSet } asDictionary! !
 
-!PreferencesMenuPackage class methodsFor: 'installing' stamp: 'KLG 5/16/2022 14:20:30'!
+!PreferencesMenuPackage class methodsFor: 'installing' stamp: 'Install-PreferencesMenu 7/1/2022 20:13:33'!
 postPackageInstall
 	"This gets called after installing all the package code."
 	
-	PreferenceNG
+	Preferences
 		name: #menusShowSubSectionTitles
 		description: 'If set to true, menus will show subsection titles'
 		category: #gui

          
@@ 57,13 57,13 @@ I am package that installs a class varia
 classesAndClassVariableNamesToAdd
 	"Answer an mapping of class names to sets of class variable names to add"
 
-	^ { #Preferences -> #(BooleanPreferencesByCategory) asSet } asDictionary! !
+	^ { #Preference -> #(BooleanPreferencesByCategory) asSet } asDictionary! !
 
-!PreferencesMenuPackage class methodsFor: 'installing' stamp: 'KLG 5/16/2022 14:20:30'!
+!PreferencesMenuPackage class methodsFor: 'installing' stamp: 'Install-PreferencesMenu 7/1/2022 20:13:33'!
 postPackageInstall
 	"This gets called after installing all the package code."
 	
-	PreferenceNG
+	Preferences
 		name: #menusShowSubSectionTitles
 		description: 'If set to true, menus will show subsection titles'
 		category: #gui

          
@@ 117,7 117,7 @@ displayStringFromUnarySelector: aUpperca
 							ifFalse: [ character asLowercase ]) ].
 				wasUpperCase _ isUpperCase ] ]! !
 
-!PreferenceNG class methodsFor: '*PreferencesMenu-accessing' stamp: 'KLG 5/16/2022 15:06:01'!
+!PreferenceSet methodsFor: '*PreferencesMenu-accessing' stamp: 'KLG 7/1/2022 20:52:38'!
 addBooleanItemsForCategory: aCategory toMenu: aMenu
 	"Add the items for aCategory to aMenu."
 	

          
@@ 134,21 134,15 @@ addBooleanItemsForCategory: aCategory to
 					preference description ifNotNil: [ :description |
 						menuItem setBalloonText: description ] ] ] ]! !
 
-!PreferenceNG class methodsFor: '*PreferencesMenu-preferences panel' stamp: 'KLG 5/16/2022 15:21:23'!
+!PreferenceSet methodsFor: '*PreferencesMenu-preferences panel' stamp: 'KLG 7/1/2022 20:47:56'!
 openPreferencesExplorer
 	"Open a window on the current set of preferences choices, allowing the user to view and change their settings
 	
 	We just open an explorer."
 	
-	ThePreferences explore! !
+	ObjectExplorerWindow open: (ObjectExplorer new rootObject: self allPreferences) label: 'Preferences'! !
 
-!PreferenceNG class methodsFor: '*PreferencesMenu-preferences panel' stamp: 'KLG 5/16/2022 15:21:12'!
-openPreferencesInspector
-	"Open a window on the current set of preferences choices, allowing the user to view and change their settings"
-	
-	ThePreferences inspectWithLabel: 'Preferences'! !
-
-!PreferenceNG class methodsFor: '*PreferencesMenu-accessing' stamp: 'KLG 5/16/2022 14:52:31'!
+!PreferenceSet methodsFor: '*PreferencesMenu-accessing' stamp: 'KLG 7/1/2022 20:53:03'!
 togglePreference: prefSymbol
 	"Toggle the given preference"
 

          
@@ 168,7 162,7 @@ mouseButton2Activity
 	self addConfigurationOptionsToMenu: menu.
 	menu popUpInWorld! !
 
-!TaskbarMorph class methodsFor: '*PreferencesMenu-menus' stamp: 'KLG 5/16/2022 18:53:00'!
+!TaskbarMorph class methodsFor: '*PreferencesMenu-menus' stamp: 'KLG 7/1/2022 20:23:57'!
 addConfigurationOptionsToMenu: aMenu
 	"Add my configuration options to a aMenu."
 

          
@@ 181,13 175,13 @@ addConfigurationOptionsToMenu: aMenu
 		add: 'Show taskbar'
 		target: self runningWorld
 		action: #showTaskbar
-		icon: (PreferenceNG at: #wantsMenuIcons :: ifTrue: [ #expandIcon ]) ::
+		icon: (Preferences at: #wantsMenuIcons :: ifTrue: [ #expandIcon ]) ::
 			setBalloonText: 'Show the taskbar'.
 	aMenu
 		add: 'Hide taskbar'
 		target: self runningWorld
 		action: #hideTaskbar
-		icon: (PreferenceNG at: #wantsMenuIcons :: ifTrue: [ #collapseIcon ])::
+		icon: (Preferences at: #wantsMenuIcons :: ifTrue: [ #collapseIcon ])::
 			setBalloonText: 'Hide the taskbar'.
 	aMenu
 	        addSubSectionLine;

          
@@ 343,7 337,7 @@ updateStringContents
 					ifFalse: [ '<No>' ] :: , 
 						wordingSelector ])! !
 
-!MenuMorph methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 13:51:59'!
+!MenuMorph methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:14:10'!
 addItemsFromDictionaries: dataForMenuDicts
 	"A menu constructor utility that uses Dictionaries with elements:
 		#label - the name that displays in the menu

          
@@ 355,7 349,7 @@ addItemsFromDictionaries: dataForMenuDic
 
 	note, nil elements will add a line."
 	| item wantsIcons |
-	wantsIcons _ PreferenceNG at: #wantsMenuIcons..
+	wantsIcons _ Preferences at: #wantsMenuIcons..
 	dataForMenuDicts do: [ :itemSpec |
 		itemSpec
 			ifNil: [ self addSubSectionLine ]

          
@@ 395,7 389,7 @@ addItemsFromDictionaries: dataForMenuDic
 							ifPresent: [ :balloonText |
 								item setBalloonText: balloonText ] ] ] ]! !
 
-!MenuMorph methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:20:27'!
+!MenuMorph methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:23:23'!
 addSection: aString
 	"Either add a section or just a line, depending on preference settings."
 

          
@@ 403,34 397,22 @@ addSection: aString
 		^ self hasSubmorphs
 			ifTrue: [ self addLine ]
 			ifFalse: [ self ] ].
-	^ PreferenceNG at: #menusShowSubSectionTitles ::
+	^ Preferences at: #menusShowSubSectionTitles ::
 		ifTrue: [ self addTitle: aString ]
 		ifFalse: [ submorphs size = 1 ifFalse: [ self addLine ] ]! !
 
-!MenuMorph methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/17/2022 21:45:04'!
+!MenuMorph methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:23:31'!
 addSubSectionLine
 	"Either add a line, if we have real sections or do nothing."
 
-	PreferenceNG at: #menusShowSubSectionTitles ::
+	Preferences at: #menusShowSubSectionTitles ::
 		ifTrue: [ self addLine ]! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:22:47'!
-autoNumberUserChanges
-	"Answer the menu for generating automatic user changes files."
-	
-	^ PreferenceNG at: #autoNumberUserChanges :: asMenuItemTextPrefix, 'Numbered user changes files'! !
-
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:23:16'!
-changeSetVersionNumbers
-	"Answer the menu for generating versioned change set files.."
-	
-	^ PreferenceNG at: #changeSetVersionNumbers :: asMenuItemTextPrefix, 'Version numbered change set files'! !
-
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:23:40'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:24:31'!
 clickGrabsMorphs
 	"Answer the menu item for click grabs morph"
 	
-	^ PreferenceNG at: #clickGrabsMorphs :: asMenuItemTextPrefix, 'Click grabs morph'! !
+	^ Preferences at: #clickGrabsMorphs :: asMenuItemTextPrefix, 'Click grabs morph'! !
 
 !TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 8/30/2021 10:56:49'!
 extensionThemesMenu

          
@@ 442,17 424,17 @@ extensionThemesMenu
 	^ menu
 		! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:24:18'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:24:19'!
 focusFollowsMouse
 	"Answer the label for focus follows mouse.."
 	
-	^ PreferenceNG at: #focusFollowsMouse :: asMenuItemTextPrefix, 'Focus follows mouse'! !
+	^ Preferences at: #focusFollowsMouse :: asMenuItemTextPrefix, 'Focus follows mouse'! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:27:07'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:24:53'!
 menusShowSubSectionTitles
 	"Answer item strimg for this preference"
 	
-	^ PreferenceNG at: #menusShowSubSectionTitles :: asMenuItemTextPrefix,  'Menus show section titles'! !
+	^ Preferences at: #menusShowSubSectionTitles :: asMenuItemTextPrefix,  'Menus show section titles'! !
 
 !TheWorldMenu methodsFor: '*PreferencesMenu-popups' stamp: 'KLG 8/30/2021 10:58:26'!
 openExtensionThemesMenu

          
@@ 466,14 448,14 @@ openPreferencesMenuForCategory: aCategor
 
 	self doPopUp: (self preferencesMenuForCategory: aCategory)! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 15:18:55'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 21:05:55'!
 preferencesMenu
 	"Build the preferences menu for the world."
 
 	| menu |
 	(menu _ self menu: 'Preferences...')
 		addItemsFromDictionaries: {
-			'Event handling'.
+			'Gui'.
 			{
 				#label 			-> 		#focusFollowsMouse.
 				#selector 			-> 		#toggleFocusFollowsMouse.

          
@@ 502,6 484,23 @@ and ', 'horizontal scrolling' bold, ' is
 If ',' not checked' bold, ' clicking on a morph just ','selects' bold, ' it.'
 								)
 			} asDictionary.
+			{
+				#label 			-> 		#wantsMenuIcons.
+				#selector 			-> 		#toggleMenuIcons.
+				#icon 			-> 		#worldIcon.
+				#balloonText 	-> 		(
+'If ', 'checked' bold, ', menus show ', 'icons' bold,  '
+If ','not checked' bold, ' menus show just ','lines' bold, ' without icons'
+								)
+			} asDictionary.
+			{
+				#label 			-> 		#menusShowSubSectionTitles.
+				#selector 			-> 		#toggleMenusShowSubSectionTitles.
+				#balloonText 	->	(
+'If ', 'checked' bold, ', menus show ', 'section titles' bold,  '
+If ','not checked' bold, ' menus show just ','lines' bold
+								)
+			} asDictionary.
 			'Fonts'.
 			{
 				#label 			-> 		'Size of GUI elements...'.

          
@@ 524,24 523,6 @@ If ',' not checked' bold, ' clicking on 
 				#icon 			-> 		#preferencesDesktopFontIcon.
 				#balloonText 	-> 		'Load additional TrueType fonts included with Cuis.'
 			} asDictionary.
-			'Menus'.
-			{
-				#label 			-> 		#wantsMenuIcons.
-				#selector 			-> 		#toggleMenuIcons.
-				#icon 			-> 		#worldIcon.
-				#balloonText 	-> 		(
-'If ', 'checked' bold, ', menus show ', 'icons' bold,  '
-If ','not checked' bold, ' menus show just ','lines' bold, ' without icons'
-								)
-			} asDictionary.
-			{
-				#label 			-> 		#menusShowSubSectionTitles.
-				#selector 			-> 		#toggleMenusShowSubSectionTitles.
-				#balloonText 	->	(
-'If ', 'checked' bold, ', menus show ', 'section titles' bold,  '
-If ','not checked' bold, ' menus show just ','lines' bold
-								)
-			} asDictionary.
 			'Themes' }.
 	Theme addThemeChangersToMenu: menu forExtensionThemes: false.
 	menu			

          
@@ 578,43 559,24 @@ If ','not checked' bold, ' menus show ju
 				#icon 			-> 		#usersIcon.
 				#balloonText 	-> 		'supply initials to be used to identify the author of code and other content.'
 			} asDictionary.
-			nil.
-			{
-				#label 			-> 		#autoNumberUserChanges.
-				#selector 			-> 		#toggleAutoNumberUserChanges.
-				#icon 			-> 		#usersIcon.
-				#balloonText 	-> 		(
-'Generate numbered user change files
-(<image>.user.', '<number>' bold, '.changes)'
-								)
-			} asDictionary.
-			{
-				#label 			-> 		#changeSetVersionNumbers.
-				#selector 			-> 		#toggleChangeSetVersionNumbers.
-				#icon 			-> 		#usersIcon.
-				#balloonText 	-> 		(
-'Generate version numbered change set files
-(<number>-<description>-<author>-<timestamp>-<initials>.', '<versionnumber>' bold, '.cs.st)'
-								)
-			} asDictionary.
-			'Other'.
+			'Exploring'.
 			{
 				#label 			-> 		'Inspect preferences...'.
-				#object 			-> 		PreferenceNG.
+				#object 			-> 		Preferences.
 				#selector 			-> 		#openPreferencesInspector.
 				#icon 			-> 		#preferencesIcon.
 				#balloonText 	-> 		'Open an inspector on all the preferences.'
 			} asDictionary.
 			{
 				#label 			-> 		'Explore preferences...'.
-				#object 			-> 		PreferenceNG.
+				#object 			-> 		Preferences.
 				#selector 			-> 		#openPreferencesExplorer.
 				#icon 			-> 		#preferencesIcon.
 				#balloonText 	-> 		'Open an explorer on all the preferences.'
 			} asDictionary.
-			nil
+			'By Category'
 		}.
-	PreferenceNG categories do: [ :category | 
+	Preferences categories do: [ :category | 
 		menu
 			add: category capitalized, ' ...'
 			target: self

          
@@ 623,13 585,13 @@ If ','not checked' bold, ' menus show ju
 	^ menu
 		! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 15:16:19'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:52:05'!
 preferencesMenuForCategory: aCategory
 	"Create the preferences menu for a category."
 
 	| answer |
 	answer _ self menu: aCategory capitalized, ' Preferences'.
-	PreferenceNG addBooleanItemsForCategory: aCategory toMenu: answer.
+	Preferences addBooleanItemsForCategory: aCategory toMenu: answer.
 	^ answer! !
 
 !TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 9/1/2021 17:38:52'!

          
@@ 638,43 600,43 @@ sendsMouseWheelEvents
 	
 	^ Smalltalk sendMouseWheelEvents asMenuItemTextPrefix,  'Send mouse wheel events'! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 5/16/2022 15:25:38'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 7/1/2022 20:56:40'!
 toggleAutoNumberUserChanges
 	"Toogle automatic generation of user changes files.."
 	
-	PreferenceNG 		togglePreference: #autoNumberUserChanges
+	Preferences 		togglePreference: #autoNumberUserChanges
 	! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 5/16/2022 15:08:57'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 7/1/2022 20:56:53'!
 toggleChangeSetVersionNumbers
 	"Toggle the chnage set version numbers preference "
 	
-	PreferenceNG togglePreference: #autoNumberUserChanges
+	Preferences togglePreference: #autoNumberUserChanges
 	! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 5/16/2022 15:09:06'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 7/1/2022 20:55:35'!
 toggleClickGrabsMorphs
 	"Toogle the click grabs morph preference."
 	
-	^ PreferenceNG togglePreference: #clickGrabsMorphs! !
+	^ Preferences togglePreference: #clickGrabsMorphs! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 5/16/2022 18:39:17'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 7/1/2022 20:55:19'!
 toggleFocusFollowsMouse
 	"Toggle the focus follows mouse menu'"
 	
-	PreferenceNG togglePreference: #focusFollowsMouse! !
+	Preferences togglePreference: #focusFollowsMouse! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 5/16/2022 15:10:46'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 7/1/2022 20:54:19'!
 toggleMenuIcons
 	"Toggle the preference that controls menu icons"
 
-	PreferenceNG togglePreference: #wantsMenuIcons	! !
+	Preferences togglePreference: #wantsMenuIcons	! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 5/16/2022 15:14:25'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 7/1/2022 20:54:56'!
 toggleMenusShowSubSectionTitles
 	"Toggle the settings for menus showing subsection items."
 	
-	PreferenceNG togglePreference: #menusShowSubSectionTitles! !
+	Preferences togglePreference: #menusShowSubSectionTitles! !
 
 !TheWorldMenu methodsFor: '*PreferencesMenu-commands' stamp: 'KLG 8/27/2021 23:50:48'!
 toggleSendMouseWheelEvents

          
@@ 683,11 645,11 @@ toggleSendMouseWheelEvents
 	Smalltalk sendMouseWheelEvents: Smalltalk sendMouseWheelEvents not
 	! !
 
-!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 5/16/2022 14:26:12'!
+!TheWorldMenu methodsFor: '*PreferencesMenu-construction' stamp: 'KLG 7/1/2022 20:24:39'!
 wantsMenuIcons
 	"Answer true when menus should have icons."
 	
-	^ PreferenceNG at: #wantsMenuIcons :: asMenuItemTextPrefix, 'Menus show icons'! !
+	^ Preferences at: #wantsMenuIcons :: asMenuItemTextPrefix, 'Menus show icons'! !
 
 !Theme class methodsFor: '*PreferencesMenu-user interface' stamp: 'KLG 8/30/2021 11:36:12'!
 addThemeChangersToMenu: menu forExtensionThemes: anExtensionThemeFlag 

          
M klg-packages/core-tools/KlgBaseliner.pck.st +0 -3
@@ 240,9 240,6 @@ dumpCheckForCodeFile: aCodeFile onStream
 		self dumpClassDefinitionCheckFor: class on: aStream ].
 	aCodeFile allMethodReferences do: [ :method |
 		self dumpMethodTimeStampCheckFor: method on: aStream ].
-	aStream
-		lf;
-		nextPutAll: 'Preferences verboseBaseLineChecks ifTrue: [ self inform: ''Baseline check OK'' ].'! !
 
 !KlgBaseliner methodsFor: 'checking' stamp: 'KLG 11/2/2020 18:21:24'!
 dumpCheckOnFileForCodeFile: aCodeFile