[squeak-dev] The Trunk: EToys-tfel.215.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Aug 30 15:13:08 UTC 2016


Tim Felgentreff uploaded a new version of EToys to project The Trunk:
http://source.squeak.org/trunk/EToys-tfel.215.mcz

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

Name: EToys-tfel.215
Author: tfel
Time: 30 August 2016, 5:12:02.14204 pm
UUID: a6ef1339-ed42-d14d-9046-7c8dded0b72d
Ancestors: EToys-tfel.214

- fix deprecation warnings
- Components and their subclasses are not uniclasses
- sugarnavbar should re-initialize when the theme changes

=============== Diff against EToys-tfel.214 ===============

Item was added:
+ ----- Method: Component class>>isUniClass (in category 'other') -----
+ isUniClass
+ 	"UnscriptedPlayer reimplements to false"
+ 
+ 	^ false!

Item was changed:
  ----- Method: EtoysTheme class>>create (in category 'instance creation') -----
  create
+ 	"doIt: [self create apply.]"
- 	"doIt: [self createDark apply.]"
  
  	| themeName |
  	themeName := 'Etoys'.
  	^ (self named: themeName) in: [:theme |
  		theme merge: (self named: 'Squeak') overwrite: true.
  		theme name: themeName.
  
  		theme set: #background for: #MorphicProject to: (SolidFillStyle color: (Color r: 0.9 g: 0.9 b: 1)).
  
- 
  		theme
  			set: #standardListFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #standardFlapFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: TextEmphasis bold emphasisCode);
  
  			set: #eToysButtonFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #eToysFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: TextEmphasis bold emphasisCode);
  			set: #eToysCodeFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #eToysTitleFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 32 emphasis: 0);
+ 			set: #paintBoxButtonFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 12 emphasis: 0);
- 			set: #paintBoxButtonFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 9 emphasis: 0);
  			set: #standardMenuFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
+ 			set: #standardButtonFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #windowTitleFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #balloonHelpFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #connectorsLabelFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #standardCodeFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
+ 			set: #standardDefaultTextFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0);
  			set: #standardSystemFont to: (TTCFont familyName: 'BitstreamVeraSans' pointSize: 15 emphasis: 0).
  		theme]!

