[Pkg] The Trunk: System-mt.894.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Aug 16 09:52:23 UTC 2016


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

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

Name: System-mt.894
Author: mt
Time: 16 August 2016, 11:48:55.578039 am
UUID: bb9a7996-562f-c449-9b29-093bc70630a0
Ancestors: System-mt.893

Small adjustments in the Solarized and Monokai themes.

=============== Diff against System-mt.893 ===============

Item was changed:
  ----- Method: MonokaiTheme class>>addDarkWindowColors: (in category 'instance creation') -----
  addDarkWindowColors: theme
  	"self createDark apply."
  	theme
+ 		set: #uniformWindowColor for: #Model to:( self invisibleColor adjustBrightness: 0.16) "lighter twice";
- 		set: #uniformWindowColor for: #Model to: self invisibleColor lighter;
  		
+ 		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color adjustBrightness: -0.16 "darker twice"] ];
- 		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color darker] ];
  		set: #unfocusedLabelColor for: #SystemWindow to: [
  			Model useColorfulWindows
  				ifTrue: [(Color r: 0.285 g: 0.282 b: 0.242) "invisible color"]
  				ifFalse: [(Color r: 0.972 g: 0.972 b: 0.948) "foreground color"] ];
  		set: #focusedLabelColor for: #SystemWindow to: [
  			Model useColorfulWindows
  				ifTrue: [(Color r: 0.152 g: 0.156 b: 0.133) "background color"]
  				ifFalse: [(Color r: 0.901 g: 0.858 b: 0.455) "yellow"] ];
  
  		set: #customWindowColor for: #Browser to: self green;
  		set: #customWindowColor for: #ChangeList to: self blue;
  		set: #customWindowColor for: #ChangeSorter to: self blue;
  		set: #customWindowColor for: #ChatNotes to: self magenta;
  		set: #customWindowColor for: #ClassCommentVersionsBrowser to: self violet;
  		set: #customWindowColor for: #Debugger to: self red;
  		set: #customWindowColor for: #DualChangeSorter to: self blue;
  		set: #customWindowColor for: #FileContentsBrowser to: self yellow;
  		set: #customWindowColor for: #FileList to: self yellow;
  		set: #customWindowColor for: #InstanceBrowser to: self cyan;
  		set: #customWindowColor for: #Lexicon to: self cyan;
  		set: #customWindowColor for: #MCTool to: self violet;
  		set: #customWindowColor for: #MessageNames to: self green;
  		set: #customWindowColor for: #MessageSet to: self cyan;
  		set: #customWindowColor for: #PackagePaneBrowser to: self green;
  		set: #customWindowColor for: #PluggableFileList to: self yellow;
  		set: #customWindowColor for: #PreferenceBrowser to: self cyan;
  		set: #customWindowColor for: #SMLoader to: self orange;
  		set: #customWindowColor for: #SMLoaderPlus to: self orange;
  		set: #customWindowColor for: #SMReleaseBrowser to: self orange;
  		set: #customWindowColor for: #ScriptingDomain to: self yellow;
  		set: #customWindowColor for: #SelectorBrowser to: self cyan;
  		set: #customWindowColor for: #StringHolder to: self yellow;
  		set: #customWindowColor for: #TestRunner to: self orange;
  		set: #customWindowColor for: #TranscriptStream to: self orange;
  		set: #customWindowColor for: #VersionsBrowser to: self violet.!

Item was changed:
  ----- Method: MonokaiTheme class>>createDark (in category 'instance creation') -----
  createDark
  	"self createDark apply."
