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

commits at source.squeak.org commits at source.squeak.org
Fri Aug 5 06:54:17 UTC 2016


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

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

Name: System-mt.865
Author: mt
Time: 5 August 2016, 8:53:50.188358 am
UUID: 11d47b5b-9af6-ca46-859d-f57957cb482c
Ancestors: System-cmm.864

Apply latest theme additions (#disabledTextColor for menus and #frameAdornmentWidth for text fields) to all themes.

=============== Diff against System-cmm.864 ===============

Item was changed:
  ----- Method: CommunityTheme class>>addDarkScrollables: (in category 'instance creation') -----
  addDarkScrollables: aUserInterfaceTheme
  	"self createDark apply."
  	"Scroll bars"
  	aUserInterfaceTheme
  		set: #thumbColor for: #ScrollBar to: self dbGray;
  		set: #thumbBorderColor for: #ScrollBar to: self dbGray twiceDarker.
  	"Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets."
  	aUserInterfaceTheme
  		set: #color for: #ScrollPane to: self dbBackground.
  	"List widgets"
  	aUserInterfaceTheme
  		set: #textColor for: #PluggableListMorph to: (Color gray: 0.9);
  		set: #selectionColor for: #PluggableListMorph to: self dbSelection;
  		derive: #selectionTextColor for: #PluggableListMorph from: #PluggableListMorph at: #textColor ;
  		derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c twiceDarker];
  		set: #filterColor for: #PluggableListMorph to: (self dbYellow alpha: 0.5);
  		derive: #filterTextColor for: #PluggableListMorph from: #PluggableListMorph at: #textColor ;
  		set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c twiceDarker ] ];
  		set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c twiceDarker alpha: 0.5 ] ].
  	"Tree widgets"
  	aUserInterfaceTheme
  		set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self dbYellow lighter lighter;
  		set: #lineColor for: #SimpleHierarchicalListMorph to: Color gray.
  	"Text widgets"
  	aUserInterfaceTheme
  		set: #textColor for: #PluggableTextMorph to: (Color gray: 0.9);
  		set: #caretColor for: #PluggableTextMorph to: Color orange darker;
  		set: #selectionColor for: #PluggableTextMorph to: (self dbSelection darker duller);
  		set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | c duller] ];
  		set: #adornmentReadOnly for: #PluggableTextMorph to: self dbPurple;
  		set: #adornmentRefuse for: #PluggableTextMorph to: self dbBlue;
  		set: #adornmentConflict for: #PluggableTextMorph to: self dbRed;
  		set: #adornmentDiff for: #PluggableTextMorph to: self dbGreen;
  		set: #adornmentNormalEdit for: #PluggableTextMorph to: self dbOrange;
  		set: #adornmentDiffEdit for: #PluggableTextMorph to: self dbYellow;
+ 		set: #frameAdornmentWidth for: #PluggableTextMorph to: 2.
- 		set: #frameAdornmentWidth for: PluggableTextMorph to: 2.
  	aUserInterfaceTheme
  		set: #balloonTextColor for: #PluggableTextMorphPlus to: Color lightGray!

Item was changed:
  ----- Method: MonokaiTheme class>>addDarkMenusAndDockingBars: (in category 'instance creation') -----
  addDarkMenusAndDockingBars: theme
  	"self createDark apply."
  	theme
  		set: #borderWidth for: #MenuMorph to: 1;
  		set: #borderColor for: #MenuMorph to: self invisibleColor;
  		set: #color for: #MenuMorph to: self backgroundColor;
  		set: #titleTextColor for: #MenuMorph to: self yellow;
  		set: #lineColor for: #MenuMorph to: self invisibleColor;
  		set: #lineStyle for: #MenuMorph to: BorderStyle default;
  		set: #lineWidth for: #MenuMorph to: 1.
  		
  	theme
  		set: #textColor for: #MenuItemMorph to: self foregroundColor;
+ 		set: #disabledTextColor for: #MenuItemMorph to: self grayLight;
  		set: #selectionColor for: #MenuItemMorph to: self invisibleColor;
  		set: #selectionTextColor for: #MenuItemMorph to: self yellow.
  		"set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph."
  		
  	"The world main docking bar."
  	theme
  		set: #color for: #DockingBarMorph to: self invisibleColor;
  		set: #selectionColor for: #DockingBarItemMorph to: self grayLight;
  		set: #logoColor for: #TheWorldMainDockingBar to: self foregroundColor;
  		set: #selectionLogoColor for: #TheWorldMainDockingBar to: self yellow.!

