Squeak-dev August 2016

squeak-dev@lists.squeakfoundation.org

38 participants
609 discussions

The Trunk: Morphic-mt.1221.mcz
by commits＠source.squeak.org 02 Aug '16

02 Aug '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1221.mcz ==================== Summary ==================== Name: Morphic-mt.1221 Author: mt Time: 2 August 2016, 10:09:26.611882 am UUID: 49b92f76-cbe0-b442-8c78-770e30243990 Ancestors: Morphic-mt.1220 Let models such as HelpBrowser signal content changes that require a fresh start at the top. (Differentiate from appended content updates where a scroll-to-top would annoy the user who is scrolling down and in the process of reading). =============== Diff against Morphic-mt.1220 =============== Item was changed: ----- Method: PluggableTextMorph>>update: (in category 'updating') ----- update: aSymbol aSymbol ifNil: [^self]. aSymbol == #flash ifTrue: [^self flash]. aSymbol == getTextSelector ifTrue: [ self setText: self getText. getSelectionSelector ifNotNil: [self setSelection: self getSelection]. ^ self]. aSymbol == getSelectionSelector ifTrue: [^self setSelection: self getSelection]. aSymbol == #acceptChanges ifTrue: [^ self accept]. aSymbol == #revertChanges ifTrue: [^ self cancel]. (aSymbol == #autoSelect and: [getSelectionSelector notNil]) ifTrue: [self handleEdit: [(textMorph editor) abandonChangeText; "no replacement!!" setSearch: model autoSelectString; findAgain]]. aSymbol == #clearUserEdits ifTrue: [^self hasUnacceptedEdits: false]. aSymbol == #wantToChange ifTrue: [self canDiscardEdits ifFalse: [^self promptForCancel]. ^self]. aSymbol == #appendEntry ifTrue: [self handleEdit: [self appendEntry]. ^self refreshWorld]. aSymbol == #appendEntryLater ifTrue: [self handleEdit: [self appendEntry]]. aSymbol == #clearText ifTrue: [self handleEdit: [self changeText: Text new]. ^self refreshWorld]. aSymbol == #bs ifTrue: [self handleEdit: [self bsText]. ^self refreshWorld]. aSymbol == #codeChangedElsewhere ifTrue: [self hasEditingConflicts: true. ^self changed]. aSymbol == #saveContents ifTrue: [^self saveContentsInFile]. + aSymbol == #showContents + ifTrue: + [^ self scrollToTop]. !

1 0

The Trunk: HelpSystem-Core-mt.87.mcz
by commits＠source.squeak.org 02 Aug '16

02 Aug '16

Marcel Taeumel uploaded a new version of HelpSystem-Core to project The Trunk: http://source.squeak.org/trunk/HelpSystem-Core-mt.87.mcz ==================== Summary ==================== Name: HelpSystem-Core-mt.87 Author: mt Time: 2 August 2016, 10:07:29.753882 am UUID: ba6bc8ef-a866-df4f-802f-992894c957c7 Ancestors: HelpSystem-Core-nice.86 Fixes parsing of broken HTML a-href links as found in SWiki. Fixes scroll-to-top when selecting new help topics. =============== Diff against HelpSystem-Core-nice.86 =============== Item was changed: ----- Method: HelpBrowser>>currentTopic: (in category 'accessing') ----- currentTopic: aHelpTopic self okToChange ifFalse: [^ self]. self currentTopic == aHelpTopic ifTrue: [^ self]. currentTopic := aHelpTopic. topicPath := nil. self changed: #currentTopic. + self changed: #topicContents. + self changed: #showContents.! - self changed: #topicContents.! Item was changed: ----- Method: HtmlHelpTopic>>subtopicUrls (in category 'accessing') ----- subtopicUrls ^ subtopicUrls ifNil: [ + | start end endGuard | - | start end | subtopicUrls := OrderedCollection new. start := self document findString: '<a '. start := self document findString: 'href' startingAt: start. [start > 0] whileTrue: [ start := self document findString: '"' startingAt: start. end := self document findString: '"' startingAt: start+1. + endGuard := self document findString: '>' startingAt: start+1. + (end > 0 and: [end < endGuard]) + ifTrue: [subtopicUrls addIfNotPresent: (self document copyFrom: start+1 to: end-1)]. - subtopicUrls addIfNotPresent: (self document copyFrom: start+1 to: end-1). start := self document findString: '<a ' startingAt: end+1. start > 0 ifTrue: [start := self document findString: 'href' startingAt: start]]. subtopicUrls := subtopicUrls select: self selectBlock thenCollect: self convertBlock. subtopicUrls]!

1 0

The Trunk: Collections-mt.703.mcz
by commits＠source.squeak.org 02 Aug '16

02 Aug '16