Item was changed:
  ----- Method: KedamaMorph>>makePrototypeOfExampler:color: (in category 'turtles') -----
  makePrototypeOfExampler: examplerPlayer color: cPixel
  
  	| array inst info ind |
  	array := examplerPlayer turtles.
  	info := array info.
  	array size > 0 ifTrue: [
  		inst := array makePrototypeFromFirstInstance.
  		cPixel ifNotNil: [inst at: (info at: #color) put: cPixel].
  		^ inst.
  	].
  
  	inst := Array new: array instSize.
  	info associationsDo: [:assoc |
  		ind := assoc value.
  		(examplerPlayer turtles types at: ind) = #Boolean ifTrue: [
  			ind = 7
  				ifTrue: [inst at: ind put: 1]
  				ifFalse: [
+ 					inst at: ind put: ((examplerPlayer perform: (assoc key asString asGetterSelector)) ifTrue: [1] ifFalse: [0]).
- 					inst at: ind put: ((examplerPlayer perform: (Utilities getterSelectorFor: assoc key)) ifTrue: [1] ifFalse: [0]).
  				]
  		] ifFalse: [
+ 			inst at: ind put: (examplerPlayer perform: (assoc key asString asGetterSelector)).
- 			inst at: ind put: (examplerPlayer perform: (Utilities getterSelectorFor: assoc key)).
  		].
  	].
  	cPixel ifNotNil: [inst at: (info at: #color) put: cPixel] ifNil: [inst at: (info at: #color) put: ((examplerPlayer getColor pixelValueForDepth: 32) bitAnd: 16rFFFFFF)].
  	^ inst.
  !

Item was added:
+ ----- Method: Morph>>isButton (in category '*Etoys-Squeakland-testing') -----
+ isButton
+ 
+ 	^ false!

Item was changed:
  ----- Method: PreferencesPanel>>findPreferencesMatching: (in category 'initialization') -----
  findPreferencesMatching: incomingTextOrString
  	"find all preferences matching incomingTextOrString"
  
  	| result aList aPalette controlPage |
  	result := incomingTextOrString asString asLowercase.
  	result := result asLowercase withBlanksTrimmed.
  	result isEmptyOrNil ifTrue: [^ self].
  
+ 	aList := Preferences allPreferences select:
- 	aList := Preferences allPreferenceObjects select:
  		[:aPreference | 
  			(aPreference name includesSubstring: result caseSensitive: false) or:
  				[aPreference helpString includesSubstring: result caseSensitive: false]].
  	aPalette := (self containingWindow ifNil: [^ self]) findDeeplyA: TabbedPalette.
  	aPalette ifNil: [^ self].
  	aPalette selectTabNamed:  'search results'.
  	aPalette currentPage ifNil: [^ self].  "bkwd compat"
  	controlPage := aPalette currentPage.
  	controlPage removeAllMorphs.
  	controlPage addMorph: (StringMorph contents: ('Preferences matching "', self searchString, '"') font: Preferences standardEToysButtonFont).
  	aList := aList asSortedCollection:
  		[:a :b | a name < b name].
  	aList do:
  		[:aPreference | | button |
  			button := aPreference representativeButtonWithColor: Color white inPanel: self.
  			button ifNotNil: [controlPage addMorphBack: button]].
  	aPalette world startSteppingSubmorphsOf: aPalette!

Item was changed:
  ----- Method: ReleaseBuilderSqueakland class>>prepareEnvironment (in category 'preparing') -----
  prepareEnvironment
  	| directory entries projectNames |
  	super prepareEnvironment.
  	projectNames := #('Gallery' 'Tutorials' 'Home').
  	directory := FileDirectory on: Smalltalk imagePath.
  	entries := FileList2 projectOnlySelectionMethod: directory entries.
  	projectNames
  		do: [:projectName | (entries
  					anySatisfy: [:each | (Project parseProjectFileName: each first) first = projectName])
+ 				ifFalse: [self inform: projectName , ' is not found']].
- 				ifFalse: [^ self error: projectName , ' is not found']].
  	DeferredTask := [ProjectLoading openFromImagePath: 'Home'].!

Item was changed:
  ----- Method: ReleaseBuilderSqueakland class>>setPreferences (in category 'scripts') -----
  setPreferences
  
  	super setPreferences.
  	Preferences cambridge.
+ 	Preferences allPreferences do: [:each |
- 	Preferences allPreferenceObjects do: [:each |
  		each defaultValue: each preferenceValue].
  
  	Preferences
  		disable: #alternativeWindowBoxesLook;
  		enable: #magicHalos;
  		enable: #mouseOverHalos;
  		enable: #roundedScrollBarLook;
  		enable: #roundedWindowCorners;
  		enable: #showAdvancedNavigatorButtons;
  		disable: #honorDesktopCmdKeys;
  		disable: #warnIfNoChangesFile;
  		disable: #warnIfNoSourcesFile;
  		enable: #unlimitedPaintArea;
  		enable: #fastDragWindowForMorphic;
  		enable: #noviceMode;
  		disable: #generalizedYellowButtonMenu;
  		disable: #showAdvancedNavigatorButtons;
  		disable: #signProjectFiles;
  		disable: #warnIfNoChangesFile;
  		disable: #warnIfChangesFileReadOnly;
  		disable: #warnIfNoSourcesFile.
  	Morph preferredCornerRadius: 8.
  	PluggableButtonMorph roundedButtonCorners: true.
  	FillInTheBlankMorph roundedDialogCorners: true.
  	SystemWindow roundedWindowCorners: true.
- 	Preferences restoreDefaultFontsForSqueakland.
  	Cursor useBiggerCursors: true.
  	TrashCanMorph
  		slideDismissalsToTrash: true;
  		preserveTrash: true.
  	SugarNavigatorBar
  		showHideButton: false;
  		showSugarNavigator: true.!

Item was added:
+ ----- Method: SimpleButtonMorph>>isButton (in category '*Etoys-Squeakland-testing') -----
+ isButton
+ 
+ 	^ true!

Item was added:
+ ----- Method: SugarNavigatorBar class>>themeProperties (in category 'nil') -----
+ themeProperties
+ 
+ 	^ {}!

Item was added:
+ ----- Method: SugarNavigatorBar>>applyUserInterfaceTheme (in category 'updating') -----
+ applyUserInterfaceTheme
+ 
+ 	self class showSugarNavigator: self class showSugarNavigator.!

Item was added:
+ ----- Method: SugarNavigatorBar>>canApplyUserInterfaceTheme (in category 'nil') -----
+ canApplyUserInterfaceTheme
+ 
+ 	^ true!

Item was removed:
- ----- Method: SystemDictionary>>makeSqueaklandReleasePhaseFinalSettings (in category '*Etoys-Squeakland-squeakland') -----
- makeSqueaklandReleasePhaseFinalSettings
- 	"Smalltalk makeSqueaklandReleasePhaseFinalSettings"
- 
- 	| serverName serverURL serverDir updateServer highestUpdate newVersion |
- 
- 	ProjectLauncher splashMorph: ((FileDirectory default directoryNamed: 'scripts' )readOnlyFileNamed: 'SqueaklandSplash.morph') fileInObjectAndCode.
- 
- 	"Dump all morphs so we don't hold onto anything"
- 	World submorphsDo:[:m| m delete].
- 
- 	#(
- 		(honorDesktopCmdKeys false)
- 		(warnIfNoChangesFile false)
- 		(warnIfNoSourcesFile false)
- 		(showDirectionForSketches true)
- 		(menuColorFromWorld false)
- 		(unlimitedPaintArea true)
- 		(useGlobalFlaps false)
- 		(mvcProjectsAllowed false)
- 		(projectViewsInWindows false)
- 		(automaticKeyGeneration true)
- 		(securityChecksEnabled true)
- 		(showSecurityStatus false)
- 		(startInUntrustedDirectory true)
- 		(warnAboutInsecureContent false)
- 		(promptForUpdateServer false)
- 		(fastDragWindowForMorphic false)
- 
- 		(externalServerDefsOnly true)
- 		(expandedFormat false)
- 		(allowCelesteTell false)
- 		(eToyFriendly true)
- 		(eToyLoginEnabled true)
- 		(magicHalos true)
- 		(mouseOverHalos true)
- 		(biggerHandles false)
- 		(selectiveHalos true)
- 		(includeSoundControlInNavigator true)
- 		(readDocumentAtStartup true)
- 		(preserveTrash true)
- 		(slideDismissalsToTrash true)
- 
- 	) do:[:spec|
- 		Preferences setPreference: spec first toValue: spec last].
- 	"Workaround for bug"
- 	Preferences enable: #readDocumentAtStartup.
- 
- 	World color: (Color r: 0.9 g: 0.9 b: 1.0).
- 
- 	"Clear all server entries"
- 	ServerDirectory serverNames do: [:each | ServerDirectory removeServerNamed: each].
- 	SystemVersion current resetHighestUpdate.
- 
- 	"Add the squeakalpha update stream"
- 	serverName := 'Squeakalpha'.
- 	serverURL := 'squeakalpha.org'.
- 	serverDir := serverURL , '/'.
- 
- 	updateServer := ServerDirectory new.
- 	updateServer
- 		server: serverURL;
- 		directory: 'updates/';
- 		altUrl: serverDir;
- 		user: 'sqland';
- 		password: nil.
- 	Utilities updateUrlLists addFirst: {serverName. {serverDir. }.}.
- 
- 	"Add the squeakland update stream"
- 	serverName := 'Squeakland'.
- 	serverURL := 'squeakland.org'.
- 	serverDir := serverURL , '/'.
- 
- 	updateServer := ServerDirectory new.
- 	updateServer
- 		server: serverURL;
- 		directory: 'public_html/updates/';
- 		altUrl: serverDir.
- 	Utilities updateUrlLists addFirst: {serverName. {serverDir. }.}.
- 
- 	highestUpdate := SystemVersion current highestUpdate.
- 	(self confirm: 'Reset highest update (' , highestUpdate printString , ')?')
- 		ifTrue: [SystemVersion current highestUpdate: 0].
- 
- 	newVersion := FillInTheBlank request: 'New version designation:' initialAnswer: 'Squeakland 3.8.' , highestUpdate printString. 
- 	SystemVersion newVersion: newVersion.
- 	(self confirm: self version , '
- Is this the correct version designation?
- If not, choose no, and fix it.') ifFalse: [^ self].
- !



More information about the Squeak-dev mailing list