[squeak-dev] The Trunk: Tools-mt.722.mcz
commits at source.squeak.org
commits at source.squeak.org
Wed Aug 24 08:52:21 UTC 2016
Marcel Taeumel uploaded a new version of Tools to project The Trunk:
http://source.squeak.org/trunk/Tools-mt.722.mcz
==================== Summary ====================
Name: Tools-mt.722
Author: mt
Time: 24 August 2016, 10:51:53.333003 am
UUID: ec1bbe45-f22c-cf47-a2a8-979c13e702b0
Ancestors: Tools-mt.721
Remove use of ColorTheme.
=============== Diff against Tools-mt.721 ===============
Item was changed:
----- Method: FileList2 class>>blueButtonText:textColor:color:inWindow: (in category 'blue ui') -----
blueButtonText: aString textColor: textColor color: aColor inWindow: window
| result |
result := window
fancyText: aString translated
font: Preferences standardEToysFont
color: textColor.
result setProperty: #buttonText toValue: aString;
hResizing: #rigid;
extent: 100 @ 20;
layoutInset: 4;
+ borderWidth: 1;
- borderWidth: ColorTheme current dialogButtonBorderWidth;
useRoundedCorners.
aColor isNil
ifFalse: [""result color: aColor. result borderColor: aColor muchDarker].
^ result!
Item was changed:
----- Method: FileList2 class>>blueButtonText:textColor:color:inWindow:balloonText:selector:recipient: (in category 'blue ui') -----
blueButtonText: aString textColor: textColor color: aColor inWindow: window balloonText: balloonText selector: sel recipient: recip
| result |
result := window
fancyText: aString translated
+ font: Preferences standardEToysFont
- font: Preferences standardEToysFont
color: textColor.
result setProperty: #buttonText toValue: aString;
hResizing: #rigid;
extent: 100 @ 20;
layoutInset: 4;
+ borderWidth: 1;
- borderWidth: ColorTheme current dialogButtonBorderWidth;
useRoundedCorners;
setBalloonText: balloonText.
result
on: #mouseUp
send: sel
to: recip.
aColor isNil
ifFalse: [""
result color: aColor.
result borderColor: aColor muchDarker].
^ result!
Item was changed:
----- Method: FileList2 class>>morphicViewGeneralLoaderInWorld: (in category 'blue ui') -----
morphicViewGeneralLoaderInWorld: aWorld
"
FileList2 morphicViewGeneralLoaderInWorld: self currentWorld
"
| window aFileList buttons treePane textColor1 fileListPane pane2a pane2b fileTypeInfo fileTypeButtons fileTypeRow actionRow |
fileTypeInfo := self endingSpecs.
window := AlignmentMorphBob1 newColumn.
window hResizing: #shrinkWrap; vResizing: #shrinkWrap.
textColor1 := Color r: 0.742 g: 0.839 b: 1.0.
aFileList := self new directory: FileDirectory default.
aFileList
fileSelectionBlock: self projectOnlySelectionBlock;
modalView: window.
window
setProperty: #FileList toValue: aFileList;
wrapCentering: #center; cellPositioning: #topCenter;
+ borderWidth: 1;
+ borderColor: (Color r: 0.9 g: 0.801 b: 0.2);
- borderWidth: ColorTheme current dialogBorderWidth;
- borderColor: ColorTheme current dialogBorderColor;
useRoundedCorners.
fileTypeButtons := fileTypeInfo collect: [ :each |
(self blueButtonText: each first textColor: Color gray inWindow: window)
setProperty: #enabled toValue: true;
hResizing: #shrinkWrap;
useSquareCorners
].
+ buttons := {{'OK'. Color lightGreen}. {'Cancel'. Color lightRed}} collect: [ :each |
- buttons := {{'OK'. ColorTheme current okColor}. {'Cancel'. ColorTheme current cancelColor}} collect: [ :each |
self blueButtonText: each first textColor: textColor1 color: each second inWindow: window
].
treePane := aFileList morphicDirectoryTreePane
extent: 250 at 300;
retractable: false;
borderWidth: 0.
fileListPane := aFileList morphicFileListPane
extent: 350 at 300;
retractable: false;
borderWidth: 0.
window addARow: {window fancyText: 'Find...' translated font: Preferences standardEToysTitleFont color: textColor1}.
fileTypeRow := window addARowCentered: fileTypeButtons cellInset: 2.
actionRow := window addARowCentered: {
buttons first.
(Morph new extent: 30 at 5) color: Color transparent.
buttons second
} cellInset: 2.
window
addARow: {
(window inAColumn: {(pane2a := window inARow: {window inAColumn: {treePane}})
useRoundedCorners;
layoutInset: 0;
+ borderWidth: 1;
+ borderColor: (Color r: 0.6 g: 0.7 b: 1)
- borderWidth: ColorTheme current dialogPaneBorderWidth;
- borderColor: ColorTheme current dialogPaneBorderColor
}) layoutInset: 10.
(window inAColumn: {(pane2b := window inARow: {window inAColumn: {fileListPane}})
useRoundedCorners;
layoutInset: 0;
+ borderWidth: 1;
+ borderColor: (Color r: 0.6 g: 0.7 b: 1)
- borderWidth: ColorTheme current dialogPaneBorderWidth;
- borderColor: ColorTheme current dialogPaneBorderColor
}) layoutInset: 10.
}.
window fullBounds.
+ window fillWithRamp: (Color r: 1 g: 0.85 b: 0.975) oriented: 0.65.
+ pane2a fillWithRamp: (Color r: 0.85 g: 0.9 b: 1) oriented: (0.7 @ 0.35).
+ pane2b fillWithRamp: (Color r: 0.85 g: 0.9 b: 1) oriented: (0.7 @ 0.35).
- window fillWithRamp: ColorTheme current dialogRampOrColor oriented: 0.65.
- pane2a fillWithRamp: ColorTheme current dialogPaneRampOrColor oriented: (0.7 @ 0.35).
- pane2b fillWithRamp: ColorTheme current dialogPaneRampOrColor oriented: (0.7 @ 0.35).
"
buttons do: [ :each |
each fillWithRamp: ColorTheme current dialogButtonsRampOrColor oriented: (0.75 @ 0).
].
"
fileTypeButtons do: [ :each |
each
on: #mouseUp
send: #value:value:
to: [ :evt :morph |
self update: actionRow in: window fileTypeRow: fileTypeRow morphUp: morph.
]
].
buttons first on: #mouseUp send: #okHit to: aFileList.
buttons second on: #mouseUp send: #cancelHit to: aFileList.
aFileList postOpen.
window position: aWorld topLeft + (aWorld extent - window extent // 2).
aFileList directoryChangeBlock: [ :newDir |
self update: actionRow in: window fileTypeRow: fileTypeRow morphUp: nil.
self enableTypeButtons: fileTypeButtons info: fileTypeInfo forDir: newDir.
].
aFileList directory: aFileList directory.
window adoptPaneColor: (Color r: 0.548 g: 0.677 b: 1.0).
window becomeModal.
^ window openInWorld: aWorld.!
Item was changed:
----- Method: FileList2 class>>morphicViewProjectLoader2InWorld:reallyLoad:dirFilterType: (in category 'blue ui') -----
morphicViewProjectLoader2InWorld: aWorld reallyLoad: aBoolean dirFilterType: aSymbol
| window aFileList buttons treePane textColor1 fileListPane pane2a pane2b treeExtent filesExtent |
window := AlignmentMorphBob1 newColumn.
window hResizing: #shrinkWrap; vResizing: #shrinkWrap.
textColor1 := Color r: 0.742 g: 0.839 b: 1.0.
aFileList := self new directory: FileDirectory default.
aFileList
optionalButtonSpecs: aFileList servicesForProjectLoader;
fileSelectionBlock: (
aSymbol == #limitedSuperSwikiDirectoryList ifTrue: [
MessageSend receiver: self selector: #projectOnlySelectionMethod:
] ifFalse: [
self projectOnlySelectionBlock
]
);
"dirSelectionBlock: self hideSqueakletDirectoryBlock;"
modalView: window.
window
setProperty: #FileList toValue: aFileList;
wrapCentering: #center; cellPositioning: #topCenter;
+ borderWidth: 1;
+ borderColor: (Color r: 0.9 g: 0.801 b: 0.2);
- borderWidth: ColorTheme current dialogBorderWidth;
- borderColor: ColorTheme current dialogBorderColor;
useRoundedCorners.
+ buttons := {{'OK'. Color lightGreen}. {'Cancel'. Color lightRed}} collect: [ :each |
- buttons := {{'OK'. ColorTheme current okColor}. {'Cancel'. ColorTheme current cancelColor}} collect: [ :each |
self blueButtonText: each first textColor: textColor1 color: each second inWindow: window
].
aWorld width < 800 ifTrue: [
treeExtent := 150 at 300.
filesExtent := 350 at 300.
] ifFalse: [
treeExtent := 250 at 300.
filesExtent := 350 at 300.
].
(treePane := aFileList morphicDirectoryTreePaneFiltered: aSymbol)
extent: treeExtent;
retractable: false;
borderWidth: 0.
fileListPane := aFileList morphicFileListPane
extent: filesExtent;
retractable: false;
borderWidth: 0.
window
addARow: {
window fancyText: 'Load A Project' translated font: Preferences standardEToysTitleFont color: textColor1
};
addARowCentered: {
buttons first.
(Morph new extent: 30 at 5) color: Color transparent.
buttons second
};
addARow: {
window fancyText: 'Please select a project' translated font: Preferences standardEToysFont color: textColor1
};
addARow: {
(window inAColumn: {(pane2a := window inARow: {window inAColumn: {treePane}})
useRoundedCorners;
layoutInset: 0;
+ borderWidth: 1;
+ borderColor: (Color r: 0.6 g: 0.7 b: 1)
- borderWidth: ColorTheme current dialogPaneBorderWidth;
- borderColor: ColorTheme current dialogPaneBorderColor
}) layoutInset: 10.
(window inAColumn: {(pane2b := window inARow: {window inAColumn: {fileListPane}})
useRoundedCorners;
layoutInset: 0;
+ borderWidth: 1;
+ borderColor: (Color r: 0.6 g: 0.7 b: 1)
- borderWidth: ColorTheme current dialogPaneBorderWidth;
- borderColor: ColorTheme current dialogPaneBorderColor
}) layoutInset: 10.
}.
window fullBounds.
+ window fillWithRamp: (Color r: 1 g: 0.85 b: 0.975) oriented: 0.65.
+ pane2a fillWithRamp: (Color r: 0.85 g: 0.9 b: 1) oriented: (0.7 @ 0.35).
+ pane2b fillWithRamp: (Color r: 0.85 g: 0.9 b: 1) oriented: (0.7 @ 0.35).
- window fillWithRamp: ColorTheme current dialogRampOrColor oriented: 0.65.
- pane2a fillWithRamp: ColorTheme current dialogPaneRampOrColor oriented: (0.7 @ 0.35).
- pane2b fillWithRamp: ColorTheme current dialogPaneRampOrColor oriented: (0.7 @ 0.35).
"
buttons do: [ :each |
each fillWithRamp: ColorTheme current dialogButtonsRampOrColor oriented: (0.75 @ 0).
].
"
buttons first
on: #mouseUp
send: (aBoolean ifTrue: [#okHitForProjectLoader] ifFalse: [#okHit])
to: aFileList.
buttons second on: #mouseUp send: #cancelHit to: aFileList.
aFileList postOpen.
window position: aWorld topLeft + (aWorld extent - window extent // 2).
window adoptPaneColor: (Color r: 0.548 g: 0.677 b: 1.0).
window becomeModal.
^ window openInWorld: aWorld.!
Item was changed:
----- Method: FileList2 class>>morphicViewProjectSaverFor: (in category 'blue ui') -----
morphicViewProjectSaverFor: aProject
"
(FileList2 morphicViewProjectSaverFor: Project current) openInWorld
"
| window aFileList buttons treePane pane2 textColor1 option treeExtent buttonData buttonRow |
textColor1 := Color r: 0.742 g: 0.839 b: 1.0.
aFileList := self new directory: ServerDirectory projectDefaultDirectory.
aFileList dirSelectionBlock: self hideSqueakletDirectoryBlock.
window := AlignmentMorphBob1 newColumn.
window hResizing: #shrinkWrap; vResizing: #shrinkWrap.
aFileList modalView: window.
window
setProperty: #FileList toValue: aFileList;
wrapCentering: #center; cellPositioning: #topCenter;
+ borderWidth: 1;
+ borderColor: (Color r: 0.9 g: 0.801 b: 0.2);
- borderWidth: ColorTheme current dialogBorderWidth;
- borderColor: ColorTheme current dialogBorderColor;
useRoundedCorners.
buttonData := Preferences enableLocalSave
ifTrue: [{
+ {'Save'. #okHit. 'Save in the place specified below, and in the Squeaklets folder on your local disk'. Color lightGreen}.
+ {'Save on local disk only'. #saveLocalOnlyHit. 'saves in the Squeaklets folder'. Color lightGreen}.
+ {'Cancel'. #cancelHit. 'return without saving'. Color lightRed}
- {'Save'. #okHit. 'Save in the place specified below, and in the Squeaklets folder on your local disk'. ColorTheme current okColor}.
- {'Save on local disk only'. #saveLocalOnlyHit. 'saves in the Squeaklets folder'. ColorTheme current okColor}.
- {'Cancel'. #cancelHit. 'return without saving'. ColorTheme current cancelColor}
}]
ifFalse: [{
+ {'Save'. #okHit. 'Save in the place specified below, and in the Squeaklets folder on your local disk'. Color lightGreen}.
+ {'Cancel'. #cancelHit. 'return without saving'. Color lightRed}
- {'Save'. #okHit. 'Save in the place specified below, and in the Squeaklets folder on your local disk'. ColorTheme current okColor}.
- {'Cancel'. #cancelHit. 'return without saving'. ColorTheme current cancelColor}
}].
buttons := buttonData collect: [ :each |
(self blueButtonText: each first textColor: textColor1 color: each fourth inWindow: window)
setBalloonText: each third translated;
hResizing: #shrinkWrap;
on: #mouseUp send: each second to: aFileList
].
option := aProject world
valueOfProperty: #SuperSwikiPublishOptions
ifAbsent: [#initialDirectoryList].
aProject world removeProperty: #SuperSwikiPublishOptions.
treeExtent := World height < 500
ifTrue: [ 350 at 150 ]
ifFalse: [ 350 at 300 ].
(treePane := aFileList morphicDirectoryTreePaneFiltered: option)
extent: treeExtent;
retractable: false;
borderWidth: 0.
window
addARowCentered: {
window fancyText: 'Publish This Project' translated font: Preferences standardEToysTitleFont color: textColor1
}.
buttonRow := OrderedCollection new.
buttons do: [:button | buttonRow add: button] separatedBy: [buttonRow add: ((Morph new extent: 30 at 5) color: Color transparent)].
" addARowCentered: {
buttons first.
(Morph new extent: 30 at 5) color: Color transparent.
buttons second.
(Morph new extent: 30 at 5) color: Color transparent.
buttons third
};"
window
addARowCentered: buttonRow;
addARowCentered: { (window inAColumn: {(ProjectViewMorph on: aProject) lock}) layoutInset: 4};
addARowCentered: {
window fancyText: 'Please select a folder' translated font: Preferences standardEToysFont color: textColor1
};
addARow: {
(
window inAColumn: {
(pane2 := window inARow: {window inAColumn: {treePane}})
useRoundedCorners;
layoutInset: 0;
+ borderWidth: 1;
+ borderColor: (Color r: 0.6 g: 0.7 b: 1)
- borderWidth: ColorTheme current dialogPaneBorderWidth;
- borderColor: ColorTheme current dialogPaneBorderColor
}
) layoutInset: 10
}.
window fullBounds.
+ window fillWithRamp: (Color r: 1 g: 0.85 b: 0.975) oriented: 0.65.
+ pane2 fillWithRamp: (Color r: 0.85 g: 0.9 b: 1) oriented: (0.7 @ 0.35).
- window fillWithRamp: ColorTheme current dialogRampOrColor oriented: 0.65.
- pane2 fillWithRamp: ColorTheme current dialogPaneRampOrColor oriented: (0.7 @ 0.35).
"
buttons do: [ :each |
each fillWithRamp: ColorTheme current dialogButtonsRampOrColor oriented: (0.75 @ 0).
].
"
window setProperty: #morphicLayerNumber toValue: 11.
aFileList postOpen.
window adoptPaneColor: (Color r: 0.548 g: 0.677 b: 1.0).
^ window !
Item was changed:
----- Method: FileList2 class>>update:in:fileTypeRow:morphUp: (in category 'morphic ui') -----
update: actionRow in: window fileTypeRow: fileTypeRow morphUp: morph
| fileTypeInfo info2 buttons textColor1 fileSuffixes fileActions aFileList fileTypeString |
(morph notNil and:[(morph valueOfProperty: #enabled) not]) ifTrue: [^self].
fileTypeRow submorphsDo: [ :sub |
sub color: (
sub == morph
ifTrue: [Color white]
ifFalse: [(sub valueOfProperty: #enabled)
ifTrue: [Color transparent] ifFalse: [Color gray]]
).
].
fileTypeString := morph isNil ifTrue:['xxxx'] ifFalse:[morph valueOfProperty: #buttonText].
aFileList := window valueOfProperty: #FileList.
textColor1 := Color r: 0.742 g: 0.839 b: 1.0.
actionRow removeAllMorphs.
fileTypeInfo := self endingSpecs.
info2 := fileTypeInfo detect: [ :each | each first = fileTypeString] ifNone: [ nil ].
info2 isNil
ifTrue:[
buttons := OrderedCollection new
]
ifFalse:[
fileSuffixes := info2 second.
fileActions := info2 third.
buttons := fileActions collect: [ :each | aFileList blueButtonForService: each textColor: textColor1 inWindow: window ].
buttons do: [ :each |
+ each fillWithRamp: Color lightGreen oriented: (0.75 @ 0).
- each fillWithRamp: ColorTheme current okColor oriented: (0.75 @ 0).
].
].
buttons addLast: (self
blueButtonText: 'Cancel'
textColor: textColor1
+ color: Color lightRed
- color: ColorTheme current cancelColor
inWindow: window
balloonText: 'Cancel this search' selector: #cancelHit recipient: aFileList).
buttons do: [ :each | actionRow addMorphBack: each].
window fullBounds.
fileSuffixes isNil ifFalse:[
aFileList fileSelectionBlock: (
self selectionBlockForSuffixes: (fileSuffixes collect: [ :each | '*.',each])
).
].
aFileList updateFileList.!
Item was changed:
----- Method: FileList2>>blueButtonForService:textColor:inWindow: (in category 'user interface') -----
blueButtonForService: aService textColor: textColor inWindow: window
| block result |
block := [self fullName isNil
ifTrue: [self inform: 'Please select a file' translated]
ifFalse: [aService performServiceFor: self]].
result := window
fancyText: aService buttonLabel capitalized translated
font: Preferences standardEToysFont
color: textColor.
result setProperty: #buttonText toValue: aService buttonLabel capitalized;
hResizing: #rigid;
extent: 100 @ 20;
layoutInset: 4;
+ borderWidth: 1;
- borderWidth: ColorTheme current dialogButtonBorderWidth;
useRoundedCorners;
setBalloonText: aService label.
result
on: #mouseUp
send: #value
to: block.
^ result!
More information about the Squeak-dev
mailing list
|