Marcel Taeumel uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-mt.703.mcz ==================== Summary ==================== Name: Collections-mt.703 Author: mt Time: 2 August 2016, 10:05:41.089882 am UUID: 32b3f850-392c-9a4d-b0cb-7e1ed37c9bc6 Ancestors: Collections-mt.702 Small fix for SWiki HTML parsing. Recognize also non-hash color names. Our Color class is fine with it, too. =============== Diff against Collections-mt.702 =============== Item was changed: ----- Method: HtmlReadWriter>>mapFontTag: (in category 'mapping') ----- mapFontTag: aTag | result colorStartIndex colorStopIndex attribute | result := OrderedCollection new. + "<font color=""#00FFCC""> or <font color=""green"">" - "<font color=""#00FFCC"">" attribute := 'color'. colorStartIndex := aTag findString: attribute. colorStartIndex > 0 ifTrue: [ + colorStartIndex := aTag findString: '"' startingAt: colorStartIndex+attribute size. - colorStartIndex := aTag findString: '#' startingAt: colorStartIndex+attribute size. colorStopIndex := aTag findString: '"' startingAt: colorStartIndex+1. result add: (TextColor color: + (Color fromString: (aTag copyFrom: colorStartIndex+1 to: colorStopIndex-1)))]. + - (Color fromString: (aTag copyFrom: colorStartIndex to: colorStopIndex-1)))]. - ^ result!

1 0

The Trunk: Morphic-mt.1220.mcz
by commits＠source.squeak.org 02 Aug '16

02 Aug '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1220.mcz ==================== Summary ==================== Name: Morphic-mt.1220 Author: mt Time: 2 August 2016, 9:23:14.170882 am UUID: f900f8ec-e0be-0a43-8828-b5ecc0624b15 Ancestors: Morphic-mt.1219 I forgot to restore the keyboard shortcut functionality for confirmation dialogs. It has been there before my refactorings. =============== Diff against Morphic-mt.1219 =============== Item was changed: ----- Method: DialogWindow>>registerKeyboardShortcutFor: (in category 'constructing') ----- registerKeyboardShortcutFor: button "Take the first alpha-numeric character that is not already used as a shortcut, and use it as a shortcut." (button valueOfProperty: #normalLabel) asString in: [:normalLabel | normalLabel do: [:char | char isAlphaNumeric ifTrue: [ keyMap at: char asLowercase ifPresent: [] + ifAbsent: [ + button setProperty: #normalLabel toValue: ('{1} ({2})' format: {normalLabel. char asLowercase}). + button label: (button valueOfProperty: #normalLabel). - ifAbsent: [ - button label: ('{1} ({2})' format: {normalLabel. char}). ^ keyMap at: char asLowercase put: button ] ] ] ]! Item was changed: ----- Method: DialogWindow>>step (in category 'stepping and presenter') ----- step timeout ifNil: [^self]. timeout = 0 ifTrue: [ self stopStepping. selectedButton performAction] ifFalse: [ + selectedButton label: ('{1} [{2}]' format: { - selectedButton label: ('{1} ({2})' format: { selectedButton valueOfProperty: #normalLabel. timeout}). timeout := timeout - 1]! Item was changed: ----- Method: UserDialogBoxMorph class>>confirm:orCancel:title:at: (in category 'utilities') ----- confirm: aString orCancel: cancelBlock title: titleString at: aPointOrNil (self new title: titleString; message: aString; createButton: 'Yes' translated value: true; createButton: 'No' translated value: false; createButton: 'Cancel' translated value: nil; selectedButtonIndex: 1; "YES" + registerKeyboardShortcuts; yourself) in: [:dialog | ^ (aPointOrNil ifNil: [dialog getUserResponseAtHand] ifNotNil: [ dialog moveTo: aPointOrNil. dialog getUserResponse]) ifNil: [ cancelBlock value ]]! Item was changed: ----- Method: UserDialogBoxMorph class>>confirm:title:at: (in category 'utilities') ----- confirm: aString title: titleString at: aPointOrNil "UserDialogBoxMorph confirm: 'Make your choice carefully' withCRs title: 'Do you like chocolate?'" ^self new title: titleString; message: aString; createButton: 'Yes' translated value: true; createCancelButton: 'No' translated value: false; selectedButtonIndex: 1; "YES" + registerKeyboardShortcuts; getUserResponseAtHand! Item was changed: ----- Method: UserDialogBoxMorph class>>confirm:title:trueChoice:falseChoice:at: (in category 'utilities') ----- confirm: aString title: titleString trueChoice: trueChoice falseChoice: falseChoice at: aPointOrNil "UserDialogBoxMorph confirm: 'Make your choice carefully' withCRs title: 'Do you like chocolate?' trueChoice: 'Oh yessir!!' falseChoice: 'Not so much...'" ^self new title: titleString; message: aString; createButton: trueChoice translated value: true; createCancelButton: falseChoice translated value: false; selectedButtonIndex: 1; + registerKeyboardShortcuts; moveTo: (aPointOrNil ifNil: [ActiveWorld center]); getUserResponse! Item was changed: ----- Method: UserDialogBoxMorph class>>confirm:title:trueChoice:falseChoice:default:triggerAfter:at: (in category 'utilities') ----- confirm: aString title: titleString trueChoice: trueChoice falseChoice: falseChoice default: default triggerAfter: seconds at: aPointOrNil "UserDialogBoxMorph confirm: 'I like hot java' title: 'What do you say?' trueChoice: 'You bet!!' falseChoice: 'Nope' default: false triggerAfter: 12 at: 121@212" ^self new title: titleString; message: aString; createButton: trueChoice translated value: true; createCancelButton: falseChoice translated value: false; selectedButtonIndex: (default ifTrue: [1] ifFalse: [2]); + registerKeyboardShortcuts; moveTo: (aPointOrNil ifNil: [ActiveWorld center]); getUserResponseAfter: seconds!