Item was changed:
  ----- Method: SolarizedTheme class>>addDarkMenusAndDockingBars: (in category 'instance creation') -----
  addDarkMenusAndDockingBars: theme
  	"self createDark apply."
  	theme
  		set: #borderWidth for: #MenuMorph to: 1;
  		set: #borderColor for: #MenuMorph to: self darkBackgroundHighlights;
  		set: #color for: #MenuMorph to: self darkBackground;
  		set: #titleTextColor for: #MenuMorph to: self darkContentEmphasizedMore;
  		set: #lineColor for: #MenuMorph to: self darkBackgroundHighlights;
  		set: #lineStyle for: #MenuMorph to: BorderStyle default;
  		set: #lineWidth for: #MenuMorph to: 1.
  		
  	theme
  		set: #textColor for: #MenuItemMorph to: self darkContentEmphasized;
+ 		set: #disabledTextColor for: #MenuItemMorph to: self darkContentSecondary;
  		set: #selectionColor for: #MenuItemMorph to: self darkBackgroundHighlights;
  		set: #selectionTextColor for: #MenuItemMorph to: self darkContentEmphasizedMore.
  		"set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph."
  		
  	"The world main docking bar."
  	theme
  		set: #color for: #DockingBarMorph to: self darkBackgroundHighlights;
  		set: #selectionColor for: #DockingBarItemMorph to: self darkContentSecondary;
  		set: #logoColor for: #TheWorldMainDockingBar to: self darkContentEmphasized;
  		set: #selectionLogoColor for: #TheWorldMainDockingBar to: self darkContentEmphasizedMore.!

Item was changed:
  ----- Method: SolarizedTheme class>>addLightMenusAndDockingBars: (in category 'instance creation') -----
  addLightMenusAndDockingBars: theme
  	"self createLight apply."
  	theme
  		set: #borderWidth for: #MenuMorph to: 1;
  		set: #borderColor for: #MenuMorph to: self lightBackgroundHighlights;
  		set: #color for: #MenuMorph to: self lightBackground;
  		set: #titleTextColor for: #MenuMorph to: self lightContentEmphasizedMore;
  		set: #lineColor for: #MenuMorph to: self lightBackgroundHighlights;
  		set: #lineStyle for: #MenuMorph to: BorderStyle default;
  		set: #lineWidth for: #MenuMorph to: 1.
  		
  	theme
  		set: #textColor for: #MenuItemMorph to: self lightContentEmphasized;
+ 		set: #disabledTextColor for: #MenuItemMorph to: self lightContentSecondary;
  		set: #selectionColor for: #MenuItemMorph to: self lightBackgroundHighlights;
  		set: #selectionTextColor for: #MenuItemMorph to: self lightContentEmphasizedMore.
  		"set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph."
  		
  	"The world main docking bar."
  	theme
  		set: #color for: #DockingBarMorph to: self lightBackgroundHighlights;
  		set: #selectionColor for: #DockingBarItemMorph to: self lightContentSecondary;
  		set: #logoColor for: #TheWorldMainDockingBar to: self lightContentEmphasized;
  		set: #selectionLogoColor for: #TheWorldMainDockingBar to: self lightContentEmphasizedMore.!

Item was changed:
  ----- Method: SolarizedTheme class>>addLightScrollables: (in category 'instance creation') -----
  addLightScrollables: theme
  	"self createLight apply."
  
  	"Scroll bars"
  	theme
  		set: #thumbColor for: #ScrollBar to: self lightBackground;
  		set: #thumbBorderColor for: #ScrollBar to: self lightBackground;
  		set: #thumbBorderWidth for: #ScrollBar to: 1;
  		set: #thumbColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.1] ];
  		set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | Color transparent ] ];
  		set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.1] ].
  	
  	"Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets."
  	theme
  		set: #borderWidth for: #ScrollPane to: 0;
  	"	set: #borderColor for: #ScrollPane to: Color transparent;"
  		set: #color for: #ScrollPane to: self lightBackground.
  		
  	"List widgets"
  	theme
  		set: #textColor for: #PluggableListMorph to: self lightContentEmphasized;
  		set: #selectionColor for: #PluggableListMorph to: self lightBackgroundHighlights;
  		set: #selectionTextColor for: #PluggableListMorph to: self lightContentEmphasizedMore;
