[squeak-dev] The Trunk: MorphicExtras-mt.306.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Jan 19 10:44:12 UTC 2022


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

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

Name: MorphicExtras-mt.306
Author: mt
Time: 19 January 2022, 11:44:10.527855 am
UUID: 958e3389-eede-c043-9f47-9233b5284db8
Ancestors: MorphicExtras-ct.305

Fixes GetText export: "withCRs translated" -> "translated withCRs"

=============== Diff against MorphicExtras-ct.305 ===============

Item was changed:
  ----- Method: BookMorph class>>openFromFile: (in category 'fileIn/Out') -----
  openFromFile: fullName
  	"Reconstitute a Morph from the selected file, presumed to be represent
  	a Morph saved via the SmartRefStream mechanism, and open it in an
  	appropriate Morphic world"
  
  	| book aFileStream |
  	Smalltalk verifyMorphicAvailability ifFalse: [^ self].
  
  	aFileStream := FileStream readOnlyFileNamed: fullName.
  	book := BookMorph new.
  	book setProperty: #url toValue: aFileStream url.
  	book fromRemoteStream: aFileStream.
  	aFileStream close.
  
  	Smalltalk isMorphic 
  		ifTrue: [self currentWorld addMorphsAndModel: book]
+ 		ifFalse: [book isMorph ifFalse: [^self inform: 'Can only load a single morph\into an mvc project via this mechanism.' translated withCRs].
- 		ifFalse: [book isMorph ifFalse: [^self inform: 'Can only load a single morph\into an mvc project via this mechanism.' withCRs translated].
  			book openInWorld].
  	book goToPage: 1!

Item was changed:
  ----- Method: ScrapBook>>scrapBook (in category 'scraps') -----
  scrapBook
  	| header aButton label |
  	^ book ifNil: [
  		book := BookMorph new pageSize: 300 at 300; setNameTo: 'scraps' translated.
  		book addCornerGrips.
  		book color: Color yellow muchLighter.
  		book borderColor: Color darkGray; borderWidth: 2.
  		book removeEverything; showPageControls; insertPage.
  
  		header := AlignmentMorph newRow wrapCentering: #center; cellPositioning: #leftCenter.
  		header setProperty: #header toValue: true.
  		header addMorph: (aButton := ThreePhaseButtonMorph labelSymbol: #'Halo-Collapse').
  		aButton target: book;
  			actionSelector: #delete;
+ 			setBalloonText: 'Close the trashcan.\(to view again later, click on any trashcan).' translated withCRs.
- 			setBalloonText: 'Close the trashcan.\(to view again later, click on any trashcan).' withCRs translated.
  		header addMorphBack: AlignmentMorph newVariableTransparentSpacer beSticky.
  		header addMorphBack: 	(label := UpdatingStringMorph new target: self) beSticky.
  		label getSelector: #trashTitle; useStringFormat; step.
  		header addMorphBack: AlignmentMorph newVariableTransparentSpacer beSticky.
  		header addMorphBack: (aButton := ThreePhaseButtonMorph labelSymbol: #'Halo-Dismiss').
  		aButton target: self;
  			actionSelector: #maybeEmptyTrash;
  			setBalloonText: 'Click here to empty the trash.' translated.
  		book currentPage
  			layoutPolicy: TableLayout new;
  			addMorph: (TextMorph new
+ 				contents: 'Objects you drag into the trash will automatically be saved here, one object per page, in case you need them later.  To disable this feature set the "preserveTrash" Preference to false.\\You can individually expunge objects by hitting the "-" control (behind "..."). You can empty out all the objects in the trash can by hitting the "X" button at top right.' translated withCRs;
- 				contents: 'Objects you drag into the trash will automatically be saved here, one object per page, in case you need them later.  To disable this feature set the "preserveTrash" Preference to false.\\You can individually expunge objects by hitting the "-" control (behind "..."). You can empty out all the objects in the trash can by hitting the "X" button at top right.' withCRs translated;
  				hResizing: #spaceFill).
  
  		book addMorphFront: header.
  		book setProperty: #scraps toValue: true].!



More information about the Squeak-dev mailing list