Karl Ramberg uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-kfr.693.mcz

==================== Summary ====================

Name: System-kfr.693
Author: kfr
Time: 2 January 2015, 8:41:05.888 pm
UUID: 760e94c5-2386-f642-a545-55a1fe293351
Ancestors: System-bf.692

empty log message

=============== Diff against System-bf.692 ===============

Item was changed:
  ----- Method: Preferences class>>loadPreferencesFrom: (in category 'personalization') -----
+ loadPreferencesFrom: aFile
- loadPreferencesFrom: aFileName
  	| stream params dict desktopColor |
+ 	stream := ReferenceStream on: aFile.
- 	stream := ReferenceStream fileNamed: aFileName.
  	params := stream next.
  	self assert: (params isKindOf: IdentityDictionary).
  	params removeKey: #PersonalDictionaryOfPreferences.
  	dict := stream next.
  	self assert: (dict isKindOf: IdentityDictionary).
  	desktopColor := stream next.
  	stream close.
  	dict keysAndValuesDo:
  		[:key :value | (self preferenceAt: key ifAbsent: [nil]) ifNotNil:
  			[:pref | pref preferenceValue: value preferenceValue]].
  
  	params keysAndValuesDo: [ :key :value | self setParameter: key to: value ].
  
  	Smalltalk isMorphic
  		ifTrue: [ World fillStyle: desktopColor ]
  		ifFalse: [ self desktopColor: desktopColor. ScheduledControllers updateGray ].
  !

Item was changed:
  ----- Method: Preferences class>>restorePreferencesFromDisk (in category 'personalization') -----
  restorePreferencesFromDisk
+ 	| result |
+ 	result := (FileList2 modalFileSelectorForSuffixes: #('prefs')) .
+ 	result ifNil: [^ self]. 
+ 	self restorePreferencesFromDisk: result
+ 		
- 	(FileDirectory default fileExists: 'my.prefs')
- 		ifTrue: [ Cursor wait showWhile: [
- 			[ self loadPreferencesFrom: 'my.prefs' ] on: Error do: [ :ex | self inform: 'there was an error restoring the preferences' ]
- 		] ]
- 		ifFalse: [ self inform: 'you haven''t saved your preferences yet!!' ].
  	!

Item was added:
+ ----- Method: Preferences class>>restorePreferencesFromDisk: (in category 'personalization') -----
+ restorePreferencesFromDisk: aFile 
+ 	Cursor wait
+ 		showWhile: [[self loadPreferencesFrom: aFile]
+ 				on: Error
+ 				do: [:ex | self halt.self inform: 'there was an error restoring the preferences' translated]]!

Item was changed:
  ----- Method: Preferences class>>storePreferencesToDisk (in category 'personalization') -----
  storePreferencesToDisk
+ 	| newName |
+ 	newName := UIManager default request: 'Please confirm name for save...' initialAnswer: 'myPreferences'.
+ 	newName isEmpty
+ 		ifTrue: [^ self].
+ 	Cursor wait
+ 		showWhile: [[self storePreferencesIn: newName , '.prefs']
+ 				on: Error
+ 				do: [:ex | self inform: 'there was an error storing your preferences to disk. you probably already have stored your preferences' translated]]!
- 	Cursor wait showWhile: [
- 		[ self storePreferencesIn: 'my.prefs' ] on: Error do: [ :ex | self inform: 'there was an error storing your preferences to disk' ]]!