+ 		derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c darker];
  		set: #filterColor for: #PluggableListMorph to: self yellow;
  		set: #filterTextColor for: #PluggableListMorph to: self lightBackground;
  		set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.5 ] ];
  		set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.5 ] ].
  		
  	"Tree widgets"
  	theme
  		set: #highlightTextColor for: #SimpleHierarchicalListMorph to: self yellow lighter lighter;
  		set: #lineColor for: #SimpleHierarchicalListMorph to: self lightContentSecondary.
  	
  	"Text widgets"
  	theme
  		set: #textColor for: #PluggableTextMorph to: self lightContentPrimary;
  		set: #caretColor for: #PluggableTextMorph to: self lightContentEmphasizedMore;
  		set: #selectionColor for: #PluggableTextMorph to: self lightBackgroundHighlights;
  		set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | (Color r: 0.933 g: 0.909 b: 0.835) "light background highlights"] ];
  		set: #adornmentReadOnly for: #PluggableTextMorph to: self magenta;
  		set: #adornmentRefuse for: #PluggableTextMorph to: self cyan;
  		set: #adornmentConflict for: #PluggableTextMorph to: self red;
  		set: #adornmentDiff for: #PluggableTextMorph to: self green;
  		set: #adornmentNormalEdit for: #PluggableTextMorph to: self orange;
  		set: #adornmentDiffEdit for: #PluggableTextMorph to: self yellow.
  	theme
  		set: #balloonTextColor for: #PluggableTextMorphPlus to: self lightContentSecondary.!

Item was changed:
  ----- Method: SqueakTheme class>>addMenusAndDockingBars: (in category 'instance creation') -----
  addMenusAndDockingBars: theme
  
  	theme
  		set: #borderColor for: #MenuMorph to: Color gray;
  		set: #borderWidth for: #MenuMorph to: 1;
  		set: #borderStyle for: #MenuMorph to: BorderStyle default;
  		set: #color for: #MenuMorph to: (Color gray: 0.9);
  
  		set: #titleBorderColor for: #MenuMorph to: (Color r: 0.6 g: 0.7 b: 1);
  		set: #titleBorderWidth for: #MenuMorph to: 0;
  		set: #titleBorderStyle for: #MenuMorph to: BorderStyle default;
  		set: #titleColor for: #MenuMorph to: Color transparent;
  		set: #titleFont for: #MenuMorph to: [Preferences windowTitleFont];
  		set: #titleTextColor for: #MenuMorph to: Color black;
  		
  		set: #lineColor for: #MenuMorph to: (Color gray: 0.9);
  		set: #lineStyle for: #MenuMorph to: BorderStyle inset;
  		set: #lineWidth for: #MenuMorph to: 2.
  		
  	theme
  		set: #font for: #MenuItemMorph to: [Preferences standardMenuFont];
  		set: #textColor for: #MenuItemMorph to: Color black;
+ 		set: #disabledTextColor for: #MenuItemMorph to: Color gray;
  		set: #selectionColor for: #MenuItemMorph to: (Color r: 0.4 g: 0.5 b: 0.7);
  		set: #selectionTextColor for: #MenuItemMorph to: Color white;
  		set: #subMenuMarker for: #MenuItemMorph to: nil. "Use hard-coded default. See MenuItemMorph."
  		
  	"Derive some stuff for the docking bar morph, which looks mostly like a menu morph."
  	theme
  		set: #borderWidth for: #DockingBarMorph to: 0;
  		derive: #borderColor for: #DockingBarMorph from: #MenuMorph;
  		derive: #borderStyle for: #DockingBarMorph from: #MenuMorph;
  		derive: #color for: #DockingBarMorph from: #MenuMorph;
  	
  		derive: #lineColor for: #DockingBarMorph from: #MenuMorph;
  		derive: #lineStyle for: #DockingBarMorph from: #MenuMorph;
  		derive: #lineWidth for: #DockingBarMorph from: #MenuMorph.
  		
  	"The world main docking bar."
  	theme
  		derive: #font for: #TheWorldMainDockingBar from: #MenuItemMorph;
  		derive: #textColor for: #TheWorldMainDockingBar from: #MenuItemMorph;
  		set: #logoColor for: #TheWorldMainDockingBar to: Color black;
  		set: #selectionLogoColor for: #TheWorldMainDockingBar to: Color white.!

