[squeak-dev] The Trunk: System-fbs.518.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Mar 5 09:39:10 UTC 2013


Frank Shearar uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-fbs.518.mcz

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

Name: System-fbs.518
Author: fbs
Time: 5 March 2013, 9:37:27.65 am
UUID: 1a7fc936-536a-48da-b154-4ad4ba13d341
Ancestors: System-fbs.517

Put all the SmallLand colour themes in a separate package.

=============== Diff against System-fbs.517 ===============

Item was removed:
- SmallLandColorTheme subclass: #BlueSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: BlueSmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- 	" 
- 	BlueSmallLandColorTheme apply.  
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.2 0.3 0.9 ))
- 		with: (Color fromArray: #(0.6 0.7 1.0 ))
- 		with: (Color fromArray: #(0.85 0.9 1.0 ))!

Item was removed:
- SmallLandColorTheme subclass: #GraySmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: GraySmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- 	" 
- 	GraySmallLandColorTheme apply.
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.4 0.4 0.4 ))
- 		with: (Color fromArray: #(0.8 0.8 0.8 ))
- 		with: (Color fromArray: #(0.97 0.97 0.97 ))!

Item was removed:
- SmallLandColorTheme subclass: #GreenSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: GreenSmallLandColorTheme>>baseColors (in category 'initialize-release') -----
- baseColors
- 	" 
- 	GreenSmallLandColorTheme apply.
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.1 0.5 0.3 ))
- 		with: (Color fromArray: #(0.2 0.9 0.6 ))
- 		with: (Color fromArray: #(0.85 1.0 0.98 ))!

Item was removed:
- SmallLandColorTheme subclass: #MagentaSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: MagentaSmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- 	" 
- 	MagentaSmallLandColorTheme apply.
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.8 0.1 0.7 ))
- 		with: (Color fromArray: #(1.0 0.3 0.9 ))
- 		with: (Color fromArray: #(1.0 0.9 0.8 ))!

Item was removed:
- SmallLandColorTheme subclass: #OrangeSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: OrangeSmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- "
- OrangeSmallLandColorTheme apply.
- "
- 	^ Array
- 		with: (Color fromArray: #(0.8 0.4 0.0 ))
- 		with: (Color fromArray: #(1.0 0.8 0.0 ))
- 		with: (Color fromArray: #(1.0 1.0 0.8 ))!

Item was removed:
- SmallLandColorTheme subclass: #RedSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: RedSmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- 	" 
- 	RedSmallLandColorTheme apply.  
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.8 0.0 0.2 ))
- 		with: (Color fromArray: #(0.97 0.13 0.3 ))
- 		with: (Color fromArray: #(1.0 0.88 0.97 ))!

Item was removed:
- ColorTheme subclass: #SmallLandColorTheme
- 	instanceVariableNames: 'darks normals lights'
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: SmallLandColorTheme class>>allThemes (in category 'accessing') -----
- allThemes
- 	"
- SmallLandColorTheme allThemes.
- 	"
- 	^ self withAllSubclasses
- 		reject: [:each | each == self]!

Item was removed:
- ----- Method: SmallLandColorTheme class>>chooseTheme (in category 'accessing') -----
- chooseTheme
- 	" 
- 	SmallLandColorTheme chooseTheme.  
- 	"
- 	| themes menu |
- 	menu := MenuMorph new defaultTarget: self.
- 	menu addTitle: 'choose color theme' translated.
- 	Preferences noviceMode
- 		ifFalse: [menu addStayUpItem].
- 	""
- 	themes := self allThemes
- 				asSortedCollection: [:x :y | x themeName translated <= y themeName translated].
- 	themes
- 		do: [:each | ""menu
- 				addUpdating: #stringForTheme:
- 				target: each
- 				selector: #applyTheme:
- 				argumentList: {each}].
- 	""
- 	menu popUpInWorld!

Item was removed:
- ----- Method: SmallLandColorTheme class>>stringForTheme: (in category 'accessing') -----
- stringForTheme: aTheme 
- 
- 	^ (aTheme == ColorTheme current class
- 		ifTrue: ['<on>']
- 		ifFalse: ['<off>'])
- 		, aTheme themeName translated.!

Item was removed:
- ----- Method: SmallLandColorTheme class>>themeName (in category 'accessing') -----
- themeName
- 	" 
- 	self themeName. 
- 	 
- 	BlueSmallLandColorTheme themeName.  
- 	GreenSmallLandColorTheme themeName.  
- 	"
- 	^ self name allButLast: 'SmallLandColorTheme' size.
- !

Item was removed:
- ----- Method: SmallLandColorTheme>>apply (in category 'applying') -----
- apply
- 	Preferences installBrightWindowColors.
- 	""
- 	super apply.
- 	""
- 	self updateTopProject.
- 	self updateFlaps.
- 	self updateWorldMainDockingBar!

Item was removed:
- ----- Method: SmallLandColorTheme>>balloonColor (in category 'theme') -----
- balloonColor
- 	^ (self light: 1) twiceLighter alpha: 0.95"Color white alpha: 0.95"!

Item was removed:
- ----- Method: SmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- 	"Answer a collection of the 3 base colors"
- 	^ self subclassResponsibility!

Item was removed:
- ----- Method: SmallLandColorTheme>>cancelColor (in category 'theme') -----
- cancelColor
- 	^ super cancelColor"self normal: 8"!

Item was removed:
- ----- Method: SmallLandColorTheme>>dark: (in category 'private - colors') -----
- dark: index
- 	^ darks at: index!

Item was removed:
- ----- Method: SmallLandColorTheme>>defaultWorldColor (in category 'theme') -----
- defaultWorldColor
- 	^ (self light: 1) twiceLighter twiceLighter !

Item was removed:
- ----- Method: SmallLandColorTheme>>dialog3DTitles (in category 'theme - dialogs') -----
- dialog3DTitles
- 	^ false!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogBorderColor (in category 'theme - dialogs') -----
- dialogBorderColor
- 	^ (self dark: 5) !

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogBorderWidth (in category 'theme - dialogs') -----
- dialogBorderWidth
- 	^ 2!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogButtonBorderWidth (in category 'theme - dialogs') -----
- dialogButtonBorderWidth
- 	^ 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogColor (in category 'theme - dialogs') -----
- dialogColor
- 	^ self light: 3!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogPaneBorderColor (in category 'theme - dialogs') -----
- dialogPaneBorderColor
- 	^ self dialogTextBoxBorderColor !

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogPaneBorderWidth (in category 'theme - dialogs') -----
- dialogPaneBorderWidth
- 	^ 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogPaneRampOrColor (in category 'theme - dialogs') -----
- dialogPaneRampOrColor
- 	^ self dialogTextBoxColor!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogRampOrColor (in category 'theme - dialogs') -----
- dialogRampOrColor
- 	^ self dialogColor!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogTextBoxBorderColor (in category 'theme - dialogs') -----
- dialogTextBoxBorderColor
- 	^ self normal: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>dialogTextBoxColor (in category 'theme - dialogs') -----
- dialogTextBoxColor
- 	^ self light: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>dockingBarAutoGradient (in category 'theme - dockingbar') -----
- dockingBarAutoGradient
- 	^ true!

Item was removed:
- ----- Method: SmallLandColorTheme>>dockingBarColor (in category 'theme - dockingbar') -----
- dockingBarColor
- 	^self normal:1!

Item was removed:
- ----- Method: SmallLandColorTheme>>dockingBarGradientRamp (in category 'theme - dockingbar') -----
- dockingBarGradientRamp
- 	^ {0.0 -> Color white. 1.0
- 		-> (self normal:1)}!

Item was removed:
- ----- Method: SmallLandColorTheme>>helpColor (in category 'theme') -----
- helpColor
- ^ self okColor!

Item was removed:
- ----- Method: SmallLandColorTheme>>initialize (in category 'initialization') -----
- initialize
- 	"Initialize the receiver"
- 	| baseColors |
- 	super initialize.
- 	""
- 	baseColors := self baseColors.
- 	""
- 	darks := baseColors first wheel: 8.
- 	normals := baseColors second wheel: 8.
- 	lights := baseColors third wheel: 8!

Item was removed:
- ----- Method: SmallLandColorTheme>>insertionPointColor (in category 'theme') -----
- insertionPointColor
- 	^ self normal: 7!

Item was removed:
- ----- Method: SmallLandColorTheme>>keyboardFocusColor (in category 'theme') -----
- keyboardFocusColor
- 	^ self normal: 8!

Item was removed:
- ----- Method: SmallLandColorTheme>>labelForColor: (in category 'private - colors') -----
- labelForColor: aColor 
- 	^ (aColor red roundTo: 0.01) asString , ' ' , (aColor green roundTo: 0.01) asString , ' ' , (aColor blue roundTo: 0.01) asString!

Item was removed:
- ----- Method: SmallLandColorTheme>>light: (in category 'private - colors') -----
- light: index 
- 	^ lights at: index!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuBorderColor (in category 'theme - menus') -----
- menuBorderColor
- 	^self dark: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuBorderWidth (in category 'theme - menus') -----
- menuBorderWidth ^ 2.!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuColor (in category 'theme - menus') -----
- menuColor
- 	^ self light: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuLineColor (in category 'theme - menus') -----
- menuLineColor
- 	^ self normal: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuSelectionColor (in category 'theme - menus') -----
- menuSelectionColor
- 	^ self dark: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuTitleBorderColor (in category 'theme - menus') -----
- menuTitleBorderColor
- 	^ self menuTitleColor !

Item was removed:
- ----- Method: SmallLandColorTheme>>menuTitleBorderWidth (in category 'theme - menus') -----
- menuTitleBorderWidth
- 	^ 6!

Item was removed:
- ----- Method: SmallLandColorTheme>>menuTitleColor (in category 'theme - menus') -----
- menuTitleColor
- 	^ self normal: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>normal: (in category 'private - colors') -----
- normal: index 
- 	^ normals at: index!

Item was removed:
- ----- Method: SmallLandColorTheme>>okColor (in category 'theme') -----
- okColor
- 	^ super okColor "self normal: 2"!

Item was removed:
- ----- Method: SmallLandColorTheme>>printOn: (in category 'printing') -----
- printOn: aStream 
- 	aStream nextPutAll: 'Small-Land Color Theme: ', self class themeName!

Item was removed:
- ----- Method: SmallLandColorTheme>>rowOf: (in category 'private - colors') -----
- rowOf: colors 
- 	| row |
- 	row := AlignmentMorph newRow.
- 	row cellInset: 5.
- 	row color: Color white.
- 	""
- 	colors
- 		do: [:each | 
- 			| box label | 
- 			box := RectangleMorph new.
- 			box extent: 100 @ 60.
- 			box color: each.
- 			box borderWidth: 2.
- 			box borderColor: box color muchDarker.
- 			""
- 			label := StringMorph
- 						contents: (self labelForColor: each).
- 			label color: each negated.
- 			box addMorphCentered: label.
- 			""
- 			row addMorphBack: box].
- 	""
- 	^ row !

Item was removed:
- ----- Method: SmallLandColorTheme>>showColors (in category 'private - colors') -----
- showColors
- 	" 
- 	BlueSmallLandColorTheme new showColors. 
- 	"
- 	| col |
- 	col := AlignmentMorph newColumn.
- 	col color: Color white.
- 	col
- 		addMorphBack: (self rowOf: darks).
- 	col
- 		addMorphBack: (self rowOf: normals).
- 	col
- 		addMorphBack: (self rowOf: lights).
- 	""
- 	col openInWorld!

Item was removed:
- ----- Method: SmallLandColorTheme>>textHighlightColor (in category 'theme') -----
- textHighlightColor
- 	^self normal: 1!

Item was removed:
- ----- Method: SmallLandColorTheme>>updateFlaps (in category 'applying') -----
- updateFlaps
- 	Flaps globalFlapTabs
- 		select: [:each | each flapID = 'Supplies' translated]
- 		thenDo: [:each | 
- 			each
- 				color: (self normal: 1);
- 				
- 				borderColor: (self normal: 1);
- 				 borderWidth: (self menuBorderWidth).
- 			""
- 			each referent
- 				color: (self light: 1);
- 				 borderWidth: (self menuBorderWidth);
- 				
- 				borderColor: (self normal: 1)]!

Item was removed:
- ----- Method: SmallLandColorTheme>>updateTopProject (in category 'applying') -----
- updateTopProject
- 	Project current == Project topProject
- 	ifFalse:[^ self].
- 
- ""
- 			World color: Preferences defaultWorldColor.
- 			World submorphs
- 				select: [:each | ""
- 					(each isKindOf: StringMorph)
- 						and: [each contents = 'Squeak']]
- 				thenDo: [:each | each
- 						color: (self dark: 1)].
- !

Item was removed:
- ----- Method: SmallLandColorTheme>>updateWorldMainDockingBar (in category 'applying') -----
- updateWorldMainDockingBar
- 	| oldPreference |
- 	oldPreference := Project current showWorldMainDockingBar.
- 	""
- 	Project current showWorldMainDockingBar: false.
- 	Project current showWorldMainDockingBar: oldPreference.
- 	TheWorldMainDockingBar updateInstances!

Item was removed:
- SmallLandColorTheme subclass: #VioletSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: VioletSmallLandColorTheme>>baseColors (in category 'as yet unclassified') -----
- baseColors
- 	" 
- 	VioletSmallLandColorTheme apply.
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.6 0.0 1.0 ))
- 		with: (Color fromArray: #(0.8 0.4 1.0 ))
- 		with: (Color fromArray: #(0.95 0.95 1.0 ))!

Item was removed:
- SmallLandColorTheme subclass: #YellowSmallLandColorTheme
- 	instanceVariableNames: ''
- 	classVariableNames: ''
- 	poolDictionaries: ''
- 	category: 'System-Support'!

Item was removed:
- ----- Method: YellowSmallLandColorTheme>>baseColors (in category 'initialization') -----
- baseColors
- 	" 
- 	YellowSmallLandColorTheme apply.
- 	"
- 	^ Array
- 		with: (Color fromArray: #(0.6 0.6 0.0 ))
- 		with: (Color fromArray: #(0.9 0.9 0.3 ))
- 		with: (Color fromArray: #(1.0 1.0 0.9 ))!



More information about the Squeak-dev mailing list