[squeak-dev] The Trunk: Monticello-mt.613.mcz

30 Apr 2015


      Marcel Taeumel uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-mt.613.mcz
==================== Summary ====================
Name: Monticello-mt.613
Author: mt
Time: 30 April 2015, 2:05:31.212 pm
UUID: 6f63f5b3-e15e-894e-a186-6841c9947c06
Ancestors: Monticello-mt.612
Some hard-coded layout properties refactored to adapt spacing according to fonts.
=============== Diff against Monticello-mt.612 ===============
Item was changed:
  ----- Method: MCChangeSelector>>widgetSpecs (in category 'as yet unclassified') -----
  widgetSpecs
    Preferences annotationPanes ifFalse: [ ^#(
+ 		((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight))
+ 		((multiListMorph:selection:listSelection:menu: list selection listSelectionAt: methodListMenu:) (0 0 1 0.4) (0 defaultButtonPaneHeight 0 0))
+ 		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 defaultButtonPaneHeight))
+ 		((textMorph: text) (0 0.4 1 1) (0 defaultButtonPaneHeight 0 0))
- 		((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((multiListMorph:selection:listSelection:menu: list selection listSelectionAt: methodListMenu:) (0 0 1 0.4) (0 30 0 0))
- 		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30))
- 		((textMorph: text) (0 0.4 1 1) (0 30 0 0))
    	)].
+ 	^ {
+ 		#((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight)).
+ 		#((multiListMorph:selection:listSelection:menu: list selection listSelectionAt: methodListMenu:) (0 0 1 0.4) (0 defaultButtonPaneHeight 0 0)).
+ 		#((innerButtonRow) (0 0.4 1 0.4) (0 0 0 defaultButtonPaneHeight)).
+ 		{ #(textMorph: annotations). #(0 0.4 1 0.4). { 0. self defaultButtonPaneHeight. 0. self defaultButtonPaneHeight+self defaultAnnotationPaneHeight. }}.
+ 		{ #(textMorph: text). #(0 0.4 1 1). { 0. self defaultButtonPaneHeight+self defaultAnnotationPaneHeight. 0. 0.}}
+ 	}!
- 	^ #(
- 		((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((multiListMorph:selection:listSelection:menu: list selection listSelectionAt: methodListMenu:) (0 0 1 0.4) (0 30 0 0))
- 		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30))
- 		((textMorph: annotations) (0 0.4 1 0.4) (0 30 0 88))
- 		((textMorph: text) (0 0.4 1 1) (0 88 0 0))
- 		)!
Item was changed:
  ----- Method: MCMergeBrowser>>widgetSpecs (in category 'as yet unclassified') -----
  widgetSpecs
    Preferences annotationPanes ifFalse: [ ^#(
+ 		((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight))
+ 		((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 defaultButtonPaneHeight 0 0))
+ 		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 defaultButtonPaneHeight))
+ 		((textMorph: text) (0 0.4 1 1) (0 defaultButtonPaneHeight 0 0))
- 		((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 30 0 0))
- 		((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30))
- 		((textMorph: text) (0 0.4 1 1) (0 30 0 0))
    	)].
^ {
+ 		#((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight)).
+ 		#((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 defaultButtonPaneHeight 0 0)).
+ 		#((innerButtonRow) (0 0.4 1 0.4) (0 0 0 defaultButtonPaneHeight)).
+ 		{ #(textMorph: annotations). #(0 0.4 1 0.4). { 0. self defaultButtonPaneHeight. 0. self defaultButtonPaneHeight+self defaultAnnotationPaneHeight. }}.
+ 		{ #(textMorph: text). #(0 0.4 1 1). { 0. self defaultButtonPaneHeight+self defaultAnnotationPaneHeight. 0. 0.}}
- 		#((buttonRow) (0 0 1 0) (0 0 0 30)).
- 		#((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 30 0 0)).
- 		#((innerButtonRow) (0 0.4 1 0.4) (0 0 0 30)).
- 		{ #(textMorph: annotations). #(0 0.4 1 0.4). { 0. 30. 0. 30+self defaultAnnotationPaneHeight. }}.
- 		{ #(textMorph: text). #(0 0.4 1 1). { 0. 30+self defaultAnnotationPaneHeight. 0. 0.}}
    }!
Item was changed:
  ----- Method: MCOperationsBrowser>>widgetSpecs (in category 'ui') -----
  widgetSpecs
    Preferences annotationPanes ifFalse: [ ^#(
    	((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 0 0 0))
    	((textMorph: text) (0 0.4 1 1))
    	) ].
+ 	^ #(
+ 		((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 0 0 0))
+ 		((textMorph: annotations) (0 0.4 1 0.4) (0 0 0 defaultAnnotationPaneHeight))
+ 		((textMorph: text) (0 0.4 1 1) (0 defaultAnnotationPaneHeight 0 0))
+ 	)!
- 	^ {
- 		#((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 1 0.4) (0 0 0 0)).
- 		{ #(textMorph: annotations). #(0 0.4 1 0.4). { 0. 0. 0. self defaultAnnotationPaneHeight. } }.
- 		{ #(textMorph: text). #(0 0.4 1 1). { 0. self defaultAnnotationPaneHeight. 0. 0. } }.
- 		}!
Item was changed:
  ----- Method: MCRepositoryInspector>>widgetSpecs (in category 'morphic ui') -----
  widgetSpecs
+ 	^#(	((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight))
+ 		((listMorph: package) (0 0 0.5 0.6) (0 defaultButtonPaneHeight 0 0))
+ 		((listMorph: version) (0.5 0 1 0.6) (0 defaultButtonPaneHeight 0 0))
- 	^#(	((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((listMorph: package) (0 0 0.5 0.6) (0 30 0 0))
- 		((listMorph: version) (0.5 0 1 0.6) (0 30 0 0))
    	((textMorph: summary) (0 0.6 1 1) (0 0 0 0)) )!
Item was changed:
  ----- Method: MCSaveVersionDialog>>widgetSpecs (in category 'ui') -----
  widgetSpecs
    ^ #(	
    	((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0 0.5 0.6) (0 0 0 -47) )
+ 		((inputMorph: versionName) (0.5 0 1 0) (0 0 0 defaultInputFieldHeight))
+ 		((textMorph: logMessage) (0.5 0 1 0.6) (0 defaultInputFieldHeight 0 -47))
- 		((inputMorph: versionName) (0.5 0 1 0) (0 0 0 30))
- 		((textMorph: logMessage) (0.5 0 1 0.6) (0 30 0 -47))
    	((buttonRow) (0.5 0.6 1 0.6) (0 -47 0 0))
    	((textMorph: annotations) (0 0.6 0.5 0.6) (0 -47 0 0))
    	((textMorph: text) (0 0.6 1 1) (0 0 0 0))
    	)!
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))
+ 		((inputMorph: annotations) (0 0.4 1 0.4) (0 0 0 defaultInputFieldHeight))
+ 		((codePane: text) (0 0.4 1 1) (0 defaultInputFieldHeight 0 0))
- 		((inputMorph: annotations) (0 0.4 1 0.4) (0 0 0 30))
- 		((codePane: text) (0 0.4 1 1) (0 30 0 0))
    	)!
