The Trunk: System-cmm.876.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: System-cmm.876.mcz

commits-2
Chris Muller uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-cmm.876.mcz

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

Name: System-cmm.876
Author: cmm
Time: 9 August 2016, 8:32:55.734245 pm
UUID: 636f3012-7416-443d-a00b-c4e115a6e3f6
Ancestors: System-mt.875

- CommunityDark, fix the Squeak-logo color when selected.
- Fix ability to load legacy .prefs files saved with Squeak 5.0.

=============== Diff against System-mt.875 ===============

Item was changed:
  ----- Method: CommunityTheme class>>addDarkMenusAndDockingBars: (in category 'instance creation') -----
  addDarkMenusAndDockingBars: aUserInterfaceTheme
  "self createDark apply."
  aUserInterfaceTheme
  set: #borderWidth for: #MenuMorph to: 0;
  set: #color for: #MenuMorph to: Color darkGray twiceDarker;
  set: #titleTextColor for: #MenuMorph to: Color white;
  set: #lineColor for: #MenuMorph to: Color darkGray;
  set: #lineStyle for: #MenuMorph to: BorderStyle default;
  set: #lineWidth for: #MenuMorph to: 1.
  aUserInterfaceTheme
  set: #textColor for: #MenuItemMorph to: self dbForeground;
  set: #selectionColor for: #MenuItemMorph to: self dbSelection;
  set: #selectionTextColor for: #MenuItemMorph to: Color white ;
  set: #disabledTextColor for: #MenuItemMorph to: self dbForeground muchDarker.
  "set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph."
  "The world main docking bar."
  aUserInterfaceTheme
  " set: #color for: #DockingBarMorph to: Color darkGray;"
  " set: #selectionColor for: #DockingBarItemMorph to: self darkContentSecondary;"
  set: #logoColor for: #TheWorldMainDockingBar to: Color white;
+ set: #selectionLogoColor for: #TheWorldMainDockingBar to: Color white!
- set: #selectionLogoColor for: #TheWorldMainDockingBar to: Color black!

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: #borderColor for: #ScrollPane to: (Color transparent) ; "So the search box isn't outlined."
  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;
+ set: #selectionTextColor for: #PluggableListMorph to: Color white ;
- 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.4);
  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.
  aUserInterfaceTheme
  set: #balloonTextColor for: #PluggableTextMorphPlus to: Color lightGray!

Item was changed:
  ----- Method: Preferences class>>loadPreferencesFrom: (in category 'initialization - save/load') -----
  loadPreferencesFrom: aFile
  | stream params dict desktopColor |
  stream := ReferenceStream fileNamed: aFile.
  params := stream next.
  self assert: (params isKindOf: IdentityDictionary).
  params removeKey: #PersonalDictionaryOfPreferences.
  dict := stream next.
  self assert: (dict isKindOf: IdentityDictionary).
  desktopColor := stream next.
  stream close.
  dict keysAndValuesDo:
  [:key :value | (self preferenceAt: key ifAbsent: [nil]) ifNotNil:
+ [:pref | [pref preferenceValue: value preferenceValue] on: Error do: [ : err | "Ignore preferences which may not be supported anymore."]]].
- [:pref | pref preferenceValue: value preferenceValue]].
-
  params keysAndValuesDo: [ :key :value | self setParameter: key to: value ].
-
  Smalltalk isMorphic
  ifTrue: [ World fillStyle: desktopColor ]
+ ifFalse: [ self desktopColor: desktopColor. ScheduledControllers updateGray ]!
- ifFalse: [ self desktopColor: desktopColor. ScheduledControllers updateGray ].
- !