The Trunk: Monticello-kb.371.mcz

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

The Trunk: Monticello-kb.371.mcz

commits-2
A new version of Monticello was added to project The Trunk:
http://source.squeak.org/trunk/Monticello-kb.371.mcz

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

Name: Monticello-kb.371
Author: kb
Time: 24 February 2010, 10:25:20.812 pm
UUID: 32697701-61b8-44cc-a601-3596fc9032ca
Ancestors: Monticello-kb.370

 - fix: don't style class comments, and other things that we shouldn't style.
 - fix: use codePane: in widgetSpecs if annotationPanes are enabled
 - fix: add codePane: to MCTool for the case if we don't have ToolBuilder

=============== Diff against Monticello-kb.370 ===============

Item was added:
+ ----- Method: MCTool>>codePane: (in category 'morphic ui') -----
+ codePane: aSymbol
+
+ | textMorph |
+ textMorph := PluggableTextMorphPlus
+ on: self
+ text: aSymbol
+ accept: (aSymbol, ':') asSymbol.
+ textMorph useDefaultStyler.
+ ^textMorph!

Item was changed:
  ----- Method: MCSnapshotBrowser>>aboutToStyle: (in category 'morphic ui') -----
  aboutToStyle: aStyler
 
+ | classOrMetaClass shouldStyle |
+ classSelection ifNil: [ ^false ].
+ switch = #comment ifTrue: [ ^false ].
+ (protocolSelection notNil and: [
+ methodSelection notNil ])
+ ifTrue: [
+ classOrMetaClass := self selectedClassOrMetaClass.
+ shouldStyle := true ]
+ ifFalse: [
+ classOrMetaClass := nil.
+ shouldStyle := categorySelection ~= self extensionsCategory ].
+ aStyler classOrMetaClass: classOrMetaClass.
+ ^shouldStyle!
- aStyler classOrMetaClass: (
- (methodSelection isNil and: [
- protocolSelection isNil and: [
- classSelection notNil ] ])
- ifFalse: [ self selectedClassOrMetaClass ]
- ifTrue: [ nil ]).
- ^true
- !

Item was changed:
  ----- Method: MCSnapshotBrowser>>widgetSpecs (in category 'morphic ui') -----
  widgetSpecs
 
  Preferences annotationPanes ifFalse: [ ^#(
  ((listMorph: category) (0 0 0.25 0.4))
  ((listMorph: class) (0.25 0 0.50 0.4) (0 0 0 -30))
  ((listMorph: protocol) (0.50 0 0.75 0.4))
  ((listMorph:selection:menu:keystroke:  methodList methodSelection methodListMenu: methodListKey:from:) (0.75 0 1 0.4))
  ((buttonRow) (0.25 0.4 0.5 0.4) (0 -30 0 0))
  ((codePane: text) (0 0.4 1 1))
  ) ].
 
  ^#(
  ((listMorph: category) (0 0 0.25 0.4))
  ((listMorph: class) (0.25 0 0.50 0.4) (0 0 0 -30))
  ((listMorph: protocol) (0.50 0 0.75 0.4))
  ((listMorph:selection:menu:keystroke:  methodList methodSelection methodListMenu: methodListKey:from:) (0.75 0 1 0.4))
 
  ((buttonRow) (0.25 0.4 0.5 0.4) (0 -30 0 0))
 
  ((textMorph: annotations) (0 0.4 1 0.4) (0 0 0 30))
+ ((codePane: text) (0 0.4 1 1) (0 30 0 0))
- ((textMorph: text) (0 0.4 1 1) (0 30 0 0))
  )!

Item was changed:
  SystemOrganization addCategory: #'Monticello-Base'!
  SystemOrganization addCategory: #'Monticello-Chunk Format'!
  SystemOrganization addCategory: #'Monticello-Loading'!
  SystemOrganization addCategory: #'Monticello-Merging'!
  SystemOrganization addCategory: #'Monticello-Modeling'!
  SystemOrganization addCategory: #'Monticello-Patching'!
  SystemOrganization addCategory: #'Monticello-Repositories'!
  SystemOrganization addCategory: #'Monticello-Storing'!
  SystemOrganization addCategory: #'Monticello-UI'!
  SystemOrganization addCategory: #'Monticello-Versioning'!
+ SystemOrganization addCategory: #'Monticello-Mocks'!


Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Monticello-kb.371.mcz

Balázs Kósi
Hi,

This is still not perfect, because classes not in the image are styled
incorrectly.
There is already a solution for the problem in:
http://www.squeaksource.com/shout/ShoutMonticello.1-tween.2.mcz
Should I fold this into the trunk? Shouldn't we put all the styling
related code in the ShoutCore package?

Balázs