+ 	| themeName |
+ 	themeName := 'Monokai (dark)'.
+ 	^ (self named: themeName) in: [:theme |
- 	| name |
- 	name := 'Monokai (dark)'.
- 	^ (self named: name) in: [:theme |
  		theme merge: (self named: 'Squeak') overwrite: true.
+ 		theme name: themeName.
- 		theme name: name.
  		
  		"General morph stuff."
  		theme
  			set: #keyboardFocusColor for: #Morph to: self yellow;
  			set: #keyboardFocusWidth for: #Morph to: 1.
  
  		theme set: #background for: #MorphicProject to: (BitmapFillStyle fromForm: self darkBackgroundForm).
  
  		self
  			addDarkFonts: theme;
  			addDarkWindowColors: theme;
  			addDarkSyntaxHighlighting: theme;
  			addDarkScrollables: theme;
  			addDarkButtons: theme;
  			addDarkDialogs: theme;
  			addDarkMenusAndDockingBars: theme.
  
  		theme]!

Item was changed:
  ----- Method: MonokaiTheme class>>darkBackgroundForm (in category 'instance creation') -----
  darkBackgroundForm
  
  	| ref |
  	ref := self backgroundColor.
  
  	^ (SqueakTheme linenblue  asFormOfDepth: 32) collectColors: [:c | 
  		Color
  			h:ref hue
  			s: ref saturation
  			v: c brightness - 0.1
  			alpha: c alpha]!

Item was changed:
  ----- Method: SolarizedTheme class>>addDarkWindowColors: (in category 'instance creation') -----
  addDarkWindowColors: theme
+ 	"doIt: [self createDark apply.]"
+ 
- 	"self createDark apply."
  	theme
+ 		set: #uniformWindowColor for: #Model to: (self darkBackgroundHighlights adjustBrightness: 0.16 "lighter twice");
+ 
+ 		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color adjustBrightness: -0.16 "darker twice"] ];
- 		set: #uniformWindowColor for: #Model to: self darkBackgroundHighlights lighter;
- 		
- 		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color darker] ];
  		set: #unfocusedLabelColor for: #SystemWindow to: self darkContentEmphasized;
  		set: #focusedLabelColor for: #SystemWindow to: self darkContentEmphasizedMore;
  
  		set: #customWindowColor for: #Browser to: self green;
  		set: #customWindowColor for: #ChangeList to: self blue;
  		set: #customWindowColor for: #ChangeSorter to: self blue;
  		set: #customWindowColor for: #ChatNotes to: self magenta;
  		set: #customWindowColor for: #ClassCommentVersionsBrowser to: self violet;
  		set: #customWindowColor for: #Debugger to: self red;
  		set: #customWindowColor for: #DualChangeSorter to: self blue;
  		set: #customWindowColor for: #FileContentsBrowser to: self yellow;
  		set: #customWindowColor for: #FileList to: self yellow;
  		set: #customWindowColor for: #InstanceBrowser to: self cyan;
  		set: #customWindowColor for: #Lexicon to: self cyan;
  		set: #customWindowColor for: #MCTool to: self violet;
  		set: #customWindowColor for: #MessageNames to: self green;
  		set: #customWindowColor for: #MessageSet to: self cyan;
  		set: #customWindowColor for: #PackagePaneBrowser to: self green;
  		set: #customWindowColor for: #PluggableFileList to: self yellow;
  		set: #customWindowColor for: #PreferenceBrowser to: self cyan;
  		set: #customWindowColor for: #SMLoader to: self orange;
  		set: #customWindowColor for: #SMLoaderPlus to: self orange;
  		set: #customWindowColor for: #SMReleaseBrowser to: self orange;
  		set: #customWindowColor for: #ScriptingDomain to: self yellow;
  		set: #customWindowColor for: #SelectorBrowser to: self cyan;
  		set: #customWindowColor for: #StringHolder to: self yellow;
  		set: #customWindowColor for: #TestRunner to: self orange;
  		set: #customWindowColor for: #TranscriptStream to: self orange;
  		set: #customWindowColor for: #VersionsBrowser to: self violet.!

Item was changed:
  ----- Method: SolarizedTheme class>>addLightWindowColors: (in category 'instance creation') -----
  addLightWindowColors: theme
+ 	"You have to create dark first.
+ 	doIt: [self createDark. self createLight apply.]"
+ 
- 	"self createLight apply."
  	theme