1 0

Re: [squeak-dev] International text input on X11
by Yoshiki Ohshima 02 Aug '16

02 Aug '16

Hi Tim, As the VM changes for this matter is in shape (if I'm not mistaken, the plugins.ext has to have ImmX11Plugin), the following image side changes will greatly help the usability for kids in Japan and elsewhere. Can you add those at some point? On Sun, May 15, 2016 at 1:19 PM, Yoshiki Ohshima <Yoshiki.Ohshima(a)acm.org> wrote: > Then on the image side, we need to fix ImmX11>>keyboardFocusForMorph: > to support non-TextMorphs. My feeble attempt involves to test whether > the given morph understand #paragraph and make it read: > > ------------------- > keyboardFocusForAMorph: aMorph > > aMorph ifNil: [^ self]. > [ > | left bottom pos height | > pos := aMorph preferredKeyboardPosition. > left := (pos x min: Display width max: 0) asInteger. > (aMorph respondsTo: #paragraph) ifTrue: [ > height := (aMorph paragraph > characterBlockForIndex: aMorph editor selectionInterval first) height > ] ifFalse: [ > height := aMorph height]. > bottom := (pos y min: Display height max: 0) asInteger > + height. > self setCompositionWindowPositionX: left y: bottom asInteger > ] on: Error > do: [:ex |]. > > ------------------- > (#asInteger is sent so that the primitive does not get floats.) > > and then to use it StringFieldMorph (and possible a few other classes) > need its #keyboardFocusChange: to read: > > ------------------- > keyboardFocusChange: t1 > (t1 > and: [isKeyboardFocus not]) > ifTrue: [lastContents := stringMorph contents]. > (isKeyboardFocus > and: [t1 not]) > ifTrue: [lastContents := nil. > isNumeric > ifTrue: [self contents: stringMorph contents asNumberNoError printStringNoExponent]. > acceptWhenFocusLost > ifTrue: [self acceptEdits]]. > isKeyboardFocus := t1. > isKeyboardFocus > ifTrue: [selectionStart := 0. > selectionEnd := stringMorph contents size]. > "This line below" > isKeyboardFocus ifTrue: [ActiveHand compositionWindowManager keyboardFocusForAMorph: self]. > self changed > ------------------- > > The result is that when the input method is enabled, and the user > tries to type into a field, the preedit window shows up right there > where you are typing in. -- -- Yoshiki

2 27

Daily Commit Log
by commits＠source.squeak.org 01 Aug '16

01 Aug '16

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2016-August/068385.html Name: Network-ul.180 Ancestors: Network-nice.179 Socket changes: - fixed the comment of #isOtherEndConnected and #isThisEndConnected - do not slice the data (TCP) in the image in #sendData:. Let the VM, the kernel, the hardware deal with that. - use #isOtherEndConnected when receiving data, and #isThisEndConnected when sending data instead of #isConnected - move away from #milliseconds:since:, since we have a clock that won't roll over ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068386.html Name: Morphic-mt.1218 Ancestors: Morphic-mt.1217 Add the possibility to filter button-only dialogs via keyboard expressions as known from menus. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068387.html Name: ToolBuilder-Morphic-mt.176 Ancestors: ToolBuilder-Morphic-mt.175 For lists smaller than or equal to 7, use button-only dialog but still support keyboard filtering. Note that people tend to choose between #(yes no) and hence we do need such a button-only version of a list chooser. Still, better than using menus in terms of input modality and visual consistency. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068388.html Name: Monticello-mt.641 Ancestors: Monticello-mt.640 If we are in feature-freeze or code-freeze, inform the developer when committing to the trunk repository. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068389.html Name: ReleaseBuilder-mt.140 Ancestors: ReleaseBuilder-mt.139 Feature-freeze the Trunk. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068390.html Name: System-mt.856 Ancestors: System-mt.855 Revise the system version descriptions. Be not so talky in release versions. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068391.html Name: System-mt.857 Ancestors: System-mt.856 Theme the three-phase button, too. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068392.html Name: Morphic-mt.1219 Ancestors: Morphic-mt.1218 Fixes a bug in the pluggable button label drawing code. Theme the three-phase button, too. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068393.html Name: PreferenceBrowser-mt.63 Ancestors: PreferenceBrowser-mt.62 Fixes the appearance of the preference browser considering themes. There are still some UI glitches, but at least a freshly opened preference browser looks now like the current UI theme suggests it. Yeah, we borrow UI properties from the PluggableListMorph because the whole preference browser is subject to refactoring in the future. (Sorry for this small hack. Kids, do not use UserInterfaceTheme like that! Look away! Hurry! What's that? Ice cream? Ice cream!) ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068394.html Name: System-mt.858 Ancestors: System-mt.857 Re-create all basic themes due to the latest updates in three-phase button morph. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2016-August/068395.html Name: Services-Base-cmm.59 Ancestors: Services-Base-mt.58 Fix for selection of ServiceEntry items on menus activated from background windows. =============================================

1 0

The Trunk: Services-Base-cmm.59.mcz
by commits＠source.squeak.org 01 Aug '16

01 Aug '16

Chris Muller uploaded a new version of Services-Base to project The Trunk: http://source.squeak.org/trunk/Services-Base-cmm.59.mcz ==================== Summary ==================== Name: Services-Base-cmm.59 Author: cmm Time: 1 August 2016, 2:27:04.61688 pm UUID: 47d86ec3-8926-4a76-a51b-20c21cd0aae2 Ancestors: Services-Base-mt.58 Fix for selection of ServiceEntry items on menus activated from background windows. =============== Diff against Services-Base-mt.58 =============== Item was added: + ----- Method: PasteUpMorph>>focusedRequestor (in category '*services-base') ----- + focusedRequestor + "returns the focused window's requestor" + ^self submorphs + detect: [:ea | ea isSystemWindow and: [ea isLookingFocused]] + ifFound: [:ea | ea requestor] + ifNone: [Requestor default]! Item was removed: - ----- Method: PasteUpMorph>>topRequestor (in category '*services-base') ----- - topRequestor - "returns the focused window's requestor" - ^ SystemWindow topWindow requestor! Item was changed: ----- Method: ServiceAction>>execute (in category 'executing') ----- execute + ^ action clone valueWithRequestor: World focusedRequestor! - ^ action clone valueWithRequestor: World topRequestor! Item was changed: ----- Method: ServiceAction>>executeCondition (in category 'executing') ----- executeCondition + ^ [condition clone valueWithRequestor: World focusedRequestor] - ^ [condition clone valueWithRequestor: World topRequestor] on: Error do: [false]!

1 0

The Trunk: System-mt.858.mcz
by commits＠source.squeak.org 01 Aug '16

01 Aug '16

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.858.mcz ==================== Summary ==================== Name: System-mt.858 Author: mt Time: 1 August 2016, 5:20:59.661106 pm UUID: a27d5973-1724-5a4e-a013-45aa8c9bd421 Ancestors: System-mt.857 Re-create all basic themes due to the latest updates in three-phase button morph. =============== Diff against System-mt.857 =============== Item was changed: + (PackageInfo named: 'System') postscript: '"Re-create all themes." + SqueakTheme create apply. - (PackageInfo named: 'System') postscript: 'SqueakTheme create apply. SqueakTheme createClassic; createDuller. SolarizedTheme createDark; createLight. MonokaiTheme createDark. CommunityTheme createDark.'!

1 0

The Trunk: PreferenceBrowser-mt.63.mcz
by commits＠source.squeak.org 01 Aug '16

01 Aug '16

Marcel Taeumel uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-mt.63.mcz ==================== Summary ==================== Name: PreferenceBrowser-mt.63 Author: mt Time: 1 August 2016, 5:18:07.719106 pm UUID: b534f79f-adbf-164f-80c0-4eb1c4740b8d Ancestors: PreferenceBrowser-mt.62 Fixes the appearance of the preference browser considering themes. There are still some UI glitches, but at least a freshly opened preference browser looks now like the current UI theme suggests it. Yeah, we borrow UI properties from the PluggableListMorph because the whole preference browser is subject to refactoring in the future. (Sorry for this small hack. Kids, do not use UserInterfaceTheme like that! Look away! Hurry! What's that? Ice cream? Ice cream!) =============== Diff against PreferenceBrowser-mt.62 =============== Item was changed: ----- Method: PBBooleanPreferenceView>>enabledButton (in category 'user interface') ----- enabledButton + | aButton | - | aButton aLabel | aButton := UpdatingThreePhaseButtonMorph checkBox target: self preference; actionSelector: #togglePreferenceValue; getSelector: #preferenceValue; + label: 'enabled' translated; yourself. - aLabel := (StringMorph contents: 'enabled' translated - font: (StrikeFont familyName: TextStyle defaultFont familyName - pointSize: TextStyle defaultFont pointSize - 1)). ^self horizontalPanel addMorphBack: aButton; - addMorphBack: aLabel; yourself.! Item was changed: ----- Method: PBBooleanPreferenceView>>localToProjectButton (in category 'user interface') ----- localToProjectButton + | aButton | - | aButton aLabel | aButton := UpdatingThreePhaseButtonMorph checkBox target: self preference; actionSelector: #toggleProjectLocalness; getSelector: #localToProject; + label: 'local' translated; yourself. - aLabel := (StringMorph contents: 'local' translated - font: (StrikeFont familyName: TextStyle defaultFont familyName - pointSize: TextStyle defaultFont pointSize - 1)). ^self horizontalPanel addMorphBack: aButton; - addMorphBack: aLabel; yourself.! Item was changed: ----- Method: PBBooleanPreferenceView>>representativeButtonWithColor:inPanel: (in category 'user interface') ----- representativeButtonWithColor: aColor inPanel: aPreferencesPanel ^self horizontalPanel layoutInset: 2; cellInset: 7; color: aColor; + addMorphBack: self morphForName; - addMorphBack: (StringMorph contents: self preference name); addMorphBack: self horizontalFiller; addMorphBack: self enabledButton; addMorphBack: self localToProjectButton; yourself.! Item was changed: ----- Method: PBColorPreferenceView>>representativeButtonWithColor:inPanel: (in category 'user interface') ----- representativeButtonWithColor: aColor inPanel: aPreferenceBrowser ^self horizontalPanel layoutInset: 2; color: aColor; cellInset: 20; cellPositioning: #center; + addMorphBack: self morphForName; - addMorphBack: (StringMorph contents: self preference name); addMorphBack: self horizontalFiller; addMorphBack: self colorMenuButton; yourself! Item was changed: ----- Method: PBHaloThemePreferenceView>>representativeButtonWithColor:inPanel: (in category 'user interface') ----- representativeButtonWithColor: aColor inPanel: aPreferencesPanel | innerPanel | innerPanel := self horizontalPanel addMorphBack: (self blankSpaceOf: 10@0); addMorphBack: self haloThemeRadioButtons; yourself. ^self verticalPanel color: aColor; layoutInset: 2; + addMorphBack: self morphForName; - addMorphBack: (StringMorph contents: self preference name); addMorphBack: innerPanel.! Item was changed: ----- Method: PBNumericPreferenceView>>representativeButtonWithColor:inPanel: (in category 'user interface') ----- representativeButtonWithColor: aColor inPanel: aPreferenceBrowser ^self horizontalPanel layoutInset: 2; color: aColor; cellInset: 20; cellPositioning: #center; + addMorphBack: self morphForName; - addMorphBack: (StringMorph contents: self preference name); addMorphBack: self horizontalFiller; addMorphBack: self textField; yourself.! Item was changed: ----- Method: PBNumericPreferenceView>>textField (in category 'user interface') ----- textField ^(PluggableTextMorph on: self text: #preferenceValue accept: #preferenceValue:) hideScrollBarsIndefinitely; - borderColor: #inset; acceptOnCR: true; - color: Color gray veryMuchLighter; vResizing: #rigid; hResizing: #spaceFill; height: TextStyle defaultFont height + 6; yourself.! Item was changed: ----- Method: PBPreferenceButtonMorph>>highlightOff (in category 'highlighting') ----- highlightOff self beTransparent. + self label + color: ((UserInterfaceTheme current get: #textColor for: PluggableListMorph) ifNil: [Color black]); + font: ((UserInterfaceTheme current get: #font for: PluggableListMorph) ifNil: [TextStyle defaultFont]). - self label color: Color black. self removeExtraControls.! Item was changed: ----- Method: PBPreferenceButtonMorph>>highlightOn (in category 'highlighting') ----- highlightOn + self color: ((UserInterfaceTheme current get: #selectionColor for: PluggableListMorph) ifNil: [Color gray alpha: 0.1]). + + self label + color: ((UserInterfaceTheme current get: #selectionTextColor for: PluggableListMorph) ifNil: [Color black]); + font: ((UserInterfaceTheme current get: #font for: PluggableListMorph) ifNil: [TextStyle defaultFont]). + - self color: (Color gray alpha: 0.1). - self addExtraControls.! Item was changed: ----- Method: PBPreferenceButtonMorph>>preferenceHelpText (in category 'preference accessing') ----- preferenceHelpText ^self preferenceHelp asText addAttribute: TextEmphasis italic; + addAttribute: (TextColor color: ((UserInterfaceTheme current get: #textColor for: PluggableListMorph) ifNil: [Color black])); yourself.! Item was changed: ----- Method: PBTextPreferenceView>>representativeButtonWithColor:inPanel: (in category 'user interface') ----- representativeButtonWithColor: aColor inPanel: aPreferenceBrowser ^self horizontalPanel layoutInset: 2; color: aColor; cellInset: 20; cellPositioning: #center; + addMorphBack: self morphForName; - addMorphBack: (StringMorph contents: self preference name); addMorphBack: self textField; yourself.! Item was changed: ----- Method: PreferenceBrowserMorph>>basicButton (in category 'submorphs - buttons') ----- basicButton + + ^ PluggableButtonMorph new + model: self model; + offColor: self paneColor; + hResizing: #shrinkWrap; + layoutInset: (15@5 corner: 15@5); + yourself! - | button | - button := SimpleButtonMorph new. - button - borderWidth: 2; - borderColor: #raised; - on: #mouseEnter send: #value to: [button borderColor: self paneColor]; - on: #mouseLeave send: #value to: [button borderColor: #raised]; - vResizing: #spaceFill; - useRoundedCorners; - clipSubmorphs: true; - color: self paneColor muchLighter; - target: self model. - ^button! Item was changed: ----- Method: PreferenceBrowserMorph>>defaultButton (in category 'submorphs - buttons') ----- defaultButton ^defaultButton ifNil: [defaultButton := self basicButton label: 'default' translated; + action: #defaultSelected; - actionSelector: #defaultSelected; setBalloonText: 'Click here to reset all the preferences to their standard ', 'default values.' translated]! Item was changed: ----- Method: PreferenceBrowserMorph>>helpButton (in category 'submorphs - buttons') ----- helpButton ^helpButton ifNil: [helpButton := self basicButton label: 'help' translated; setBalloonText: 'Click here to get some hints on use of this Preferences ', 'Panel' translated; + action: #helpSelected]! - actionSelector: #helpSelected]! Item was changed: ----- Method: PreferenceBrowserMorph>>loadButton (in category 'submorphs - buttons') ----- loadButton ^loadButton ifNil: [loadButton := self basicButton label: 'load' translated; + action: #loadSelected; - actionSelector: #loadSelected; setBalloonText: 'Click here to reset all the preferences to their values ', 'in your Personal Preferences.' translated]! Item was changed: ----- Method: PreferenceBrowserMorph>>loadFromDiskButton (in category 'submorphs - buttons') ----- loadFromDiskButton ^loadFromDiskButton ifNil: [loadFromDiskButton := self basicButton label: 'load from disk' translated; + action: #loadFromDiskSelected; - actionSelector: #loadFromDiskSelected; setBalloonText: 'Click here to load all the preferences from ', 'their saved values on disk.' translated]! Item was changed: ----- Method: PreferenceBrowserMorph>>newCategoryList (in category 'submorphs - category list') ----- newCategoryList ^(PluggableListMorph on: self model list: #categoryList selected: #selectedCategoryIndex changeSelected: #selectedCategoryIndex:) - color: Color white; - borderInset; hResizing: #spaceFill; vResizing: #spaceFill; layoutFrame: (LayoutFrame fractions: (0@0 corner: 0.25@1)); yourself.! Item was changed: ----- Method: PreferenceBrowserMorph>>newSearchTextField (in category 'submorphs - search panel') ----- newSearchTextField | ptm | ptm := PluggableTextMorphPlus on: self model text: #searchPatternNeverTriggered accept: #searchPattern:. ptm minimumHeight: 0; balloonText: 'Search preferences ...'; hideScrollBarsIndefinitely; layoutFrame: (LayoutFrame fractions: (0@0 corner: 1@0) offsets: (0@0 corner: 0@ (TextStyle default lineGrid * 2))); borderInset; - color: Color white; vResizing: #spaceFill; hResizing: #spaceFill; acceptOnCR: true; onKeyStrokeSend: #value to: [ ptm hasUnacceptedEdits ifTrue: [ ptm accept ] ]. ^ptm.! Item was changed: ----- Method: PreferenceBrowserMorph>>preferenceList (in category 'submorphs - preference list') ----- preferenceList ^preferenceList ifNil: [preferenceList := ScrollPane new - color: Color white; - borderInset; vResizing: #spaceFill; hResizing: #spaceFill; + layoutFrame: (LayoutFrame fractions: (0.25@0 corner: 1@1) offsets: (4@0 corner: 0@0)). - layoutFrame: (LayoutFrame fractions: (0.25@0 corner: 1@1)). preferenceList scroller - on: #mouseEnter send: #value: - to: [:event | event hand newKeyboardFocus: preferenceList scroller]; on: #keyStroke send: #keyPressed: to: self. preferenceList.]! Item was changed: ----- Method: PreferenceBrowserMorph>>saveButton (in category 'submorphs - buttons') ----- saveButton ^saveButton ifNil: [saveButton := self basicButton label: 'save' translated; + action: #saveSelected; - actionSelector: #saveSelected; setBalloonText: 'Click here to save the current constellation of Preferences ', 'settings as your personal defaults; you can get them all ', 'reinstalled with a single gesture by clicking the "Restore ', 'my Personal Preferences".' translated]! Item was changed: ----- Method: PreferenceBrowserMorph>>saveToDiskButton (in category 'submorphs - buttons') ----- saveToDiskButton ^saveToDiskButton ifNil: [saveToDiskButton := self basicButton label: 'save to disk' translated; + action: #saveToDiskSelected; - actionSelector: #saveToDiskSelected; setBalloonText: 'Click here to save the current constellation of Preferences ', 'settings to a file; you can get them all reinstalled with a ', 'single gesture by clicking "Restore Settings From Disk".' translated]! Item was changed: ----- Method: PreferenceBrowserMorph>>themeButton (in category 'submorphs - buttons') ----- themeButton ^themeButton ifNil: [themeButton := self basicButton label: 'theme...' translated; + action: #themeSelected; - actionSelector: #themeSelected; setBalloonText: 'Numerous "Preferences" govern many things about the ', 'way Squeak looks and behaves. Set individual preferences ', 'using a "Preferences" panel. Set an entire "theme" of many ', 'Preferences all at the same time by pressing this "change ', 'theme" button and choosing a theme to install. Look in ', 'category "themes" in Preferences class to see what each ', 'theme does; add your own methods to the "themes" ', 'category and they will show up in the list of theme ', 'choices.' translated].! Item was added: + ----- Method: PreferenceView>>morphForName (in category 'user interface') ----- + morphForName + + ^ ((StringMorph contents: self preference name) + color: ((UserInterfaceTheme current get: #textColor for: PluggableListMorph) ifNil: [Color black]); + font: ((UserInterfaceTheme current get: #font for: PluggableListMorph) ifNil: [TextStyle defaultFont]); + yourself)! Item was changed: ----- Method: PreferenceView>>tearOffButton (in category 'user interface') ----- tearOffButton "Hand the user a button the can control this" | aButton | + aButton := self representativeButtonWithColor: ((UserInterfaceTheme current get: #uniformWindowColor for: Model) ifNil: [Color white]) inPanel: nil. - aButton := self representativeButtonWithColor: Color white inPanel: nil. aButton borderWidth: 1; borderColor: Color black; useRoundedCorners. aButton openInHand!

1 0

The Trunk: Morphic-mt.1219.mcz
by commits＠source.squeak.org 01 Aug '16

01 Aug '16

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1219.mcz ==================== Summary ==================== Name: Morphic-mt.1219 Author: mt Time: 1 August 2016, 5:14:54.536106 pm UUID: d7730709-869a-b847-adaa-ee09107f7cdd Ancestors: Morphic-mt.1218 Fixes a bug in the pluggable button label drawing code. Theme the three-phase button, too. =============== Diff against Morphic-mt.1218 =============== Item was changed: ----- Method: ImageMorph>>extent: (in category 'geometry') ----- extent: aPoint + + super extent: self preferredExtent.! - "Do nothing; my extent is determined by my image Form." - ! Item was changed: ----- Method: ImageMorph>>image: (in category 'accessing') ----- image: anImage self changed. image := anImage depth = 1 ifTrue: [ColorForm mappingWhiteToTransparentFrom: anImage] ifFalse: [anImage]. + super extent: self preferredExtent! - super extent: image extent! Item was added: + ----- Method: ImageMorph>>preferredExtent (in category 'accessing') ----- + preferredExtent + ^ image ifNil: [0@0] ifNotNil: [image extent]! Item was changed: ----- Method: PluggableButtonMorph>>drawLabelOn: (in category 'drawing') ----- drawLabelOn: aCanvas | fontToUse labelToUse colorToUse labelWidth layoutBounds drawBlock | self label ifNil: [^ self]. layoutBounds := self layoutBounds. labelToUse := self label asString. fontToUse := self font. colorToUse := self textColorToUse. "Support very narrow buttons. Shrink text to monogram then." + ((layoutBounds width < self labelShrinkThreshold + and: [self hResizing ~~ #shrinkWrap]) + and: [labelToUse size > 3]) ifTrue: [ + labelToUse := labelToUse first asString. "Show first character only." + fontToUse := fontToUse emphasized: (TextEmphasis bold) emphasisCode]. - (layoutBounds width < self labelShrinkThreshold and: [labelToUse size > 3]) ifTrue: [ - labelToUse := labelToUse first asString. "Show first character only." - fontToUse := fontToUse emphasized: (TextEmphasis bold) emphasisCode]. labelWidth := fontToUse widthOfString: labelToUse. drawBlock := [:c | c drawString: labelToUse at: (layoutBounds center x - (labelWidth // 2) max: (layoutBounds left)) @ (layoutBounds center y - (fontToUse height // 2)) font: fontToUse color: colorToUse]. self clipSubmorphs ifTrue: [aCanvas clipBy: layoutBounds during: drawBlock] ifFalse: [drawBlock value: aCanvas]! Item was changed: ImageMorph subclass: #ThreePhaseButtonMorph + instanceVariableNames: 'offImage pressedImage state target actionSelector arguments actWhen label font textColor' - instanceVariableNames: 'offImage pressedImage state target actionSelector arguments actWhen' classVariableNames: 'AuthorModeOwner' poolDictionaries: '' category: 'Morphic-Widgets'! !ThreePhaseButtonMorph commentStamp: '<historical>' prior: 0! A button morph with separate images for on, off, and pressed with the mouse. When the event actWhen occurs, send actionSelector with 'arguments' to target. For other events, default to my eventHandler. The current event is not supplied in the arguments to the actionSelector. image (a.k.a. onImage) may not be nil. offImage and pressedImage may be nil. nil there means be transparent and show the underlying object. Tools for debugging: Display the images momentarily under program control (for positioning) (self is an instance). self state: #on. self state: #off. self state: #pressed. self state: #off. Display a rectangle where the button is. Display fillWithColor: bounds + (self world viewBox origin). self invalidRect: bounds.! Item was changed: ----- Method: ThreePhaseButtonMorph class>>checkBox (in category 'instance creation') ----- checkBox "Answer a button pre-initialized with checkbox images." | f | ^self new onImage: (f := ScriptingSystem formAtKey: 'CheckBoxOn'); pressedImage: (ScriptingSystem formAtKey: 'CheckBoxPressed'); offImage: (ScriptingSystem formAtKey: 'CheckBoxOff'); extent: f extent + (2@0); + setDefaultParameters; yourself ! Item was changed: ----- Method: ThreePhaseButtonMorph class>>radioButton (in category 'instance creation') ----- radioButton "Answer a button pre-initialized with radiobutton images." | f | ^self new onImage: (f := ScriptingSystem formAtKey: 'RadioButtonOn'); pressedImage: (ScriptingSystem formAtKey: 'RadioButtonPressed'); offImage: (ScriptingSystem formAtKey: 'RadioButtonOff'); extent: f extent + (2@0); + setDefaultParameters; yourself ! Item was added: + ----- Method: ThreePhaseButtonMorph class>>themeProperties (in category 'preferences') ----- + themeProperties + + ^ super themeProperties, { + { #color. 'Colors'. 'Color of the button.' }. + { #font. 'Fonts'. 'Font for button title.' }. + { #textColor. 'Colors'. 'Color for the button title label.' }. + }! Item was added: + ----- Method: ThreePhaseButtonMorph>>applyUserInterfaceTheme (in category 'updating') ----- + applyUserInterfaceTheme + + super applyUserInterfaceTheme. + self setDefaultParameters.! Item was added: + ----- Method: ThreePhaseButtonMorph>>color: (in category 'accessing') ----- + color: c + + self onImage ifNotNil: [:form | + self onImage: ((form asFormOfDepth: 32) collectColors: [:col | c alpha: col alpha])]. + self offImage ifNotNil: [:form | + self offImage: ((form asFormOfDepth: 32) collectColors: [:col | c alpha: col alpha])]. + self pressedImage ifNotNil: [:form | + self pressedImage: ((form asFormOfDepth: 32) collectColors: [:col | c alpha: col alpha])]. + + ^ super color: c! Item was added: + ----- Method: ThreePhaseButtonMorph>>currentImage (in category 'accessing') ----- + currentImage + + state == #off ifTrue: [^ offImage]. + state == #pressed ifTrue: [^ pressedImage]. + state == #on ifTrue: [^ image]. + ^ image! Item was changed: ----- Method: ThreePhaseButtonMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas + | imageToUse | + + imageToUse := self currentImage. + + imageToUse ifNotNil: [aCanvas translucentImage: imageToUse at: bounds origin]. + + self label ifNotNil: [:lbl | + aCanvas + drawString: lbl + at: bounds origin + (imageToUse ifNil: [0@0] ifNotNil: [:form | (form width @ 0) + (3@0)]) + font: self font + color: self textColor].! - state == #off ifTrue: [ - offImage ifNotNil: [aCanvas translucentImage: offImage at: bounds origin]]. - state == #pressed ifTrue: [ - pressedImage ifNotNil: [aCanvas translucentImage: pressedImage at: bounds origin]]. - state == #on ifTrue: [ - image ifNotNil: [aCanvas translucentImage: image at: bounds origin]].! Item was added: + ----- Method: ThreePhaseButtonMorph>>font (in category 'accessing') ----- + font + ^ font ifNil: [TextStyle defaultFont]! Item was added: + ----- Method: ThreePhaseButtonMorph>>font: (in category 'accessing') ----- + font: aFont + font := aFont. + super extent: self preferredExtent.! Item was added: + ----- Method: ThreePhaseButtonMorph>>label (in category 'accessing') ----- + label + ^ label! Item was added: + ----- Method: ThreePhaseButtonMorph>>label: (in category 'accessing') ----- + label: aString + label := aString. + super extent: self preferredExtent.! Item was added: + ----- Method: ThreePhaseButtonMorph>>preferredExtent (in category 'accessing') ----- + preferredExtent + + | iw ih lw lh | + iw := self currentImage width. + ih := self currentImage height. + lw := self font widthOfString: (self label ifNil: ['']). + lh := self font height. + ^ (iw + 3 + lw) @ (ih max: lh)! Item was added: + ----- Method: ThreePhaseButtonMorph>>setDefaultParameters (in category 'initialization') ----- + setDefaultParameters + + self + color: (self userInterfaceTheme color ifNil: [Color black]); + font: (self userInterfaceTheme font ifNil: [TextStyle defaultFont]); + textColor: (self userInterfaceTheme textColor ifNil: [Color black]).! Item was added: + ----- Method: ThreePhaseButtonMorph>>textColor (in category 'accessing') ----- + textColor + ^ textColor ifNil: [Color black]! Item was added: + ----- Method: ThreePhaseButtonMorph>>textColor: (in category 'accessing') ----- + textColor: aColor + textColor := aColor.!

1 0

Jump to page: