[squeak-dev] The Trunk: EToys-mt.453.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Dec 21 17:06:52 UTC 2021


Marcel Taeumel uploaded a new version of EToys to project The Trunk:
http://source.squeak.org/trunk/EToys-mt.453.mcz

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

Name: EToys-mt.453
Author: mt
Time: 21 December 2021, 6:06:46.480727 pm
UUID: 1ecddfc5-9be9-4a84-a2a8-744b037c9c17
Ancestors: EToys-mt.452

Removes unused code around font management.

=============== Diff against EToys-mt.452 ===============

Item was changed:
  ----- Method: EtoysTheme class>>create (in category 'instance creation') -----
  create
  	"doIt: [self create 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: #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: TextEmphasis bold emphasisCode);
  			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 removed:
- ----- Method: Preferences class>>restoreDefaultEToysFonts (in category '*Etoys-Squeakland-prefs - fonts') -----
- restoreDefaultEToysFonts
- 	"Since this is called from menus, we can take the opportunity to
- 	prompt for missing font styles."
- 	"
- 	Preferences restoreDefaultEToysFonts
- 	"
- 	Preferences setDefaultFonts: #(#(#setListFontTo: #BitstreamVeraSans 15 ) #(#setFlapsFontTo: #BitstreamVeraSansBold 15 ) #(#setEToysButtonFontTo: #BitstreamVeraSans 15 ) #(#setEToysFontTo: #BitstreamVeraSansBold 15 ) #(#setEToysCodeFontTo: #BitstreamVeraSans 15 ) #(#setEToysTitleFontTo: #BitstreamVeraSans 32 ) #(#setPaintBoxButtonFontTo: #BitstreamVeraSans 9 ) #(#setMenuFontTo: #BitstreamVeraSans 15 ) #(#setWindowTitleFontTo: #BitstreamVeraSans 15 ) #(#setBalloonHelpFontTo: #BitstreamVeraSans 15 ) #(#setConnectorsLabelFontTo: #BitstreamVeraSans 15 ) )!

Item was removed:
- ----- Method: Preferences class>>restoreDefaultFontsForSqueakland (in category '*Etoys-Squeakland-fonts') -----
- restoreDefaultFontsForSqueakland
- 	"Since this is called from menus, we can take the opportunity to prompt for missing font styles."
- 	"
- 	Preferences restoreDefaultFontsForSqueakland
- 	"
- 
- 	Preferences restoreDefaultEToysFonts..
- 	Preferences setDefaultFonts: #(
- 			(setCodeFontTo: 	BitstreamVeraSans 				15)
- 			(setSystemFontTo: BitstreamVeraSans 				15)
- 		).
- 
- !

Item was removed:
- ----- Method: StandardScriptingSystem class>>applyNewEToyLook (in category '*Etoys') -----
- applyNewEToyLook
- 	"Apply the new EToy look based on free fonts, approximating the classic look as closely as possible."
- 
- 	"StandardScriptingSystem applyNewEToyLook"
- 
- "	| aTextStyle aFont | 
- 	aTextStyle := TextStyle named: #BitstreamVeraSansMono.
- 	aFont := aTextStyle fontOfSize: 12.
- 	aFont := aFont emphasis: 1.
- 	Preferences setEToysFontTo: aFont.
- 	Preferences setButtonFontTo: aFont.
- 
- 	aTextStyle := TextStyle named: #Accushi.
- 	aFont := aTextStyle fontOfSize: 12.
- 	Preferences setFlapsFontTo: aFont.
- 
- 	(aTextStyle := TextStyle named: #Accuny)
- 		ifNotNil:
- 			[Preferences setSystemFontTo: (aTextStyle fontOfSize: 12)]"
- 
- 	Preferences setDefaultFonts: #(
- 		(setEToysFontTo:			BitstreamVeraSansBold	10)
- 		(setButtonFontTo:		BitstreamVeraSansMono	9)
- 		(setFlapsFontTo:			Accushi				12)
- 		(setSystemFontTo:		Accuny				10)
- 		(setWindowTitleFontTo:	BitstreamVeraSansBold	12)
- 	)
- !

Item was removed:
- ----- Method: TTCFont class>>familyName:pointSize:emphasized: (in category '*Etoys-Squeakland-instance creation') -----
- familyName: n pointSize: s emphasized: code
- 
- 	"(TTCFont familyName: 'BitstreamVeraSans' pointSize: 12 emphasis: 0)"
- 	| t ret index |
- 	t := self registry at: n asSymbol ifAbsent: [#()].
- 	t isEmpty ifTrue: [
- 		t := (TextConstants at: #DefaultTextStyle) fontArray.
- 		ret := t first.
- 		ret pointSize >= s ifTrue: [^ ret emphasis: code].
- 		index := 2.
- 		[index <= t size and: [(t at: index) pointSize <= s]] whileTrue: [
- 			ret := t at: index.
- 			index := index + 1.
- 		].
- 		^ ret emphasis: code.
- 	].
- 	^ ((TextStyle named: n) addNewFontSize: s) emphasis: code.
- !



More information about the Squeak-dev mailing list