+ 		set: #uniformWindowColor for: #Model to: (self lightBackgroundHighlights adjustBrightness: -0.16 "darker twice");
+ 
+ 		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color adjustBrightness: 0.16 "lighter twice"] ];
- 		set: #uniformWindowColor for: #Model to: self lightBackgroundHighlights darker;
- 		
- 		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color lighter] ];
  		set: #unfocusedLabelColor for: #SystemWindow to: self lightContentEmphasized;
  		set: #focusedLabelColor for: #SystemWindow to: self lightContentEmphasizedMore;
  
  		set: #customWindowColor for: #Browser to: self green;
  		set: #customWindowColor for: #ChangeList to: self blue;
  		set: #customWindowColor for: #ChangeSorter to: self blue;
  		set: #customWindowColor for: #ChatNotes to: self magenta;
  		set: #customWindowColor for: #ClassCommentVersionsBrowser to: self violet;
  		set: #customWindowColor for: #Debugger to: self red;
  		set: #customWindowColor for: #DualChangeSorter to: self blue;
  		set: #customWindowColor for: #FileContentsBrowser to: self yellow;
  		set: #customWindowColor for: #FileList to: self yellow;
  		set: #customWindowColor for: #InstanceBrowser to: self cyan;
  		set: #customWindowColor for: #Lexicon to: self cyan;
  		set: #customWindowColor for: #MCTool to: self violet;
  		set: #customWindowColor for: #MessageNames to: self green;
  		set: #customWindowColor for: #MessageSet to: self cyan;
  		set: #customWindowColor for: #PackagePaneBrowser to: self green;
  		set: #customWindowColor for: #PluggableFileList to: self yellow;
  		set: #customWindowColor for: #PreferenceBrowser to: self cyan;
  		set: #customWindowColor for: #SMLoader to: self orange;
  		set: #customWindowColor for: #SMLoaderPlus to: self orange;
  		set: #customWindowColor for: #SMReleaseBrowser to: self orange;
  		set: #customWindowColor for: #ScriptingDomain to: self yellow;
  		set: #customWindowColor for: #SelectorBrowser to: self cyan;
  		set: #customWindowColor for: #StringHolder to: self yellow;
  		set: #customWindowColor for: #TestRunner to: self orange;
  		set: #customWindowColor for: #TranscriptStream to: self orange;
  		set: #customWindowColor for: #VersionsBrowser to: self violet.!

Item was changed:
  ----- Method: SolarizedTheme class>>createDark (in category 'instance creation') -----
  createDark