Item was changed:
  ----- Method: MCTool>>buildWith: (in category 'toolbuilder') -----
  buildWith: builder
    |  windowBuilder |
windowBuilder := MCToolWindowBuilder builder: builder tool: self.
    self widgetSpecs do:
    	[:spec | | send fractions offsets |
    	send := spec first.
+ 		fractions := (spec at: 2 ifAbsent: [#(0 0 1 1)]) copy.
+ 		offsets := (spec at: 3 ifAbsent: [#(0 0 0 0)]) copy.
+ 		
+ 		fractions doWithIndex: [:numberOrSymbol :index |
+ 			numberOrSymbol isSymbol
+ 				ifTrue: [fractions at: index put: (self perform: numberOrSymbol)]].
+ 		offsets doWithIndex: [:numberOrSymbol :index |
+ 			numberOrSymbol isSymbol
+ 				ifTrue: [offsets at: index put: (self perform: numberOrSymbol)]].
+ 					
- 		fractions := spec at: 2 ifAbsent: [#(0 0 1 1)].
- 		offsets := spec at: 3 ifAbsent: [#(0 0 0 0)].
    	windowBuilder frame: (LayoutFrame
    		fractions: (fractions first @ fractions second corner: fractions third @ fractions fourth)
    		offsets: (offsets first @ offsets second corner: offsets third @ offsets fourth)).
    	windowBuilder perform: send first withArguments: send allButFirst].
^ windowBuilder build
  !
Item was changed:
  ----- Method: MCTool>>defaultAnnotationPaneHeight (in category 'morphic ui') -----
  defaultAnnotationPaneHeight 
    "Answer the receiver's preferred default height for new annotation panes.
    Since MC compares two annotations, reserve a bit less than a double the traditional height."
+ 	
+ 	^ Preferences standardDefaultTextFont height * 3!
- 	^ (Preferences parameterAt: #defaultAnnotationPaneHeight ifAbsentPut: [25]) * 5 // 3!
Item was changed:
  ----- Method: MCTool>>defaultButtonPaneHeight (in category 'morphic ui') -----
  defaultButtonPaneHeight
    "Answer the user's preferred default height for new button panes."
+ 	^ (Preferences standardButtonFont height * 2.5) rounded!
- 	^ Preferences parameterAt: #defaultButtonPaneHeight ifAbsentPut: [25]!
Item was added:
+ ----- Method: MCTool>>defaultInputFieldHeight (in category 'morphic ui') -----
+ defaultInputFieldHeight
+ 
+ 	^ Preferences standardDefaultTextFont height * 2!
Item was changed:
  ----- Method: MCVersionInspector>>widgetSpecs (in category 'morphic ui') -----
  widgetSpecs
    ^ #(
+ 		((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight))
+ 		((textMorph: summary) (0 0 1 1) (0 defaultButtonPaneHeight 0 0))
- 		((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((textMorph: summary) (0 0 1 1) (0 30 0 0))
    	)!
Item was changed:
  ----- Method: MCWorkingCopyBrowser>>widgetSpecs (in category 'morphic ui') -----
  widgetSpecs
    ^ #(
+ 		((buttonRow) (0 0 1 0) (0 0 0 defaultButtonPaneHeight))
+ 		((treeOrListMorph: workingCopy) (0 0 0.5 1) (0 defaultButtonPaneHeight 0 0))
+ 		((listMorph: repository) (0.5 0 1 1) (0 defaultButtonPaneHeight 0 0))
- 		((buttonRow) (0 0 1 0) (0 0 0 30))
- 		((treeOrListMorph: workingCopy) (0 0 0.5 1) (0 30 0 0))
- 		((listMorph: repository) (0.5 0 1 1) (0 30 0 0))
    	)!