The Trunk: Monticello-mt.646.mcz

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

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

Name: Monticello-mt.646
Author: mt
Time: 16 August 2016, 2:21:44.204602 pm
UUID: c02c97e9-6287-c54d-a55d-d61e57e2caed
Ancestors: Monticello-mt.645

Fix UI theme for MCOperationsBrowser. For the sake of feature freeze, do it for ignore/reject changes only. As far as I can see, the MCMergeBrowser requires a little more care. However, the MCConflict summaries are emphasis only (bold etc.) and not colorized, so this is not that urgent.

=============== Diff against Monticello-mt.645 ===============

Item was added:
+ ----- Method: MCOperationsBrowser class>>themeProperties (in category 'preferences') -----
+ themeProperties
+
+ ^ super themeProperties, {
+ { #revertedOperationAttributes. 'Colors' . 'Text attributes to use for reverted operations in MC tools.' }.
+ { #ignoredOperationAttributes. 'Colors' . 'Text attributes to use for ignored operations in MC tools.' }.
+
+ "{ #rejectedOperationAttributes. 'Colors' . 'Text attributes to use for rejected operations in MC tools.' }.
+ { #acceptedOperationAttributes. 'Colors' . 'Text attributes to use for accepted operations in MC tools.' }.
+ { #conflictingOperationAttributes. 'Colors' . 'Text attributes to use for conflicting operations in MC tools.' }."
+ }!

Item was added:
+ ----- Method: MCOperationsBrowser>>applyUserInterfaceTheme (in category 'updating') -----
+ applyUserInterfaceTheme
+
+ super applyUserInterfaceTheme.
+
+ self changed: #list.!

Item was changed:
  ----- Method: MCOperationsBrowser>>list (in category 'accessing') -----
  list
  ^ self items collect: [:each |
  (self reverts includes: each)
  ifFalse: [each summary]
+ ifTrue: [Text
+ string: '( ', each summary, ' )'
+ attributes: (self userInterfaceTheme revertedOperationAttributes ifNil: [{TextEmphasis struckOut}])]]!
- ifTrue: [Text string: '( ', each summary, ' )' attribute: TextEmphasis struckOut ]]!

Item was changed:
  ----- Method: MCSaveVersionDialog>>list (in category 'accessing') -----
  list
    ^ self items collect: [:each |
          (self reverts includes: each)
              ifFalse: [(self ignore includes: each)
                          ifFalse: [each summary]
+                         ifTrue: [Text
+ string: '( ', each summary, ' )'
+ attributes: (self userInterfaceTheme ignoredOperationAttributes ifNil: [{TextColor color: Color gray}])]]
+             ifTrue: [Text
+ string: '( ', each summary, ' )'
+ attribute: (self userInterfaceTheme revertedOperationAttributes ifNil: [ {TextEmphasis struckOut} ]) ]]!
-                         ifTrue: [Text string: '( ', each summary, ' )' attribute: (TextColor color: Color gray)]]
-             ifTrue: [Text string: '( ', each summary, ' )' attribute: TextEmphasis struckOut ]]!