+ 	"doIt: [self createDark apply.]"
+ 
+ 	| themeName |
+ 	themeName := 'Solarized (dark)'.
+ 	^ (self named: themeName) in: [:theme |
- 	"self createDark apply."
- 	| name |
- 	name := 'Solarized (dark)'.
- 	^ (self named: name) in: [:theme |
  		theme merge: (self named: 'Squeak') overwrite: true.
+ 		theme name: themeName.
+ 
- 		theme name: name.
- 		
  		"General morph stuff."
  		theme
  			set: #keyboardFocusColor for: #Morph to: self darkContentSecondary;
  			set: #keyboardFocusWidth for: #Morph to: 1.
- 			
- 		theme set: #background for: #MorphicProject to: (BitmapFillStyle fromForm: self darkBackgroundForm).
  
+ 		theme set: #background for: #MorphicProject to: (BitmapFillStyle fromForm: self lightBackgroundForm).
+ 
  		self
  			addDarkFonts: theme;
  			addDarkWindowColors: theme;
  			addDarkSyntaxHighlighting: theme;
  			addDarkScrollables: theme;
  			addDarkButtons: theme;
  			addDarkDialogs: theme;
  			addDarkMenusAndDockingBars: theme.
+ 
- 			
  		theme]!

Item was changed:
  ----- Method: SolarizedTheme class>>createLight (in category 'instance creation') -----
  createLight
  	"You have to create dark first.
+ 	doIt: [self createDark. self createLight apply.]"
+ 
+ 	| themeName |
+ 	themeName := 'Solarized (light)'.
+ 	^ (self named: themeName) in: [:theme |
- 	self createLight apply."
- 	
- 	| name |
- 	name := 'Solarized (light)'.
- 	^ (self named: 'Solarized (light)') in: [:theme |
  		theme merge: (self named: 'Solarized (dark)') overwrite: true.
+ 		theme name: themeName.
+ 
- 		theme name: name.
- 	
  		"General morph stuff."
  		theme
  			set: #keyboardFocusColor for: #Morph to: self lightContentSecondary;
  			set: #keyboardFocusWidth for: #Morph to: 1.
- 			
- 		theme set: #background for: #MorphicProject to: (BitmapFillStyle fromForm: self lightBackgroundForm).
  
+ 		theme set: #background for: #MorphicProject to: (BitmapFillStyle fromForm: self darkBackgroundForm).
+ 
  		self
  			addLightFonts: theme;
  			addLightWindowColors: theme;
  			addLightSyntaxHighlighting: theme;
  			addLightScrollables: theme;
  			addLightButtons: theme;
  			addLightDialogs: theme;
  			addLightMenusAndDockingBars: theme.
+ 
- 			
  		theme]!

Item was changed:
  ----- Method: SqueakTheme class>>addWindowColors: (in category 'instance creation') -----
  addWindowColors: theme
  
+ 	theme 
- 	theme
  		set: #titleFont for: #SystemWindow to: [Preferences windowTitleFont];
  		set: #borderColorModifier for: #SystemWindow to: [ [:c | c adjustBrightness: -0.3] ];
  		set: #borderWidth for: #SystemWindow to: 1;
  	
  		set: #uniformWindowColor for: #Model to: Color veryVeryLightGray;
  		derive: #uniformWindowColor for: #TranscriptStream from: #Model;
+ 		derive: #color for: #SystemWindow from: #Model at: #uniformWindowColor; "Fall back for windows without models."
+ 				
- 		
  		set: #unfocusedWindowColorModifier for: #SystemWindow to: [ [:color | color darker] ];
  		set: #unfocusedLabelColor for: #SystemWindow to: Color darkGray;
  		set: #focusedLabelColor for: #SystemWindow to: Color black;
  
  		set: #customWindowColor for: #Browser to: (Color r: 0.764 g: 0.9 b: 0.63);
  		set: #customWindowColor for: #ChangeList to: (Color r: 0.719 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #ChangeSorter to: (Color r: 0.719 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #ChatNotes to: (Color r: 1.0 g: 0.7 b: 0.8);
  		set: #customWindowColor for: #ClassCommentVersionsBrowser to: (Color r: 0.753 g: 0.677 b: 0.9);
  		set: #customWindowColor for: #Debugger to: (Color r: 0.9 g: 0.719 b: 0.719);
  		set: #customWindowColor for: #DualChangeSorter to: (Color r: 0.719 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #FileContentsBrowser to: (Color r: 0.7 g: 0.7 b: 0.508);
  		set: #customWindowColor for: #FileList to: (Color r: 0.65 g: 0.65 b: 0.65);
  		set: #customWindowColor for: #InstanceBrowser to: (Color r: 0.726 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #Lexicon to: (Color r: 0.79 g: 0.9 b: 0.79);
  		set: #customWindowColor for: #MCTool to: (Color r: 0.65 g: 0.691 b: 0.876);
  		set: #customWindowColor for: #MessageNames to: (Color r: 0.639 g: 0.9 b: 0.497);
  		set: #customWindowColor for: #MessageSet to: (Color r: 0.719 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #PackagePaneBrowser to: (Color r: 0.9 g: 0.9 b: 0.63);
  		set: #customWindowColor for: #PluggableFileList to: Color lightYellow;
  		set: #customWindowColor for: #PreferenceBrowser to: (Color r: 0.671 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #SMLoader to: (Color r: 0.801 g: 0.801 b: 0.614);
  		set: #customWindowColor for: #SMLoaderPlus to: (Color r: 0.801 g: 0.801 b: 0.614);
  		set: #customWindowColor for: #SMReleaseBrowser to: (Color r: 0.801 g: 0.801 b: 0.614);
  		set: #customWindowColor for: #ScriptingDomain to: (Color r: 0.91 g: 0.91 b: 0.91);
  		set: #customWindowColor for: #SelectorBrowser to: (Color r: 0.45 g: 0.9 b: 0.9);
  		set: #customWindowColor for: #StringHolder to: (Color r: 0.9 g: 0.9 b: 0.719);
  		set: #customWindowColor for: #TestRunner to: (Color r: 0.9 g: 0.576 b: 0.09);
  		set: #customWindowColor for: #TranscriptStream to: (Color r: 0.9 g: 0.75 b: 0.45);
  		set: #customWindowColor for: #VersionsBrowser to: (Color r: 0.782 g: 0.677 b: 0.9).!

Item was changed:
  ----- Method: SqueakTheme class>>create (in category 'instance creation') -----
  create
  	"This is the default theme for Squeak.
  	
+ 	self create apply. "
- 	self create. "
  	
  	^ (self named: 'Squeak') in: [:theme |		
  		"General morph stuff."
  		theme
  			set: #keyboardFocusColor for: #Morph to: (TranslucentColor r: 0.3 g: 0.5 b: 0.5 alpha: 0.5);
  			set: #keyboardFocusWidth for: #Morph to: 3;
  			set: #softShadowColor for: #Morph to: (Color black alpha: 0.01);
  			set: #softShadowOffset for: #Morph to: (10 at 8 corner: 10 at 12);
  			set: #hardShadowColor for: #Morph to: (Color black alpha: 0.5);
  			set: #hardShadowOffset for: #Morph to: 1 at 1.
  			
  		theme set: #background for: #MorphicProject to: (BitmapFillStyle fromForm: self linenblue).
  			
  		self
  			addFonts: theme;
  			addWindowColors: theme;
  			addSyntaxHighlighting: theme;
  			addMenusAndDockingBars: theme;
  			addDialogs: theme;
  			addButtons: theme;
  			addScrollables: theme.
  		
  		theme]!



More information about the Packages mailing list