Item was changed:
  ----- Method: SqueakTheme class>>addScrollables: (in category 'instance creation') -----
  addScrollables: theme
  	"self create apply"
  	
  	"Sliders"
  	theme
  		set: #borderColor for: #Slider to: Color gray;
  		set: #borderWidth for: #Slider to: 1;
  		set: #color for: #Slider to: Color lightGray;
  		set: #thumbBorderColor for: #Slider to: [Color gray: 0.6];
  		set: #thumbBorderWidth for: #Slider to: 0;
  		set: #thumbColor for: #Slider to: Color veryVeryLightGray;
  		set: #thumbShadowModifier for: #Slider to: [ [:c | c alpha: 0.7] ].
  				
  	"Scroll bars"
  	theme
  		set: #thumbBorderWidth for: #ScrollBar to: 1;
  		set: #thumbColorModifier for: #ScrollBar to: [ [:c | c] ];
  		set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | c darker alpha: 0.35] ];
  		set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.3] ].
  	
  	"Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets."
  	theme
  		set: #borderColor for: #ScrollPane to: (Color gray: 0.6);
  		set: #borderWidth for: #ScrollPane to: 1;
  		set: #borderStyle for: #ScrollPane to: BorderStyle default;
  		set: #color for: #ScrollPane to: Color white.
  		
  	"List widgets"
  	theme
  		set: #font for: #PluggableListMorph to: [Preferences standardListFont];
  		set: #textColor for: #PluggableListMorph to: Color black;
  		set: #selectionColor for: #PluggableListMorph to: (Color r: 0.72 g: 0.72 b: 0.9);
  		derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c lighter];
  		set: #selectionTextColor for: #PluggableListMorph to: Color black;
  		set: #filterColor for: #PluggableListMorph to: Color yellow paler;
  		set: #filterTextColor for: #PluggableListMorph to: Color black;
  		set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | Color gray: 0.9] ];
  		set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.3] ].
  		
  	"Tree widgets"
  	theme
  		derive: #font for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		derive: #textColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		derive: #selectionColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		derive: #selectionTextColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		derive: #filterColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		derive: #filterTextColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		derive: #hoverSelectionModifier for: #SimpleHierarchicalListMorph from: #PluggableListMorph;
  		
  		set: #higlightTextColor for: #SimpleHierarchicalListMorph to: Color red;
  		set: #lineColor for: #SimpleHierarchicalListMorph to: Color veryLightGray.
  	
  	"Text widgets"
  	theme
  		set: #font for: #PluggableTextMorph to: [Preferences standardDefaultTextFont];
  		set: #textColor for: #PluggableTextMorph to: Color black;
  		set: #caretColor for: #PluggableTextMorph to: Color red;
  		set: #selectionColor for: #PluggableTextMorph to: (TranslucentColor r: 0.0 g: 0.0 b: 0.8 alpha: 0.2);
  		set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | Color gray: 0.9] ];
  		set: #adornmentReadOnly for: #PluggableTextMorph to: Color black;
  		set: #adornmentRefuse for: #PluggableTextMorph to: Color tan;
  		set: #adornmentConflict for: #PluggableTextMorph to: Color red;
  		set: #adornmentDiff for: #PluggableTextMorph to: Color green;
  		set: #adornmentNormalEdit for: #PluggableTextMorph to: Color orange;
+ 		set: #adornmentDiffEdit for: #PluggableTextMorph to: Color yellow;
+ 		set: #frameAdornmentWidth for: #PluggableTextMorph to: 1.
- 		set: #adornmentDiffEdit for: #PluggableTextMorph to: Color yellow.
  	theme
  		set: #balloonTextColor for: #PluggableTextMorphPlus to: (Color gray: 0.7);
  		derive: #balloonTextFont for: #PluggableTextMorphPlus from: #PluggableTextMorph at: #font.!



More information about the Squeak-dev mailing list