[squeak-dev] The Trunk: System-mt.889.mcz

commits at source.squeak.org commits at source.squeak.org
Sun Aug 14 15:46:15 UTC 2016


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

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

Name: System-mt.889
Author: mt
Time: 14 August 2016, 5:45:51.533782 pm
UUID: 7a092426-3bbd-b649-8a26-cd2de9273ab4
Ancestors: System-mt.888

Complete Squeak's duller theme by reducing luminance also for other things like menus and buttons.

=============== Diff against System-mt.888 ===============

Item was changed:
  ----- Method: SqueakTheme class>>addButtons: (in category 'instance creation') -----
  addButtons: theme
  
  	theme
  		set: #borderColor for: #PluggableButtonMorph to: Color gray;
  		set: #borderWidth for: #PluggableButtonMorph to: 1;
  		set: #borderStyle for: #PluggableButtonMorph to: BorderStyle default;
+ 		set: #color for: #PluggableButtonMorph to: (Color gray: 0.91);
- 		set: #color for: #PluggableButtonMorph to: [Color gray: 0.91];
  		
  		set: #font for: #PluggableButtonMorph to: [Preferences standardButtonFont];
  		set: #textColor for: #PluggableButtonMorph to: Color black;
  
  		set: #selectionModifier for: #PluggableButtonMorph to: [ [:c | c adjustBrightness: -0.2] ];
  		set: #hoverModifier for: #PluggableButtonMorph to: [ [:c | c adjustBrightness: -0.1] ];
  		set: #feedbackModifier for: #PluggableButtonMorph to: [ [:c | c adjustBrightness: -0.3] ].
  	
  	"And the plus-version."
  	theme
  		set: #disabledColor for: #PluggableButtonMorphPlus to: Color transparent;
  		set: #disabledTextColor for: #PluggableButtonMorphPlus to: (Color gray: 0.6).
  
  	"And the three-phase button."
  	theme
  		derive: #color for: #ThreePhaseButtonMorph from: #PluggableButtonMorph at: #textColor;
  		derive: #font for: #ThreePhaseButtonMorph from: #PluggableButtonMorph;
  		derive: #textColor for: #ThreePhaseButtonMorph from: #PluggableButtonMorph.!

Item was added:
+ ----- Method: SqueakTheme class>>addDullerButtons: (in category 'instance creation') -----
+ addDullerButtons: theme
+ 
+ 	theme
+ 		set: #borderColor for: #PluggableButtonMorph to: Color gray duller;
+ 		set: #color for: #PluggableButtonMorph to: (Color gray: 0.91) duller.
+ 			
+ 	"And the plus-version."
+ 	theme
+ 		set: #disabledTextColor for: #PluggableButtonMorphPlus to: (Color gray: 0.6) duller.!

Item was added:
+ ----- Method: SqueakTheme class>>addDullerDialogs: (in category 'instance creation') -----
+ addDullerDialogs: theme
+ 	"self createDuller apply."
+ 	
+ 	theme
+ 		set: #titleColor for: #DialogWindow to: (Color r: 0.658 g: 0.678 b: 0.78) duller;
+ 		set: #okColor for: #DialogWindow to: (Color r: 0.49 g: 0.749 b: 0.49) duller;
+ 		set: #cancelColor for: #DialogWindow to: (Color r: 1 g: 0.6 b: 0.588) duller;
+ 		set: #buttonColor for: #DialogWindow to: (Color r: 0.658 g: 0.678 b: 0.78) twiceLighter duller;
+ 		set: #selectionModifier for: #DialogWindow to: [ [:c | Color orange duller ] ].
+ 	
+ 	"The List Chooser is a dialog, too."
+ 	theme
+ 		set: #addColor for: #ListChooser to: Color ocean;
+ 		set: #disabledColor for: #ListChooser to: Color gray duller.
+ 		
+ 	"And the system progress bar."
+ 	theme
+ 		set: #color for: #SystemProgressBarMorph to: (Color r: 0.977 g: 0.977 b: 0.977) duller;
+ 		set: #barColor for: #SystemProgressBarMorph to: (Color r: 0.72 g: 0.72 b: 0.9) duller.
+ 		
+ 	"And the balloon morphs."
+ 	theme
+ 		set: #borderColor for: #NewBalloonMorph to: (Color r: 0.46 g: 0.46 b: 0.353) duller;
+ 		set: #color for: #NewBalloonMorph to:(Color r: 0.92 g: 0.92 b: 0.706) duller.!

Item was added:
+ ----- Method: SqueakTheme class>>addDullerMenusAndDockingBars: (in category 'instance creation') -----
+ addDullerMenusAndDockingBars: theme
+ 
+ 	theme
+ 		set: #borderColor for: #MenuMorph to: Color gray duller;
+ 		set: #color for: #MenuMorph to: (Color gray: 0.9) duller;	
+ 		set: #lineColor for: #MenuMorph to: (Color gray: 0.9) duller.
+ 		
+ 	theme
+ 		set: #disabledTextColor for: #MenuItemMorph to: Color gray duller;
+ 		set: #selectionColor for: #MenuItemMorph to: (Color r: 0.4 g: 0.5 b: 0.7) duller.!

Item was changed:
  ----- Method: SqueakTheme class>>addSyntaxHighlighting: (in category 'instance creation') -----
  addSyntaxHighlighting: theme
+ 	"This was the former sub-dued highlighting.
+ 	self create apply.
+ 	"
- 	"This was the former sub-dued highlighting."
  	
  	theme
+ 		set: #color for: #TextAction to: Color aqua;
- 		set: #color for: #TextAction to: (Color r: 0.4 g: 0.0 b: 1);
  		
  		set: #default for: #SHTextStylerST80 to: {Color black};
  		set: #invalid for: #SHTextStylerST80 to: {Color red};
  		set: #excessCode for: #SHTextStylerST80 to: {Color red};
  		set: #comment for: #SHTextStylerST80 to: {Color cyan muchDarker};
  		set: #unfinishedComment for: #SHTextStylerST80 to: {Color red muchDarker. TextEmphasis italic};
  		set: #'$' for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #character for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #integer for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #number for: #SHTextStylerST80 to: {Color red muchDarker};	
  		set: #- for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #symbol for: #SHTextStylerST80 to: {Color blue muchDarker};	
  		set: #stringSymbol for: #SHTextStylerST80 to: {Color blue muchDarker};	
  		set: #literalArray for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #string for: #SHTextStylerST80 to: {Color magenta muchDarker. TextEmphasis normal};
  		set: #unfinishedString for: #SHTextStylerST80 to: {Color red. TextEmphasis normal};
  		set: #assignment for: #SHTextStylerST80 to: {nil. TextEmphasis bold};
  		set: #ansiAssignment for: #SHTextStylerST80 to: {nil. TextEmphasis bold};
  		set: #literal for: #SHTextStylerST80 to: {nil. TextEmphasis italic};
  		set: #keyword for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #binary for: #SHTextStylerST80 to: {Color blue muchDarker};	
  		set: #unary for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #incompleteKeyword for: #SHTextStylerST80 to: {Color gray muchDarker. TextEmphasis underlined};
  		set: #incompleteBinary for: #SHTextStylerST80 to: {Color gray muchDarker. TextEmphasis underlined};	
  		set: #incompleteUnary for: #SHTextStylerST80 to: {Color gray muchDarker. TextEmphasis underlined};
  		set: #undefinedKeyword for: #SHTextStylerST80 to: {Color red};
  		set: #undefinedBinary for: #SHTextStylerST80 to: {Color red};	
  		set: #undefinedUnary for: #SHTextStylerST80 to: {Color red};													
  		set: #patternKeyword for: #SHTextStylerST80 to: {nil. TextEmphasis bold};
  		set: #patternBinary for: #SHTextStylerST80 to: {nil. TextEmphasis bold};
  		set: #patternUnary for: #SHTextStylerST80 to: {nil. TextEmphasis bold};	
  		set: #self for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #super for: #SHTextStylerST80 to: {Color red muchDarker}; 
  		set: #true for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #false for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #nil for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #thisContext for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #return for: #SHTextStylerST80 to: {Color red muchDarker};
  		set: #patternArg for: #SHTextStylerST80 to: {Color blue muchDarker};	
  		set: #methodArg for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #blockPatternArg for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #blockArg for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #argument for: #SHTextStylerST80 to: {Color blue muchDarker};
  		set: #blockArgColon for: #SHTextStylerST80 to: {Color black}; 
  		set: #leftParenthesis for: #SHTextStylerST80 to: {Color black}; 
  		set: #rightParenthesis for: #SHTextStylerST80 to: {Color black}; 
  		set: #leftParenthesis1 for: #SHTextStylerST80 to: {Color green muchDarker}; 
  		set: #rightParenthesis1 for: #SHTextStylerST80 to: {Color green muchDarker}; 
  		set: #leftParenthesis2 for: #SHTextStylerST80 to: {Color magenta muchDarker}; 
  		set: #rightParenthesis2 for: #SHTextStylerST80 to: {Color magenta muchDarker}; 
  		set: #leftParenthesis3 for: #SHTextStylerST80 to: {Color red muchDarker}; 
  		set: #rightParenthesis3 for: #SHTextStylerST80 to: {Color red muchDarker}; 
  		set: #leftParenthesis4 for: #SHTextStylerST80 to: {Color green darker}; 
  		set: #rightParenthesis4 for: #SHTextStylerST80 to: {Color green darker}; 
  		set: #leftParenthesis5 for: #SHTextStylerST80 to: {Color orange darker}; 
  		set: #rightParenthesis5 for: #SHTextStylerST80 to: {Color orange darker}; 
  		set: #leftParenthesis6 for: #SHTextStylerST80 to: {Color magenta darker}; 
  		set: #rightParenthesis6 for: #SHTextStylerST80 to: {Color magenta darker}; 
  		set: #leftParenthesis7 for: #SHTextStylerST80 to: {Color blue}; 
  		set: #rightParenthesis7 for: #SHTextStylerST80 to: {Color blue}; 
  		set: #blockStart for: #SHTextStylerST80 to: {Color black}; 
  		set: #blockEnd for: #SHTextStylerST80 to: {Color black}; 
  		set: #blockStart1 for: #SHTextStylerST80 to: {Color green muchDarker}; 
  		set: #blockEnd1 for: #SHTextStylerST80 to: {Color green muchDarker}; 
  		set: #blockStart2 for: #SHTextStylerST80 to: {Color magenta muchDarker}; 
  		set: #blockEnd2 for: #SHTextStylerST80 to: {Color magenta muchDarker}; 
  		set: #blockStart3 for: #SHTextStylerST80 to: {Color red muchDarker}; 
  		set: #blockEnd3 for: #SHTextStylerST80 to: {Color red muchDarker}; 
  		set: #blockStart4 for: #SHTextStylerST80 to: {Color green darker}; 
  		set: #blockEnd4 for: #SHTextStylerST80 to: {Color green darker}; 
  		set: #blockStart5 for: #SHTextStylerST80 to: {Color orange darker}; 
  		set: #blockEnd5 for: #SHTextStylerST80 to: {Color orange darker}; 
  		set: #blockStart6 for: #SHTextStylerST80 to: {Color magenta darker}; 
  		set: #blockEnd6 for: #SHTextStylerST80 to: {Color magenta darker}; 
  		set: #blockStart7 for: #SHTextStylerST80 to: {Color blue}; 
  		set: #blockEnd7 for: #SHTextStylerST80 to: {Color blue}; 																																																		
  		set: #arrayStart for: #SHTextStylerST80 to: {Color black}; 
  		set: #arrayEnd for: #SHTextStylerST80 to: {Color black}; 
  		set: #arrayStart1 for: #SHTextStylerST80 to: {Color black}; 
  		set: #arrayEnd1 for: #SHTextStylerST80 to: {Color black}; 
  		set: #byteArrayStart for: #SHTextStylerST80 to: {Color black}; 
  		set: #byteArrayEnd for: #SHTextStylerST80 to: {Color black}; 
  		set: #byteArrayStart1 for: #SHTextStylerST80 to: {Color black}; 
  		set: #byteArrayEnd1 for: #SHTextStylerST80 to: {Color black}; 
  		set: #leftBrace for: #SHTextStylerST80 to: {Color black}; 
  		set: #rightBrace for: #SHTextStylerST80 to: {Color black}; 
  		set: #cascadeSeparator for: #SHTextStylerST80 to: {Color black}; 
  		set: #statementSeparator for: #SHTextStylerST80 to: {Color black}; 
  		set: #externalCallType for: #SHTextStylerST80 to: {Color black}; 
  		set: #externalCallTypePointerIndicator for: #SHTextStylerST80 to: {Color black}; 
  		set: #primitiveOrExternalCallStart for: #SHTextStylerST80 to: {Color black}; 
  		set: #primitiveOrExternalCallEnd for: #SHTextStylerST80 to: {Color black};
  		set: #methodTempBar for: #SHTextStylerST80 to: {Color gray}; 
  		set: #blockTempBar for: #SHTextStylerST80 to: {Color gray};
  		set: #blockArgsBar for: #SHTextStylerST80 to: {Color gray};
  		set: #primitive for: #SHTextStylerST80 to: {Color green muchDarker. TextEmphasis bold};
  		set: #pragmaKeyword for: #SHTextStylerST80 to: {Color green muchDarker. TextEmphasis bold};
  		set: #pragmaUnary for: #SHTextStylerST80 to: {Color green muchDarker. TextEmphasis bold};
  		set: #pragmaBinary for: #SHTextStylerST80 to: {Color green muchDarker. TextEmphasis bold};									
  		set: #externalFunctionCallingConvention for: #SHTextStylerST80 to: {Color green muchDarker. TextEmphasis bold}; 
  		set: #module for: #SHTextStylerST80 to: {Color green muchDarker. TextEmphasis bold};
  		set: #blockTempVar for: #SHTextStylerST80 to: {Color gray};
  		set: #blockPatternTempVar for: #SHTextStylerST80 to: {Color gray};
  		set: #instVar for: #SHTextStylerST80 to: {Color black};
  		set: #workspaceVar for: #SHTextStylerST80 to: {Color black};
  		set: #undefinedIdentifier for: #SHTextStylerST80 to: {Color red};
  		set: #incompleteIdentifier for: #SHTextStylerST80 to: {Color gray darker. {TextEmphasis italic. TextEmphasis underlined}};
  		set: #tempVar for: #SHTextStylerST80 to: {Color gray darker};
  		set: #patternTempVar for: #SHTextStylerST80 to: {Color gray darker};
  		set: #poolConstant for: #SHTextStylerST80 to: {Color gray muchDarker};
  		set: #classVar for: #SHTextStylerST80 to: {Color gray muchDarker};
  		set: #globalVar for: #SHTextStylerST80 to: {Color black}.
  		
  	"And the text differ"
  	theme	
  		set: #insertTextAttributes for: #TextDiffBuilder to: { TextColor red };
  		set: #removeTextAttributes for: #TextDiffBuilder to: { TextEmphasis struckOut. TextColor blue };
  		set: #normalTextAttributes for: #TextDiffBuilder to: { TextEmphasis normal }.!

Item was changed:
  ----- Method: SqueakTheme class>>createDuller (in category 'instance creation') -----
  createDuller
  	"self createDuller apply"
  	
  	| name |
  	name := 'Squeak (duller)'.
  	^ (self named:name) in: [:theme |
  		theme merge: (self named: 'Squeak') overwrite: true.
  		theme name: name.
  		self
  			addDullerWindowColors: theme;
+ 			addDullerScrollables: theme;
+ 			addDullerDialogs: theme;
+ 			addDullerMenusAndDockingBars: theme;
+ 			addDullerButtons: theme.
+ 			
+ 		theme set: #color for: #TextAction to: Color ocean.
+ 		
- 			addDullerScrollables: theme.
  		theme]!



More information about the Squeak-dev mailing list