From c863327776ec992b3244ec84b3245d841209e08b Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 14:03:48 +0200 Subject: [PATCH 001/112] PSPresentationTool: renamed accessor parameters --- .../instance/createButtonBarTopSpec..st | 2 +- .../instance/magneticRasterActive..st | 4 ++-- .../PSPresentationTool.class/methodProperties.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st index f98e56e..5a323c5 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st @@ -7,7 +7,7 @@ createButtonBarTopSpec: aBuilder frame: (self barFrameFrom: self menuBarHeight height: self buttonHeight); name: #ButtonBarTop; children: OrderedCollection new. - + self buttonBarTopData do: [:each | | button | button := self createButtonSpec: each with: aBuilder. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st index c113268..e9ec338 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st @@ -1,4 +1,4 @@ accessing -magneticRasterActive: aBool +magneticRasterActive: aBoolean - magneticRasterActive := aBool \ No newline at end of file + magneticRasterActive := aBoolean \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index b92acae..11385b3 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -20,7 +20,7 @@ "checkSlideDirectory:" : "JZ 6/29/2018 17:24", "checkSlideDirectoryName:" : "JZ 6/29/2018 17:03", "clampSlideNumber:" : "WoC 6/22/2018 16:11", - "createButtonBarTopSpec:" : "JZ 7/6/2018 15:47", + "createButtonBarTopSpec:" : "LM 7/6/2018 18:01", "createButtonSpec:with:" : "LM 7/6/2018 17:56", "createDirectory:in:" : "JZ 6/8/2018 19:12", "createMenuBarSpec:" : "JZ 7/6/2018 15:56", @@ -67,11 +67,11 @@ "loadPresentationUnchecked:" : "LM 6/29/2018 20:26", "loadSlideFromDirectory:" : "LM 6/29/2018 20:05", "magneticRasterActive" : "LB 7/5/2018 19:48", - "magneticRasterActive:" : "LB 7/5/2018 19:49", + "magneticRasterActive:" : "LM 7/13/2018 14:03", "magneticRasterButtonColor" : "LB 7/5/2018 21:59", "magneticRasterButtonData" : "JZ 7/6/2018 15:37", "menuBarButtonData" : "JZ 7/6/2018 14:39", - "menuBarColor" : "LM 7/6/2018 17:37", + "menuBarColor" : "LM 7/11/2018 16:30", "menuBarHeight" : "JZ 7/6/2018 15:47", "miniatureOf:" : "LB 6/29/2018 17:28", "miniatureViewLayoutFrame" : "LB 6/29/2018 15:31", From 4e8b346993b34f83bf166296bd5e1b65aa9e98f1 Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Fri, 13 Jul 2018 14:20:22 +0200 Subject: [PATCH 002/112] categorize all uncategorized methods --- .../PSPresentationTool.class/instance/clampSlideNumber..st | 2 +- .../PSPresentationTool.class/instance/duplicateCurrentSlide.st | 2 +- .../instance/magneticRasterButtonColor.st | 2 +- .../PSPresentationTool.class/instance/step.st | 2 +- .../PSPresentationTool.class/instance/toggleMagneticRaster.st | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st index 3aa63ef..7c756cd 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st @@ -1,4 +1,4 @@ -as yet unclassified +slide management clampSlideNumber: aNumber ^ aNumber diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st index cae23df..9fbc5a9 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st @@ -1,4 +1,4 @@ -as yet unclassified +slide management duplicateCurrentSlide self slides diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonColor.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonColor.st index fb86399..1164a24 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonColor.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonColor.st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder magneticRasterButtonColor ^ self magneticRasterActive diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/step.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/step.st index f70bfb6..577690f 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/step.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/step.st @@ -1,4 +1,4 @@ -as yet unclassified +stepping and presenter step self updateCurrentMiniature \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/toggleMagneticRaster.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/toggleMagneticRaster.st index a24e145..526343d 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/toggleMagneticRaster.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/toggleMagneticRaster.st @@ -1,4 +1,4 @@ -as yet unclassified +slide management toggleMagneticRaster self magneticRasterActive: self magneticRasterActive not. From 110b12eeb7b2a70441988c73b4634d7d864b54cc Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 14:32:54 +0200 Subject: [PATCH 003/112] PSFadingMessage: Refactored accessors and magic values --- .../PSContentContainer.class/class/for..st | 2 +- .../{setContent..st => addContent..st} | 2 +- .../instance/addHandleAt..st | 6 +++--- .../instance/corners.st | 8 ++++++++ .../instance/layoutFractionsOf..st | 8 ++++++++ .../instance/placeHandles.st | 1 + .../instance/resizeFractionsOf..st | 2 +- .../methodProperties.json | 14 ++++++++------ .../PSFadingMessage.class/class/for..st | 2 +- .../PSFadingMessage.class/instance/active..st | 4 ++-- .../instance/alphaThreshold.st | 4 ---- .../PSFadingMessage.class/instance/content..st | 4 ++-- .../instance/initialize.st | 2 +- .../{withMessage..st => setContent..st} | 2 +- .../instance/startFadingTime.st | 4 ++++ .../{fadingTime.st => totalVisibleTime.st} | 2 +- .../instance/updateColor.st | 6 +++--- .../methodProperties.json | 18 +++++++++--------- .../instance/menuBarButtonData.st | 6 ++---- .../instance/menuBarColor.st | 3 +-- .../instance/styleMenuBar..st | 5 ++--- .../methodProperties.json | 8 ++++---- .../instance/disablePresentationMode.st | 3 ++- .../instance/layoutFractionsOf..st | 5 ----- .../PSSlide.class/instance/layoutFrameFor..st | 2 +- .../PSSlide.class/instance/mouseDown..st | 2 +- .../PSSlide.class/methodProperties.json | 7 +++---- .../instance/occupiesWorld.st | 5 ----- .../PSSlideContainer.class/instance/step.st | 5 +++-- .../methodProperties.json | 3 +-- 30 files changed, 75 insertions(+), 70 deletions(-) rename packages/Presenter-Core.package/PSContentContainer.class/instance/{setContent..st => addContent..st} (88%) create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/alphaThreshold.st rename packages/Presenter-Core.package/PSFadingMessage.class/instance/{withMessage..st => setContent..st} (91%) create mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st rename packages/Presenter-Core.package/PSFadingMessage.class/instance/{fadingTime.st => totalVisibleTime.st} (51%) delete mode 100644 packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/class/for..st b/packages/Presenter-Core.package/PSContentContainer.class/class/for..st index 7fd04c7..87b8664 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/class/for..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/class/for..st @@ -1,4 +1,4 @@ instance creation for: aMorph - ^ self new setContent: aMorph \ No newline at end of file + ^ self new addContent: aMorph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addContent..st similarity index 88% rename from packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st rename to packages/Presenter-Core.package/PSContentContainer.class/instance/addContent..st index 7701d3c..93eb0cc 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/addContent..st @@ -1,5 +1,5 @@ contentHandling -setContent: aMorph +addContent: aMorph self position: aMorph position; diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st index 5356e7e..91866f7 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st @@ -1,8 +1,8 @@ handles -addHandleAt: aPosition +addHandleAt: aPositionSelector | handle | - handle := self createHandleOnMove: (self actionForCorner: aPosition). + handle := self createHandleOnMove: (self actionForCorner: aPositionSelector). handle setProperty: #morphicLayerNumber toValue: self handleLayerNumber. self addMorphInLayer: handle. - self resizeHandles at: aPosition put: handle \ No newline at end of file + self resizeHandles at: aPositionSelector put: handle \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st new file mode 100644 index 0000000..4c609b1 --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st @@ -0,0 +1,8 @@ +accessing +corners + + ^ { + self topLeft. + self topRight. + self bottomRight. + self bottomLeft} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st new file mode 100644 index 0000000..f763bdd --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st @@ -0,0 +1,8 @@ +resizing +layoutFractionsOf: aPoint + + | ownerBounds positionOnOwner| + ownerBounds := self owner bounds. + positionOnOwner := aPoint - ownerBounds origin. + ^ (positionOnOwner / ownerBounds extent) + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st index b0e3411..7baa9c6 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st @@ -1,5 +1,6 @@ resizing placeHandles + self flag: #TODO. "Meta programming" self resizeHandles keysAndValuesDo: [:key :each | each center: (self perform: key)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st index bcc7bd5..76b2a12 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st @@ -2,6 +2,6 @@ resizing resizeFractionsOf: anEvent | layoutFractions | - layoutFractions := self owner layoutFractionsOf: anEvent cursorPoint. + layoutFractions := self layoutFractionsOf: anEvent cursorPoint. self isMagnetic ifTrue: [layoutFractions := layoutFractions roundTo: self rasterResolution]. ^ layoutFractions \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 57db2db..85e6792 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -1,13 +1,15 @@ { "class" : { - "for:" : "LB 7/6/2018 18:09" }, + "for:" : "MK 5/18/2018 16:30" }, "instance" : { "actionForCorner:" : "LB 7/6/2018 16:30", - "addHandleAt:" : "LB 7/6/2018 18:07", + "addContent:" : "LM 6/15/2018 19:11", + "addHandleAt:" : "LB 7/6/2018 16:31", "addResizeHandles" : "LB 7/6/2018 16:15", "child" : "MK 5/18/2018 20:03", "child:" : "LM 5/21/2018 12:48", "copyChildToHand" : "LM 6/17/2018 11:52", + "corners" : "MK 5/25/2018 17:11", "createContextMenu" : "LB 6/15/2018 21:42", "createHandleOnMove:" : "LB 7/6/2018 16:26", "defaultContextMenuContent" : "LM 6/17/2018 11:52", @@ -32,15 +34,15 @@ "ifAnyHandleContains:do:" : "MK 5/25/2018 17:06", "initialize" : "LB 7/6/2018 15:35", "isMagnetic" : "LB 7/5/2018 21:38", + "layoutFractionsOf:" : "LB 7/5/2018 19:42", "mouseDown:" : "MK 6/1/2018 16:25", "notifySlideRescale:" : "LM 6/17/2018 19:02", - "placeHandles" : "LB 7/6/2018 18:10", + "placeHandles" : "LB 7/6/2018 15:43", "rasterResolution" : "LB 7/5/2018 19:42", "removeResizeHandles" : "MK 5/25/2018 16:18", "removedMorph:" : "WoC 5/23/2018 18:40", "resizeChild" : "MK 5/18/2018 20:03", - "resizeFractionsOf:" : "LB 7/6/2018 17:48", + "resizeFractionsOf:" : "LB 7/6/2018 16:20", "resizeHandleSize" : "MK 5/18/2018 19:13", "resizeHandles" : "MK 5/18/2018 17:43", - "resizeHandles:" : "LB 7/6/2018 15:35", - "setContent:" : "LB 7/6/2018 18:08" } } + "resizeHandles:" : "LB 7/6/2018 15:35" } } diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st index 9fc99a2..a061b65 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st @@ -1,4 +1,4 @@ nil for: aString - ^ self new withMessage: aString \ No newline at end of file + ^ self new setContent: aString \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st index 7745dab..fb0c35a 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st @@ -1,4 +1,4 @@ accessing -active: anObject +active: aBoolean - active := anObject + active := aBoolean diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/alphaThreshold.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/alphaThreshold.st deleted file mode 100644 index 5573423..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/alphaThreshold.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -alphaThreshold - - ^ 1000 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/content..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/content..st index 11619f1..9f895a7 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/content..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/content..st @@ -1,4 +1,4 @@ accessing -content: aMorph +content: aStringMorph - content := aMorph + content := aStringMorph diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st index c126096..a2b0a1e 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st @@ -6,5 +6,5 @@ initialize content: StringMorph new; addMorph: self content; color: Color gray; - remaining: self fadingTime; + remaining: self totalVisibleTime; startStepping \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/setContent..st similarity index 91% rename from packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st rename to packages/Presenter-Core.package/PSFadingMessage.class/instance/setContent..st index 09f693a..81e6a21 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/setContent..st @@ -1,5 +1,5 @@ accessing -withMessage: aString +setContent: aString self content contents: aString. "here no cascade because it fixes a presentation bug" self bounds: (self content position corner: self content bottomRight + self defaultPadding). diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st new file mode 100644 index 0000000..f14c23e --- /dev/null +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st @@ -0,0 +1,4 @@ +accessing +startFadingTime + + ^ 1000.0 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/fadingTime.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/totalVisibleTime.st similarity index 51% rename from packages/Presenter-Core.package/PSFadingMessage.class/instance/fadingTime.st rename to packages/Presenter-Core.package/PSFadingMessage.class/instance/totalVisibleTime.st index 77cb706..e897303 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/fadingTime.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/totalVisibleTime.st @@ -1,4 +1,4 @@ accessing -fadingTime +totalVisibleTime ^ 1500 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st index fc4a6f6..dc28c3e 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st @@ -2,8 +2,8 @@ stepping and presenter updateColor | alpha | - self remaining: self remaining - 10. - self remaining < self alphaThreshold + self remaining: self remaining - self stepTime. + self remaining < self startFadingTime ifTrue: [ - alpha := remaining / self alphaThreshold. + alpha := remaining / self startFadingTime. self color: (self color alpha: alpha)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index 739d2be..e96cff2 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -1,19 +1,19 @@ { "class" : { - "for:" : "LB 7/6/2018 18:05" }, + "for:" : "WoC 6/15/2018 17:24" }, "instance" : { "active" : "WoC 6/15/2018 19:23", - "active:" : "WoC 6/15/2018 19:23", - "alphaThreshold" : "LB 7/6/2018 18:03", + "active:" : "LM 7/13/2018 14:04", "content" : "WoC 6/15/2018 17:21", - "content:" : "LB 7/6/2018 18:02", + "content:" : "LM 7/13/2018 14:19", "defaultPadding" : "WoC 6/15/2018 17:31", - "fadingTime" : "WoC 6/15/2018 17:46", - "initialize" : "WoC 6/15/2018 19:23", + "initialize" : "LM 7/13/2018 14:30", "isActive" : "WoC 6/15/2018 19:23", "remaining" : "WoC 6/15/2018 17:41", - "remaining:" : "LB 7/6/2018 18:03", + "remaining:" : "LM 7/13/2018 14:19", + "setContent:" : "WoC 6/15/2018 18:13", + "startFadingTime" : "LM 7/13/2018 14:25", "step" : "WoC 6/15/2018 17:43", "stepTime" : "WoC 6/15/2018 17:55", - "updateColor" : "LB 7/6/2018 18:03", - "withMessage:" : "LB 7/6/2018 18:05" } } + "totalVisibleTime" : "LM 7/13/2018 14:30", + "updateColor" : "LM 7/13/2018 14:24" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st index 2d3add2..30c6f35 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st @@ -1,8 +1,6 @@ toolbuilder menuBarButtonData - ^ { - self fileButtonData. + ^ {self fileButtonData. self insertButtonData. - self slideButtonData - } \ No newline at end of file + self slideButtonData} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarColor.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarColor.st index 3caeb1d..c3837ea 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarColor.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarColor.st @@ -1,5 +1,4 @@ toolbuilder menuBarColor - ^ (UserInterfaceTheme current get: #color for: #PluggableButtonMorphPlus) - ifNotNil: [:color | color] \ No newline at end of file + ^ Color r: 1 g: 1 b: 1 alpha: 1/255 "completely transparent does not work, this is a workaround" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st index 0108b2c..0d65775 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st @@ -1,6 +1,5 @@ toolbuilder styleMenuBar: aBuilder - "Only works with Morphs!" + "Only for esthetics, only works with Morphs!" self menuBarButtonData do: [ :each | - (aBuilder widgetAt: (each at: #name) ifAbsent: [nil]) - borderWidth: 0] \ No newline at end of file + (aBuilder widgetAt: (each at: #name)) borderWidth: 0] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 11385b3..2cd5c7a 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -51,7 +51,7 @@ "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LB 7/6/2018 17:23", "exportAsPNGs:" : "LB 7/3/2018 13:16", - "fileButtonData" : "JZ 7/6/2018 15:42", + "fileButtonData" : "LM 7/13/2018 14:18", "getValidPresentationName:" : "JZ 6/8/2018 20:45", "highlightCurrentMiniature" : "LB 6/29/2018 17:22", "initialize" : "LB 7/6/2018 17:10", @@ -70,8 +70,8 @@ "magneticRasterActive:" : "LM 7/13/2018 14:03", "magneticRasterButtonColor" : "LB 7/5/2018 21:59", "magneticRasterButtonData" : "JZ 7/6/2018 15:37", - "menuBarButtonData" : "JZ 7/6/2018 14:39", - "menuBarColor" : "LM 7/11/2018 16:30", + "menuBarButtonData" : "LM 7/13/2018 14:18", + "menuBarColor" : "LM 7/13/2018 14:13", "menuBarHeight" : "JZ 7/6/2018 15:47", "miniatureOf:" : "LB 6/29/2018 17:28", "miniatureViewLayoutFrame" : "LB 6/29/2018 15:31", @@ -121,7 +121,7 @@ "sortedMorphFiles:" : "JZ 6/29/2018 17:50", "sortedSlideSubdirectories:" : "LM 6/17/2018 17:35", "step" : "LB 6/29/2018 17:05", - "styleMenuBar:" : "LM 7/6/2018 17:44", + "styleMenuBar:" : "LM 7/13/2018 14:17", "toggleInteractivity" : "LB 7/6/2018 16:58", "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st b/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st index 0d1c73e..74c4b4d 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st @@ -1,4 +1,5 @@ presentation mode disablePresentationMode - self submorphsDo: [:each | each disablePresentationMode] \ No newline at end of file + self submorphsDo: [:each | each disablePresentationMode]. + "self hideSlideNumberMorphHandles" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st deleted file mode 100644 index 51ee3c5..0000000 --- a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st +++ /dev/null @@ -1,5 +0,0 @@ -contentHandling -layoutFractionsOf: aPoint - - ^ aPoint - self position / self extent - \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st index daa89cb..5a41634 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st @@ -2,6 +2,6 @@ contentHandling layoutFrameFor: aMorph | upperLeft lowerRight | - upperLeft := self layoutFractionsOf: aMorph position. + upperLeft := (aMorph position - self position) / self extent. lowerRight := upperLeft + (aMorph extent / self extent). ^ (LayoutFrame fractions: (upperLeft corner: lowerRight)) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st index 0919a68..73d181e 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st @@ -4,4 +4,4 @@ mouseDown: evt super mouseDown: evt. evt redButtonPressed ifTrue: [self waitForDoubleClick: evt]. - "self fullBounds" \ No newline at end of file + self fullBounds \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json index addef46..7d67a4d 100644 --- a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json @@ -5,7 +5,7 @@ "acceptDroppingMorph:event:" : "LB 5/23/2018 15:46", "addContent:" : "LB 7/5/2018 19:57", "changed" : "LB 6/29/2018 16:57", - "disablePresentationMode" : "LB 7/6/2018 18:00", + "disablePresentationMode" : "WoC 6/27/2018 14:13", "doubleClick:" : "LM 5/25/2018 17:20", "enablePresentationMode" : "MK 5/25/2018 15:11", "extent:" : "LB 6/6/2018 14:49", @@ -15,10 +15,9 @@ "initialize" : "LM 7/6/2018 16:48", "isImageFileName:" : "LB 5/18/2018 17:16", "isMagnetic" : "LB 7/5/2018 21:41", - "layoutFractionsOf:" : "LB 7/6/2018 17:47", - "layoutFrameFor:" : "LB 7/6/2018 17:47", + "layoutFrameFor:" : "LB 6/15/2018 21:36", "model" : "LB 7/5/2018 20:03", - "mouseDown:" : "LB 7/6/2018 17:58", + "mouseDown:" : "LM 5/25/2018 17:21", "prepareToBeSaved" : "LB 6/22/2018 19:33", "resizeMorphHeightToFit:" : "LB 5/18/2018 17:36", "resizeMorphToFit:" : "LB 5/18/2018 17:36", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st deleted file mode 100644 index f344001..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st +++ /dev/null @@ -1,5 +0,0 @@ -stepping and presenter -occupiesWorld - - ^ self extent = self world extent - and: [self position = (0@0)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st index afb3a1f..b337cd8 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st @@ -2,5 +2,6 @@ stepping and presenter step self model presentationMode ifFalse: [^self]. - self occupiesWorld - ifFalse: [self occupyWorld: self world] \ No newline at end of file + (self extent ~= self world extent + or: [self position ~= (0@0)]) + ifTrue: [self occupyWorld: self world] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index a001d64..c6f6ae5 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -27,7 +27,6 @@ "makeMeVisible" : "WoC 6/3/2018 00:10", "notification" : "WoC 6/15/2018 19:21", "notification:" : "WoC 6/15/2018 19:21", - "occupiesWorld" : "LB 7/6/2018 17:43", "occupyWorld:" : "JZ 6/29/2018 19:01", "presentationCommandShortcuts" : "MK 6/28/2018 13:40", "presentationCommandShortcuts:" : "MK 6/28/2018 14:03", @@ -47,6 +46,6 @@ "sharedShortcuts" : "LB 6/29/2018 15:45", "showNotification:" : "LM 6/22/2018 15:40", "showSlide:" : "LB 5/6/2018 16:49", - "step" : "LB 7/6/2018 17:44", + "step" : "JZ 6/29/2018 19:02", "stepTime" : "JZ 6/29/2018 18:56", "wantsDroppedMorph:event:" : "MK 6/7/2018 09:29" } } From 0f5baaae9695ecb65fd6b5552f15bcb98cd9411e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 14:34:04 +0200 Subject: [PATCH 004/112] Added cancel checks for UI requests --- .../PSPresentationTool.class/instance/openSlideMoveDialog.st | 1 + .../instance/openSlideSelectionDialog.st | 1 + .../PSPresentationTool.class/methodProperties.json | 4 ++-- .../PSTextMorph.class/instance/showFontSizeDialog.st | 2 +- .../PSTextMorph.class/methodProperties.json | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st index 827035f..a5f3b96 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st @@ -3,6 +3,7 @@ openSlideMoveDialog | userInput | userInput := UIManager default request: 'Where should I move the current slide???'. + userInput isEmpty ifTrue: [^ self]. "Check for cancel" [self moveCurrentSlideTo: userInput asNumber] on: Error do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st index 12a7801..6bdb815 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st @@ -3,6 +3,7 @@ openSlideSelectionDialog | userInput | userInput := UIManager default request: 'Which slide should I select???'. + userInput isEmpty ifTrue: [^ self]. "Check for cancel" [self selectSlideNumber: userInput asNumber] on: Error do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index b92acae..0a4d307 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -91,8 +91,8 @@ "openInsertMenu" : "MK 7/6/2018 16:11", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", "openSlideMenu" : "MK 7/6/2018 16:14", - "openSlideMoveDialog" : "WoC 6/22/2018 16:24", - "openSlideSelectionDialog" : "LB 6/29/2018 15:45", + "openSlideMoveDialog" : "LB 7/13/2018 14:33", + "openSlideSelectionDialog" : "LB 7/13/2018 14:33", "overwriteQuestion" : "JZ 6/8/2018 20:06", "presentationMode" : "LM 5/25/2018 16:57", "presentationMode:" : "LM 5/25/2018 16:57", diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st index 4f5a45f..553e22c 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st @@ -5,7 +5,7 @@ showFontSizeDialog newSize := UIManager default request: self fontSizeDialogText initialAnswer: self selectionFontSize printString. - newSize isEmpty ifTrue: [^ self]. + newSize isEmpty ifTrue: [^ self]. "Check for cancel" [self selectionFontSize: newSize asNumber] on: Error do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index bd436b1..aa1bd4c 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -25,7 +25,7 @@ "setText:" : "MK 7/6/2018 16:58", "showBackgroundColorDialog" : "LB 6/15/2018 16:14", "showFontColorDialog" : "LB 6/8/2018 14:56", - "showFontSizeDialog" : "LB 6/29/2018 19:38", + "showFontSizeDialog" : "LB 7/13/2018 14:33", "textEdited:" : "LB 6/17/2018 18:46", "textScale" : "LB 5/25/2018 16:08", "textScale:" : "LB 6/8/2018 15:38" } } From c5bbdc285ae59d5b18b8d393cacc000d87461948 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 14:42:34 +0200 Subject: [PATCH 005/112] Enter commit log message here --- .../PSContentContainer.class/class/for..st | 2 +- .../instance/addHandleAt..st | 6 +++--- .../PSContentContainer.class/instance/corners.st | 8 -------- .../instance/layoutFractionsOf..st | 8 -------- .../instance/placeHandles.st | 1 - .../instance/resizeFractionsOf..st | 2 +- .../instance/{addContent..st => setContent..st} | 2 +- .../PSContentContainer.class/methodProperties.json | 14 ++++++-------- .../PSFadingMessage.class/class/for..st | 2 +- .../instance/{setContent..st => withMessage..st} | 2 +- .../PSFadingMessage.class/methodProperties.json | 8 ++++---- .../instance/createButtonBarTopSpec..st | 2 +- .../instance/magneticRasterActive..st | 4 ++-- .../PSPresentationTool.class/methodProperties.json | 6 +++--- .../instance/disablePresentationMode.st | 3 +-- .../PSSlide.class/instance/layoutFractionsOf..st | 5 +++++ .../PSSlide.class/instance/layoutFrameFor..st | 2 +- .../PSSlide.class/instance/mouseDown..st | 2 +- .../PSSlide.class/methodProperties.json | 7 ++++--- .../instance/occupiesWorld.st | 5 +++++ .../PSSlideContainer.class/instance/step.st | 5 ++--- .../PSSlideContainer.class/methodProperties.json | 3 ++- 22 files changed, 45 insertions(+), 54 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st delete mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st rename packages/Presenter-Core.package/PSContentContainer.class/instance/{addContent..st => setContent..st} (88%) rename packages/Presenter-Core.package/PSFadingMessage.class/instance/{setContent..st => withMessage..st} (91%) create mode 100644 packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st create mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/class/for..st b/packages/Presenter-Core.package/PSContentContainer.class/class/for..st index 87b8664..7fd04c7 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/class/for..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/class/for..st @@ -1,4 +1,4 @@ instance creation for: aMorph - ^ self new addContent: aMorph \ No newline at end of file + ^ self new setContent: aMorph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st index 91866f7..5356e7e 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st @@ -1,8 +1,8 @@ handles -addHandleAt: aPositionSelector +addHandleAt: aPosition | handle | - handle := self createHandleOnMove: (self actionForCorner: aPositionSelector). + handle := self createHandleOnMove: (self actionForCorner: aPosition). handle setProperty: #morphicLayerNumber toValue: self handleLayerNumber. self addMorphInLayer: handle. - self resizeHandles at: aPositionSelector put: handle \ No newline at end of file + self resizeHandles at: aPosition put: handle \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st deleted file mode 100644 index 4c609b1..0000000 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st +++ /dev/null @@ -1,8 +0,0 @@ -accessing -corners - - ^ { - self topLeft. - self topRight. - self bottomRight. - self bottomLeft} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st deleted file mode 100644 index f763bdd..0000000 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st +++ /dev/null @@ -1,8 +0,0 @@ -resizing -layoutFractionsOf: aPoint - - | ownerBounds positionOnOwner| - ownerBounds := self owner bounds. - positionOnOwner := aPoint - ownerBounds origin. - ^ (positionOnOwner / ownerBounds extent) - \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st index 7baa9c6..b0e3411 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st @@ -1,6 +1,5 @@ resizing placeHandles - self flag: #TODO. "Meta programming" self resizeHandles keysAndValuesDo: [:key :each | each center: (self perform: key)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st index 76b2a12..bcc7bd5 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st @@ -2,6 +2,6 @@ resizing resizeFractionsOf: anEvent | layoutFractions | - layoutFractions := self layoutFractionsOf: anEvent cursorPoint. + layoutFractions := self owner layoutFractionsOf: anEvent cursorPoint. self isMagnetic ifTrue: [layoutFractions := layoutFractions roundTo: self rasterResolution]. ^ layoutFractions \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addContent..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st similarity index 88% rename from packages/Presenter-Core.package/PSContentContainer.class/instance/addContent..st rename to packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st index 93eb0cc..7701d3c 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/addContent..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st @@ -1,5 +1,5 @@ contentHandling -addContent: aMorph +setContent: aMorph self position: aMorph position; diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 85e6792..57db2db 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -1,15 +1,13 @@ { "class" : { - "for:" : "MK 5/18/2018 16:30" }, + "for:" : "LB 7/6/2018 18:09" }, "instance" : { "actionForCorner:" : "LB 7/6/2018 16:30", - "addContent:" : "LM 6/15/2018 19:11", - "addHandleAt:" : "LB 7/6/2018 16:31", + "addHandleAt:" : "LB 7/6/2018 18:07", "addResizeHandles" : "LB 7/6/2018 16:15", "child" : "MK 5/18/2018 20:03", "child:" : "LM 5/21/2018 12:48", "copyChildToHand" : "LM 6/17/2018 11:52", - "corners" : "MK 5/25/2018 17:11", "createContextMenu" : "LB 6/15/2018 21:42", "createHandleOnMove:" : "LB 7/6/2018 16:26", "defaultContextMenuContent" : "LM 6/17/2018 11:52", @@ -34,15 +32,15 @@ "ifAnyHandleContains:do:" : "MK 5/25/2018 17:06", "initialize" : "LB 7/6/2018 15:35", "isMagnetic" : "LB 7/5/2018 21:38", - "layoutFractionsOf:" : "LB 7/5/2018 19:42", "mouseDown:" : "MK 6/1/2018 16:25", "notifySlideRescale:" : "LM 6/17/2018 19:02", - "placeHandles" : "LB 7/6/2018 15:43", + "placeHandles" : "LB 7/6/2018 18:10", "rasterResolution" : "LB 7/5/2018 19:42", "removeResizeHandles" : "MK 5/25/2018 16:18", "removedMorph:" : "WoC 5/23/2018 18:40", "resizeChild" : "MK 5/18/2018 20:03", - "resizeFractionsOf:" : "LB 7/6/2018 16:20", + "resizeFractionsOf:" : "LB 7/6/2018 17:48", "resizeHandleSize" : "MK 5/18/2018 19:13", "resizeHandles" : "MK 5/18/2018 17:43", - "resizeHandles:" : "LB 7/6/2018 15:35" } } + "resizeHandles:" : "LB 7/6/2018 15:35", + "setContent:" : "LB 7/6/2018 18:08" } } diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st index a061b65..9fc99a2 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st @@ -1,4 +1,4 @@ nil for: aString - ^ self new setContent: aString \ No newline at end of file + ^ self new withMessage: aString \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/setContent..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st similarity index 91% rename from packages/Presenter-Core.package/PSFadingMessage.class/instance/setContent..st rename to packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st index 81e6a21..09f693a 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/setContent..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st @@ -1,5 +1,5 @@ accessing -setContent: aString +withMessage: aString self content contents: aString. "here no cascade because it fixes a presentation bug" self bounds: (self content position corner: self content bottomRight + self defaultPadding). diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index e96cff2..84675c1 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "for:" : "WoC 6/15/2018 17:24" }, + "for:" : "LB 7/6/2018 18:05" }, "instance" : { "active" : "WoC 6/15/2018 19:23", "active:" : "LM 7/13/2018 14:04", @@ -10,10 +10,10 @@ "initialize" : "LM 7/13/2018 14:30", "isActive" : "WoC 6/15/2018 19:23", "remaining" : "WoC 6/15/2018 17:41", - "remaining:" : "LM 7/13/2018 14:19", - "setContent:" : "WoC 6/15/2018 18:13", + "remaining:" : "LB 7/6/2018 18:03", "startFadingTime" : "LM 7/13/2018 14:25", "step" : "WoC 6/15/2018 17:43", "stepTime" : "WoC 6/15/2018 17:55", "totalVisibleTime" : "LM 7/13/2018 14:30", - "updateColor" : "LM 7/13/2018 14:24" } } + "updateColor" : "LM 7/13/2018 14:24", + "withMessage:" : "LB 7/6/2018 18:05" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st index 5a323c5..f98e56e 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st @@ -7,7 +7,7 @@ createButtonBarTopSpec: aBuilder frame: (self barFrameFrom: self menuBarHeight height: self buttonHeight); name: #ButtonBarTop; children: OrderedCollection new. - + self buttonBarTopData do: [:each | | button | button := self createButtonSpec: each with: aBuilder. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st index e9ec338..c113268 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st @@ -1,4 +1,4 @@ accessing -magneticRasterActive: aBoolean +magneticRasterActive: aBool - magneticRasterActive := aBoolean \ No newline at end of file + magneticRasterActive := aBool \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 2cd5c7a..0ea797d 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -20,7 +20,7 @@ "checkSlideDirectory:" : "JZ 6/29/2018 17:24", "checkSlideDirectoryName:" : "JZ 6/29/2018 17:03", "clampSlideNumber:" : "WoC 6/22/2018 16:11", - "createButtonBarTopSpec:" : "LM 7/6/2018 18:01", + "createButtonBarTopSpec:" : "JZ 7/6/2018 15:47", "createButtonSpec:with:" : "LM 7/6/2018 17:56", "createDirectory:in:" : "JZ 6/8/2018 19:12", "createMenuBarSpec:" : "JZ 7/6/2018 15:56", @@ -51,7 +51,7 @@ "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LB 7/6/2018 17:23", "exportAsPNGs:" : "LB 7/3/2018 13:16", - "fileButtonData" : "LM 7/13/2018 14:18", + "fileButtonData" : "JZ 7/6/2018 15:42", "getValidPresentationName:" : "JZ 6/8/2018 20:45", "highlightCurrentMiniature" : "LB 6/29/2018 17:22", "initialize" : "LB 7/6/2018 17:10", @@ -67,7 +67,7 @@ "loadPresentationUnchecked:" : "LM 6/29/2018 20:26", "loadSlideFromDirectory:" : "LM 6/29/2018 20:05", "magneticRasterActive" : "LB 7/5/2018 19:48", - "magneticRasterActive:" : "LM 7/13/2018 14:03", + "magneticRasterActive:" : "LB 7/5/2018 19:49", "magneticRasterButtonColor" : "LB 7/5/2018 21:59", "magneticRasterButtonData" : "JZ 7/6/2018 15:37", "menuBarButtonData" : "LM 7/13/2018 14:18", diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st b/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st index 74c4b4d..0d1c73e 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st @@ -1,5 +1,4 @@ presentation mode disablePresentationMode - self submorphsDo: [:each | each disablePresentationMode]. - "self hideSlideNumberMorphHandles" \ No newline at end of file + self submorphsDo: [:each | each disablePresentationMode] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st new file mode 100644 index 0000000..51ee3c5 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st @@ -0,0 +1,5 @@ +contentHandling +layoutFractionsOf: aPoint + + ^ aPoint - self position / self extent + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st index 5a41634..daa89cb 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st @@ -2,6 +2,6 @@ contentHandling layoutFrameFor: aMorph | upperLeft lowerRight | - upperLeft := (aMorph position - self position) / self extent. + upperLeft := self layoutFractionsOf: aMorph position. lowerRight := upperLeft + (aMorph extent / self extent). ^ (LayoutFrame fractions: (upperLeft corner: lowerRight)) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st index 73d181e..0919a68 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st @@ -4,4 +4,4 @@ mouseDown: evt super mouseDown: evt. evt redButtonPressed ifTrue: [self waitForDoubleClick: evt]. - self fullBounds \ No newline at end of file + "self fullBounds" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json index 7d67a4d..addef46 100644 --- a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json @@ -5,7 +5,7 @@ "acceptDroppingMorph:event:" : "LB 5/23/2018 15:46", "addContent:" : "LB 7/5/2018 19:57", "changed" : "LB 6/29/2018 16:57", - "disablePresentationMode" : "WoC 6/27/2018 14:13", + "disablePresentationMode" : "LB 7/6/2018 18:00", "doubleClick:" : "LM 5/25/2018 17:20", "enablePresentationMode" : "MK 5/25/2018 15:11", "extent:" : "LB 6/6/2018 14:49", @@ -15,9 +15,10 @@ "initialize" : "LM 7/6/2018 16:48", "isImageFileName:" : "LB 5/18/2018 17:16", "isMagnetic" : "LB 7/5/2018 21:41", - "layoutFrameFor:" : "LB 6/15/2018 21:36", + "layoutFractionsOf:" : "LB 7/6/2018 17:47", + "layoutFrameFor:" : "LB 7/6/2018 17:47", "model" : "LB 7/5/2018 20:03", - "mouseDown:" : "LM 5/25/2018 17:21", + "mouseDown:" : "LB 7/6/2018 17:58", "prepareToBeSaved" : "LB 6/22/2018 19:33", "resizeMorphHeightToFit:" : "LB 5/18/2018 17:36", "resizeMorphToFit:" : "LB 5/18/2018 17:36", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st new file mode 100644 index 0000000..f344001 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st @@ -0,0 +1,5 @@ +stepping and presenter +occupiesWorld + + ^ self extent = self world extent + and: [self position = (0@0)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st index b337cd8..afb3a1f 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st @@ -2,6 +2,5 @@ stepping and presenter step self model presentationMode ifFalse: [^self]. - (self extent ~= self world extent - or: [self position ~= (0@0)]) - ifTrue: [self occupyWorld: self world] \ No newline at end of file + self occupiesWorld + ifFalse: [self occupyWorld: self world] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index c6f6ae5..a001d64 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -27,6 +27,7 @@ "makeMeVisible" : "WoC 6/3/2018 00:10", "notification" : "WoC 6/15/2018 19:21", "notification:" : "WoC 6/15/2018 19:21", + "occupiesWorld" : "LB 7/6/2018 17:43", "occupyWorld:" : "JZ 6/29/2018 19:01", "presentationCommandShortcuts" : "MK 6/28/2018 13:40", "presentationCommandShortcuts:" : "MK 6/28/2018 14:03", @@ -46,6 +47,6 @@ "sharedShortcuts" : "LB 6/29/2018 15:45", "showNotification:" : "LM 6/22/2018 15:40", "showSlide:" : "LB 5/6/2018 16:49", - "step" : "JZ 6/29/2018 19:02", + "step" : "LB 7/6/2018 17:44", "stepTime" : "JZ 6/29/2018 18:56", "wantsDroppedMorph:event:" : "MK 6/7/2018 09:29" } } From 88f9841995014fc2ff22941334aa783af746c668 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 15:08:46 +0200 Subject: [PATCH 006/112] Refactoring in PSContentContainer, PSFadingMessage and PSPresentationTool --- .../instance/addResizeHandles.st | 13 +++++++------ .../instance/createHandleOnMove..st | 5 +---- .../instance/defaultContextMenuContent.st | 3 +-- .../PSContentContainer.class/methodProperties.json | 6 +++--- .../PSFadingMessage.class/instance/step.st | 1 + .../PSFadingMessage.class/instance/updateColor.st | 7 ++----- .../PSFadingMessage.class/methodProperties.json | 4 ++-- ...onName..st => askForPresentationDirectoryIn..st} | 8 ++++---- .../instance/savePresentationConfirmed.st | 2 +- .../instance/validateUsageOf.inDirectory..st | 2 +- .../PSPresentationTool.class/methodProperties.json | 6 +++--- 11 files changed, 26 insertions(+), 31 deletions(-) rename packages/Presenter-Core.package/PSPresentationTool.class/instance/{getValidPresentationName..st => askForPresentationDirectoryIn..st} (55%) diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addResizeHandles.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addResizeHandles.st index 99f1ade..fbbd219 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/addResizeHandles.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/addResizeHandles.st @@ -2,9 +2,10 @@ handles addResizeHandles self hasHandles ifFalse: [ - self addHandleAt: #topLeft. - self addHandleAt: #topRight. - self addHandleAt: #bottomRight. - self addHandleAt: #bottomLeft. - self placeHandles. - self hasHandles: true] \ No newline at end of file + self + addHandleAt: #topLeft; + addHandleAt: #topRight; + addHandleAt: #bottomRight; + addHandleAt: #bottomLeft; + placeHandles; + hasHandles: true] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st index 928b96b..33a1067 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st @@ -5,8 +5,5 @@ createHandleOnMove: aSymbol handle := RectangleMorph new extent: self resizeHandleSize; color: Color black. - handle - on: #mouseMove - send: aSymbol - to: self. + handle on: #mouseMove send: aSymbol to: self. ^ handle \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/defaultContextMenuContent.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/defaultContextMenuContent.st index 15e639b..e18dc65 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/defaultContextMenuContent.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/defaultContextMenuContent.st @@ -1,8 +1,7 @@ accessing defaultContextMenuContent - ^ #( - ('grab' grabChild) + ^ #(('grab' grabChild) - ('delete' abandon) - diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 57db2db..233a037 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -4,13 +4,13 @@ "instance" : { "actionForCorner:" : "LB 7/6/2018 16:30", "addHandleAt:" : "LB 7/6/2018 18:07", - "addResizeHandles" : "LB 7/6/2018 16:15", + "addResizeHandles" : "LM 7/13/2018 14:58", "child" : "MK 5/18/2018 20:03", "child:" : "LM 5/21/2018 12:48", "copyChildToHand" : "LM 6/17/2018 11:52", "createContextMenu" : "LB 6/15/2018 21:42", - "createHandleOnMove:" : "LB 7/6/2018 16:26", - "defaultContextMenuContent" : "LM 6/17/2018 11:52", + "createHandleOnMove:" : "LM 7/13/2018 14:59", + "defaultContextMenuContent" : "LM 7/13/2018 14:59", "disablePresentationMode" : "WoC 6/17/2018 18:44", "dragBottomLeftEvent:fromHandle:" : "LB 7/6/2018 16:32", "dragBottomRightEvent:fromHandle:" : "LB 7/6/2018 16:28", diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st index 0a3b144..f36e270 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st @@ -1,6 +1,7 @@ stepping and presenter step + self remaining: self remaining - self stepTime. self remaining <= 0 ifTrue: [ self delete ] ifFalse: [self updateColor] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st index dc28c3e..ab07c66 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st @@ -2,8 +2,5 @@ stepping and presenter updateColor | alpha | - self remaining: self remaining - self stepTime. - self remaining < self startFadingTime - ifTrue: [ - alpha := remaining / self startFadingTime. - self color: (self color alpha: alpha)] \ No newline at end of file + alpha := self remaining / self startFadingTime. + self color: (self color alpha: alpha) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index 84675c1..fa42b79 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -12,8 +12,8 @@ "remaining" : "WoC 6/15/2018 17:41", "remaining:" : "LB 7/6/2018 18:03", "startFadingTime" : "LM 7/13/2018 14:25", - "step" : "WoC 6/15/2018 17:43", + "step" : "LM 7/13/2018 14:47", "stepTime" : "WoC 6/15/2018 17:55", "totalVisibleTime" : "LM 7/13/2018 14:30", - "updateColor" : "LM 7/13/2018 14:24", + "updateColor" : "LM 7/13/2018 14:55", "withMessage:" : "LB 7/6/2018 18:05" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/getValidPresentationName..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st similarity index 55% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/getValidPresentationName..st rename to packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st index 9ffe5e2..a2833cd 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/getValidPresentationName..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st @@ -1,12 +1,12 @@ presentation saving -getValidPresentationName: aFileDirectory +askForPresentationDirectoryIn: aFileDirectory | presentationName directory | presentationName := self askForPresentationName. + "Pressing cancel returns an empty string, so we have to check" presentationName = '' ifTrue: [^ nil]. - directory := (aFileDirectory / presentationName). + directory := aFileDirectory / presentationName. ^ directory exists ifTrue: [self validateUsageOf: presentationName inDirectory: aFileDirectory] - ifFalse: [directory assureExistence] - \ No newline at end of file + ifFalse: [directory assureExistence] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st index 9b4ae8a..454bbc5 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st @@ -4,7 +4,7 @@ savePresentationConfirmed | directory | directory := self defaultDirectory. - directory := self getValidPresentationName: directory. + directory := self askForPresentationDirectoryIn: directory. directory ifNil: [^ self]. directory := self createDirectory: 'slides' in: directory. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st index 4a3da83..5ae36ac 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st @@ -6,4 +6,4 @@ validateUsageOf: aString inDirectory: aFileDirectory self warn: self overwriteQuestion trueChoice: [directory recursiveDelete. ^ self createDirectory: aString in: aFileDirectory] - falseChoice: [^ self getValidPresentationName: aFileDirectory] \ No newline at end of file + falseChoice: [^ self askForPresentationDirectoryIn: aFileDirectory] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 0ea797d..3fee647 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -11,6 +11,7 @@ "addPSTextMorphIn:at:centeredWithSize:" : "MK 7/6/2018 15:40", "addPSTextMorphIn:at:withSize:" : "MK 7/6/2018 15:40", "afterBuildWith:" : "LM 7/6/2018 17:43", + "askForPresentationDirectoryIn:" : "LM 7/13/2018 15:06", "askForPresentationName" : "JZ 6/8/2018 20:41", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", @@ -52,7 +53,6 @@ "enablePresentationMode" : "LB 7/6/2018 17:23", "exportAsPNGs:" : "LB 7/3/2018 13:16", "fileButtonData" : "JZ 7/6/2018 15:42", - "getValidPresentationName:" : "JZ 6/8/2018 20:45", "highlightCurrentMiniature" : "LB 6/29/2018 17:22", "initialize" : "LB 7/6/2018 17:10", "insertButtonData" : "JZ 7/6/2018 15:43", @@ -101,7 +101,7 @@ "previousSlideButtonData" : "JZ 7/6/2018 15:24", "riskyOperationMessage" : "LM 6/23/2018 14:21", "savePresentation" : "LM 6/23/2018 14:30", - "savePresentationConfirmed" : "LM 6/23/2018 14:29", + "savePresentationConfirmed" : "LM 7/13/2018 15:07", "selectSlide:" : "LB 6/29/2018 15:47", "selectSlideButtonData" : "WoC 6/22/2018 15:42", "selectSlideNumber:" : "WoC 6/29/2018 19:18", @@ -126,7 +126,7 @@ "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", "updateSlideMiniatures" : "LB 6/29/2018 17:08", - "validateUsageOf:inDirectory:" : "JZ 6/8/2018 20:05", + "validateUsageOf:inDirectory:" : "LM 7/13/2018 15:07", "viewPortLayoutFrame" : "LB 6/29/2018 15:31", "wantsSteps" : "LB 6/29/2018 17:04", "warn:trueChoice:" : "JZ 6/8/2018 17:54", From 803f902becdbe571fb8973e4641a6508936da93f Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 15:16:02 +0200 Subject: [PATCH 007/112] Replace isEmpty ifTrue: checks with ifEmpty: --- .../instance/askForPresentationDirectoryIn..st | 3 +-- .../instance/openSlideMoveDialog.st | 2 +- .../instance/openSlideSelectionDialog.st | 2 +- .../PSPresentationTool.class/instance/showErrorReport..st | 6 +++--- .../PSPresentationTool.class/methodProperties.json | 8 ++++---- .../PSTextMorph.class/instance/showFontSizeDialog.st | 2 +- .../PSTextMorph.class/methodProperties.json | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st index a2833cd..5441fc8 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st @@ -4,8 +4,7 @@ askForPresentationDirectoryIn: aFileDirectory | presentationName directory | presentationName := self askForPresentationName. "Pressing cancel returns an empty string, so we have to check" - presentationName = '' - ifTrue: [^ nil]. + presentationName ifEmpty: [^ nil]. directory := aFileDirectory / presentationName. ^ directory exists ifTrue: [self validateUsageOf: presentationName inDirectory: aFileDirectory] diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st index a5f3b96..45a61f8 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st @@ -3,7 +3,7 @@ openSlideMoveDialog | userInput | userInput := UIManager default request: 'Where should I move the current slide???'. - userInput isEmpty ifTrue: [^ self]. "Check for cancel" + userInput ifEmpty: [^ self]. "Check for cancel" [self moveCurrentSlideTo: userInput asNumber] on: Error do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st index 6bdb815..db0e1fe 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st @@ -3,7 +3,7 @@ openSlideSelectionDialog | userInput | userInput := UIManager default request: 'Which slide should I select???'. - userInput isEmpty ifTrue: [^ self]. "Check for cancel" + userInput ifEmpty: [^ self]. "Check for cancel" [self selectSlideNumber: userInput asNumber] on: Error do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st index 3fd9f27..c561276 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st @@ -3,6 +3,6 @@ showErrorReport: aDictionary | corruptedSlides | corruptedSlides := aDictionary select: [:each | each > 0]. - corruptedSlides isEmpty - ifTrue: [UIManager inform: 'I successfully loaded the presentation.'] - ifFalse: [UIManager inform: (self buildErrorReportString: corruptedSlides)] \ No newline at end of file + corruptedSlides + ifEmpty: [UIManager inform: 'I successfully loaded the presentation.'] + ifNotEmpty: [UIManager inform: (self buildErrorReportString: corruptedSlides)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 6fb1c6d..d282c2d 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -11,7 +11,7 @@ "addPSTextMorphIn:at:centeredWithSize:" : "MK 7/6/2018 15:40", "addPSTextMorphIn:at:withSize:" : "MK 7/6/2018 15:40", "afterBuildWith:" : "LM 7/6/2018 17:43", - "askForPresentationDirectoryIn:" : "LM 7/13/2018 15:06", + "askForPresentationDirectoryIn:" : "LM 7/13/2018 15:11", "askForPresentationName" : "JZ 6/8/2018 20:41", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", @@ -91,8 +91,8 @@ "openInsertMenu" : "MK 7/6/2018 16:11", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", "openSlideMenu" : "MK 7/6/2018 16:14", - "openSlideMoveDialog" : "LB 7/13/2018 14:33", - "openSlideSelectionDialog" : "LB 7/13/2018 14:33", + "openSlideMoveDialog" : "LM 7/13/2018 15:12", + "openSlideSelectionDialog" : "LM 7/13/2018 15:12", "overwriteQuestion" : "JZ 6/8/2018 20:06", "presentationMode" : "LM 5/25/2018 16:57", "presentationMode:" : "LM 5/25/2018 16:57", @@ -105,7 +105,7 @@ "selectSlide:" : "LB 6/29/2018 15:47", "selectSlideButtonData" : "WoC 6/22/2018 15:42", "selectSlideNumber:" : "WoC 6/29/2018 19:18", - "showErrorReport:" : "MK 6/8/2018 18:30", + "showErrorReport:" : "LM 7/13/2018 15:13", "slideAt:" : "LM 5/6/2018 15:37", "slideButtonData" : "LM 7/6/2018 17:27", "slideContainer" : "MK 5/6/2018 15:32", diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st index 553e22c..935be5d 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st @@ -5,7 +5,7 @@ showFontSizeDialog newSize := UIManager default request: self fontSizeDialogText initialAnswer: self selectionFontSize printString. - newSize isEmpty ifTrue: [^ self]. "Check for cancel" + newSize ifEmpty: [^ self]. "Check for cancel" [self selectionFontSize: newSize asNumber] on: Error do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index aa1bd4c..dfcab40 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -25,7 +25,7 @@ "setText:" : "MK 7/6/2018 16:58", "showBackgroundColorDialog" : "LB 6/15/2018 16:14", "showFontColorDialog" : "LB 6/8/2018 14:56", - "showFontSizeDialog" : "LB 7/13/2018 14:33", + "showFontSizeDialog" : "LM 7/13/2018 15:14", "textEdited:" : "LB 6/17/2018 18:46", "textScale" : "LB 5/25/2018 16:08", "textScale:" : "LB 6/8/2018 15:38" } } From e052f63d6b4db560d976e62edd62dac3ab6504fa Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Fri, 13 Jul 2018 15:19:32 +0200 Subject: [PATCH 008/112] minor changes --- .../PSFadingMessage.class/instance/active..st | 4 ---- .../PSFadingMessage.class/instance/active.st | 4 ---- .../PSFadingMessage.class/instance/isActive.st | 4 ---- .../PSFadingMessage.class/methodProperties.json | 3 --- .../instance/presentationModeCommandShortcuts.st | 2 +- .../instance/presentationModeShortcuts.st | 2 +- .../PSSlideContainer.class/methodProperties.json | 4 ++-- 7 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/active.st delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st deleted file mode 100644 index fb0c35a..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/active..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -active: aBoolean - - active := aBoolean diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/active.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/active.st deleted file mode 100644 index 19f0b7e..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/active.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -active - - ^ active diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st deleted file mode 100644 index f6c7881..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isActive - - ^ active \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index 84675c1..9359929 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -2,13 +2,10 @@ "class" : { "for:" : "LB 7/6/2018 18:05" }, "instance" : { - "active" : "WoC 6/15/2018 19:23", - "active:" : "LM 7/13/2018 14:04", "content" : "WoC 6/15/2018 17:21", "content:" : "LM 7/13/2018 14:19", "defaultPadding" : "WoC 6/15/2018 17:31", "initialize" : "LM 7/13/2018 14:30", - "isActive" : "WoC 6/15/2018 19:23", "remaining" : "WoC 6/15/2018 17:41", "remaining:" : "LB 7/6/2018 18:03", "startFadingTime" : "LM 7/13/2018 14:25", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st index d97567c..861645d 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st @@ -1,4 +1,4 @@ accessing presentationModeCommandShortcuts - "{character that trggers event . action block . discription}" + "{character that triggers event . action block . discription}" ^ {}, self sharedCommandShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st index 3817f34..bc66e3c 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st @@ -1,6 +1,6 @@ accessing presentationModeShortcuts - "{character that trggers event . action block . discription}" + "{character that triggers event . action block . discription}" ^ { {$i . [self model toggleInteractivity] . 'Toggle iteractive/non interactive mode'} }, self sharedShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index a001d64..ff133fa 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -37,8 +37,8 @@ "presentationCreationModeShortcuts" : "MK 6/28/2018 14:14", "presentationCreationShortcuts" : "WoC 6/15/2018 15:55", "presentationCreationShortcuts:" : "MK 6/28/2018 14:02", - "presentationModeCommandShortcuts" : "MK 6/28/2018 14:15", - "presentationModeShortcuts" : "LB 7/6/2018 16:57", + "presentationModeCommandShortcuts" : "JZ 7/13/2018 15:16", + "presentationModeShortcuts" : "JZ 7/13/2018 15:16", "presentationShortcuts" : "WoC 6/15/2018 15:55", "presentationShortcuts:" : "MK 6/28/2018 14:02", "previousOwner" : "MK 5/25/2018 15:31", From 4326fcff9eb4ca290316edb533b35d5c80903eaf Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 15:21:20 +0200 Subject: [PATCH 009/112] Added test for slide selection dialog --- .../PSFadingMessage.class/instance/isActive.st | 4 ---- .../PSFadingMessage.class/methodProperties.json | 1 - .../instance/openSlideSelectionDialog.st | 2 +- .../instance/slideSelectionDialogText.st | 4 ++++ .../PSPresentationTool.class/methodProperties.json | 3 ++- .../instance/testSlideSelectionDialog.st | 7 +++++++ .../PSPresentationToolTest.class/methodProperties.json | 1 + 7 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st deleted file mode 100644 index f6c7881..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/isActive.st +++ /dev/null @@ -1,4 +0,0 @@ -testing -isActive - - ^ active \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index 84675c1..9b0cbe7 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -8,7 +8,6 @@ "content:" : "LM 7/13/2018 14:19", "defaultPadding" : "WoC 6/15/2018 17:31", "initialize" : "LM 7/13/2018 14:30", - "isActive" : "WoC 6/15/2018 19:23", "remaining" : "WoC 6/15/2018 17:41", "remaining:" : "LB 7/6/2018 18:03", "startFadingTime" : "LM 7/13/2018 14:25", diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st index 6bdb815..44f5f1b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st @@ -2,7 +2,7 @@ slide management openSlideSelectionDialog | userInput | - userInput := UIManager default request: 'Which slide should I select???'. + userInput := UIManager default request: self slideSelectionDialogText. userInput isEmpty ifTrue: [^ self]. "Check for cancel" [self selectSlideNumber: userInput asNumber] on: Error diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st new file mode 100644 index 0000000..1143e6e --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st @@ -0,0 +1,4 @@ +accessing +slideSelectionDialogText + + ^ 'Which slide should I select???' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 07d6577..ad6ec69 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -92,7 +92,7 @@ "openSlideLayoutChooser" : "MK 7/6/2018 16:28", "openSlideMenu" : "MK 7/6/2018 16:14", "openSlideMoveDialog" : "LB 7/13/2018 14:33", - "openSlideSelectionDialog" : "LB 7/13/2018 14:33", + "openSlideSelectionDialog" : "LB 7/13/2018 14:58", "overwriteQuestion" : "JZ 6/8/2018 20:06", "presentationMode" : "LM 5/25/2018 16:57", "presentationMode:" : "LM 5/25/2018 16:57", @@ -115,6 +115,7 @@ "slideMiniatures" : "LB 6/29/2018 17:28", "slideNumberString" : "LB 6/22/2018 16:08", "slideNumberString:" : "LB 6/29/2018 15:45", + "slideSelectionDialogText" : "LB 7/13/2018 14:58", "slides" : "LM 5/6/2018 15:05", "slides:" : "MK 5/6/2018 15:56", "slidesDirectoryName" : "MK 6/8/2018 18:14", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st new file mode 100644 index 0000000..5e32bc6 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st @@ -0,0 +1,7 @@ +slide navigation tests +testSlideSelectionDialog + + self + should: [self tool openSlideSelectionDialog] + raise: ProvideAnswerNotification + description: self tool slideSelectionDialogText \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 2461d1a..66d8a08 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -56,6 +56,7 @@ "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", "testSlideRatioIsFixed" : "LB 6/1/2018 18:49", "testSlideResizeRegression" : "LB 5/18/2018 20:27", + "testSlideSelectionDialog" : "LB 7/13/2018 14:58", "testSlidesDirectoryIsEmpty" : "LM 6/15/2018 18:42", "testSlidesReceiveEnablePresentationMode" : "LM 6/15/2018 18:40", "testSortMorphFiles" : "JZ 6/29/2018 18:00", From 5c5cb9f96269d95c810c90589fee3c4f668bd269 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 15:49:17 +0200 Subject: [PATCH 010/112] Refactored shortcuts --- .../instance/scalingSource..st | 4 ++-- .../methodProperties.json | 2 +- .../instance/createShortcutsFrom..st | 8 ++++++++ .../instance/initialize.st | 5 +---- .../instance/initializeShortcuts.in..st | 5 ----- .../instance/initializeShortcuts.st | 13 ------------- .../instance/presentationCommandShortcuts..st | 4 ---- .../instance/presentationCommandShortcuts.st | 2 +- .../presentationCreationCommandShortcuts..st | 4 ---- .../presentationCreationCommandShortcuts.st | 2 +- .../instance/presentationCreationShortcuts..st | 4 ---- .../instance/presentationCreationShortcuts.st | 2 +- .../instance/presentationShortcuts..st | 4 ---- .../instance/presentationShortcuts.st | 2 +- .../methodProperties.json | 17 ++++++----------- 15 files changed, 22 insertions(+), 56 deletions(-) create mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/createShortcutsFrom..st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.in..st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts..st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts..st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts..st delete mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts..st diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st index af99ee0..a19dad2 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st @@ -1,4 +1,4 @@ accessing scalingSource: anObject - - scalingSource := anObject + "The object must understand the #textScale message" + scalingSource := anObject \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json index 40fc27f..227007f 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json @@ -12,6 +12,6 @@ "font" : "LB 6/8/2018 12:45", "forFontInStyle:do:" : "LB 6/8/2018 16:16", "scalingSource" : "LB 6/8/2018 12:27", - "scalingSource:" : "LB 6/8/2018 12:27", + "scalingSource:" : "LM 7/13/2018 15:20", "style" : "LB 6/8/2018 12:27", "style:" : "LB 6/8/2018 12:27" } } diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/createShortcutsFrom..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/createShortcutsFrom..st new file mode 100644 index 0000000..ca27cd7 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/createShortcutsFrom..st @@ -0,0 +1,8 @@ +initialize-release +createShortcutsFrom: aCollection + + | shortcuts | + shortcuts := Dictionary new. + aCollection do: [:each | + shortcuts at: each first put: each second]. + ^ shortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initialize.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/initialize.st index c5f186e..fbac8b3 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/initialize.st @@ -2,7 +2,4 @@ initialize-release initialize super initialize. - self - initializeStyle; - initializeShortcuts - \ No newline at end of file + self initializeStyle \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.in..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.in..st deleted file mode 100644 index 381fdbc..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.in..st +++ /dev/null @@ -1,5 +0,0 @@ -initialize-release -initializeShortcuts: aCollection in: aDictionary - - aCollection do: [:each | - aDictionary at: each first put: each second] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.st deleted file mode 100644 index 22ac2ff..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/initializeShortcuts.st +++ /dev/null @@ -1,13 +0,0 @@ -initialize-release -initializeShortcuts - - self presentationShortcuts: Dictionary new. - self presentationCommandShortcuts: Dictionary new. - self presentationCreationShortcuts: Dictionary new. - self presentationCreationCommandShortcuts: Dictionary new. - - self initializeShortcuts: self presentationModeShortcuts in: self presentationShortcuts. - self initializeShortcuts: self presentationModeCommandShortcuts in: self presentationCommandShortcuts. - self initializeShortcuts: self presentationCreationModeCommandShortcuts in: self presentationCreationCommandShortcuts. - self initializeShortcuts: self presentationCreationModeShortcuts in: self presentationCreationShortcuts - \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts..st deleted file mode 100644 index 3e34cc0..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -presentationCommandShortcuts: aDictionary - - presentationCommandShortcuts := aDictionary diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st index e077a7a..0f919f9 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st @@ -1,4 +1,4 @@ accessing presentationCommandShortcuts - ^ presentationCommandShortcuts + ^ self createShortcutsFrom: self presentationModeCommandShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts..st deleted file mode 100644 index 087386f..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -presentationCreationCommandShortcuts: aDictionary - - presentationCreationCommandShortcuts := aDictionary \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st index 2ea6a17..8ef7ed6 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st @@ -1,4 +1,4 @@ accessing presentationCreationCommandShortcuts - ^ presentationCreationCommandShortcuts + ^ self createShortcutsFrom: self presentationCreationModeCommandShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts..st deleted file mode 100644 index 90cb33c..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -presentationCreationShortcuts: aDictionary - - presentationCreationShortcuts := aDictionary diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st index 81229bb..968f137 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st @@ -1,4 +1,4 @@ accessing presentationCreationShortcuts - ^ presentationCreationShortcuts + ^ self createShortcutsFrom: self presentationCreationModeShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts..st deleted file mode 100644 index d53a06f..0000000 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -presentationShortcuts: aDictionary - - presentationShortcuts := aDictionary diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st index e277308..adefa7d 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st @@ -1,4 +1,4 @@ accessing presentationShortcuts - ^ presentationShortcuts + ^ self createShortcutsFrom: self presentationModeShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index a001d64..b62089b 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -4,6 +4,7 @@ "instance" : { "beKeyWindow" : "WoC 6/3/2018 00:10", "chooseShortcutsDictionary:" : "MK 6/28/2018 14:06", + "createShortcutsFrom:" : "LM 7/13/2018 15:38", "currentSlide" : "MK 5/6/2018 13:56", "currentSlide:" : "MK 5/6/2018 15:51", "defaultColor" : "MK 5/25/2018 15:41", @@ -16,9 +17,7 @@ "filterEvent:for:" : "LB 7/6/2018 17:08", "handlesKeyboard:" : "WoC 6/15/2018 17:00", "in:tryToEvaluate:" : "WoC 6/15/2018 17:07", - "initialize" : "LB 7/6/2018 17:09", - "initializeShortcuts" : "MK 6/28/2018 13:44", - "initializeShortcuts:in:" : "WoC 6/15/2018 15:57", + "initialize" : "LM 7/13/2018 15:42", "initializeStyle" : "WoC 6/15/2018 16:00", "isCollapsed" : "LM 6/6/2018 18:13", "isSystemWindow" : "WoC 6/4/2018 17:35", @@ -29,18 +28,14 @@ "notification:" : "WoC 6/15/2018 19:21", "occupiesWorld" : "LB 7/6/2018 17:43", "occupyWorld:" : "JZ 6/29/2018 19:01", - "presentationCommandShortcuts" : "MK 6/28/2018 13:40", - "presentationCommandShortcuts:" : "MK 6/28/2018 14:03", - "presentationCreationCommandShortcuts" : "MK 6/28/2018 13:40", - "presentationCreationCommandShortcuts:" : "MK 6/28/2018 14:03", + "presentationCommandShortcuts" : "LM 7/13/2018 15:39", + "presentationCreationCommandShortcuts" : "LM 7/13/2018 15:40", "presentationCreationModeCommandShortcuts" : "MK 6/28/2018 14:14", "presentationCreationModeShortcuts" : "MK 6/28/2018 14:14", - "presentationCreationShortcuts" : "WoC 6/15/2018 15:55", - "presentationCreationShortcuts:" : "MK 6/28/2018 14:02", + "presentationCreationShortcuts" : "LM 7/13/2018 15:40", "presentationModeCommandShortcuts" : "MK 6/28/2018 14:15", "presentationModeShortcuts" : "LB 7/6/2018 16:57", - "presentationShortcuts" : "WoC 6/15/2018 15:55", - "presentationShortcuts:" : "MK 6/28/2018 14:02", + "presentationShortcuts" : "LM 7/13/2018 15:41", "previousOwner" : "MK 5/25/2018 15:31", "previousOwner:" : "MK 5/25/2018 15:32", "sharedCommandShortcuts" : "MK 6/28/2018 14:00", From 46f4195e3032dc8658731757d06e73cb4297e0f5 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 16:19:16 +0200 Subject: [PATCH 011/112] Added super cool mock file stream and drop image test --- .../PSMockByteStream.class/README.md | 0 .../class/examplePngBytes.st | 4 ++++ .../PSMockByteStream.class/class/newPng.st | 7 +++++++ .../PSMockByteStream.class/instance/atEnd.st | 4 ++++ .../PSMockByteStream.class/instance/binary.st | 4 ++++ .../PSMockByteStream.class/instance/close.st | 2 ++ .../instance/collection..st | 7 +++++++ .../PSMockByteStream.class/instance/initialize.st | 6 ++++++ .../PSMockByteStream.class/instance/name..st | 4 ++++ .../PSMockByteStream.class/instance/name.st | 4 ++++ .../PSMockByteStream.class/instance/reset.st | 4 ++++ .../PSMockByteStream.class/instance/setToEnd.st | 4 ++++ .../PSMockByteStream.class/instance/skip..st | 4 ++++ .../PSMockByteStream.class/methodProperties.json | 15 +++++++++++++++ .../PSMockByteStream.class/properties.json | 14 ++++++++++++++ .../instance/testAcceptDropImageFile.st | 9 +++++++++ .../methodProperties.json | 1 + 17 files changed, 93 insertions(+) create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/README.md create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/atEnd.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/binary.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/close.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/collection..st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/name..st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/name.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/setToEnd.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/instance/skip..st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/properties.json create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/README.md b/packages/Presenter-Tests.package/PSMockByteStream.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st new file mode 100644 index 0000000..dfd6773 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st @@ -0,0 +1,4 @@ +as yet unclassified +examplePngBytes + + ^ #(0 137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 4 0 0 0 4 8 2 0 0 0 38 147 9 41 0 0 0 1 115 82 71 66 0 174 206 28 233 0 0 0 4 103 65 77 65 0 0 177 143 11 252 97 5 0 0 0 9 112 72 89 115 0 0 36 232 0 0 36 232 1 130 99 5 28 0 0 0 28 73 68 65 84 24 87 99 120 43 163 2 68 255 193 0 149 3 161 148 54 250 0 17 18 103 163 15 0 98 205 33 25 33 239 53 132 0 0 0 0 73 69 78 68 174 66 96 130) asByteArray \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st new file mode 100644 index 0000000..11ac6a9 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st @@ -0,0 +1,7 @@ +as yet unclassified +newPng + + ^ self new + name: 'test.png'; + collection: self examplePngBytes; + yourself \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/atEnd.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/atEnd.st new file mode 100644 index 0000000..f0f68da --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/atEnd.st @@ -0,0 +1,4 @@ +testing +atEnd + + ^ position > collection size \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/binary.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/binary.st new file mode 100644 index 0000000..ed60222 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/binary.st @@ -0,0 +1,4 @@ +file modes +binary + + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/close.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/close.st new file mode 100644 index 0000000..e65eb2b --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/close.st @@ -0,0 +1,2 @@ +file open/close +close \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/collection..st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/collection..st new file mode 100644 index 0000000..e98adbf --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/collection..st @@ -0,0 +1,7 @@ +accessing +collection: aByteArray + + collection := aByteArray. + readLimit := collection size + + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st new file mode 100644 index 0000000..d203d35 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st @@ -0,0 +1,6 @@ +initialize-release +initialize + + super initialize. + self reset. + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/name..st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/name..st new file mode 100644 index 0000000..4418526 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/name..st @@ -0,0 +1,4 @@ +accessing +name: aString + + name := aString \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/name.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/name.st new file mode 100644 index 0000000..4b7f350 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/name.st @@ -0,0 +1,4 @@ +accessing +name + + ^ name \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st new file mode 100644 index 0000000..21b3ca4 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st @@ -0,0 +1,4 @@ +positioning +reset + + position := 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/setToEnd.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/setToEnd.st new file mode 100644 index 0000000..382c846 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/setToEnd.st @@ -0,0 +1,4 @@ +positioning +setToEnd + + position := collection size + 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/skip..st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/skip..st new file mode 100644 index 0000000..aaa1356 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/skip..st @@ -0,0 +1,4 @@ +positioning +skip: aNumber + + position := position + aNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json new file mode 100644 index 0000000..ac51718 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json @@ -0,0 +1,15 @@ +{ + "class" : { + "examplePngBytes" : "LB 7/13/2018 16:12", + "newPng" : "LB 7/13/2018 16:13" }, + "instance" : { + "atEnd" : "LB 7/13/2018 15:45", + "binary" : "LB 7/13/2018 15:29", + "close" : "LB 7/13/2018 15:36", + "collection:" : "LB 7/13/2018 16:11", + "initialize" : "LB 7/13/2018 16:13", + "name" : "LB 7/13/2018 16:10", + "name:" : "LB 7/13/2018 16:10", + "reset" : "LB 7/13/2018 15:51", + "setToEnd" : "LB 7/13/2018 16:04", + "skip:" : "LB 7/13/2018 15:45" } } diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json new file mode 100644 index 0000000..6b17924 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Presenter-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "name" ], + "name" : "PSMockByteStream", + "pools" : [ + ], + "super" : "FileStream", + "type" : "normal" } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st new file mode 100644 index 0000000..34e993e --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st @@ -0,0 +1,9 @@ +as yet unclassified +testAcceptDropImageFile + + | createdImages | + createdImages := self getNew: SketchMorph createdIn: + [self slide + handleDroppedItem: PSMockByteStream newPng + event: (self redMouseDownAt: self slide center)]. + self assert: createdImages size equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index c7e0502..b3ec194 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -8,6 +8,7 @@ "morph:" : "LB 5/18/2018 16:11", "setUp" : "WoC 6/15/2018 20:15", "tearDown" : "LB 6/1/2018 17:51", + "testAcceptDropImageFile" : "LB 7/13/2018 16:18", "testContainerResizing" : "LB 7/6/2018 16:33", "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", From f3732f666abba957e7a433fc1f82b0195e544aa0 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Fri, 13 Jul 2018 16:47:27 +0200 Subject: [PATCH 012/112] refactored PSTextMorph --- .../PSSlideLayout.class/instance/layout.in..st | 4 +++- .../PSSlideLayout.class/methodProperties.json | 2 +- .../PSTextMorph.class/README.md | 7 +++++++ .../PSTextMorph.class/instance/defaultFontColor.st | 2 +- .../instance/defaultTextBackgroundColor.st | 2 +- .../PSTextMorph.class/instance/defaultTextScale.st | 4 ++++ .../PSTextMorph.class/instance/initialize.st | 7 ++----- .../instance/initializeProperties.st | 6 ++++++ .../PSTextMorph.class/instance/initializeStyle.st | 7 +++++++ .../instance/openColorDialogWIth.selecting..st | 8 ++++++++ .../instance/showBackgroundColorDialog.st | 6 +----- .../instance/showFontColorDialog.st | 6 +----- .../PSTextMorph.class/instance/textScale.st | 2 +- .../PSTextMorph.class/methodProperties.json | 12 ++++++++---- .../PSTextMorph.class/properties.json | 2 +- 15 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextScale.st create mode 100644 packages/Presenter-Core.package/PSTextMorph.class/instance/initializeProperties.st create mode 100644 packages/Presenter-Core.package/PSTextMorph.class/instance/initializeStyle.st create mode 100644 packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st diff --git a/packages/Presenter-Core.package/PSSlideLayout.class/instance/layout.in..st b/packages/Presenter-Core.package/PSSlideLayout.class/instance/layout.in..st index e3c5475..5121b22 100644 --- a/packages/Presenter-Core.package/PSSlideLayout.class/instance/layout.in..st +++ b/packages/Presenter-Core.package/PSSlideLayout.class/instance/layout.in..st @@ -11,4 +11,6 @@ layout: morph in: newBounds ifFalse: [newExtent := proposedExtent y / slide sideRatio @ proposedExtent y]. diffExtent := proposedExtent - newExtent. - slide extent: newExtent; center: morph center \ No newline at end of file + slide + extent: newExtent; + center: morph center \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideLayout.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideLayout.class/methodProperties.json index 5e46c3c..d998bb6 100644 --- a/packages/Presenter-Core.package/PSSlideLayout.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideLayout.class/methodProperties.json @@ -2,4 +2,4 @@ "class" : { }, "instance" : { - "layout:in:" : "LB 6/6/2018 14:48" } } + "layout:in:" : "WoC 7/13/2018 16:46" } } diff --git a/packages/Presenter-Core.package/PSTextMorph.class/README.md b/packages/Presenter-Core.package/PSTextMorph.class/README.md index e69de29..b9621a3 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/README.md +++ b/packages/Presenter-Core.package/PSTextMorph.class/README.md @@ -0,0 +1,7 @@ +A PSTextMorph is a TestMorph for PowerSqueak-presentations, that enables scaling, coloring, resizing for text and background-coloring. + +Instance Variables + textScale: Number + +textScale + - scaling factor for text diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st index 2c654f5..24bd9db 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st @@ -1,4 +1,4 @@ -styling +accessing defaultFontColor ^ Color black \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st index 182c7c0..f571b2f 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st @@ -1,4 +1,4 @@ -styling +accessing defaultTextBackgroundColor ^ Color transparent. \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextScale.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextScale.st new file mode 100644 index 0000000..5157b75 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextScale.st @@ -0,0 +1,4 @@ +accessing +defaultTextScale + + ^ 1 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/initialize.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/initialize.st index 3164dc2..443c1ec 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/initialize.st @@ -4,9 +4,6 @@ initialize super initialize. self initializeTextAttribute; - setProperty: #acceptRescale toValue: true; - setProperty: #wantsCustomContextMenu toValue: true; - borderWidth: 0; - color: self defaultTextBackgroundColor; - selectionColor: self defaultFontColor. + initializeProperties; + initializeStyle. self textMorph releaseParagraph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeProperties.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeProperties.st new file mode 100644 index 0000000..3baba00 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeProperties.st @@ -0,0 +1,6 @@ +initialize-release +initializeProperties + + self + setProperty: #acceptRescale toValue: true; + setProperty: #wantsCustomContextMenu toValue: true \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeStyle.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeStyle.st new file mode 100644 index 0000000..21d9d9c --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeStyle.st @@ -0,0 +1,7 @@ +initialize-release +initializeStyle + + self + borderWidth: 0; + color: self defaultTextBackgroundColor; + selectionColor: self defaultFontColor \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st new file mode 100644 index 0000000..4557496 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st @@ -0,0 +1,8 @@ +styling +openColorDialogWIth: aColor selecting: aSymbol + + (NewColorPickerMorph + on: self + originalColor: aColor + setColorSelector: aSymbol) + openNear: self fullBoundsInWorld \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st index 3cfae64..7ae5a40 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st @@ -1,8 +1,4 @@ styling showBackgroundColorDialog - (NewColorPickerMorph - on: self - originalColor: self color - setColorSelector: #color:) - openNear: self fullBoundsInWorld \ No newline at end of file + self openColorDialogWIth: self color selecting: #color \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st index 18738a2..9970d2b 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st @@ -1,8 +1,4 @@ styling showFontColorDialog - (NewColorPickerMorph - on: self - originalColor: self selectionColor - setColorSelector: #selectionColor:) - openNear: self fullBoundsInWorld \ No newline at end of file + self openColorDialogWIth: self selectionColor selecting: #selectionColor: \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale.st index 780ac23..e3ea07e 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale.st @@ -1,4 +1,4 @@ accessing textScale - ^ textScale ifNil: [1] + ^ textScale ifNil: [self defaultTextScale] diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index dfcab40..aac8222 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -9,11 +9,15 @@ "defaultBasicTextSize" : "LB 5/25/2018 16:44", "defaultFontColor" : "LM 6/6/2018 19:22", "defaultTextBackgroundColor" : "LM 6/15/2018 19:04", + "defaultTextScale" : "WoC 7/13/2018 16:27", "ensureScalingFontAttribute" : "LB 6/17/2018 18:39", "fontSizeDialogText" : "LB 6/29/2018 19:38", "hasUnacceptedEdits" : "LM 6/8/2018 20:48", - "initialize" : "LM 6/18/2018 10:07", + "initialize" : "WoC 7/13/2018 16:29", + "initializeProperties" : "WoC 7/13/2018 16:28", + "initializeStyle" : "WoC 7/13/2018 16:29", "initializeTextAttribute" : "LB 6/12/2018 16:48", + "openColorDialogWIth:selecting:" : "WoC 7/13/2018 16:31", "rescale:" : "LB 6/17/2018 13:23", "selectionAddAttribute:" : "LB 6/8/2018 15:11", "selectionAddAttribute:onNoSelection:" : "LB 6/15/2018 19:30", @@ -23,9 +27,9 @@ "selectionFontSize" : "LB 6/8/2018 15:04", "selectionFontSize:" : "LB 6/15/2018 19:27", "setText:" : "MK 7/6/2018 16:58", - "showBackgroundColorDialog" : "LB 6/15/2018 16:14", - "showFontColorDialog" : "LB 6/8/2018 14:56", + "showBackgroundColorDialog" : "WoC 7/13/2018 16:31", + "showFontColorDialog" : "WoC 7/13/2018 16:32", "showFontSizeDialog" : "LM 7/13/2018 15:14", "textEdited:" : "LB 6/17/2018 18:46", - "textScale" : "LB 5/25/2018 16:08", + "textScale" : "WoC 7/13/2018 16:27", "textScale:" : "LB 6/8/2018 15:38" } } diff --git a/packages/Presenter-Core.package/PSTextMorph.class/properties.json b/packages/Presenter-Core.package/PSTextMorph.class/properties.json index 9d079bf..8811052 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/properties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ "DefaultTextStyle" ], - "commentStamp" : "", + "commentStamp" : "WoC 7/13/2018 16:46", "instvars" : [ "textScale" ], "name" : "PSTextMorph", From 958e572d266fcf3e1cf6a63cbab6a24d429900b7 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 16:53:55 +0200 Subject: [PATCH 013/112] Added ability to export as PNG --- .../instance/askForPresentationName.st | 6 +++++- .../instance/clearSubdirectory.in..st | 6 ++++++ .../instance/exportAsPNGs..st | 13 ------------- .../instance/exportAsPNGs.st | 7 +++++++ .../instance/exportAsPNGsIn..st | 9 +++++++++ .../instance/exportFolder.st | 6 ++++++ .../instance/exportFolderName.st | 4 ++++ .../instance/exportSlidesAsPNGsInDirectory..st | 7 +++++++ .../instance/openFileMenu.st | 1 + .../instance/validateUsageOf.inDirectory..st | 3 +-- .../PSPresentationTool.class/methodProperties.json | 13 +++++++++---- 11 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolderName.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st index 02185a2..b537150 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st @@ -1,4 +1,8 @@ presentation saving askForPresentationName - ^ UIManager default request: 'Please enter a presentation name: ' initialAnswer: 'Presentation' centerAt: World center \ No newline at end of file + ^ (UIManager default + request: 'Please enter a presentation name: ' + initialAnswer: 'Presentation' + centerAt: World center) + ifNil: [''] "Workaround for UIManager sometimes returning nil, and sometimes empty string when cancelled" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st new file mode 100644 index 0000000..5812a23 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st @@ -0,0 +1,6 @@ +presentation saving +clearSubdirectory: aString in: aDirectory + + (aDirectory / aString) recursiveDelete. + World doOneCycle. "Workaround for primitive failure of createDirectory" + ^ self createDirectory: aString in: aDirectory \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs..st deleted file mode 100644 index 8b00f6e..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs..st +++ /dev/null @@ -1,13 +0,0 @@ -do not touch -exportAsPNGs: name - - | directory | - directory := FileDirectory default / 'PSSlidePNGs' / name. - directory assureExistence. - self enablePresentationMode. - self slideContainer enableNonInteractiveMode. - self slides withIndexDo: [:each :index | - self selectSlideNumber: index. - World doOneCycle. - each exportAsPNGNamed: (directory / ('slide', index, '.png')) fullName]. - self disablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st new file mode 100644 index 0000000..ceb8930 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st @@ -0,0 +1,7 @@ +exporting +exportAsPNGs + + | directory | + directory := self askForPresentationDirectoryIn: self exportFolder. + directory + ifNotNil: [self exportAsPNGsIn: directory] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st new file mode 100644 index 0000000..5432614 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st @@ -0,0 +1,9 @@ +exporting +exportAsPNGsIn: aDirectory + + self enablePresentationMode. + self enableNonInteractiveMode. + World doOneCycle. + self exportSlidesAsPNGsInDirectory: aDirectory. + self disablePresentationMode. + UIManager default inform: 'Your presentation has been exported to: ', aDirectory fullName \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st new file mode 100644 index 0000000..3c6ee2d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st @@ -0,0 +1,6 @@ +exporting +exportFolder + + ^ (FileDirectory default / self exportFolderName) + assureExistence; + yourself \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolderName.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolderName.st new file mode 100644 index 0000000..12bf264 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolderName.st @@ -0,0 +1,4 @@ +accessing +exportFolderName + + ^ 'PSPresentationsExports' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st new file mode 100644 index 0000000..a10ab58 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st @@ -0,0 +1,7 @@ +exporting +exportSlidesAsPNGsInDirectory: aDirectory + + self slides withIndexDo: [:each :index | + self selectSlideNumber: index. + World doOneCycle. + each exportAsPNGNamed: (aDirectory / ('slide', index, '.png')) fullName] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st index cd766cb..b7c4f95 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st @@ -6,4 +6,5 @@ openFileMenu menu defaultTarget: self. menu add: 'Save' action: #savePresentation. menu add: 'Load' action: #loadPresentation. + menu add: 'Export as PNGs' action: #exportAsPNGs. menu popUpInWorld \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st index 5ae36ac..e09d99b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st @@ -4,6 +4,5 @@ validateUsageOf: aString inDirectory: aFileDirectory | directory | directory := aFileDirectory / aString. self warn: self overwriteQuestion - trueChoice: [directory recursiveDelete. - ^ self createDirectory: aString in: aFileDirectory] + trueChoice: [^ self clearSubdirectory: aString in: aFileDirectory] falseChoice: [^ self askForPresentationDirectoryIn: aFileDirectory] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index d282c2d..0f63fcc 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -12,7 +12,7 @@ "addPSTextMorphIn:at:withSize:" : "MK 7/6/2018 15:40", "afterBuildWith:" : "LM 7/6/2018 17:43", "askForPresentationDirectoryIn:" : "LM 7/13/2018 15:11", - "askForPresentationName" : "JZ 6/8/2018 20:41", + "askForPresentationName" : "LM 7/13/2018 16:49", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", "buildWith:" : "LM 7/6/2018 17:08", @@ -21,6 +21,7 @@ "checkSlideDirectory:" : "JZ 6/29/2018 17:24", "checkSlideDirectoryName:" : "JZ 6/29/2018 17:03", "clampSlideNumber:" : "WoC 6/22/2018 16:11", + "clearSubdirectory:in:" : "LM 7/13/2018 16:42", "createButtonBarTopSpec:" : "JZ 7/6/2018 15:47", "createButtonSpec:with:" : "LM 7/6/2018 17:56", "createDirectory:in:" : "JZ 6/8/2018 19:12", @@ -51,7 +52,11 @@ "duplicateCurrentSlide" : "WoC 6/22/2018 17:14", "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LB 7/6/2018 17:23", - "exportAsPNGs:" : "LB 7/3/2018 13:16", + "exportAsPNGs" : "LM 7/13/2018 16:50", + "exportAsPNGsIn:" : "LM 7/13/2018 16:30", + "exportFolder" : "LM 7/13/2018 16:28", + "exportFolderName" : "LM 7/13/2018 16:02", + "exportSlidesAsPNGsInDirectory:" : "LM 7/13/2018 16:07", "fileButtonData" : "JZ 7/6/2018 15:42", "highlightCurrentMiniature" : "LB 6/29/2018 17:22", "initialize" : "LB 7/6/2018 17:10", @@ -86,7 +91,7 @@ "newTextField" : "LB 5/25/2018 16:43", "nextSlide" : "LB 6/29/2018 15:45", "nextSlideButtonData" : "JZ 7/6/2018 15:23", - "openFileMenu" : "LB 6/22/2018 17:40", + "openFileMenu" : "LM 7/13/2018 16:11", "openImageField:" : "LB 5/18/2018 17:35", "openInsertMenu" : "MK 7/6/2018 16:11", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", @@ -126,7 +131,7 @@ "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", "updateSlideMiniatures" : "LB 6/29/2018 17:08", - "validateUsageOf:inDirectory:" : "LM 7/13/2018 15:07", + "validateUsageOf:inDirectory:" : "LM 7/13/2018 16:41", "viewPortLayoutFrame" : "LB 6/29/2018 15:31", "wantsSteps" : "LB 6/29/2018 17:04", "warn:trueChoice:" : "JZ 6/8/2018 17:54", From 9a92020f063eb2d19f3c0bb0aaac76c26efdaec7 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Fri, 13 Jul 2018 16:55:47 +0200 Subject: [PATCH 014/112] fixes small bug --- .../PSContentContainer.class/instance/copyChildToHand.st | 2 +- .../PSContentContainer.class/instance/removedMorph..st | 3 ++- .../PSContentContainer.class/instance/resizeChild.st | 3 ++- .../PSContentContainer.class/methodProperties.json | 6 +++--- .../PSTextMorph.class/instance/showBackgroundColorDialog.st | 2 +- .../PSTextMorph.class/methodProperties.json | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st index 8d5660a..cc7b259 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st @@ -4,4 +4,4 @@ copyChildToHand | copy | copy := self child copy. copy center: ActiveHand center. - ActiveHand grabMorph: copy. \ No newline at end of file + ActiveHand grabMorph: copy \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st index a31bb14..12c8399 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st @@ -1,4 +1,5 @@ submorphs-add/remove removedMorph: aMorph - aMorph = self child ifTrue: [self abandon] \ No newline at end of file + aMorph = self child + ifTrue: [self abandon] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st index 2004b46..3f0c93d 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st @@ -1,4 +1,5 @@ resizing resizeChild - self child bounds: self bounds \ No newline at end of file + self child + bounds: self bounds \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 233a037..7986b86 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -7,7 +7,7 @@ "addResizeHandles" : "LM 7/13/2018 14:58", "child" : "MK 5/18/2018 20:03", "child:" : "LM 5/21/2018 12:48", - "copyChildToHand" : "LM 6/17/2018 11:52", + "copyChildToHand" : "WoC 7/13/2018 16:53", "createContextMenu" : "LB 6/15/2018 21:42", "createHandleOnMove:" : "LM 7/13/2018 14:59", "defaultContextMenuContent" : "LM 7/13/2018 14:59", @@ -37,8 +37,8 @@ "placeHandles" : "LB 7/6/2018 18:10", "rasterResolution" : "LB 7/5/2018 19:42", "removeResizeHandles" : "MK 5/25/2018 16:18", - "removedMorph:" : "WoC 5/23/2018 18:40", - "resizeChild" : "MK 5/18/2018 20:03", + "removedMorph:" : "WoC 7/13/2018 16:51", + "resizeChild" : "WoC 7/13/2018 16:52", "resizeFractionsOf:" : "LB 7/6/2018 17:48", "resizeHandleSize" : "MK 5/18/2018 19:13", "resizeHandles" : "MK 5/18/2018 17:43", diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st index 7ae5a40..dc2f828 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st @@ -1,4 +1,4 @@ styling showBackgroundColorDialog - self openColorDialogWIth: self color selecting: #color \ No newline at end of file + self openColorDialogWIth: self color selecting: #color: \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index aac8222..9270bc2 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -27,7 +27,7 @@ "selectionFontSize" : "LB 6/8/2018 15:04", "selectionFontSize:" : "LB 6/15/2018 19:27", "setText:" : "MK 7/6/2018 16:58", - "showBackgroundColorDialog" : "WoC 7/13/2018 16:31", + "showBackgroundColorDialog" : "WoC 7/13/2018 16:55", "showFontColorDialog" : "WoC 7/13/2018 16:32", "showFontSizeDialog" : "LM 7/13/2018 15:14", "textEdited:" : "LB 6/17/2018 18:46", From cf8d9aea5a5ccf3eb833562a04631d97462dcbb8 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 17:04:33 +0200 Subject: [PATCH 015/112] Added slide duplication ability --- .../instance/createSlideButtonData.st | 2 +- .../instance/duplicateCurrentSlide.st | 5 +++-- .../PSPresentationTool.class/instance/openSlideMenu.st | 7 ++++--- .../PSPresentationTool.class/methodProperties.json | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st index e24b1ba..465bc8c 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st @@ -4,5 +4,5 @@ createSlideButtonData ^ Dictionary withAll: { #frame -> (0.0@0.0 corner: 0.15@1.0). #name -> #CreateSlideButton. - #label -> 'Create Slide'. + #label -> 'Create slide'. #action -> #createSlide} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st index 9fbc5a9..b26caee 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st @@ -2,5 +2,6 @@ slide management duplicateCurrentSlide self slides - add: self currentSlide copy - afterIndex: self currentSlideNumber \ No newline at end of file + add: self currentSlide copy + afterIndex: self currentSlideNumber. + self updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st index 7a98c2c..985a079 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st @@ -4,8 +4,9 @@ openSlideMenu | menu | menu := MenuMorph new. menu defaultTarget: self. - menu add: 'Create Slide' action: #createSlide. + menu add: 'Create slide' action: #createSlide. menu add: 'Create slide with layout' action: #openSlideLayoutChooser. - menu add: 'Delete Slide' action: #deleteSlide. - menu add: 'Move Slide' action: #openSlideMoveDialog. + menu add: 'Delete slide' action: #deleteSlide. + menu add: 'Move slide' action: #openSlideMoveDialog. + menu add: 'Duplicate slide' action: #duplicateCurrentSlide. menu popUpInWorld \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index bcd5e4c..d0923f3 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -28,7 +28,7 @@ "createMenuBarSpec:" : "JZ 7/6/2018 15:56", "createMiniatureViewSpec:" : "LM 7/6/2018 17:57", "createSlide" : "LM 7/6/2018 17:57", - "createSlideButtonData" : "JZ 7/6/2018 14:52", + "createSlideButtonData" : "LM 7/13/2018 16:59", "createSlideContainerIn:" : "LM 7/6/2018 17:58", "createSlideNumberLabelSpec:" : "LM 7/6/2018 17:58", "createSlideViewportSpec:" : "LM 7/6/2018 17:58", @@ -49,7 +49,7 @@ "deleteSlide:" : "LM 7/6/2018 16:48", "disableNonInteractiveMode" : "LB 7/6/2018 17:24", "disablePresentationMode" : "LB 7/6/2018 17:28", - "duplicateCurrentSlide" : "WoC 6/22/2018 17:14", + "duplicateCurrentSlide" : "LM 7/13/2018 17:01", "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LB 7/6/2018 17:23", "exportAsPNGs" : "LM 7/13/2018 16:50", @@ -95,7 +95,7 @@ "openImageField:" : "LB 5/18/2018 17:35", "openInsertMenu" : "MK 7/6/2018 16:11", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", - "openSlideMenu" : "MK 7/6/2018 16:14", + "openSlideMenu" : "LM 7/13/2018 16:58", "openSlideMoveDialog" : "LM 7/13/2018 15:12", "openSlideSelectionDialog" : "LB 7/13/2018 16:22", "overwriteQuestion" : "JZ 6/8/2018 20:06", From 858b17585ab2cd1c988ba10a573095d3a389f98d Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 17:05:41 +0200 Subject: [PATCH 016/112] Added grab test and reworked image drop test --- .../PSContentContainer.class/instance/grabChild.st | 4 ++-- .../PSContentContainer.class/methodProperties.json | 2 +- .../instance/selectSlideButtonData.st | 8 -------- .../PSPresentationTool.class/methodProperties.json | 1 - .../instance/testAcceptDropImageFile.st | 12 +++++++----- .../instance/testGrabbing.st | 8 ++++++++ .../PSSlideSubmorphTest.class/methodProperties.json | 3 ++- .../PSTestWorld.class/instance/setUp.st | 6 ++++-- .../PSTestWorld.class/methodProperties.json | 2 +- .../UITestCase.class/instance/setUp.st | 6 ++++++ .../UITestCase.class/methodProperties.json | 1 + 11 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlideButtonData.st create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st create mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/setUp.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st index 558ff4d..fdc115c 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st @@ -1,5 +1,5 @@ context menu grabChild - self child center: ActiveHand position. - ActiveHand grabMorph: self child \ No newline at end of file + self child center: self world activeHand position. + self world activeHand grabMorph: self child \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 233a037..23c6a52 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -24,7 +24,7 @@ "extentTopLeft:" : "LB 7/6/2018 15:57", "extentTopRight:" : "LB 7/6/2018 15:57", "filterEvent:for:" : "MK 6/1/2018 18:02", - "grabChild" : "LM 6/15/2018 16:32", + "grabChild" : "LB 7/13/2018 16:57", "handleLayerNumber" : "MK 5/25/2018 16:26", "handlesMouseDown:" : "WoC 5/22/2018 19:48", "hasHandles" : "MK 5/18/2018 19:42", diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlideButtonData.st deleted file mode 100644 index 6d20f69..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlideButtonData.st +++ /dev/null @@ -1,8 +0,0 @@ -toolbuilder -selectSlideButtonData - - ^ Dictionary withAll: { - #frame -> (0.8@0.0 corner: 0.9@1.0). - #name -> #AddSlideButton. - #label -> 'Select Slide'. - #action -> #openSlideSelectionDialog} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index b6a9481..0bce501 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -103,7 +103,6 @@ "savePresentation" : "LM 6/23/2018 14:30", "savePresentationConfirmed" : "LM 7/13/2018 15:07", "selectSlide:" : "LB 6/29/2018 15:47", - "selectSlideButtonData" : "WoC 6/22/2018 15:42", "selectSlideNumber:" : "WoC 6/29/2018 19:18", "showErrorReport:" : "LM 7/13/2018 15:13", "slideAt:" : "LM 5/6/2018 15:37", diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st index 34e993e..724c263 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st @@ -1,9 +1,11 @@ as yet unclassified testAcceptDropImageFile - | createdImages | - createdImages := self getNew: SketchMorph createdIn: - [self slide - handleDroppedItem: PSMockByteStream newPng - event: (self redMouseDownAt: self slide center)]. + | oldSubMorphs createdImages | + oldSubMorphs := self slide submorphs. + self slide + handleDroppedItem: PSMockByteStream newPng + event: (self redMouseDownAt: self slide center). + createdImages := (self slide submorphs difference: oldSubMorphs) + select: [:each | each child isKindOf: SketchMorph]. self assert: createdImages size equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st new file mode 100644 index 0000000..31ebfe1 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st @@ -0,0 +1,8 @@ +container tests +testGrabbing + + | container | + self slide addContent: self morph. + container := self morph owner. + container grabChild. + self assert: self morph owner equals: self hand \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index b3ec194..c767815 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -8,12 +8,13 @@ "morph:" : "LB 5/18/2018 16:11", "setUp" : "WoC 6/15/2018 20:15", "tearDown" : "LB 6/1/2018 17:51", - "testAcceptDropImageFile" : "LB 7/13/2018 16:18", + "testAcceptDropImageFile" : "LB 7/13/2018 17:01", "testContainerResizing" : "LB 7/6/2018 16:33", "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", "testContextMenu" : "WoC 6/15/2018 20:13", "testDroppingCreatesContainer" : "LM 5/18/2018 18:59", + "testGrabbing" : "LB 7/13/2018 17:04", "testLeavePresentationModeEnablesHandles" : "LM 6/8/2018 20:11", "testPresentationModeRemovesHandle" : "LM 6/8/2018 20:14", "testResizeHandleMagnetic" : "LB 7/5/2018 23:06", diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st index 3dde63e..7d60681 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st @@ -6,7 +6,8 @@ setUp self world: ((PasteUpMorph newWorldForProject: nil) extent: Display extent; viewBox: (0@0 extent: Display extent); - yourself). + yourself); + name: 'TestWorld'. (self world instVarNamed: #worldState) instVarNamed: #canvas @@ -16,4 +17,5 @@ setUp self world removeHand: self world firstHand; "the default hand" - addHand: self hand \ No newline at end of file + addHand: self hand; + activeHand: self hand \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json index 9695f91..bba1de8 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "hand" : "LB 5/29/2018 17:26", "hand:" : "LB 5/29/2018 17:26", - "setUp" : "WoC 6/17/2018 13:36", + "setUp" : "LB 7/13/2018 16:51", "tearDown" : "LB 5/29/2018 17:26", "world" : "LB 5/29/2018 17:26", "world:" : "LB 5/29/2018 17:26" } } diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/setUp.st b/packages/Presenter-Tests.package/UITestCase.class/instance/setUp.st new file mode 100644 index 0000000..25d2183 --- /dev/null +++ b/packages/Presenter-Tests.package/UITestCase.class/instance/setUp.st @@ -0,0 +1,6 @@ +running +setUp + + super setUp. + "This needs to be set because morphic tends to set the active hand to the main project hand" + self world activeHand: self hand \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json index bc405ae..acb0770 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json @@ -17,6 +17,7 @@ "mouseMove:from:to:" : "LB 7/5/2018 22:57", "number:isSimilarTo:" : "LB 5/29/2018 17:39", "redMouseDownAt:" : "LB 7/5/2018 22:28", + "setUp" : "LB 7/13/2018 17:04", "tearDown" : "LM 6/17/2018 11:23", "world" : "LM 6/15/2018 18:41", "yellowMouseDownAt:" : "LB 7/5/2018 22:27" } } From 553994cc5c7435de1663e16727fd394bcceba9e0 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Fri, 13 Jul 2018 17:25:32 +0200 Subject: [PATCH 017/112] Working on tests --- ...ndTwoContents.st => createTitleAndTwoContentsSlide.st} | 2 +- .../PSPresentationTool.class/instance/slideLayoutNames.st | 2 +- .../PSPresentationTool.class/methodProperties.json | 4 ++-- .../instance/testDuplicateSlide.st | 8 ++++++++ .../PSPresentationToolTest.class/methodProperties.json | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) rename packages/Presenter-Core.package/PSPresentationTool.class/instance/{createTitleAndTwoContents.st => createTitleAndTwoContentsSlide.st} (92%) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createTitleAndTwoContents.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createTitleAndTwoContentsSlide.st similarity index 92% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/createTitleAndTwoContents.st rename to packages/Presenter-Core.package/PSPresentationTool.class/instance/createTitleAndTwoContentsSlide.st index 0b68be6..c2079ac 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createTitleAndTwoContents.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createTitleAndTwoContentsSlide.st @@ -1,5 +1,5 @@ layouts -createTitleAndTwoContents +createTitleAndTwoContentsSlide | slide title leftContent rightContent | slide := self createSlide. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideLayoutNames.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideLayoutNames.st index ced7f44..b165e55 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideLayoutNames.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideLayoutNames.st @@ -4,6 +4,6 @@ slideLayoutNames ^ Dictionary withAll: { 'Title slide' -> [self createTitleAndSubtitleSlide]. 'Title and content' -> [self createTitleAndContentSlide]. - 'Title and two contents' -> [self createTitleAndTwoContents]. + 'Title and two contents' -> [self createTitleAndTwoContentsSlide]. 'Title only' -> [self createTitleSlide] } \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index d282c2d..6780b8b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -33,7 +33,7 @@ "createSlideViewportSpec:" : "LM 7/6/2018 17:58", "createTitleAndContentSlide" : "MK 7/6/2018 15:44", "createTitleAndSubtitleSlide" : "MK 7/6/2018 15:38", - "createTitleAndTwoContents" : "MK 7/6/2018 16:01", + "createTitleAndTwoContentsSlide" : "MK 7/13/2018 17:08", "createTitleSlide" : "MK 7/6/2018 17:01", "createWindowSpec:" : "LM 7/6/2018 17:56", "currentMiniature" : "LB 6/29/2018 17:28", @@ -111,7 +111,7 @@ "slideContainer" : "MK 5/6/2018 15:32", "slideContainer:" : "MK 5/6/2018 15:32", "slideCount" : "LB 5/6/2018 17:25", - "slideLayoutNames" : "MK 7/6/2018 16:24", + "slideLayoutNames" : "MK 7/13/2018 17:08", "slideMiniatures" : "LB 6/29/2018 17:28", "slideNumberString" : "LB 6/22/2018 16:08", "slideNumberString:" : "LB 6/29/2018 15:45", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st new file mode 100644 index 0000000..c9a3895 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st @@ -0,0 +1,8 @@ +slide creation tests +testDuplicateSlide + + | slideCount | + slideCount := self tool slideCount. + self tool duplicateCurrentSlide. + self assert: self tool slideCount = (slideCount + 1) + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 2461d1a..8827430 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -18,6 +18,7 @@ "testDeleteFirstSlide" : "LM 5/18/2018 18:25", "testDeletionDecreasesSlideCount" : "LM 5/18/2018 18:31", "testDeletionRemovesSlide" : "LM 5/18/2018 18:28", + "testDuplicateSlide" : "MK 7/13/2018 17:03", "testEmptyPresentationDirectoryIsValid" : "LM 6/15/2018 18:44", "testEnterNonInteractiveMode" : "LB 7/6/2018 17:16", "testErrorReportExistsPerSlide" : "LM 6/15/2018 18:38", From a1ab89edefd6973f2de446ef2d7212b2833cb64b Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 17:26:24 +0200 Subject: [PATCH 018/112] Added slide content duplicate test and hand cleanup after tests --- .../PSContentContainer.class/instance/copyChildToHand.st | 3 ++- .../PSContentContainer.class/methodProperties.json | 2 +- .../instance/testDuplicateChild.st | 8 ++++++++ .../PSSlideSubmorphTest.class/methodProperties.json | 1 + .../UITestCase.class/instance/tearDown.st | 1 + .../UITestCase.class/methodProperties.json | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st index cc7b259..5dab4f3 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st @@ -4,4 +4,5 @@ copyChildToHand | copy | copy := self child copy. copy center: ActiveHand center. - ActiveHand grabMorph: copy \ No newline at end of file + ActiveHand grabMorph: copy. + ^ copy \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index c37ec55..62995c7 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -7,7 +7,7 @@ "addResizeHandles" : "LM 7/13/2018 14:58", "child" : "MK 5/18/2018 20:03", "child:" : "LM 5/21/2018 12:48", - "copyChildToHand" : "WoC 7/13/2018 16:53", + "copyChildToHand" : "LB 7/13/2018 17:22", "createContextMenu" : "LB 6/15/2018 21:42", "createHandleOnMove:" : "LM 7/13/2018 14:59", "defaultContextMenuContent" : "LM 7/13/2018 14:59", diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st new file mode 100644 index 0000000..983fd10 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st @@ -0,0 +1,8 @@ +container tests +testDuplicateChild + + | container copy | + self slide addContent: self morph. + container := self morph owner. + copy := container copyChildToHand. + self assert: (self hand submorphs includes: copy) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index c767815..278d42f 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -14,6 +14,7 @@ "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", "testContextMenu" : "WoC 6/15/2018 20:13", "testDroppingCreatesContainer" : "LM 5/18/2018 18:59", + "testDuplicateChild" : "LB 7/13/2018 17:25", "testGrabbing" : "LB 7/13/2018 17:04", "testLeavePresentationModeEnablesHandles" : "LM 6/8/2018 20:11", "testPresentationModeRemovesHandle" : "LM 6/8/2018 20:14", diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/tearDown.st b/packages/Presenter-Tests.package/UITestCase.class/instance/tearDown.st index 563e491..ed2c081 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/tearDown.st +++ b/packages/Presenter-Tests.package/UITestCase.class/instance/tearDown.st @@ -2,4 +2,5 @@ running tearDown self world submorphsDo: [:each | each abandon]. + self hand submorphsDo: [:each | each abandon]. super tearDown \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json index acb0770..7bb17eb 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json @@ -18,6 +18,6 @@ "number:isSimilarTo:" : "LB 5/29/2018 17:39", "redMouseDownAt:" : "LB 7/5/2018 22:28", "setUp" : "LB 7/13/2018 17:04", - "tearDown" : "LM 6/17/2018 11:23", + "tearDown" : "LB 7/13/2018 17:25", "world" : "LM 6/15/2018 18:41", "yellowMouseDownAt:" : "LB 7/5/2018 22:27" } } From 9e181e413cf3d1cf66792d76b2a3f01bd83d9630 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Fri, 13 Jul 2018 17:41:36 +0200 Subject: [PATCH 019/112] Added tests for duplicateSlide --- .../instance/testDuplicatedSlidesContent.st | 9 +++++++++ .../PSPresentationToolTest.class/methodProperties.json | 1 + 2 files changed, 10 insertions(+) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st new file mode 100644 index 0000000..9de33f8 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st @@ -0,0 +1,9 @@ +slide creation tests +testDuplicatedSlidesContent + + | slide duplicatedSlide | + slide := self tool currentSlide. + slide addContent: (Morph new center: slide center). + self tool duplicateCurrentSlide. + duplicatedSlide := self tool slideAt: self tool currentSlideNumber +1. + slide submorphs withIndexDo: [:each :index | self assert: each center = (duplicatedSlide submorphs at: index) center] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 704d39d..f3587e0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -19,6 +19,7 @@ "testDeletionDecreasesSlideCount" : "LM 5/18/2018 18:31", "testDeletionRemovesSlide" : "LM 5/18/2018 18:28", "testDuplicateSlide" : "MK 7/13/2018 17:03", + "testDuplicatedSlidesContent" : "MK 7/13/2018 17:37", "testEmptyPresentationDirectoryIsValid" : "LM 6/15/2018 18:44", "testEnterNonInteractiveMode" : "LB 7/6/2018 17:16", "testErrorReportExistsPerSlide" : "LM 6/15/2018 18:38", From 66b7a44dc36aec20e7f9517a0100ee5091df0c43 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 17:41:47 +0200 Subject: [PATCH 020/112] Delete unnecessary method --- .../PSMiniature.class/instance/setSlide..st | 5 ----- .../PSMiniature.class/methodProperties.json | 1 - 2 files changed, 6 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSMiniature.class/instance/setSlide..st diff --git a/packages/Presenter-Core.package/PSMiniature.class/instance/setSlide..st b/packages/Presenter-Core.package/PSMiniature.class/instance/setSlide..st deleted file mode 100644 index f38369e..0000000 --- a/packages/Presenter-Core.package/PSMiniature.class/instance/setSlide..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -setSlide: aPSSlide - - self slide: aPSSlide. - self updateImage \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json b/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json index 0ae34fa..82aab2b 100644 --- a/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json @@ -13,7 +13,6 @@ "model" : "LB 6/29/2018 15:52", "model:" : "LB 6/29/2018 15:52", "mouseDown:" : "LB 7/3/2018 17:00", - "setSlide:" : "WoC 6/29/2018 15:26", "slide" : "WoC 6/29/2018 15:19", "slide:" : "LM 7/6/2018 14:57", "unHighlight" : "LM 7/6/2018 15:01", From 2ed5c08c6e8f7b0bb497f998d7ab95acad462438 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Fri, 13 Jul 2018 18:12:24 +0200 Subject: [PATCH 021/112] Minor changes --- .../PSFadingMessage.class/instance/step.st | 2 +- .../PSFadingMessage.class/instance/withMessage..st | 2 +- .../PSFadingMessage.class/methodProperties.json | 4 ++-- .../instance/loadMorphFromStream..st | 2 +- .../PSPresentationTool.class/methodProperties.json | 2 +- .../instance/defaultTextBackgroundColor.st | 2 +- .../PSTextMorph.class/methodProperties.json | 2 +- .../instance/assert.onResizeToFit..st | 2 +- .../instance/doForDifferentSizes..st | 4 ++-- .../instance/testAcceptDropImageFile.st | 2 +- .../instance/testDroppingCreatesContainer.st | 2 +- .../instance/testSlideDropping.st | 2 +- .../instance/testSlideResizeToFitKeepsAspectRatio.st | 2 +- .../instance/testSlideResizeToFitKeepsPosition.st | 4 ++-- .../PSSlideSubmorphTest.class/methodProperties.json | 12 ++++++------ .../instance/testFontSizeDialog.st | 2 +- .../PSTextMorphTest.class/instance/textField..st | 4 ++-- .../PSTextMorphTest.class/methodProperties.json | 4 ++-- .../UITestCase.class/instance/click.at..st | 2 +- .../UITestCase.class/instance/dragndrop.from.to..st | 2 +- .../UITestCase.class/methodProperties.json | 4 ++-- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st index f36e270..1fb2419 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st @@ -3,5 +3,5 @@ step self remaining: self remaining - self stepTime. self remaining <= 0 - ifTrue: [ self delete ] + ifTrue: [self delete] ifFalse: [self updateColor] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st index 09f693a..eb1ad56 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st @@ -3,4 +3,4 @@ withMessage: aString self content contents: aString. "here no cascade because it fixes a presentation bug" self bounds: (self content position corner: self content bottomRight + self defaultPadding). - self content center: self center. \ No newline at end of file + self content center: self center \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index 4b657cc..f3aa54e 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -9,8 +9,8 @@ "remaining" : "WoC 6/15/2018 17:41", "remaining:" : "LB 7/6/2018 18:03", "startFadingTime" : "LM 7/13/2018 14:25", - "step" : "LM 7/13/2018 14:47", + "step" : "MK 7/13/2018 18:01", "stepTime" : "WoC 6/15/2018 17:55", "totalVisibleTime" : "LM 7/13/2018 14:30", "updateColor" : "LM 7/13/2018 14:55", - "withMessage:" : "LB 7/6/2018 18:05" } } + "withMessage:" : "MK 7/13/2018 18:02" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st index 7670cce..67a48fe 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st @@ -1,4 +1,4 @@ presentation loading loadMorphFromStream: aStream - ^ self loadMorphFromStream: aStream testIn: World. \ No newline at end of file + ^ self loadMorphFromStream: aStream testIn: World \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index b987202..f60cc74 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -65,7 +65,7 @@ "isInteractive:" : "LB 7/6/2018 17:19", "isValidPresentationDirectory:" : "JZ 6/29/2018 17:18", "loadMorphFromFile:" : "MK 6/8/2018 17:32", - "loadMorphFromStream:" : "LM 6/13/2018 16:46", + "loadMorphFromStream:" : "MK 7/13/2018 17:49", "loadMorphFromStream:testIn:" : "LB 6/22/2018 19:28", "loadPresentation" : "WoC 6/27/2018 14:13", "loadPresentationFromDirectory:" : "LM 6/15/2018 18:22", diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st index f571b2f..eff21fc 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st @@ -1,4 +1,4 @@ accessing defaultTextBackgroundColor - ^ Color transparent. \ No newline at end of file + ^ Color transparent \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index 9270bc2..89147a0 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -8,7 +8,7 @@ "customContextMenuContent" : "LM 6/15/2018 19:22", "defaultBasicTextSize" : "LB 5/25/2018 16:44", "defaultFontColor" : "LM 6/6/2018 19:22", - "defaultTextBackgroundColor" : "LM 6/15/2018 19:04", + "defaultTextBackgroundColor" : "MK 7/13/2018 17:49", "defaultTextScale" : "WoC 7/13/2018 16:27", "ensureScalingFontAttribute" : "LB 6/17/2018 18:39", "fontSizeDialogText" : "LB 6/29/2018 19:38", diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/assert.onResizeToFit..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/assert.onResizeToFit..st index cbe0e5d..2e7bcb2 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/assert.onResizeToFit..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/assert.onResizeToFit..st @@ -1,7 +1,7 @@ resizeToFit tests assert: aBlock onResizeToFit: aMorph - self doForDifferentSizes: [ :width :height | + self doForDifferentSizes: [:width :height | self morph extent: width @ height. self slide resizeMorphToFit: aMorph. self assert: aBlock] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/doForDifferentSizes..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/doForDifferentSizes..st index 9d22efa..4fbbba1 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/doForDifferentSizes..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/doForDifferentSizes..st @@ -1,8 +1,8 @@ resizeToFit tests doForDifferentSizes: aBlock - self slide extent x - 100 to: self slide extent x + 100 by: 10 do: [ : width | - self slide extent y - 100 to: self slide extent y + 100 by: 10 do: [ : height | + self slide extent x - 100 to: self slide extent x + 100 by: 10 do: [:width | + self slide extent y - 100 to: self slide extent y + 100 by: 10 do: [:height | aBlock value: width value: height ] ] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st index 724c263..62586c3 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st @@ -1,4 +1,4 @@ -as yet unclassified +submorph tests testAcceptDropImageFile | oldSubMorphs createdImages | diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st index ac082f8..12a731c 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st @@ -2,4 +2,4 @@ submorph tests testDroppingCreatesContainer self slide acceptDroppingMorph: self morph event: nil. - self assert: self morph owner class = PSContentContainer. \ No newline at end of file + self assert: self morph owner class = PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st index 9ebf490..3fedff6 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st @@ -8,4 +8,4 @@ testSlideDropping self slide acceptDroppingMorph: self morph event: nil. self assert: self morph position = morphPosition. - self assert: self morph extent = morphExtent. \ No newline at end of file + self assert: self morph extent = morphExtent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st index 4eb7cca..5c35278 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st @@ -1,7 +1,7 @@ resizeToFit tests testSlideResizeToFitKeepsAspectRatio - self doForDifferentSizes: [ :width :height | + self doForDifferentSizes: [:width :height | | aspectRatio | self morph extent: width @ height. aspectRatio := self morph extent y / self morph extent x. diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsPosition.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsPosition.st index 8b281ae..19b9078 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsPosition.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsPosition.st @@ -1,9 +1,9 @@ resizeToFit tests testSlideResizeToFitKeepsPosition - self doForDifferentSizes: [ :width :height | + self doForDifferentSizes: [:width :height | | position | self morph extent: width @ height. position := self morph position. self slide resizeMorphToFit: self morph. - self assert: position = self morph position ] \ No newline at end of file + self assert: position = self morph position] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 278d42f..81d4cbb 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -2,8 +2,8 @@ "class" : { }, "instance" : { - "assert:onResizeToFit:" : "LM 5/18/2018 19:20", - "doForDifferentSizes:" : "LM 5/18/2018 21:00", + "assert:onResizeToFit:" : "MK 7/13/2018 18:07", + "doForDifferentSizes:" : "MK 7/13/2018 18:07", "morph" : "LB 5/18/2018 16:11", "morph:" : "LB 5/18/2018 16:11", "setUp" : "WoC 6/15/2018 20:15", @@ -13,7 +13,7 @@ "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", "testContextMenu" : "WoC 6/15/2018 20:13", - "testDroppingCreatesContainer" : "LM 5/18/2018 18:59", + "testDroppingCreatesContainer" : "MK 7/13/2018 18:07", "testDuplicateChild" : "LB 7/13/2018 17:25", "testGrabbing" : "LB 7/13/2018 17:04", "testLeavePresentationModeEnablesHandles" : "LM 6/8/2018 20:11", @@ -21,9 +21,9 @@ "testResizeHandleMagnetic" : "LB 7/5/2018 23:06", "testResizeHandleNonMagnetic" : "LB 7/5/2018 22:58", "testSlideContainerPosition" : "LB 5/23/2018 15:47", - "testSlideDropping" : "LB 5/18/2018 18:17", + "testSlideDropping" : "MK 7/13/2018 18:08", "testSlideResizeToFit" : "LM 5/18/2018 19:20", - "testSlideResizeToFitKeepsAspectRatio" : "LB 6/6/2018 15:16", - "testSlideResizeToFitKeepsPosition" : "LM 5/18/2018 19:25", + "testSlideResizeToFitKeepsAspectRatio" : "MK 7/13/2018 18:08", + "testSlideResizeToFitKeepsPosition" : "MK 7/13/2018 18:08", "testSubmorphsOnResize" : "LM 6/6/2018 18:09", "testTriggerContextMenu" : "LB 6/15/2018 21:37" } } diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontSizeDialog.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontSizeDialog.st index 5f96a13..25ee859 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontSizeDialog.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontSizeDialog.st @@ -4,4 +4,4 @@ testFontSizeDialog self should: [self textField showFontSizeDialog] raise: ProvideAnswerNotification - description: self textField fontSizeDialogText. \ No newline at end of file + description: self textField fontSizeDialogText \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/textField..st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/textField..st index 7213b81..7245920 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/textField..st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/textField..st @@ -1,4 +1,4 @@ accessing -textField: anObject +textField: aPSTextMorph - textField := anObject + textField := aPSTextMorph diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 32dca92..16a4c4b 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -8,9 +8,9 @@ "testBackgroundColorDialog" : "LB 6/15/2018 16:46", "testContextMenu" : "MK 6/1/2018 19:45", "testFontColorDialog" : "LB 6/15/2018 16:46", - "testFontSizeDialog" : "LB 6/29/2018 19:40", + "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "LB 6/12/2018 17:15", "testLocalFontSize" : "LB 6/12/2018 17:15", "testTextFieldRescale" : "LB 6/8/2018 14:59", "textField" : "LB 6/1/2018 18:21", - "textField:" : "LB 6/1/2018 17:57" } } + "textField:" : "MK 7/13/2018 18:11" } } diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st b/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st index d7b0e0e..d7e3f6c 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st +++ b/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st @@ -2,4 +2,4 @@ support click: aMouseButton at: aPoint self hand handleEvent: (self mouse: aMouseButton does: #mouseDown at: aPoint). - self hand handleEvent: (self mouse: aMouseButton does: #mouseUp at: aPoint). \ No newline at end of file + self hand handleEvent: (self mouse: aMouseButton does: #mouseUp at: aPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st b/packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st index fd5727b..a152695 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st +++ b/packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st @@ -2,4 +2,4 @@ support dragndrop: aMouseButton from: aPoint to: anotherPoint self drag: aMouseButton from: aPoint to: anotherPoint. - self hand handleEvent: (self mouse: aMouseButton does: #mouseUp at: anotherPoint). \ No newline at end of file + self hand handleEvent: (self mouse: aMouseButton does: #mouseUp at: anotherPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json index 7bb17eb..b63b70c 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json @@ -3,11 +3,11 @@ "resources" : "LM 6/15/2018 18:41" }, "instance" : { "blueMouseDownAt:" : "LB 7/5/2018 22:27", - "click:at:" : "LB 7/5/2018 22:36", + "click:at:" : "MK 7/13/2018 18:04", "does:answerSideRatio:" : "LB 6/6/2018 15:10", "does:deviateLessThan:onResizeOf:" : "LB 5/29/2018 17:41", "drag:from:to:" : "LB 7/5/2018 22:57", - "dragndrop:from:to:" : "LB 7/5/2018 22:56", + "dragndrop:from:to:" : "MK 7/13/2018 18:04", "getNew:createdIn:" : "LB 6/15/2018 16:46", "hand" : "LM 6/15/2018 18:41", "is:constantOnResizeOf:" : "LB 5/29/2018 17:42", From c78400b4f75e51b9fea8be236e3e3ac8900152d7 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 18:14:47 +0200 Subject: [PATCH 022/112] Renamed 'container' to 'slideContainer' in PSOnSlideTest --- .../PSMockByteStream.class/class/examplePngBytes.st | 2 +- .../PSMockByteStream.class/class/newPng.st | 2 +- .../assertDeviatesLessThan.onSlideResize..st | 2 +- .../PSOnSlideTest.class/instance/container..st | 4 ---- .../PSOnSlideTest.class/instance/container.st | 4 ---- .../PSOnSlideTest.class/instance/setUp.st | 12 ++++++------ .../PSOnSlideTest.class/instance/slideContainer..st | 4 ++++ .../PSOnSlideTest.class/instance/slideContainer.st | 4 ++++ .../PSOnSlideTest.class/instance/tearDown.st | 2 +- .../PSOnSlideTest.class/methodProperties.json | 10 +++++----- .../PSOnSlideTest.class/properties.json | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container..st delete mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container.st create mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer..st create mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer.st diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st index dfd6773..1a93a3f 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st @@ -1,4 +1,4 @@ -as yet unclassified +data examplePngBytes ^ #(0 137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 4 0 0 0 4 8 2 0 0 0 38 147 9 41 0 0 0 1 115 82 71 66 0 174 206 28 233 0 0 0 4 103 65 77 65 0 0 177 143 11 252 97 5 0 0 0 9 112 72 89 115 0 0 36 232 0 0 36 232 1 130 99 5 28 0 0 0 28 73 68 65 84 24 87 99 120 43 163 2 68 255 193 0 149 3 161 148 54 250 0 17 18 103 163 15 0 98 205 33 25 33 239 53 132 0 0 0 0 73 69 78 68 174 66 96 130) asByteArray \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st index 11ac6a9..dab2ea4 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/newPng.st @@ -1,4 +1,4 @@ -as yet unclassified +instance creation newPng ^ self new diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st index c397466..c8edffd 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st @@ -1,4 +1,4 @@ slide resizing assertDeviatesLessThan: aComparable onSlideResize: aBlock - self assert: (self does: aBlock deviateLessThan: aComparable onResizeOf: self container) \ No newline at end of file + self assert: (self does: aBlock deviateLessThan: aComparable onResizeOf: self slideContainer) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container..st deleted file mode 100644 index d37f095..0000000 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -container: aPSSlideContainer - - container := aPSSlideContainer diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container.st deleted file mode 100644 index 3b0dff2..0000000 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/container.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -container - - ^ container diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st index 442e79a..0812272 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st @@ -2,10 +2,10 @@ running setUp super setUp. - self container: PSSlideContainer new. - self container setModel: PSPresentationTool new. + self slideContainer: PSSlideContainer new. + self slideContainer setModel: PSPresentationTool new. self slide: PSSlide new. - self slide setModel: self container model. - self container showSlide: self slide. - self container extent: self world extent / 2. - self container openInWorld: self world \ No newline at end of file + self slide setModel: self slideContainer model. + self slideContainer showSlide: self slide. + self slideContainer extent: self world extent / 2. + self slideContainer openInWorld: self world \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer..st new file mode 100644 index 0000000..d702269 --- /dev/null +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer..st @@ -0,0 +1,4 @@ +accessing +slideContainer: aPSSlideContainer + + slideContainer := aPSSlideContainer diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer.st new file mode 100644 index 0000000..d985b14 --- /dev/null +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/slideContainer.st @@ -0,0 +1,4 @@ +accessing +slideContainer + + ^ slideContainer diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/tearDown.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/tearDown.st index 6034302..4c83407 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/tearDown.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/tearDown.st @@ -2,5 +2,5 @@ running tearDown self slide abandon. - self container abandon. + self slideContainer abandon. super tearDown \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 4965d3f..c2a6de8 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -2,14 +2,14 @@ "class" : { }, "instance" : { - "assertDeviatesLessThan:onSlideResize:" : "LB 6/6/2018 15:03", + "assertDeviatesLessThan:onSlideResize:" : "LB 7/13/2018 18:14", "collectMenuContentFrom:" : "LM 6/15/2018 19:18", "collectMenuItemContentsFrom:" : "LM 6/15/2018 19:18", - "container" : "LB 6/6/2018 14:50", - "container:" : "LB 6/6/2018 14:50", - "setUp" : "LB 7/6/2018 17:11", + "setUp" : "LB 7/13/2018 18:13", "slide" : "LB 6/1/2018 17:49", "slide:" : "LB 6/1/2018 17:49", - "tearDown" : "LB 6/6/2018 14:50", + "slideContainer" : "LB 7/13/2018 18:12", + "slideContainer:" : "LB 7/13/2018 18:13", + "tearDown" : "LB 7/13/2018 18:13", "testContextMenuContent:equals:" : "LB 6/15/2018 16:39", "testTextFieldCreatedOnClick" : "MK 6/1/2018 18:21" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json index ded66d2..6b5b6e6 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json @@ -7,7 +7,7 @@ "commentStamp" : "", "instvars" : [ "slide", - "container" ], + "slideContainer" ], "name" : "PSOnSlideTest", "pools" : [ ], From 2eeb4082a3bcb441d51a82560314ec440daec5ad Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Fri, 13 Jul 2018 18:47:15 +0200 Subject: [PATCH 023/112] removed some code dubplication --- .../instance/openFileMenu.st | 13 ++++++------- .../instance/openInsertMenu.st | 10 ++++------ .../instance/openMenuWith..st | 8 ++++++++ .../instance/openSlideMenu.st | 17 ++++++++--------- .../methodProperties.json | 7 ++++--- 5 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/openMenuWith..st diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st index b7c4f95..67bda5b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st @@ -1,10 +1,9 @@ menu bar openFileMenu - | menu | - menu := MenuMorph new. - menu defaultTarget: self. - menu add: 'Save' action: #savePresentation. - menu add: 'Load' action: #loadPresentation. - menu add: 'Export as PNGs' action: #exportAsPNGs. - menu popUpInWorld \ No newline at end of file + self openMenuWith: { + {'Save' . #savePresentation}. + {'Load' . #loadPresentation}. + {'Export as PNGs' . #exportAsPNGs} + } + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openInsertMenu.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openInsertMenu.st index 408387a..8425424 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openInsertMenu.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openInsertMenu.st @@ -1,9 +1,7 @@ menu bar openInsertMenu - | menu | - menu := MenuMorph new. - menu defaultTarget: self. - menu add: 'Text field' action: #newTextField. - menu add: 'Image' action: #newImageField. - menu popUpInWorld \ No newline at end of file + self openMenuWith: { + {'Text field' . #newTextField}. + {'Image' . #newImageField} + } \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openMenuWith..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openMenuWith..st new file mode 100644 index 0000000..16782d6 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openMenuWith..st @@ -0,0 +1,8 @@ +menu bar +openMenuWith: aCollection + + | menu | + menu := MenuMorph new. + menu defaultTarget: self. + aCollection do: [:each | menu add: each first action: each second]. + menu popUpInWorld \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st index 985a079..be86b68 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMenu.st @@ -1,12 +1,11 @@ menu bar openSlideMenu - | menu | - menu := MenuMorph new. - menu defaultTarget: self. - menu add: 'Create slide' action: #createSlide. - menu add: 'Create slide with layout' action: #openSlideLayoutChooser. - menu add: 'Delete slide' action: #deleteSlide. - menu add: 'Move slide' action: #openSlideMoveDialog. - menu add: 'Duplicate slide' action: #duplicateCurrentSlide. - menu popUpInWorld \ No newline at end of file + self openMenuWith: { + {'Create slide' . #createSlide}. + {'Create slide with layout' . #openSlideLayoutChooser}. + {'Delete slide' . #deleteSlide}. + {'Move slide' . #openSlideMoveDialog}. + {'Duplicate slide' . #duplicateCurrentSlide} + } + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 82d1040..3377059 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -91,11 +91,12 @@ "newTextField" : "LB 5/25/2018 16:43", "nextSlide" : "LB 6/29/2018 15:45", "nextSlideButtonData" : "JZ 7/6/2018 15:23", - "openFileMenu" : "LM 7/13/2018 16:11", + "openFileMenu" : "WoC 7/13/2018 18:45", "openImageField:" : "LB 5/18/2018 17:35", - "openInsertMenu" : "MK 7/6/2018 16:11", + "openInsertMenu" : "WoC 7/13/2018 18:44", + "openMenuWith:" : "WoC 7/13/2018 18:39", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", - "openSlideMenu" : "LM 7/13/2018 16:58", + "openSlideMenu" : "WoC 7/13/2018 18:42", "openSlideMoveDialog" : "LM 7/13/2018 15:12", "openSlideSelectionDialog" : "LB 7/13/2018 16:22", "overwriteQuestion" : "JZ 6/8/2018 20:06", From 208d087f78e4465459b166b34724b34991e81944 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 18:59:38 +0200 Subject: [PATCH 024/112] Started adding a PSPresentation class and moving slide management there --- .../PSPresentation.class/README.md | 9 ++++ .../askForPresentationDirectoryIn..st | 2 +- .../instance/askForPresentationName.st | 2 +- .../instance/clampSlideNumber..st | 6 +++ .../instance/clearSubdirectory.in..st | 2 +- .../instance/createDirectory.in..st | 6 +-- .../instance/createSlideAfter..st | 8 +++ .../instance/defaultDirectory.st | 6 +++ .../instance/defaultDirectoryName.st | 4 ++ .../instance/deleteSlideAt..st | 9 ++++ .../instance/exportAsPNGsIn..st | 9 ++++ .../PSPresentation.class/instance/indexOf..st | 4 ++ .../instance/initialize.st | 4 ++ .../instance/minimumSlideCount.st | 4 ++ .../instance/moveSlideAt.to..st | 8 +++ .../instance/overwriteQuestion.st | 0 .../instance/riskyOperationMessage.st | 4 ++ .../PSPresentation.class/instance/save.st | 4 ++ .../instance/saveConfirmed.st} | 4 +- .../PSPresentation.class/instance/slideAt..st | 4 ++ .../instance/slideCount.st | 4 ++ .../PSPresentation.class/instance/slides..st | 3 ++ .../instance/slides.st | 3 +- .../instance/slidesCollect..st | 4 ++ .../instance/slidesDo..st | 4 ++ .../instance/slidesWithIndexDo..st | 4 ++ .../instance/validateUsageOf.inDirectory..st | 2 +- .../instance/warn.trueChoice..st | 4 ++ .../instance/warn.trueChoice.falseChoice..st | 6 +++ .../methodProperties.json | 32 +++++++++++ .../PSPresentation.class/properties.json | 14 +++++ .../instance/clampSlideNumber..st | 4 +- .../instance/createSlide.st | 9 ++-- .../instance/currentSlide.st | 4 +- .../instance/currentSlideNumberString.st | 4 -- .../instance/deleteSlide..st | 10 +--- .../instance/deleteSlide.st | 2 +- .../instance/deleteSlideAt..st | 9 ++++ .../instance/disablePresentationMode.st | 2 +- .../instance/enablePresentationMode.st | 2 +- .../instance/exportAsPNGs.st | 2 +- .../exportSlidesAsPNGsInDirectory..st | 2 +- .../instance/initialize.st | 2 +- .../instance/loadPresentationUnchecked..st | 2 +- .../instance/moveCurrentSlideTo..st | 12 ++--- .../instance/nextSlide.st | 2 +- .../instance/presentation..st | 3 ++ .../instance/presentation.st | 3 ++ .../instance/savePresentation.st | 2 +- .../instance/selectSlide..st | 2 +- .../instance/slideAt..st | 2 +- .../instance/slideCount.st | 2 +- .../instance/slideMiniatures.st | 2 +- .../instance/slides..st | 4 -- .../instance/warn.trueChoice.falseChoice..st | 4 +- .../methodProperties.json | 53 ++++++++----------- .../PSPresentationTool.class/properties.json | 1 + .../instance/slides..st | 4 ++ .../instance/slides.st | 2 +- .../instance/testDefaultSlideCount.st | 2 +- .../instance/testDeleteFirstSlide.st | 8 +-- .../testDeletionDecreasesSlideCount.st | 2 +- .../instance/testDeletionRemovesSlide.st | 6 +-- .../instance/testMiniatureSelects.st | 2 +- .../instance/testNextSlide.st | 4 +- .../instance/testPreviousSlideClampsToMin.st | 4 +- .../instance/testSelectSlide.st | 4 +- .../instance/testSelectSlideClamps.st | 6 +-- .../instance/testSlideCreation.st | 2 +- .../testSlideCreationSelectsNewSlide.st | 4 +- .../testSlideDeletionMovesSlideSelection.st | 6 +-- ...testSlidesReceiveEnablePresentationMode.st | 4 +- .../instance/testZeroSlidesRegression.st | 2 +- .../instance/testnextSlideClampsToMax.st | 4 +- .../methodProperties.json | 35 ++++++------ 75 files changed, 286 insertions(+), 140 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/README.md rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/askForPresentationDirectoryIn..st (95%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/askForPresentationName.st (92%) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/clearSubdirectory.in..st (91%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/createDirectory.in..st (63%) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectory.st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectoryName.st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/minimumSlideCount.st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/moveSlideAt.to..st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/overwriteQuestion.st (100%) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/riskyOperationMessage.st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/save.st rename packages/Presenter-Core.package/{PSPresentationTool.class/instance/savePresentationConfirmed.st => PSPresentation.class/instance/saveConfirmed.st} (89%) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/slideAt..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/slideCount.st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/slides..st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/slides.st (58%) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentation.class}/instance/validateUsageOf.inDirectory..st (93%) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st create mode 100644 packages/Presenter-Core.package/PSPresentation.class/methodProperties.json create mode 100644 packages/Presenter-Core.package/PSPresentation.class/properties.json delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlideNumberString.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideAt..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/slides..st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides..st diff --git a/packages/Presenter-Core.package/PSPresentation.class/README.md b/packages/Presenter-Core.package/PSPresentation.class/README.md new file mode 100644 index 0000000..e88e14a --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/README.md @@ -0,0 +1,9 @@ +A PSPresentation is a container for PSSlides. +It manages slide creation, deletion and related tasks. +PSPresentations are also responsible for saving and loading themselves + +Instance Variables + slides: + +slides + - The list of slides to manage diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st b/packages/Presenter-Core.package/PSPresentation.class/instance/askForPresentationDirectoryIn..st similarity index 95% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st rename to packages/Presenter-Core.package/PSPresentation.class/instance/askForPresentationDirectoryIn..st index 5441fc8..5423386 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationDirectoryIn..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/askForPresentationDirectoryIn..st @@ -1,4 +1,4 @@ -presentation saving +saving askForPresentationDirectoryIn: aFileDirectory | presentationName directory | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st b/packages/Presenter-Core.package/PSPresentation.class/instance/askForPresentationName.st similarity index 92% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st rename to packages/Presenter-Core.package/PSPresentation.class/instance/askForPresentationName.st index b537150..7e8e5cc 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/askForPresentationName.st @@ -1,4 +1,4 @@ -presentation saving +saving askForPresentationName ^ (UIManager default diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st b/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st new file mode 100644 index 0000000..3aa63ef --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st @@ -0,0 +1,6 @@ +as yet unclassified +clampSlideNumber: aNumber + + ^ aNumber + clampLow: self minimumSlideCount + high: self slideCount \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st b/packages/Presenter-Core.package/PSPresentation.class/instance/clearSubdirectory.in..st similarity index 91% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st rename to packages/Presenter-Core.package/PSPresentation.class/instance/clearSubdirectory.in..st index 5812a23..c0d1722 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clearSubdirectory.in..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/clearSubdirectory.in..st @@ -1,4 +1,4 @@ -presentation saving +saving clearSubdirectory: aString in: aDirectory (aDirectory / aString) recursiveDelete. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createDirectory.in..st b/packages/Presenter-Core.package/PSPresentation.class/instance/createDirectory.in..st similarity index 63% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/createDirectory.in..st rename to packages/Presenter-Core.package/PSPresentation.class/instance/createDirectory.in..st index 03c2278..2930a85 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createDirectory.in..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/createDirectory.in..st @@ -1,7 +1,5 @@ -presentation saving +saving createDirectory: aString in: aFileDirectory aFileDirectory createDirectory: aString. - ^ aFileDirectory / aString - - \ No newline at end of file + ^ aFileDirectory / aString \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st new file mode 100644 index 0000000..1238ba7 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st @@ -0,0 +1,8 @@ +slide management +createSlideAfter: anIndex + + | newSlide | + newSlide := PSSlide new. + newSlide setModel: self. + self slides add: newSlide afterIndex: anIndex. + ^ newSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectory.st b/packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectory.st new file mode 100644 index 0000000..d0c6a5d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectory.st @@ -0,0 +1,6 @@ +accessing +defaultDirectory + + ^ (FileDirectory default / self defaultDirectoryName) + assureExistence; + yourself \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectoryName.st b/packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectoryName.st new file mode 100644 index 0000000..485b9d2 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/defaultDirectoryName.st @@ -0,0 +1,4 @@ +accessing +defaultDirectoryName + + ^ 'PSPresentations' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st b/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st new file mode 100644 index 0000000..98aae71 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st @@ -0,0 +1,9 @@ +slide management +deleteSlideAt: anIndex + + | deletedSlide | + self slideCount = self minimumSlideCount + ifTrue: [ self createSlideAfter: anIndex ]. "There should never be zero slides" + deletedSlide := self slides removeAt: anIndex. + deletedSlide abandon. + ^ deletedSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st b/packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st new file mode 100644 index 0000000..5432614 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st @@ -0,0 +1,9 @@ +exporting +exportAsPNGsIn: aDirectory + + self enablePresentationMode. + self enableNonInteractiveMode. + World doOneCycle. + self exportSlidesAsPNGsInDirectory: aDirectory. + self disablePresentationMode. + UIManager default inform: 'Your presentation has been exported to: ', aDirectory fullName \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st b/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st new file mode 100644 index 0000000..5dc9b56 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st @@ -0,0 +1,4 @@ +as yet unclassified +indexOf: aPSSlide + + ^ self slides indexOf: aPSSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st b/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st new file mode 100644 index 0000000..0622707 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st @@ -0,0 +1,4 @@ +initialize-release +initialize + + self slides: OrderedCollection new \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/minimumSlideCount.st b/packages/Presenter-Core.package/PSPresentation.class/instance/minimumSlideCount.st new file mode 100644 index 0000000..6fe3edb --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/minimumSlideCount.st @@ -0,0 +1,4 @@ +accessing +minimumSlideCount + + ^ 1 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/moveSlideAt.to..st b/packages/Presenter-Core.package/PSPresentation.class/instance/moveSlideAt.to..st new file mode 100644 index 0000000..c40bc03 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/moveSlideAt.to..st @@ -0,0 +1,8 @@ +slide management +moveSlideAt: anIndex to: newIndex + + | position | + position := (self clampSlideNumber: newIndex). + self slides + add: (self slides removeAt: anIndex) + afterIndex: position - 1. "position needs to be 0 indexed for add:afterIndex" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/overwriteQuestion.st b/packages/Presenter-Core.package/PSPresentation.class/instance/overwriteQuestion.st similarity index 100% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/overwriteQuestion.st rename to packages/Presenter-Core.package/PSPresentation.class/instance/overwriteQuestion.st diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/riskyOperationMessage.st b/packages/Presenter-Core.package/PSPresentation.class/instance/riskyOperationMessage.st new file mode 100644 index 0000000..1400b30 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/riskyOperationMessage.st @@ -0,0 +1,4 @@ +accessing +riskyOperationMessage + + ^ 'Warning!', Character cr, 'This operation is risky as it might crash your image.', Character cr, 'Do you want me to proceed?' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/save.st b/packages/Presenter-Core.package/PSPresentation.class/instance/save.st new file mode 100644 index 0000000..ab22341 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/save.st @@ -0,0 +1,4 @@ +saving +save + + self warn: self riskyOperationMessage trueChoice: [self saveConfirmed] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st b/packages/Presenter-Core.package/PSPresentation.class/instance/saveConfirmed.st similarity index 89% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st rename to packages/Presenter-Core.package/PSPresentation.class/instance/saveConfirmed.st index 454bbc5..cff9cce 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/saveConfirmed.st @@ -1,5 +1,5 @@ -presentation saving -savePresentationConfirmed +saving +saveConfirmed | directory | directory := self defaultDirectory. diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slideAt..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slideAt..st new file mode 100644 index 0000000..bd8c862 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slideAt..st @@ -0,0 +1,4 @@ +accessing +slideAt: anIndex + + ^ self slides at: anIndex \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slideCount.st b/packages/Presenter-Core.package/PSPresentation.class/instance/slideCount.st new file mode 100644 index 0000000..5d611ab --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slideCount.st @@ -0,0 +1,4 @@ +accessing +slideCount + + ^ self slides size \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st new file mode 100644 index 0000000..292be51 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st @@ -0,0 +1,3 @@ +accessing +slides: anObject + slides := anObject \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slides.st b/packages/Presenter-Core.package/PSPresentation.class/instance/slides.st similarity index 58% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/slides.st rename to packages/Presenter-Core.package/PSPresentation.class/instance/slides.st index 75d8bac..fcefa0a 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slides.st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slides.st @@ -1,4 +1,3 @@ accessing slides - - ^ slides + ^ slides \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st new file mode 100644 index 0000000..888f2f8 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st @@ -0,0 +1,4 @@ +as yet unclassified +slidesCollect: aBlock + + ^ self slides collect: aBlock \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st new file mode 100644 index 0000000..8900af3 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st @@ -0,0 +1,4 @@ +as yet unclassified +slidesDo: aBlock + + self slides do: aBlock \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st new file mode 100644 index 0000000..0c1873d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st @@ -0,0 +1,4 @@ +as yet unclassified +slidesWithIndexDo: aBlock + + ^ self slides withIndexDo: [ :each :index | aBlock value: each value: index ] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st b/packages/Presenter-Core.package/PSPresentation.class/instance/validateUsageOf.inDirectory..st similarity index 93% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st rename to packages/Presenter-Core.package/PSPresentation.class/instance/validateUsageOf.inDirectory..st index e09d99b..a2f0c0b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/validateUsageOf.inDirectory..st @@ -1,4 +1,4 @@ -presentation saving +saving validateUsageOf: aString inDirectory: aFileDirectory | directory | diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st new file mode 100644 index 0000000..2a1e44b --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st @@ -0,0 +1,4 @@ +as yet unclassified +warn: aString trueChoice: aBlock + + self warn: aString trueChoice: aBlock falseChoice: [] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st new file mode 100644 index 0000000..443dfc0 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st @@ -0,0 +1,6 @@ +as yet unclassified +warn: aString trueChoice: trueBlock falseChoice: falseBlock + + (UIManager default confirm: aString) + ifTrue: trueBlock + ifFalse: falseBlock \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json new file mode 100644 index 0000000..3bc1bd6 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json @@ -0,0 +1,32 @@ +{ + "class" : { + }, + "instance" : { + "askForPresentationDirectoryIn:" : "LM 7/13/2018 18:33", + "askForPresentationName" : "LM 7/13/2018 18:32", + "clampSlideNumber:" : "LM 7/13/2018 17:18", + "clearSubdirectory:in:" : "LM 7/13/2018 18:32", + "createDirectory:in:" : "LM 7/13/2018 18:32", + "createSlideAfter:" : "LM 7/13/2018 17:29", + "defaultDirectory" : "LM 7/13/2018 18:35", + "defaultDirectoryName" : "LM 7/13/2018 18:35", + "deleteSlideAt:" : "LM 7/13/2018 17:37", + "exportAsPNGsIn:" : "LM 7/13/2018 18:37", + "indexOf:" : "LM 7/13/2018 17:55", + "initialize" : "LM 7/13/2018 17:14", + "minimumSlideCount" : "LM 7/13/2018 17:16", + "moveSlideAt:to:" : "LM 7/13/2018 18:27", + "overwriteQuestion" : "LM 7/13/2018 18:41", + "riskyOperationMessage" : "LM 7/13/2018 18:47", + "save" : "LM 7/13/2018 18:48", + "saveConfirmed" : "LM 7/13/2018 18:46", + "slideAt:" : "LM 7/13/2018 18:11", + "slideCount" : "LM 7/13/2018 17:34", + "slides" : "LM 7/13/2018 17:13", + "slides:" : "LM 7/13/2018 17:13", + "slidesCollect:" : "LM 7/13/2018 18:18", + "slidesDo:" : "LM 7/13/2018 18:16", + "slidesWithIndexDo:" : "LM 7/13/2018 18:58", + "validateUsageOf:inDirectory:" : "LM 7/13/2018 18:33", + "warn:trueChoice:" : "LM 7/13/2018 18:47", + "warn:trueChoice:falseChoice:" : "LM 7/13/2018 18:45" } } diff --git a/packages/Presenter-Core.package/PSPresentation.class/properties.json b/packages/Presenter-Core.package/PSPresentation.class/properties.json new file mode 100644 index 0000000..ca6f72a --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Presenter-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "LM 7/13/2018 18:30", + "instvars" : [ + "slides" ], + "name" : "PSPresentation", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st index 7c756cd..ed36e50 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st @@ -1,6 +1,4 @@ slide management clampSlideNumber: aNumber - ^ aNumber - clampLow: self minimumSlideCount - high: self slideCount \ No newline at end of file + ^ self presentation clampSlideNumber: aNumber \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlide.st index 4aa9212..a1af1ea 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlide.st @@ -2,12 +2,9 @@ slide management createSlide | newSlide | - newSlide := PSSlide new. - newSlide setModel: self. - self slides add: newSlide afterIndex: self currentSlideNumber. - self + newSlide := self presentation createSlideAfter: self currentSlideNumber. + self selectSlideNumber: self currentSlideNumber + 1; updateSlideMiniatures; updateCurrentMiniature. - ^ newSlide - \ No newline at end of file + ^ newSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlide.st index baef080..da5f1c8 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlide.st @@ -1,6 +1,6 @@ accessing currentSlide - (self currentSlideNumber between: 1 and: self slides size) + (self currentSlideNumber between: 1 and: self slideCount) ifFalse: [ self error: 'No slide available']. - ^ self slides at: self currentSlideNumber \ No newline at end of file + ^ self presentation slideAt: self currentSlideNumber \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlideNumberString.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlideNumberString.st deleted file mode 100644 index 54116d5..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlideNumberString.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -currentSlideNumberString - - ^ currentSlideNumber asString diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st index 9c17d19..2efdfa7 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st @@ -1,13 +1,7 @@ -slide management +as yet unclassified deleteSlide: anIndex | deletedSlide | - self slideCount = self minimumSlideCount - ifTrue: [ self createSlide ]. "There should never be zero slides" - deletedSlide := self slides removeAt: anIndex. - deletedSlide abandon. - self currentSlideNumber >= anIndex ifTrue: - [self selectSlideNumber: (self currentSlideNumber - 1 max: self minimumSlideCount)]. - + deletedSlide := self presentation deleteSlideAt: anIndex. self miniatures removeKey: deletedSlide ifAbsent: []. self updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide.st index 6970bae..d908c28 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide.st @@ -1,5 +1,5 @@ slide management deleteSlide - self deleteSlide: self currentSlideNumber + self deleteSlideAt: self currentSlideNumber \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideAt..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideAt..st new file mode 100644 index 0000000..54679ac --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideAt..st @@ -0,0 +1,9 @@ +slide management +deleteSlideAt: anIndex + + | deletedSlide | + deletedSlide := self presentation deleteSlideAt: anIndex. + self currentSlideNumber >= anIndex + ifTrue: [self selectSlideNumber: (self currentSlideNumber - 1 max: self minimumSlideCount)]. + self miniatures removeKey: deletedSlide ifAbsent: []. + self updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/disablePresentationMode.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/disablePresentationMode.st index 2bc0555..de9b08d 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/disablePresentationMode.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/disablePresentationMode.st @@ -5,5 +5,5 @@ disablePresentationMode self disableNonInteractiveMode. self slideContainer disablePresentationMode. - self slides do: [:each | each disablePresentationMode]. + self presentation slidesDo: [:each | each disablePresentationMode]. self presentationMode: false \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/enablePresentationMode.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/enablePresentationMode.st index dca3dab..38731cc 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/enablePresentationMode.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/enablePresentationMode.st @@ -3,6 +3,6 @@ enablePresentationMode self presentationMode ifTrue: [^ self]. - self slides do: [:each | each enablePresentationMode]. + self presentation slidesDo: [:each | each enablePresentationMode]. self slideContainer enablePresentationMode. self presentationMode: true \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st index ceb8930..a664774 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st @@ -2,6 +2,6 @@ exporting exportAsPNGs | directory | - directory := self askForPresentationDirectoryIn: self exportFolder. + directory := self presentation askForPresentationDirectoryIn: self exportFolder. directory ifNotNil: [self exportAsPNGsIn: directory] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st index a10ab58..0d1b9f2 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st @@ -1,7 +1,7 @@ exporting exportSlidesAsPNGsInDirectory: aDirectory - self slides withIndexDo: [:each :index | + self presentation slidesWithIndexDo: [:each :index | self selectSlideNumber: index. World doOneCycle. each exportAsPNGNamed: (aDirectory / ('slide', index, '.png')) fullName] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/initialize.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/initialize.st index 089f80a..ff4da69 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/initialize.st @@ -2,7 +2,7 @@ initialize-release initialize self - slides: OrderedCollection new; + presentation: PSPresentation new; miniatures: Dictionary new; currentSlideNumber: 0; magneticRasterActive: false; diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st index 285120d..778b716 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st @@ -13,6 +13,6 @@ loadPresentationUnchecked: aDirectory self updateCurrentMiniature. errorReport at: each put: (slidesDirectory / each) fileNames size - slide submorphs size]. - self minimumSlideCount timesRepeat: [self deleteSlide: 1]. + self minimumSlideCount timesRepeat: [self deleteSlideAt: 1]. self selectSlideNumber: 1. ^ errorReport \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveCurrentSlideTo..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveCurrentSlideTo..st index ffb03bc..90e565a 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveCurrentSlideTo..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveCurrentSlideTo..st @@ -1,11 +1,7 @@ slide management moveCurrentSlideTo: aNumber - | position | - position := (self clampSlideNumber: aNumber) . - self slides - add: (self slides removeAt: self currentSlideNumber) - afterIndex: position - 1. "position needs to be 0 indexed for add:afterIndex" - "self updateSlideNumbers." - self selectSlideNumber: position. - self updateSlideMiniatures \ No newline at end of file + self presentation moveSlideAt: self currentSlideNumber to: aNumber. + self + selectSlideNumber: aNumber; + updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlide.st index 0c73726..a08f5a6 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlide.st @@ -1,4 +1,4 @@ slide management nextSlide - + self selectSlideNumber: self currentSlideNumber + 1 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st new file mode 100644 index 0000000..081d91e --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st @@ -0,0 +1,3 @@ +accessing +presentation: anObject + presentation := anObject \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st new file mode 100644 index 0000000..da0ea79 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st @@ -0,0 +1,3 @@ +accessing +presentation + ^ presentation \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st index f218731..5e84506 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st @@ -1,4 +1,4 @@ presentation saving savePresentation - self warn: self riskyOperationMessage trueChoice: [self savePresentationConfirmed] \ No newline at end of file + self presentation save \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlide..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlide..st index 445e785..1af77e8 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlide..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlide..st @@ -1,4 +1,4 @@ slide management selectSlide: aSlide - self selectSlideNumber: (self slides indexOf: aSlide ifAbsent: []) + self selectSlideNumber: (self presentation indexOf: aSlide) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideAt..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideAt..st index 19f1302..b6ba527 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideAt..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideAt..st @@ -1,4 +1,4 @@ accessing slideAt: aNumber - ^ self slides at: aNumber \ No newline at end of file + ^ self presentation slideAt: aNumber \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideCount.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideCount.st index deb6092..228cd77 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideCount.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideCount.st @@ -1,4 +1,4 @@ accessing slideCount - ^ self slides size \ No newline at end of file + ^ self presentation slideCount \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMiniatures.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMiniatures.st index ab0e495..a82a947 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMiniatures.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMiniatures.st @@ -1,4 +1,4 @@ slide miniatures slideMiniatures - ^ self slides collect: [:each | self miniatureOf: each] \ No newline at end of file + ^ self presentation slidesCollect: [:each | self miniatureOf: each] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slides..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slides..st deleted file mode 100644 index 3e481d0..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slides..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -slides: anOrderedCollection - - slides := anOrderedCollection diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice.falseChoice..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice.falseChoice..st index bb45a07..f2955b0 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice.falseChoice..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice.falseChoice..st @@ -2,5 +2,5 @@ notifications warn: aString trueChoice: trueBlock falseChoice: falseBlock (UIManager default confirm: aString) - ifTrue: trueBlock - ifFalse: falseBlock \ No newline at end of file + ifTrue: [trueBlock value] + ifFalse: [falseBlock value] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index d0923f3..b77d1f6 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -11,8 +11,6 @@ "addPSTextMorphIn:at:centeredWithSize:" : "MK 7/6/2018 15:40", "addPSTextMorphIn:at:withSize:" : "MK 7/6/2018 15:40", "afterBuildWith:" : "LM 7/6/2018 17:43", - "askForPresentationDirectoryIn:" : "LM 7/13/2018 15:11", - "askForPresentationName" : "LM 7/13/2018 16:49", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", "buildWith:" : "LM 7/6/2018 17:08", @@ -20,14 +18,12 @@ "buttonHeight" : "LB 6/22/2018 18:34", "checkSlideDirectory:" : "JZ 6/29/2018 17:24", "checkSlideDirectoryName:" : "JZ 6/29/2018 17:03", - "clampSlideNumber:" : "WoC 6/22/2018 16:11", - "clearSubdirectory:in:" : "LM 7/13/2018 16:42", + "clampSlideNumber:" : "LM 7/13/2018 17:52", "createButtonBarTopSpec:" : "JZ 7/6/2018 15:47", "createButtonSpec:with:" : "LM 7/6/2018 17:56", - "createDirectory:in:" : "JZ 6/8/2018 19:12", "createMenuBarSpec:" : "JZ 7/6/2018 15:56", "createMiniatureViewSpec:" : "LM 7/6/2018 17:57", - "createSlide" : "LM 7/6/2018 17:57", + "createSlide" : "LM 7/13/2018 18:23", "createSlideButtonData" : "LM 7/13/2018 16:59", "createSlideContainerIn:" : "LM 7/6/2018 17:58", "createSlideNumberLabelSpec:" : "LM 7/6/2018 17:58", @@ -38,28 +34,28 @@ "createTitleSlide" : "MK 7/6/2018 17:01", "createWindowSpec:" : "LM 7/6/2018 17:56", "currentMiniature" : "LB 6/29/2018 17:28", - "currentSlide" : "LB 6/29/2018 15:44", + "currentSlide" : "LM 7/13/2018 18:12", "currentSlideNumber" : "LM 5/6/2018 15:15", "currentSlideNumber:" : "MK 5/6/2018 15:56", - "currentSlideNumberString" : "LB 6/22/2018 15:59", "defaultDirectory" : "JZ 6/8/2018 17:01", "defaultDirectoryName" : "JZ 6/8/2018 16:52", "deleteAllSlides" : "LM 6/29/2018 20:03", - "deleteSlide" : "LB 5/6/2018 18:03", - "deleteSlide:" : "LM 7/6/2018 16:48", + "deleteSlide" : "LM 7/13/2018 17:23", + "deleteSlide:" : "LM 7/13/2018 17:23", + "deleteSlideAt:" : "LM 7/13/2018 17:37", "disableNonInteractiveMode" : "LB 7/6/2018 17:24", - "disablePresentationMode" : "LB 7/6/2018 17:28", + "disablePresentationMode" : "LM 7/13/2018 18:20", "duplicateCurrentSlide" : "LM 7/13/2018 17:01", "enableNonInteractiveMode" : "LB 7/6/2018 17:24", - "enablePresentationMode" : "LB 7/6/2018 17:23", - "exportAsPNGs" : "LM 7/13/2018 16:50", + "enablePresentationMode" : "LM 7/13/2018 18:17", + "exportAsPNGs" : "LM 7/13/2018 18:38", "exportAsPNGsIn:" : "LM 7/13/2018 16:30", "exportFolder" : "LM 7/13/2018 16:28", "exportFolderName" : "LM 7/13/2018 16:02", - "exportSlidesAsPNGsInDirectory:" : "LM 7/13/2018 16:07", + "exportSlidesAsPNGsInDirectory:" : "LM 7/13/2018 18:58", "fileButtonData" : "JZ 7/6/2018 15:42", "highlightCurrentMiniature" : "LB 6/29/2018 17:22", - "initialize" : "LB 7/6/2018 17:10", + "initialize" : "LM 7/13/2018 18:00", "insertButtonData" : "JZ 7/6/2018 15:43", "isInteractive" : "LB 7/6/2018 17:09", "isInteractive:" : "LB 7/6/2018 17:19", @@ -69,7 +65,7 @@ "loadMorphFromStream:testIn:" : "LB 6/22/2018 19:28", "loadPresentation" : "WoC 6/27/2018 14:13", "loadPresentationFromDirectory:" : "LM 6/15/2018 18:22", - "loadPresentationUnchecked:" : "LM 6/29/2018 20:26", + "loadPresentationUnchecked:" : "LM 7/13/2018 17:23", "loadSlideFromDirectory:" : "LM 6/29/2018 20:05", "magneticRasterActive" : "LB 7/5/2018 19:48", "magneticRasterActive:" : "LB 7/5/2018 19:49", @@ -85,44 +81,42 @@ "miniatures:" : "LB 6/29/2018 16:14", "minimumSlideCount" : "WoC 6/22/2018 16:10", "morph:survivesOneCycleIn:" : "LM 6/29/2018 19:48", - "moveCurrentSlideTo:" : "LB 6/29/2018 16:03", + "moveCurrentSlideTo:" : "LM 7/13/2018 18:29", "moveSlideButtonData" : "JZ 7/6/2018 14:54", "newImageField" : "LM 5/18/2018 17:13", "newTextField" : "LB 5/25/2018 16:43", - "nextSlide" : "LB 6/29/2018 15:45", + "nextSlide" : "LM 7/13/2018 17:36", "nextSlideButtonData" : "JZ 7/6/2018 15:23", - "openFileMenu" : "LM 7/13/2018 16:11", + "openFileMenu" : "LM 7/13/2018 18:40", "openImageField:" : "LB 5/18/2018 17:35", "openInsertMenu" : "MK 7/6/2018 16:11", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", "openSlideMenu" : "LM 7/13/2018 16:58", "openSlideMoveDialog" : "LM 7/13/2018 15:12", "openSlideSelectionDialog" : "LB 7/13/2018 16:22", - "overwriteQuestion" : "JZ 6/8/2018 20:06", + "presentation" : "LM 7/13/2018 17:15", + "presentation:" : "LM 7/13/2018 17:15", "presentationMode" : "LM 5/25/2018 16:57", "presentationMode:" : "LM 5/25/2018 16:57", "presentationModeButtonData" : "LB 6/22/2018 15:49", "previousSlide" : "LB 6/29/2018 15:45", "previousSlideButtonData" : "JZ 7/6/2018 15:24", "riskyOperationMessage" : "LM 6/23/2018 14:21", - "savePresentation" : "LM 6/23/2018 14:30", - "savePresentationConfirmed" : "LM 7/13/2018 15:07", - "selectSlide:" : "LB 6/29/2018 15:47", + "savePresentation" : "LM 7/13/2018 18:47", + "selectSlide:" : "LM 7/13/2018 17:55", "selectSlideButtonData" : "WoC 6/22/2018 15:42", "selectSlideNumber:" : "WoC 6/29/2018 19:18", "showErrorReport:" : "LM 7/13/2018 15:13", - "slideAt:" : "LM 5/6/2018 15:37", + "slideAt:" : "LM 7/13/2018 18:12", "slideButtonData" : "LM 7/6/2018 17:27", "slideContainer" : "MK 5/6/2018 15:32", "slideContainer:" : "MK 5/6/2018 15:32", - "slideCount" : "LB 5/6/2018 17:25", + "slideCount" : "LM 7/13/2018 17:34", "slideLayoutNames" : "MK 7/6/2018 16:24", - "slideMiniatures" : "LB 6/29/2018 17:28", + "slideMiniatures" : "LM 7/13/2018 18:19", "slideNumberString" : "LB 6/22/2018 16:08", "slideNumberString:" : "LB 6/29/2018 15:45", "slideSelectionDialogText" : "LB 7/13/2018 14:58", - "slides" : "LM 5/6/2018 15:05", - "slides:" : "MK 5/6/2018 15:56", "slidesDirectoryName" : "MK 6/8/2018 18:14", "sortedMorphFiles:" : "JZ 6/29/2018 17:50", "sortedSlideSubdirectories:" : "LM 6/17/2018 17:35", @@ -132,10 +126,9 @@ "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", "updateSlideMiniatures" : "LB 6/29/2018 17:08", - "validateUsageOf:inDirectory:" : "LM 7/13/2018 16:41", "viewPortLayoutFrame" : "LB 6/29/2018 15:31", "wantsSteps" : "LB 6/29/2018 17:04", "warn:trueChoice:" : "JZ 6/8/2018 17:54", - "warn:trueChoice:falseChoice:" : "MK 6/8/2018 18:44", + "warn:trueChoice:falseChoice:" : "LM 7/13/2018 18:43", "window" : "LM 6/1/2018 20:15", "window:" : "LM 6/1/2018 20:15" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/properties.json b/packages/Presenter-Core.package/PSPresentationTool.class/properties.json index 84d436c..f4ff85c 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/properties.json @@ -8,6 +8,7 @@ "instvars" : [ "window", "slideContainer", + "presentation", "slides", "currentSlideNumber", "presentationMode", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides..st new file mode 100644 index 0000000..b542c63 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides..st @@ -0,0 +1,4 @@ +accessing +slides: aCollection + + self tool presentation slides: aCollection \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides.st index e07ee26..cdf0105 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slides.st @@ -1,4 +1,4 @@ accessing slides - ^ self tool slides \ No newline at end of file + ^ self tool presentation slides \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st index b0a3e5a..8214899 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st @@ -2,4 +2,4 @@ slide creation tests testDefaultSlideCount self assert: self tool slideCount = 1. - self assert: self tool currentSlide = self tool slides first. \ No newline at end of file + self assert: self tool currentSlide = (self tool slideAt: 1). \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st index c7e997d..76fd634 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st @@ -4,8 +4,8 @@ testDeleteFirstSlide | deletedSlide slide | self setUpSlideDeletion. - deletedSlide := self tool slides first. - slide := self tool slides second. + deletedSlide := self tool slideAt: 1. + slide := self tool slideAt: 2. - self tool deleteSlide: 1. - self assert: self tool slides first = slide. \ No newline at end of file + self tool deleteSlideAt: 1. + self assert: (self tool slideAt: 1) = slide. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st index 2b38dab..a34344a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st @@ -5,5 +5,5 @@ testDeletionDecreasesSlideCount self setUpSlideDeletion. slideCount := self tool slideCount. - self tool deleteSlide: 1. + self tool deleteSlideAt: 1. self assert: self tool slideCount = (slideCount - 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st index 017408a..3ec4a8a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st @@ -4,6 +4,6 @@ testDeletionRemovesSlide | deletedSlide | self setUpSlideDeletion. - deletedSlide := self tool slides first. - self tool deleteSlide: 1. - self assert: (self tool slides includes: deletedSlide) not \ No newline at end of file + deletedSlide := self slides first. + self tool deleteSlideAt: 1. + self assert: (self slides includes: deletedSlide) not \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index 16ca2a0..438203c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -3,7 +3,7 @@ testMiniatureSelects | slideToSelect miniatureToClick | 5 timesRepeat: [self tool createSlide]. - slideToSelect := self tool slides at: 3. + slideToSelect := self slides third. miniatureToClick := self tool miniatureOf: slideToSelect. self hand handleEvent: (self redMouseDownAt: miniatureToClick boundsInWorld center). self assert: self tool currentSlide equals: slideToSelect \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st index 6a1b603..d71feab 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st @@ -3,6 +3,6 @@ testNextSlide self tool createSlide. self tool selectSlideNumber: 1. - self assert: self tool currentSlide = self tool slides first. + self assert: self tool currentSlide = self slides first. self tool nextSlide. - self assert: self tool currentSlide = self tool slides second. \ No newline at end of file + self assert: self tool currentSlide = self slides second. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st index 5667e3f..74199b9 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st @@ -1,6 +1,6 @@ slide navigation tests testPreviousSlideClampsToMin - self assert: self tool currentSlide = self tool slides first. + self assert: self tool currentSlide = self slides first. self tool previousSlide. - self assert: self tool currentSlide = self tool slides first. \ No newline at end of file + self assert: self tool currentSlide = self slides first. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st index 89c7287..61fdd32 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st @@ -3,7 +3,7 @@ testSelectSlide self tool createSlide. self tool selectSlideNumber: 1. - self assert: self tool currentSlide = self tool slides first. + self assert: self tool currentSlide = self slides first. self tool selectSlideNumber: 2. - self assert: self tool currentSlide = self tool slides second \ No newline at end of file + self assert: self tool currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index 57bacce..15342ac 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -3,10 +3,10 @@ testSelectSlideClamps self tool createSlide. self tool selectSlideNumber: 3. - self assert: self tool currentSlide = self tool slides last. + self assert: self tool currentSlide = self slides last. self tool selectSlideNumber: 0. - self assert: self tool currentSlide = self tool slides first. + self assert: self tool currentSlide = self slides first. self tool selectSlideNumber: -1. - self assert: self tool currentSlide = self tool slides first. \ No newline at end of file + self assert: self tool currentSlide = self slides first. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st index 4902e2f..4f27e23 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st @@ -5,5 +5,5 @@ testSlideCreation slideCount := self tool slideCount. newSlide := self tool createSlide. self assert: self tool slideCount = (slideCount + 1). - self assert: (self tool slides includes: newSlide) + self assert: (self slides includes: newSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st index 07fb3c8..8e639c3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st @@ -1,6 +1,6 @@ slide creation tests testSlideCreationSelectsNewSlide - self assert: self tool currentSlide = self tool slides first. + self assert: self tool currentSlide = self slides first. self tool createSlide. - self assert: self tool currentSlide = self tool slides second. \ No newline at end of file + self assert: self tool currentSlide = self slides second. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index f383999..8cb8ed7 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -4,8 +4,8 @@ testSlideDeletionMovesSlideSelection | slide | self setUpSlideDeletion. - slide := self tool slides first. + slide := self slides first. - self tool deleteSlide: 2. - self assert: self tool slides first = slide. + self tool deleteSlideAt: 2. + self assert: self slides first = slide. self assert: self tool currentSlide = slide. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st index 1ed977f..4130e4f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st @@ -2,7 +2,7 @@ presentation mode tests testSlidesReceiveEnablePresentationMode self tool createSlide. - self tool slides: (self tool slides collect: [:each | PSMockSlide new]). + self slides: (self slides collect: [:each | PSMockSlide new]). self tool enablePresentationMode. - self tool slides do: [:each | + self slides do: [:each | self assert: each receivedPresentationModeEnable] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st index 77609c4..c86d897 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st @@ -4,7 +4,7 @@ testZeroSlidesRegression | deletedSlide | self assert: self tool slideCount = 1. deletedSlide := self tool currentSlide. - self tool deleteSlide: 1. + self tool deleteSlideAt: 1. self assert: self tool slideCount = 1 description: 'There should never be 0 slides'. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st index e5d472d..0b0d76d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st @@ -1,6 +1,6 @@ slide navigation tests testnextSlideClampsToMax - self assert: self tool currentSlide = self tool slides last. + self assert: self tool currentSlide = self slides last. self tool nextSlide. - self assert: self tool currentSlide = self tool slides last. \ No newline at end of file + self assert: self tool currentSlide = self slides last. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 66d8a08..3d787f8 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -8,16 +8,17 @@ "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "LM 5/18/2018 18:21", "slideContainer" : "WoC 6/15/2018 18:21", - "slides" : "WoC 6/22/2018 16:54", + "slides" : "LM 7/13/2018 17:42", + "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "LM 5/18/2018 18:48", "testCanLoadEmptyPresentation" : "LM 6/15/2018 18:48", "testCanLoadEmptySlide" : "JZ 6/29/2018 18:32", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", - "testDefaultSlideCount" : "LM 5/18/2018 18:34", - "testDeleteFirstSlide" : "LM 5/18/2018 18:25", - "testDeletionDecreasesSlideCount" : "LM 5/18/2018 18:31", - "testDeletionRemovesSlide" : "LM 5/18/2018 18:28", + "testDefaultSlideCount" : "LM 7/13/2018 17:39", + "testDeleteFirstSlide" : "LM 7/13/2018 17:40", + "testDeletionDecreasesSlideCount" : "LM 7/13/2018 17:23", + "testDeletionRemovesSlide" : "LM 7/13/2018 17:43", "testEmptyPresentationDirectoryIsValid" : "LM 6/15/2018 18:44", "testEnterNonInteractiveMode" : "LB 7/6/2018 17:16", "testErrorReportExistsPerSlide" : "LM 6/15/2018 18:38", @@ -30,7 +31,7 @@ "testMiniatureChangesIfSlideChanges" : "WoC 6/29/2018 19:23", "testMiniatureCreated" : "LB 6/29/2018 18:01", "testMiniatureDeleted" : "LB 6/29/2018 18:02", - "testMiniatureSelects" : "LB 6/29/2018 18:56", + "testMiniatureSelects" : "LM 7/13/2018 17:44", "testMissingSlidesDirectory" : "LM 6/15/2018 18:39", "testMorphLoadIsValid" : "LM 6/13/2018 16:50", "testMorphNameIsNotNumber" : "JZ 6/29/2018 17:32", @@ -38,30 +39,30 @@ "testMoveSlide" : "LB 6/29/2018 15:45", "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", "testMovedSlideStayCurrentSlide" : "LB 6/29/2018 15:45", - "testNextSlide" : "LB 6/29/2018 15:45", + "testNextSlide" : "LM 7/13/2018 17:52", "testNonInteractivetyInNonInteractiveMode" : "WoC 6/15/2018 22:18", - "testPreviousSlideClampsToMin" : "LM 5/18/2018 18:45", - "testSavingShouldProvideWarning" : "LB 6/29/2018 19:38", - "testSelectSlide" : "LB 6/29/2018 15:45", - "testSelectSlideClamps" : "LB 6/29/2018 15:45", + "testPreviousSlideClampsToMin" : "LM 7/13/2018 17:53", + "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", + "testSelectSlide" : "LM 7/13/2018 17:53", + "testSelectSlideClamps" : "LM 7/13/2018 17:53", "testSelectedMiniatureChanges" : "LB 6/29/2018 19:05", "testSingleMorphOnSlide" : "JZ 6/29/2018 17:23", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", "testSlideContainerPosition" : "LM 6/8/2018 19:55", - "testSlideCreation" : "LM 5/18/2018 18:38", + "testSlideCreation" : "LM 7/13/2018 18:20", "testSlideCreationReturnsSlide" : "LM 5/18/2018 18:37", - "testSlideCreationSelectsNewSlide" : "LM 5/18/2018 18:35", - "testSlideDeletionMovesSlideSelection" : "LM 5/18/2018 18:32", + "testSlideCreationSelectsNewSlide" : "LM 7/13/2018 17:56", + "testSlideDeletionMovesSlideSelection" : "LM 7/13/2018 17:56", "testSlideNavigationInPresentationMode" : "LB 6/29/2018 15:45", "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", "testSlideRatioIsFixed" : "LB 6/1/2018 18:49", "testSlideResizeRegression" : "LB 5/18/2018 20:27", "testSlideSelectionDialog" : "LB 7/13/2018 14:58", "testSlidesDirectoryIsEmpty" : "LM 6/15/2018 18:42", - "testSlidesReceiveEnablePresentationMode" : "LM 6/15/2018 18:40", + "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", "testSortMorphFiles" : "JZ 6/29/2018 18:00", - "testZeroSlidesRegression" : "LM 5/11/2018 18:09", - "testnextSlideClampsToMax" : "LM 5/18/2018 18:42", + "testZeroSlidesRegression" : "LM 7/13/2018 17:23", + "testnextSlideClampsToMax" : "LM 7/13/2018 17:57", "tool" : "LM 5/16/2018 17:13", "validMorphFileData" : "LM 6/13/2018 17:48", "window" : "LM 5/11/2018 17:57", From 5801ba35edc6cd11874f2a3277f3fb1266ef9485 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 13 Jul 2018 19:05:09 +0200 Subject: [PATCH 025/112] Fix duplicate slide --- .../PSPresentation.class/instance/addSlide.afterIndex..st | 5 +++++ .../PSPresentation.class/instance/createSlideAfter..st | 3 +-- .../PSPresentation.class/methodProperties.json | 3 ++- .../instance/duplicateCurrentSlide.st | 4 ++-- .../PSPresentationTool.class/methodProperties.json | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/addSlide.afterIndex..st diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/addSlide.afterIndex..st b/packages/Presenter-Core.package/PSPresentation.class/instance/addSlide.afterIndex..st new file mode 100644 index 0000000..e42b7ec --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/addSlide.afterIndex..st @@ -0,0 +1,5 @@ +slide management +addSlide: aPSSlide afterIndex: anIndex + + aPSSlide setModel: self. + self slides add: aPSSlide afterIndex: anIndex. \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st index 1238ba7..a8e3d45 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideAfter..st @@ -3,6 +3,5 @@ createSlideAfter: anIndex | newSlide | newSlide := PSSlide new. - newSlide setModel: self. - self slides add: newSlide afterIndex: anIndex. + self addSlide: newSlide afterIndex: anIndex. ^ newSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json index 3bc1bd6..851e905 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json @@ -2,12 +2,13 @@ "class" : { }, "instance" : { + "addSlide:afterIndex:" : "LM 7/13/2018 19:04", "askForPresentationDirectoryIn:" : "LM 7/13/2018 18:33", "askForPresentationName" : "LM 7/13/2018 18:32", "clampSlideNumber:" : "LM 7/13/2018 17:18", "clearSubdirectory:in:" : "LM 7/13/2018 18:32", "createDirectory:in:" : "LM 7/13/2018 18:32", - "createSlideAfter:" : "LM 7/13/2018 17:29", + "createSlideAfter:" : "LM 7/13/2018 19:04", "defaultDirectory" : "LM 7/13/2018 18:35", "defaultDirectoryName" : "LM 7/13/2018 18:35", "deleteSlideAt:" : "LM 7/13/2018 17:37", diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st index b26caee..4fbb759 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st @@ -1,7 +1,7 @@ slide management duplicateCurrentSlide - self slides - add: self currentSlide copy + self presentation + addSlide: self currentSlide copy afterIndex: self currentSlideNumber. self updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 7ddb9d5..63ed1db 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -45,7 +45,7 @@ "deleteSlideAt:" : "LM 7/13/2018 17:37", "disableNonInteractiveMode" : "LB 7/6/2018 17:24", "disablePresentationMode" : "LM 7/13/2018 18:20", - "duplicateCurrentSlide" : "LM 7/13/2018 17:01", + "duplicateCurrentSlide" : "LM 7/13/2018 19:04", "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LM 7/13/2018 18:17", "exportAsPNGs" : "LM 7/13/2018 18:38", From 53852eeeb979af753f035a45c41ca458283e1edb Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 19:10:50 +0200 Subject: [PATCH 026/112] UI Test refactoring --- .../assertDeviatesLessThan.onSlideResize..st | 2 +- .../instance/testTextFieldCreatedOnClick.st | 2 +- .../PSOnSlideTest.class/methodProperties.json | 4 ++-- .../PSOnSlideTest.class/properties.json | 2 +- .../assertIsConstantOnWindowResize..st | 4 ---- .../instance/testEnterNonInteractiveMode.st | 4 ++-- .../instance/testLeaveNonInteractiveMode.st | 8 +++---- .../instance/testMiniatureSelects.st | 2 +- ...estNonInteractivetyInNonInteractiveMode.st | 6 ++--- .../instance/testSlideRatioIsFixed.st | 3 +-- .../instance/testSlideResizeRegression.st | 4 +++- .../methodProperties.json | 13 +++++------ .../properties.json | 2 +- .../instance/testAcceptDropImageFile.st | 2 +- .../instance/testTriggerContextMenu.st | 2 +- .../methodProperties.json | 4 ++-- .../PSUITestCase.class/README.md | 2 ++ .../class/resources.st | 0 .../instance/assert.constantOnResizeOf..st | 6 +++++ .../assert.deviateLessThan.onResizeOf..st | 6 +++++ .../instance/assert.onResizeOf..st | 10 ++++++++ .../PSUITestCase.class/instance/click.at..st | 5 ++++ .../instance/does.answerSideRatio..st | 0 .../instance/drag.from.to..st | 2 +- .../instance/dragndrop.from.to..st | 2 +- .../instance/getNew.createdIn..st | 0 .../instance/hand.st | 0 .../instance/keystroke.at..st | 0 .../instance/mouse.does.at..st | 0 .../instance/mouse.downAt..st} | 2 +- .../instance/mouse.upAt..st | 4 ++++ .../instance/mouseMove.from.to..st | 0 .../instance/number.isSimilarTo..st | 0 .../instance/pressKey.at..st | 4 ++++ .../instance/setUp.st | 0 .../instance/tearDown.st | 0 .../instance/world.st | 0 .../PSUITestCase.class/methodProperties.json | 23 +++++++++++++++++++ .../properties.json | 4 ++-- .../UITestCase.class/README.md | 2 -- .../instance/blueMouseDownAt..st | 4 ---- .../UITestCase.class/instance/click.at..st | 5 ---- .../does.deviateLessThan.onResizeOf..st | 13 ----------- .../instance/is.constantOnResizeOf..st | 13 ----------- .../instance/redMouseDownAt..st | 4 ---- .../instance/yellowMouseDownAt..st | 4 ---- .../UITestCase.class/methodProperties.json | 23 ------------------- 47 files changed, 95 insertions(+), 107 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/assertIsConstantOnWindowResize..st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/README.md rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/class/resources.st (100%) create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.constantOnResizeOf..st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/does.answerSideRatio..st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/drag.from.to..st (63%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/dragndrop.from.to..st (59%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/getNew.createdIn..st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/hand.st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/keystroke.at..st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/mouse.does.at..st (100%) rename packages/Presenter-Tests.package/{UITestCase.class/instance/mouse.DownAt..st => PSUITestCase.class/instance/mouse.downAt..st} (64%) create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/mouseMove.from.to..st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/number.isSimilarTo..st (100%) create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/setUp.st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/tearDown.st (100%) rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/instance/world.st (100%) create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json rename packages/Presenter-Tests.package/{UITestCase.class => PSUITestCase.class}/properties.json (72%) delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/README.md delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/blueMouseDownAt..st delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/does.deviateLessThan.onResizeOf..st delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/is.constantOnResizeOf..st delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/redMouseDownAt..st delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/instance/yellowMouseDownAt..st delete mode 100644 packages/Presenter-Tests.package/UITestCase.class/methodProperties.json diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st index c8edffd..a72f3da 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st @@ -1,4 +1,4 @@ slide resizing assertDeviatesLessThan: aComparable onSlideResize: aBlock - self assert: (self does: aBlock deviateLessThan: aComparable onResizeOf: self slideContainer) \ No newline at end of file + self assert: aBlock deviateLessThan: aComparable onResizeOf: self slideContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st index 1463ab7..b8215cf 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st @@ -3,7 +3,7 @@ testTextFieldCreatedOnClick | oldSubmorphs addedMorphs container | oldSubmorphs := self slide submorphs. - self slide doubleClick: (self redMouseDownAt: self slide center). + self slide doubleClick: (self mouse: MouseEvent redButton downAt: self slide center). addedMorphs := self slide submorphs difference: oldSubmorphs. self assert: addedMorphs size = 1. container := addedMorphs first. diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index c2a6de8..f78a2c4 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "assertDeviatesLessThan:onSlideResize:" : "LB 7/13/2018 18:14", + "assertDeviatesLessThan:onSlideResize:" : "LB 7/13/2018 19:01", "collectMenuContentFrom:" : "LM 6/15/2018 19:18", "collectMenuItemContentsFrom:" : "LM 6/15/2018 19:18", "setUp" : "LB 7/13/2018 18:13", @@ -12,4 +12,4 @@ "slideContainer:" : "LB 7/13/2018 18:13", "tearDown" : "LB 7/13/2018 18:13", "testContextMenuContent:equals:" : "LB 6/15/2018 16:39", - "testTextFieldCreatedOnClick" : "MK 6/1/2018 18:21" } } + "testTextFieldCreatedOnClick" : "LB 7/13/2018 18:43" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json index 6b5b6e6..3c3adf4 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/properties.json @@ -11,5 +11,5 @@ "name" : "PSOnSlideTest", "pools" : [ ], - "super" : "UITestCase", + "super" : "PSUITestCase", "type" : "normal" } diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/assertIsConstantOnWindowResize..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/assertIsConstantOnWindowResize..st deleted file mode 100644 index a9529a2..0000000 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/assertIsConstantOnWindowResize..st +++ /dev/null @@ -1,4 +0,0 @@ -window resizing tests -assertIsConstantOnWindowResize: aBlock - - self assert: (self is: aBlock constantOnResizeOf: self window) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index 576dbc9..03c18c5 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -1,11 +1,11 @@ presentation mode tests testEnterNonInteractiveMode - self hand handleEvent: (self keystroke: $i at: self slideContainer center). + self pressKey: $i at: self slideContainer center. self assert: self tool isInteractive equals: true. self tool enablePresentationMode. - self hand handleEvent: (self keystroke: $i at: self slideContainer center). + self pressKey: $i at: self slideContainer center. self assert: self tool isInteractive equals: false. self tool disablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st index b0542f9..c01f0bc 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st @@ -2,12 +2,12 @@ presentation mode tests testLeaveNonInteractiveMode self tool enablePresentationMode. - self hand handleEvent: (self keystroke: $i at: self slideContainer center). - self hand handleEvent: (self keystroke: $i at: self slideContainer center). + self pressKey: $i at: self slideContainer center. + self pressKey: $i at: self slideContainer center. self assert: self tool isInteractive equals: true. - self hand handleEvent: (self keystroke: $i at: self slideContainer center). - self hand handleEvent: (self keystroke: Character escape at: self slideContainer center). + self pressKey: $i at: self slideContainer center. + self pressKey: Character escape at: self slideContainer center. self assert: self tool isInteractive equals: true. self tool disablePresentationMode diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index 16ca2a0..eab12c3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -5,5 +5,5 @@ testMiniatureSelects 5 timesRepeat: [self tool createSlide]. slideToSelect := self tool slides at: 3. miniatureToClick := self tool miniatureOf: slideToSelect. - self hand handleEvent: (self redMouseDownAt: miniatureToClick boundsInWorld center). + self click: MouseEvent redButton at: miniatureToClick boundsInWorld center. self assert: self tool currentSlide equals: slideToSelect \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st index dd0ccb6..2005fee 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st @@ -5,10 +5,10 @@ testNonInteractivetyInNonInteractiveMode testMorph := PSMorphForEventTests new. self tool enablePresentationMode. self slideContainer currentSlide addContent: testMorph. - self hand handleEvent: (self keystroke: $i at: self slideContainer center). + self pressKey: $i at: self slideContainer center. - self hand handleEvent: (self keystroke: $a at: self slideContainer center). - self hand handleEvent: (self redMouseDownAt: self slideContainer center). + self pressKey: $a at: self slideContainer center. + self click: MouseEvent redButton at: self slideContainer center. self assert: testMorph receivedMouseEvents equals: 0. self assert: testMorph receivedKeyboardEvents equals: 0. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st index 4883682..e3e39d6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st @@ -4,5 +4,4 @@ testSlideRatioIsFixed | slide | slide := self tool currentSlide. self assert: (self does: slide answerSideRatio: slide sideRatio). - self assertIsConstantOnWindowResize: [ - self does: slide answerSideRatio: slide sideRatio] \ No newline at end of file + self assert: [self does: slide answerSideRatio: slide sideRatio] onResizeOf: self window \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st index fecf2d8..4c4a5d7 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st @@ -1,4 +1,6 @@ window resizing tests testSlideResizeRegression "Regression test for #32" - self assert: (self is: [self tool currentSlide extent] constantOnResizeOf: self window) not \ No newline at end of file + self + should: [self assert: [self tool currentSlide extent] constantOnResizeOf: self window] + raise: TestFailure \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index f3587e0..47ff82a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -2,7 +2,6 @@ "class" : { }, "instance" : { - "assertIsConstantOnWindowResize:" : "LB 5/18/2018 18:19", "mockEmptyPresentationDirectory" : "MK 6/17/2018 18:55", "morphLoadingStreamFor:" : "LM 6/13/2018 16:50", "setUp" : "LB 5/23/2018 16:11", @@ -21,18 +20,18 @@ "testDuplicateSlide" : "MK 7/13/2018 17:03", "testDuplicatedSlidesContent" : "MK 7/13/2018 17:37", "testEmptyPresentationDirectoryIsValid" : "LM 6/15/2018 18:44", - "testEnterNonInteractiveMode" : "LB 7/6/2018 17:16", + "testEnterNonInteractiveMode" : "LB 7/13/2018 18:30", "testErrorReportExistsPerSlide" : "LM 6/15/2018 18:38", "testInvalidLoadReturnsNil" : "LM 6/13/2018 17:34", "testInvalidSlideDirectoryNames" : "JZ 6/29/2018 17:04", "testLayoutedSlidesCreation" : "MK 7/6/2018 17:32", - "testLeaveNonInteractiveMode" : "LB 7/6/2018 17:15", + "testLeaveNonInteractiveMode" : "LB 7/13/2018 18:30", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "LB 7/5/2018 22:36", "testMiniatureChangesIfSlideChanges" : "WoC 6/29/2018 19:23", "testMiniatureCreated" : "LB 6/29/2018 18:01", "testMiniatureDeleted" : "LB 6/29/2018 18:02", - "testMiniatureSelects" : "LB 6/29/2018 18:56", + "testMiniatureSelects" : "LB 7/13/2018 18:28", "testMissingSlidesDirectory" : "LM 6/15/2018 18:39", "testMorphLoadIsValid" : "LM 6/13/2018 16:50", "testMorphNameIsNotNumber" : "JZ 6/29/2018 17:32", @@ -41,7 +40,7 @@ "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", "testMovedSlideStayCurrentSlide" : "LB 6/29/2018 15:45", "testNextSlide" : "LB 6/29/2018 15:45", - "testNonInteractivetyInNonInteractiveMode" : "WoC 6/15/2018 22:18", + "testNonInteractivetyInNonInteractiveMode" : "LB 7/13/2018 18:36", "testPreviousSlideClampsToMin" : "LM 5/18/2018 18:45", "testSavingShouldProvideWarning" : "LB 6/29/2018 19:38", "testSelectSlide" : "LB 6/29/2018 15:45", @@ -56,8 +55,8 @@ "testSlideDeletionMovesSlideSelection" : "LM 5/18/2018 18:32", "testSlideNavigationInPresentationMode" : "LB 6/29/2018 15:45", "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", - "testSlideRatioIsFixed" : "LB 6/1/2018 18:49", - "testSlideResizeRegression" : "LB 5/18/2018 20:27", + "testSlideRatioIsFixed" : "LB 7/13/2018 19:05", + "testSlideResizeRegression" : "LB 7/13/2018 18:59", "testSlideSelectionDialog" : "LB 7/13/2018 14:58", "testSlidesDirectoryIsEmpty" : "LM 6/15/2018 18:42", "testSlidesReceiveEnablePresentationMode" : "LM 6/15/2018 18:40", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/properties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/properties.json index 7053724..383d45f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/properties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/properties.json @@ -10,5 +10,5 @@ "name" : "PSPresentationToolTest", "pools" : [ ], - "super" : "UITestCase", + "super" : "PSUITestCase", "type" : "normal" } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st index 62586c3..9e1fb27 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st @@ -5,7 +5,7 @@ testAcceptDropImageFile oldSubMorphs := self slide submorphs. self slide handleDroppedItem: PSMockByteStream newPng - event: (self redMouseDownAt: self slide center). + event: (UserInputEvent new position: self slide center). createdImages := (self slide submorphs difference: oldSubMorphs) select: [:each | each child isKindOf: SketchMorph]. self assert: createdImages size equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st index 5ca91b7..ef6ffa6 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st @@ -5,5 +5,5 @@ testTriggerContextMenu container := (PSMockContentContainer for: self morph). self slide addMorph: container fullFrame: (self slide layoutFrameFor: container). - self hand handleEvent: (self yellowMouseDownAt: container center). + self click: MouseEvent yellowButton at: container center. self assert: container menuCreated equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 81d4cbb..8e6d169 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -8,7 +8,7 @@ "morph:" : "LB 5/18/2018 16:11", "setUp" : "WoC 6/15/2018 20:15", "tearDown" : "LB 6/1/2018 17:51", - "testAcceptDropImageFile" : "LB 7/13/2018 17:01", + "testAcceptDropImageFile" : "LB 7/13/2018 18:38", "testContainerResizing" : "LB 7/6/2018 16:33", "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", @@ -26,4 +26,4 @@ "testSlideResizeToFitKeepsAspectRatio" : "MK 7/13/2018 18:08", "testSlideResizeToFitKeepsPosition" : "MK 7/13/2018 18:08", "testSubmorphsOnResize" : "LM 6/6/2018 18:09", - "testTriggerContextMenu" : "LB 6/15/2018 21:37" } } + "testTriggerContextMenu" : "LB 7/13/2018 18:39" } } diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/README.md b/packages/Presenter-Tests.package/PSUITestCase.class/README.md new file mode 100644 index 0000000..a471c52 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/README.md @@ -0,0 +1,2 @@ +A PSUITestCase is a superclass for UI tests so they can be performed in another world. +Heavily inspired by UserInputEventTests on advice of the swa people. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/class/resources.st b/packages/Presenter-Tests.package/PSUITestCase.class/class/resources.st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/class/resources.st rename to packages/Presenter-Tests.package/PSUITestCase.class/class/resources.st diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.constantOnResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.constantOnResizeOf..st new file mode 100644 index 0000000..7808d2f --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.constantOnResizeOf..st @@ -0,0 +1,6 @@ +helper functions +assert: aBlock constantOnResizeOf: aMorph + + | oldValue | + oldValue := aBlock value. + self assert: [aBlock value = oldValue] onResizeOf: aMorph \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st new file mode 100644 index 0000000..4f449e1 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st @@ -0,0 +1,6 @@ +helper functions +assert: aBlock deviateLessThan: aComparable onResizeOf: aMorph + + | oldValue | + oldValue := aBlock value. + self assert: [(aBlock value - oldValue / oldValue) abs < aComparable] onResizeOf: aMorph \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st new file mode 100644 index 0000000..8a19305 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st @@ -0,0 +1,10 @@ +helper functions +assert: aBlock onResizeOf: aMorph + + 100 to: 2000 by: 100 do: [ :width | + 100 to: 2000 by: 100 do: [ :height | + aMorph extent: width@height. + aMorph fullBounds. + self assert: aBlock. + ] + ] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st new file mode 100644 index 0000000..279e3f1 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st @@ -0,0 +1,5 @@ +support +click: aMouseButton at: aPoint + + self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). + self hand handleEvent: (self mouse: aMouseButton upAt: aPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/does.answerSideRatio..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerSideRatio..st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/does.answerSideRatio..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerSideRatio..st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/drag.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st similarity index 63% rename from packages/Presenter-Tests.package/UITestCase.class/instance/drag.from.to..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st index 2bf652a..471b7c9 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/drag.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st @@ -1,5 +1,5 @@ support drag: aMouseButton from: aPoint to: anotherPoint - self hand handleEvent: (self mouse: aMouseButton does: #mouseDown at: aPoint). + self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). self hand handleEvent: (self mouseMove: aMouseButton from: aPoint to: anotherPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st similarity index 59% rename from packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st index a152695..84b9cf9 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/dragndrop.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st @@ -2,4 +2,4 @@ support dragndrop: aMouseButton from: aPoint to: anotherPoint self drag: aMouseButton from: aPoint to: anotherPoint. - self hand handleEvent: (self mouse: aMouseButton does: #mouseUp at: anotherPoint) \ No newline at end of file + self hand handleEvent: (self mouse: aMouseButton upAt: anotherPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/getNew.createdIn..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/getNew.createdIn..st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/getNew.createdIn..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/getNew.createdIn..st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/hand.st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/hand.st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/hand.st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/hand.st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/keystroke.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/keystroke.at..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/mouse.does.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/mouse.does.at..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/mouse.DownAt..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st similarity index 64% rename from packages/Presenter-Tests.package/UITestCase.class/instance/mouse.DownAt..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st index cfebc90..25709d4 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/mouse.DownAt..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st @@ -1,4 +1,4 @@ support -mouse: aButtonCode DownAt: aPoint +mouse: aButtonCode downAt: aPoint ^ self mouse: aButtonCode does: #mouseDown at: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st new file mode 100644 index 0000000..b03fd8f --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st @@ -0,0 +1,4 @@ +support +mouse: aButtonCode upAt: aPoint + + ^ self mouse: aButtonCode does: #mouseUp at: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/mouseMove.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/mouseMove.from.to..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/number.isSimilarTo..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/number.isSimilarTo..st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/number.isSimilarTo..st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/number.isSimilarTo..st diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st new file mode 100644 index 0000000..0f9c829 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st @@ -0,0 +1,4 @@ +support +pressKey: char at: point + + self hand handleEvent: (self keystroke: char at: point) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/setUp.st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/setUp.st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/setUp.st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/setUp.st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/tearDown.st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/tearDown.st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/tearDown.st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/tearDown.st diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/world.st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/world.st similarity index 100% rename from packages/Presenter-Tests.package/UITestCase.class/instance/world.st rename to packages/Presenter-Tests.package/PSUITestCase.class/instance/world.st diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json new file mode 100644 index 0000000..c47883b --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -0,0 +1,23 @@ +{ + "class" : { + "resources" : "LM 6/15/2018 18:41" }, + "instance" : { + "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", + "assert:deviateLessThan:onResizeOf:" : "LB 7/13/2018 19:01", + "assert:onResizeOf:" : "LB 7/13/2018 18:48", + "click:at:" : "LB 7/13/2018 18:44", + "does:answerSideRatio:" : "LB 6/6/2018 15:10", + "drag:from:to:" : "LB 7/13/2018 18:44", + "dragndrop:from:to:" : "LB 7/13/2018 18:44", + "getNew:createdIn:" : "LB 6/15/2018 16:46", + "hand" : "LM 6/15/2018 18:41", + "keystroke:at:" : "WoC 6/15/2018 18:26", + "mouse:does:at:" : "LB 7/13/2018 18:24", + "mouse:downAt:" : "LB 7/13/2018 18:43", + "mouse:upAt:" : "LB 7/13/2018 18:44", + "mouseMove:from:to:" : "LB 7/5/2018 22:57", + "number:isSimilarTo:" : "LB 5/29/2018 17:39", + "pressKey:at:" : "LB 7/13/2018 18:29", + "setUp" : "LB 7/13/2018 19:04", + "tearDown" : "LB 7/13/2018 17:25", + "world" : "LM 6/15/2018 18:41" } } diff --git a/packages/Presenter-Tests.package/UITestCase.class/properties.json b/packages/Presenter-Tests.package/PSUITestCase.class/properties.json similarity index 72% rename from packages/Presenter-Tests.package/UITestCase.class/properties.json rename to packages/Presenter-Tests.package/PSUITestCase.class/properties.json index bf3e475..034e2e2 100644 --- a/packages/Presenter-Tests.package/UITestCase.class/properties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/properties.json @@ -4,10 +4,10 @@ ], "classvars" : [ ], - "commentStamp" : "LB 5/22/2018 17:34", + "commentStamp" : "LB 7/13/2018 18:45", "instvars" : [ ], - "name" : "UITestCase", + "name" : "PSUITestCase", "pools" : [ ], "super" : "TestCase", diff --git a/packages/Presenter-Tests.package/UITestCase.class/README.md b/packages/Presenter-Tests.package/UITestCase.class/README.md deleted file mode 100644 index 7e72906..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/README.md +++ /dev/null @@ -1,2 +0,0 @@ -An UITestCase is a superclass for UI tests so they can be performed in another world. -Heavily inspired by UserInputEventTests on advice of the swa people. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/blueMouseDownAt..st b/packages/Presenter-Tests.package/UITestCase.class/instance/blueMouseDownAt..st deleted file mode 100644 index bda6cb1..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/blueMouseDownAt..st +++ /dev/null @@ -1,4 +0,0 @@ -support -blueMouseDownAt: aPoint - - ^ self mouse: MouseEvent blueButton DownAt: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st b/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st deleted file mode 100644 index d7e3f6c..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/click.at..st +++ /dev/null @@ -1,5 +0,0 @@ -support -click: aMouseButton at: aPoint - - self hand handleEvent: (self mouse: aMouseButton does: #mouseDown at: aPoint). - self hand handleEvent: (self mouse: aMouseButton does: #mouseUp at: aPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/does.deviateLessThan.onResizeOf..st b/packages/Presenter-Tests.package/UITestCase.class/instance/does.deviateLessThan.onResizeOf..st deleted file mode 100644 index 28c7419..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/does.deviateLessThan.onResizeOf..st +++ /dev/null @@ -1,13 +0,0 @@ -helper functions -does: aBlock deviateLessThan: aComparable onResizeOf: aMorph - - | oldValue | - oldValue := aBlock value. - 200 to: 2000 by: 100 do: [ :width | - 200 to: 2000 by: 100 do: [ :height | - aMorph extent: width@height. - aMorph fullBounds. - (aBlock value - oldValue / oldValue) abs < aComparable ifFalse: [ ^ false] - ] - ]. - ^ true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/is.constantOnResizeOf..st b/packages/Presenter-Tests.package/UITestCase.class/instance/is.constantOnResizeOf..st deleted file mode 100644 index 00ddb9f..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/is.constantOnResizeOf..st +++ /dev/null @@ -1,13 +0,0 @@ -helper functions -is: aBlock constantOnResizeOf: aMorph - - | oldValue | - oldValue := aBlock value. - 100 to: 2000 by: 100 do: [ :width | - 100 to: 2000 by: 100 do: [ :height | - aMorph extent: width@height. - aMorph fullBounds. - aBlock value = oldValue ifFalse: [^ false] - ] - ]. - ^ aBlock value = oldValue \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/redMouseDownAt..st b/packages/Presenter-Tests.package/UITestCase.class/instance/redMouseDownAt..st deleted file mode 100644 index f7ab6ac..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/redMouseDownAt..st +++ /dev/null @@ -1,4 +0,0 @@ -support -redMouseDownAt: aPoint - - ^ self mouse: MouseEvent redButton DownAt: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/instance/yellowMouseDownAt..st b/packages/Presenter-Tests.package/UITestCase.class/instance/yellowMouseDownAt..st deleted file mode 100644 index a96fd18..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/instance/yellowMouseDownAt..st +++ /dev/null @@ -1,4 +0,0 @@ -support -yellowMouseDownAt: aPoint - - ^ self mouse: MouseEvent yellowButton DownAt: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json deleted file mode 100644 index b63b70c..0000000 --- a/packages/Presenter-Tests.package/UITestCase.class/methodProperties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "class" : { - "resources" : "LM 6/15/2018 18:41" }, - "instance" : { - "blueMouseDownAt:" : "LB 7/5/2018 22:27", - "click:at:" : "MK 7/13/2018 18:04", - "does:answerSideRatio:" : "LB 6/6/2018 15:10", - "does:deviateLessThan:onResizeOf:" : "LB 5/29/2018 17:41", - "drag:from:to:" : "LB 7/5/2018 22:57", - "dragndrop:from:to:" : "MK 7/13/2018 18:04", - "getNew:createdIn:" : "LB 6/15/2018 16:46", - "hand" : "LM 6/15/2018 18:41", - "is:constantOnResizeOf:" : "LB 5/29/2018 17:42", - "keystroke:at:" : "WoC 6/15/2018 18:26", - "mouse:DownAt:" : "LB 7/5/2018 22:22", - "mouse:does:at:" : "LB 7/5/2018 22:21", - "mouseMove:from:to:" : "LB 7/5/2018 22:57", - "number:isSimilarTo:" : "LB 5/29/2018 17:39", - "redMouseDownAt:" : "LB 7/5/2018 22:28", - "setUp" : "LB 7/13/2018 17:04", - "tearDown" : "LB 7/13/2018 17:25", - "world" : "LM 6/15/2018 18:41", - "yellowMouseDownAt:" : "LB 7/5/2018 22:27" } } From f2eb8ab721fbc8b0c5951369cf1f1bc182ab993e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 19:13:08 +0200 Subject: [PATCH 027/112] Merge conflict resolvance --- .../instance/testMiniatureSelects.st | 2 +- .../PSPresentationToolTest.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index 438203c..254994e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -5,5 +5,5 @@ testMiniatureSelects 5 timesRepeat: [self tool createSlide]. slideToSelect := self slides third. miniatureToClick := self tool miniatureOf: slideToSelect. - self hand handleEvent: (self redMouseDownAt: miniatureToClick boundsInWorld center). + self click: MouseEvent redButton at: miniatureToClick boundsInWorld center. self assert: self tool currentSlide equals: slideToSelect \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 7e32eef..64c42d1 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -32,7 +32,7 @@ "testMiniatureChangesIfSlideChanges" : "WoC 6/29/2018 19:23", "testMiniatureCreated" : "LB 6/29/2018 18:01", "testMiniatureDeleted" : "LB 6/29/2018 18:02", - "testMiniatureSelects" : "LM 7/13/2018 17:44", + "testMiniatureSelects" : "LB 7/13/2018 19:12", "testMissingSlidesDirectory" : "LM 6/15/2018 18:39", "testMorphLoadIsValid" : "LM 6/13/2018 16:50", "testMorphNameIsNotNumber" : "JZ 6/29/2018 17:32", From f57188608e60da0a7ab10465dd4d9c0b7b512a1f Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 13 Jul 2018 22:20:15 +0200 Subject: [PATCH 028/112] Fixes Travis ? --- .../instance/testAcceptDropImageFile.st | 4 ++-- .../instance/testTextFieldCreatedOnClick.st | 4 +++- .../PSOnSlideTest.class/methodProperties.json | 3 ++- .../PSSlideSubmorphTest.class/methodProperties.json | 1 - .../PSTestWorld.class/instance/setUp.st | 2 +- .../PSTestWorld.class/methodProperties.json | 2 +- .../PSUITestCase.class/instance/click.at..st | 1 + .../PSUITestCase.class/methodProperties.json | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSOnSlideTest.class}/instance/testAcceptDropImageFile.st (81%) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st similarity index 81% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st rename to packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st index 9e1fb27..a89343a 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st @@ -1,11 +1,11 @@ -submorph tests +event tests testAcceptDropImageFile | oldSubMorphs createdImages | oldSubMorphs := self slide submorphs. self slide handleDroppedItem: PSMockByteStream newPng - event: (UserInputEvent new position: self slide center). + event: (UserInputEvent new setPosition: self slide center). createdImages := (self slide submorphs difference: oldSubMorphs) select: [:each | each child isKindOf: SketchMorph]. self assert: createdImages size equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st index b8215cf..9579e93 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st @@ -3,7 +3,9 @@ testTextFieldCreatedOnClick | oldSubmorphs addedMorphs container | oldSubmorphs := self slide submorphs. - self slide doubleClick: (self mouse: MouseEvent redButton downAt: self slide center). + "self slide doubleClick: (self mouse: MouseEvent redButton downAt: self slide center)." + self click: MouseEvent redButton at: self slide center. + self click: MouseEvent redButton at: self slide center. addedMorphs := self slide submorphs difference: oldSubmorphs. self assert: addedMorphs size = 1. container := addedMorphs first. diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index f78a2c4..b389c7e 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -11,5 +11,6 @@ "slideContainer" : "LB 7/13/2018 18:12", "slideContainer:" : "LB 7/13/2018 18:13", "tearDown" : "LB 7/13/2018 18:13", + "testAcceptDropImageFile" : "LB 7/13/2018 21:57", "testContextMenuContent:equals:" : "LB 6/15/2018 16:39", - "testTextFieldCreatedOnClick" : "LB 7/13/2018 18:43" } } + "testTextFieldCreatedOnClick" : "LB 7/13/2018 22:09" } } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 8e6d169..e42dc8c 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -8,7 +8,6 @@ "morph:" : "LB 5/18/2018 16:11", "setUp" : "WoC 6/15/2018 20:15", "tearDown" : "LB 6/1/2018 17:51", - "testAcceptDropImageFile" : "LB 7/13/2018 18:38", "testContainerResizing" : "LB 7/6/2018 16:33", "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st index 7d60681..04ae1e2 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st @@ -13,7 +13,7 @@ setUp instVarNamed: #canvas put: (Form extent: Display extent depth: 32) getCanvas. - self hand: HandMorphForEventTests new. + self hand: HandMorph new. self world removeHand: self world firstHand; "the default hand" diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json index bba1de8..da6b3a3 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "hand" : "LB 5/29/2018 17:26", "hand:" : "LB 5/29/2018 17:26", - "setUp" : "LB 7/13/2018 16:51", + "setUp" : "LB 7/13/2018 22:17", "tearDown" : "LB 5/29/2018 17:26", "world" : "LB 5/29/2018 17:26", "world:" : "LB 5/29/2018 17:26" } } diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st index 279e3f1..c76fcc6 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st @@ -2,4 +2,5 @@ support click: aMouseButton at: aPoint self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). + "(self hand instVarNamed: #mouseClickState put: nil)." self hand handleEvent: (self mouse: aMouseButton upAt: aPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index c47883b..048920b 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -5,7 +5,7 @@ "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", "assert:deviateLessThan:onResizeOf:" : "LB 7/13/2018 19:01", "assert:onResizeOf:" : "LB 7/13/2018 18:48", - "click:at:" : "LB 7/13/2018 18:44", + "click:at:" : "LB 7/13/2018 22:10", "does:answerSideRatio:" : "LB 6/6/2018 15:10", "drag:from:to:" : "LB 7/13/2018 18:44", "dragndrop:from:to:" : "LB 7/13/2018 18:44", From ac83f13e7977e88cc3f9de90567fa61dc9526ece Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Fri, 20 Jul 2018 14:11:41 +0200 Subject: [PATCH 029/112] Deleted dot --- .../PSMorphForEventTests.class/instance/initialize.st | 2 +- .../PSMorphForEventTests.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/initialize.st b/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/initialize.st index 1aebdd0..19dbf0f 100644 --- a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/initialize.st +++ b/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/initialize.st @@ -4,4 +4,4 @@ initialize super initialize. self receivedKeyboardEvents: 0; - receivedMouseEvents: 0. \ No newline at end of file + receivedMouseEvents: 0 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json b/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json index bc97f44..af3e132 100644 --- a/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "handlesKeyboard:" : "WoC 6/15/2018 19:02", "handlesMouseDown:" : "WoC 6/15/2018 19:03", - "initialize" : "WoC 6/15/2018 19:12", + "initialize" : "MK 7/13/2018 18:29", "keyStroke:" : "WoC 6/15/2018 19:03", "mouseDown:" : "WoC 6/15/2018 19:03", "receivedKeyboardEvents" : "WoC 6/15/2018 18:58", From 5dfce9234acac5627689feaca8e82202657b8d8e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 14:47:50 +0200 Subject: [PATCH 030/112] Decomposed slide submorph resizing test --- .../instance/testSubmorphRelativePositionOnResize.st | 7 +++++++ .../instance/testSubmorphRelativeSizeOnResize.st | 7 +++++++ .../instance/testSubmorphSideRatioOnResize.st | 7 +++++++ .../instance/testSubmorphsOnResize.st | 8 -------- .../PSSlideSubmorphTest.class/methodProperties.json | 4 +++- .../PSUITestCase.class/instance/click.at..st | 3 +-- .../PSUITestCase.class/instance/do.and.answerRatio..st | 4 ++++ .../PSUITestCase.class/instance/does.answerRatio..st | 4 ++++ .../PSUITestCase.class/instance/does.answerSideRatio..st | 2 +- .../PSUITestCase.class/instance/drag.from.to..st | 2 +- .../PSUITestCase.class/instance/dragndrop.from.to..st | 2 +- .../PSUITestCase.class/instance/keystroke.at..st | 2 +- .../PSUITestCase.class/instance/mouse.does.at..st | 2 +- .../PSUITestCase.class/instance/mouse.downAt..st | 2 +- .../PSUITestCase.class/instance/mouse.upAt..st | 2 +- .../PSUITestCase.class/instance/mouseMove.from.to..st | 2 +- .../PSUITestCase.class/instance/pressKey.at..st | 2 +- .../PSUITestCase.class/methodProperties.json | 6 ++++-- 18 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st delete mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st new file mode 100644 index 0000000..dbf8f1c --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st @@ -0,0 +1,7 @@ +submorph tests +testSubmorphRelativePositionOnResize + + | oldRatio | + self slide addContent: self morph. + oldRatio := self morph position - self slide position / self morph extent. + self assert: [self do: self morph position - self slide position and: self morph extent answerRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st new file mode 100644 index 0000000..b525c22 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st @@ -0,0 +1,7 @@ +submorph tests +testSubmorphRelativeSizeOnResize + + | oldRatio | + self slide addContent: self morph. + oldRatio := self morph extent / self slide extent. + self assert: [self do: self morph extent and: self slide extent answerRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st new file mode 100644 index 0000000..e98933a --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st @@ -0,0 +1,7 @@ +submorph tests +testSubmorphSideRatioOnResize + + | oldRatio | + self slide addContent: self morph. + oldRatio := self morph extent y / self morph extent x. + self assert: [self does: self morph answerSideRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st deleted file mode 100644 index b3894bc..0000000 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st +++ /dev/null @@ -1,8 +0,0 @@ -submorph tests -testSubmorphsOnResize - - self slide addContent: self morph. - - self assertDeviatesLessThan: 0.05 onSlideResize: [self morph extent x / self morph extent y]. - self assertDeviatesLessThan: 0.1@0.1 onSlideResize: [self morph extent / self slide extent]. - self assertDeviatesLessThan: 0.2@0.2 onSlideResize: [self morph position - self slide position / self slide extent] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index e42dc8c..bc1b7a6 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -24,5 +24,7 @@ "testSlideResizeToFit" : "LM 5/18/2018 19:20", "testSlideResizeToFitKeepsAspectRatio" : "MK 7/13/2018 18:08", "testSlideResizeToFitKeepsPosition" : "MK 7/13/2018 18:08", - "testSubmorphsOnResize" : "LM 6/6/2018 18:09", + "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:46", + "testSubmorphRelativeSizeOnResize" : "LB 7/20/2018 14:44", + "testSubmorphSideRatioOnResize" : "LB 7/20/2018 14:28", "testTriggerContextMenu" : "LB 7/13/2018 18:39" } } diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st index c76fcc6..3408074 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st @@ -1,6 +1,5 @@ -support +inputs click: aMouseButton at: aPoint self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). - "(self hand instVarNamed: #mouseClickState put: nil)." self hand handleEvent: (self mouse: aMouseButton upAt: aPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st new file mode 100644 index 0000000..7476bd9 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st @@ -0,0 +1,4 @@ +helper functions +do: onePoint and: otherPoint answerRatio: aPoint + + ^ (onePoint - (otherPoint * aPoint)) abs < (1@1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st new file mode 100644 index 0000000..fbb3a16 --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st @@ -0,0 +1,4 @@ +helper functions +does: aPoint answerRatio: aNumber + + ^ (aPoint y - (aPoint x * aNumber)) abs < 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerSideRatio..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerSideRatio..st index 1b8dacc..a1f9dfc 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerSideRatio..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerSideRatio..st @@ -1,4 +1,4 @@ helper functions does: aMorph answerSideRatio: aNumber - ^ (aMorph extent y - (aMorph extent x * aNumber)) abs < 1 \ No newline at end of file + ^ self does: aMorph extent answerRatio: aNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st index 471b7c9..29397f6 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st @@ -1,4 +1,4 @@ -support +inputs drag: aMouseButton from: aPoint to: anotherPoint self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st index 84b9cf9..0916d6c 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st @@ -1,4 +1,4 @@ -support +inputs dragndrop: aMouseButton from: aPoint to: anotherPoint self drag: aMouseButton from: aPoint to: anotherPoint. diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st index 76bc5e7..dd0c0f5 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st @@ -1,4 +1,4 @@ -support +inputs keystroke: char at: point ^ KeyboardEvent new diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st index 04d9b3b..0f0ddb8 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st @@ -1,4 +1,4 @@ -support +inputs mouse: aButtonCode does: aType at: aPoint ^ MouseButtonEvent new diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st index 25709d4..dc34dee 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st @@ -1,4 +1,4 @@ -support +inputs mouse: aButtonCode downAt: aPoint ^ self mouse: aButtonCode does: #mouseDown at: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st index b03fd8f..8702fe8 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st @@ -1,4 +1,4 @@ -support +inputs mouse: aButtonCode upAt: aPoint ^ self mouse: aButtonCode does: #mouseUp at: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st index 5f17634..268f09c 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st @@ -1,4 +1,4 @@ -support +inputs mouseMove: aMouseButton from: aPoint to: anotherPoint ^ MouseMoveEvent new diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st index 0f9c829..e721069 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st @@ -1,4 +1,4 @@ -support +inputs pressKey: char at: point self hand handleEvent: (self keystroke: char at: point) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index 048920b..3d2849a 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -5,8 +5,10 @@ "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", "assert:deviateLessThan:onResizeOf:" : "LB 7/13/2018 19:01", "assert:onResizeOf:" : "LB 7/13/2018 18:48", - "click:at:" : "LB 7/13/2018 22:10", - "does:answerSideRatio:" : "LB 6/6/2018 15:10", + "click:at:" : "LB 7/20/2018 14:11", + "do:and:answerRatio:" : "LB 7/20/2018 14:45", + "does:answerRatio:" : "LB 7/20/2018 14:24", + "does:answerSideRatio:" : "LB 7/20/2018 14:24", "drag:from:to:" : "LB 7/13/2018 18:44", "dragndrop:from:to:" : "LB 7/13/2018 18:44", "getNew:createdIn:" : "LB 6/15/2018 16:46", From 5d184d6cb5844a96d8aeefdcdcdde3c8253df58e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 15:16:42 +0200 Subject: [PATCH 031/112] Split slide submorph test in those that need a random morph outside the the slide and thos that need it inside --- .../PSSlideAndMorphTest.class/README.md | 0 .../instance/assert.onResizeToFit..st | 0 .../instance/doForDifferentSizes..st | 0 .../instance/morph..st | 0 .../instance/morph.st | 0 .../instance/setUp.st | 7 ++++ .../instance/tearDown.st | 0 .../instance/testDroppingCreatesContainer.st | 2 +- .../instance/testSlideDropping.st | 3 +- .../instance/testSlideResizeToFit.st | 0 .../testSlideResizeToFitKeepsPosition.st | 0 .../testSlideResizeToFitKeepsSideRatio.st | 9 ++++ .../instance/testTriggerContextMenu.st | 1 - .../methodProperties.json | 16 ++++++++ .../PSSlideAndMorphTest.class/properties.json | 14 +++++++ .../instance/container.st | 4 ++ .../instance/setUp.st | 3 +- .../instance/testContainerResizing.st | 6 +-- .../testContainerResizingCorner.offset..st | 8 ++-- .../instance/testContextMenu.st | 3 +- .../instance/testDuplicateChild.st | 6 +-- .../instance/testGrabbing.st | 5 +-- ...testLeavePresentationModeEnablesHandles.st | 1 - .../testPresentationModeRemovesHandle.st | 1 - .../instance/testResizeHandleMagnetic.st | 8 ++-- .../instance/testResizeHandleNonMagnetic.st | 5 +-- .../instance/testSlideContainerExtent.st | 4 ++ .../instance/testSlideContainerPosition.st | 11 +---- .../testSlideResizeToFitKeepsAspectRatio.st | 9 ---- .../testSubmorphRelativePositionOnResize.st | 1 - .../testSubmorphRelativeSizeOnResize.st | 1 - .../instance/testSubmorphSideRatioOnResize.st | 1 - .../methodProperties.json | 41 ++++++++----------- .../PSSlideSubmorphTest.class/properties.json | 4 +- 34 files changed, 91 insertions(+), 83 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/README.md rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/assert.onResizeToFit..st (100%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/doForDifferentSizes..st (100%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/morph..st (100%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/morph.st (100%) create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/tearDown.st (100%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/testDroppingCreatesContainer.st (90%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/testSlideDropping.st (94%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/testSlideResizeToFit.st (100%) rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/testSlideResizeToFitKeepsPosition.st (100%) create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st rename packages/Presenter-Tests.package/{PSSlideSubmorphTest.class => PSSlideAndMorphTest.class}/instance/testTriggerContextMenu.st (99%) create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/properties.json create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st delete mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/README.md b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/assert.onResizeToFit..st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/assert.onResizeToFit..st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/assert.onResizeToFit..st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/assert.onResizeToFit..st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/doForDifferentSizes..st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/doForDifferentSizes..st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/doForDifferentSizes..st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/doForDifferentSizes..st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/morph..st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/morph..st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/morph..st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/morph..st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/morph.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/morph.st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/morph.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/morph.st diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st new file mode 100644 index 0000000..44af3b4 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st @@ -0,0 +1,7 @@ +running +setUp + + super setUp. + self morph: (Morph new openInWorld: self world). + self morph position: self slide position + (10@10) + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/tearDown.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/tearDown.st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/tearDown.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/tearDown.st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st similarity index 90% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st index 12a731c..9c9c463 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDroppingCreatesContainer.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st @@ -1,4 +1,4 @@ -submorph tests +dropping tests testDroppingCreatesContainer self slide acceptDroppingMorph: self morph event: nil. diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st similarity index 94% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st index 3fedff6..f8af756 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideDropping.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st @@ -1,8 +1,7 @@ -submorph tests +dropping tests testSlideDropping | morphExtent morphPosition | - morphPosition := self morph position. morphExtent := self morph extent. diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFit.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFit.st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFit.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFit.st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsPosition.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsPosition.st similarity index 100% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsPosition.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsPosition.st diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st new file mode 100644 index 0000000..b594c2c --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st @@ -0,0 +1,9 @@ +resizeToFit tests +testSlideResizeToFitKeepsSideRatio + + self doForDifferentSizes: [:width :height | + | sideRatio | + self morph extent: width @ height. + sideRatio := self morph extent y / self morph extent x. + self slide resizeMorphToFit: self morph. + self assert: (self does: self morph answerSideRatio: sideRatio)] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st similarity index 99% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st index ef6ffa6..7e111cf 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testTriggerContextMenu.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st @@ -3,7 +3,6 @@ testTriggerContextMenu | container | container := (PSMockContentContainer for: self morph). - self slide addMorph: container fullFrame: (self slide layoutFrameFor: container). self click: MouseEvent yellowButton at: container center. self assert: container menuCreated equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json new file mode 100644 index 0000000..235932e --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json @@ -0,0 +1,16 @@ +{ + "class" : { + }, + "instance" : { + "assert:onResizeToFit:" : "MK 7/13/2018 18:07", + "doForDifferentSizes:" : "MK 7/13/2018 18:07", + "morph" : "LB 7/20/2018 15:04", + "morph:" : "LB 7/20/2018 15:04", + "setUp" : "LB 7/20/2018 15:05", + "tearDown" : "LB 6/1/2018 17:51", + "testDroppingCreatesContainer" : "LB 7/20/2018 15:07", + "testSlideDropping" : "LB 7/20/2018 15:07", + "testSlideResizeToFit" : "LB 7/20/2018 15:08", + "testSlideResizeToFitKeepsPosition" : "LB 7/20/2018 15:08", + "testSlideResizeToFitKeepsSideRatio" : "LB 7/20/2018 15:08", + "testTriggerContextMenu" : "LB 7/20/2018 15:09" } } diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/properties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/properties.json new file mode 100644 index 0000000..608a292 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Presenter-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "morph" ], + "name" : "PSSlideAndMorphTest", + "pools" : [ + ], + "super" : "PSOnSlideTest", + "type" : "normal" } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st new file mode 100644 index 0000000..88195e0 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st @@ -0,0 +1,4 @@ +accessing +container + + ^ self morph owner \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st index 44af3b4..84d9e16 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st @@ -2,6 +2,5 @@ running setUp super setUp. - self morph: (Morph new openInWorld: self world). - self morph position: self slide position + (10@10) + self slide addContent: self morph \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st index 5c1a8a0..1df8f86 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st @@ -1,12 +1,10 @@ container tests testContainerResizing - | container topLeft targetPoint event| - self slide addContent: self morph. - container := self morph owner. + | topLeft targetPoint event| topLeft := self morph topLeft. targetPoint := self morph bottomRight + (20 @ 20). event := MouseButtonEvent new setPosition: targetPoint. - container dragBottomRightEvent: event fromHandle: nil. + self container dragBottomRightEvent: event fromHandle: nil. self slide fullBounds. self assert: self morph bounds = (topLeft corner: targetPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st index 9128212..4e43f95 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st @@ -1,12 +1,10 @@ container tests testContainerResizingCorner: aSymbol offset: aPoint - | container oldExtent targetPoint event| - self slide addContent: self morph. - container := self morph owner. + | oldExtent targetPoint event| oldExtent := self morph extent. - targetPoint := (container resizeHandles at: aSymbol) center + aPoint. + targetPoint := (self container resizeHandles at: aSymbol) center + aPoint. event := MouseButtonEvent new setPosition: targetPoint. - container dragCorner: aSymbol event: event fromHandle: nil. + self container dragCorner: aSymbol event: event fromHandle: nil. self slide fullBounds. self assert: self morph extent equals: oldExtent + aPoint abs \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st index 5a9251d..9067453 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st @@ -1,5 +1,4 @@ context menu tests testContextMenu - self slide addContent: self morph. - self testContextMenuContent: self morph equals: self morph owner defaultContextMenuContent \ No newline at end of file + self testContextMenuContent: self morph equals: self container defaultContextMenuContent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st index 983fd10..b33cc8b 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st @@ -1,8 +1,6 @@ container tests testDuplicateChild - | container copy | - self slide addContent: self morph. - container := self morph owner. - copy := container copyChildToHand. + | copy | + copy := self container copyChildToHand. self assert: (self hand submorphs includes: copy) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st index 31ebfe1..f094764 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testGrabbing.st @@ -1,8 +1,5 @@ container tests testGrabbing - | container | - self slide addContent: self morph. - container := self morph owner. - container grabChild. + self container grabChild. self assert: self morph owner equals: self hand \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st index 995ca9b..06463cf 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st @@ -2,7 +2,6 @@ presentation mode tests testLeavePresentationModeEnablesHandles self slide - addContent: self morph; enablePresentationMode; disablePresentationMode; submorphsDo: [:each | diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st index 1d7718c..3cc0cbd 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st @@ -2,7 +2,6 @@ presentation mode tests testPresentationModeRemovesHandle self slide - addContent: self morph; enablePresentationMode; submorphsDo: [:each | self assert: each hasHandles not] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st index ff3e205..24f94e1 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st @@ -1,11 +1,9 @@ container tests testResizeHandleMagnetic - | container bottomRightFractions | + | bottomRightFractions | self slide model magneticRasterActive: true. - self slide addContent: self morph. - container := self morph owner. self drag: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). self slide fullBounds. - bottomRightFractions := container layoutFrame rightFraction @ container layoutFrame bottomFraction. - self assert: (bottomRightFractions roundTo: container rasterResolution) + bottomRightFractions := self container layoutFrame rightFraction @ self container layoutFrame bottomFraction. + self assert: (bottomRightFractions roundTo: self container rasterResolution) equals: bottomRightFractions \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st index 7a7ec09..f3717e6 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st @@ -1,8 +1,7 @@ container tests testResizeHandleNonMagnetic - | container topLeft targetPoint | - self slide addContent: self morph. - container := self morph owner. + + | topLeft targetPoint | topLeft := self morph topLeft. targetPoint := self morph bottomRight + (20 @ 20). self drag: MouseEvent redButton from: self morph bottomRight to: targetPoint. diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st new file mode 100644 index 0000000..a2a15fc --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st @@ -0,0 +1,4 @@ +container tests +testSlideContainerExtent + + self assert: self container extent = self morph extent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st index 943cd90..51d7f99 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st @@ -1,11 +1,4 @@ -submorph tests +container tests testSlideContainerPosition - | container morphPosition | - morphPosition := self morph position. - - self slide addContent: self morph. - container := self morph owner. - - self assert: container position = morphPosition. - self assert: container extent = self morph extent \ No newline at end of file + self assert: self container position = self morph position \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st deleted file mode 100644 index 5c35278..0000000 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideResizeToFitKeepsAspectRatio.st +++ /dev/null @@ -1,9 +0,0 @@ -resizeToFit tests -testSlideResizeToFitKeepsAspectRatio - - self doForDifferentSizes: [:width :height | - | aspectRatio | - self morph extent: width @ height. - aspectRatio := self morph extent y / self morph extent x. - self slide resizeMorphToFit: self morph. - self assert: (self does: self morph answerSideRatio: aspectRatio)] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st index dbf8f1c..b0293b9 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st @@ -2,6 +2,5 @@ submorph tests testSubmorphRelativePositionOnResize | oldRatio | - self slide addContent: self morph. oldRatio := self morph position - self slide position / self morph extent. self assert: [self do: self morph position - self slide position and: self morph extent answerRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st index b525c22..ca4d510 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st @@ -2,6 +2,5 @@ submorph tests testSubmorphRelativeSizeOnResize | oldRatio | - self slide addContent: self morph. oldRatio := self morph extent / self slide extent. self assert: [self do: self morph extent and: self slide extent answerRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st index e98933a..a69349c 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphSideRatioOnResize.st @@ -2,6 +2,5 @@ submorph tests testSubmorphSideRatioOnResize | oldRatio | - self slide addContent: self morph. oldRatio := self morph extent y / self morph extent x. self assert: [self does: self morph answerSideRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index bc1b7a6..c44101b 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -2,29 +2,20 @@ "class" : { }, "instance" : { - "assert:onResizeToFit:" : "MK 7/13/2018 18:07", - "doForDifferentSizes:" : "MK 7/13/2018 18:07", - "morph" : "LB 5/18/2018 16:11", - "morph:" : "LB 5/18/2018 16:11", - "setUp" : "WoC 6/15/2018 20:15", - "tearDown" : "LB 6/1/2018 17:51", - "testContainerResizing" : "LB 7/6/2018 16:33", + "container" : "LB 7/20/2018 14:51", + "setUp" : "LB 7/20/2018 15:05", + "testContainerResizing" : "LB 7/20/2018 14:51", "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", - "testContainerResizingCorner:offset:" : "LB 7/6/2018 15:40", - "testContextMenu" : "WoC 6/15/2018 20:13", - "testDroppingCreatesContainer" : "MK 7/13/2018 18:07", - "testDuplicateChild" : "LB 7/13/2018 17:25", - "testGrabbing" : "LB 7/13/2018 17:04", - "testLeavePresentationModeEnablesHandles" : "LM 6/8/2018 20:11", - "testPresentationModeRemovesHandle" : "LM 6/8/2018 20:14", - "testResizeHandleMagnetic" : "LB 7/5/2018 23:06", - "testResizeHandleNonMagnetic" : "LB 7/5/2018 22:58", - "testSlideContainerPosition" : "LB 5/23/2018 15:47", - "testSlideDropping" : "MK 7/13/2018 18:08", - "testSlideResizeToFit" : "LM 5/18/2018 19:20", - "testSlideResizeToFitKeepsAspectRatio" : "MK 7/13/2018 18:08", - "testSlideResizeToFitKeepsPosition" : "MK 7/13/2018 18:08", - "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:46", - "testSubmorphRelativeSizeOnResize" : "LB 7/20/2018 14:44", - "testSubmorphSideRatioOnResize" : "LB 7/20/2018 14:28", - "testTriggerContextMenu" : "LB 7/13/2018 18:39" } } + "testContainerResizingCorner:offset:" : "LB 7/20/2018 14:52", + "testContextMenu" : "LB 7/20/2018 15:06", + "testDuplicateChild" : "LB 7/20/2018 14:52", + "testGrabbing" : "LB 7/20/2018 14:52", + "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", + "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", + "testResizeHandleMagnetic" : "LB 7/20/2018 14:52", + "testResizeHandleNonMagnetic" : "LB 7/20/2018 14:53", + "testSlideContainerExtent" : "LB 7/20/2018 15:15", + "testSlideContainerPosition" : "LB 7/20/2018 15:14", + "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", + "testSubmorphRelativeSizeOnResize" : "LB 7/20/2018 14:59", + "testSubmorphSideRatioOnResize" : "LB 7/20/2018 14:59" } } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json index 08dfdca..4cf7138 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json @@ -6,9 +6,9 @@ ], "commentStamp" : "", "instvars" : [ - "morph" ], + ], "name" : "PSSlideSubmorphTest", "pools" : [ ], - "super" : "PSOnSlideTest", + "super" : "PSSlideAndMorphTest", "type" : "normal" } From becbdf2885119c65834321893aa53bd597cd91cf Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 15:32:11 +0200 Subject: [PATCH 032/112] Fixed small mock file stream bug --- .../PSMockByteStream.class/class/examplePngBytes.st | 2 +- .../PSMockByteStream.class/instance/reset.st | 2 +- .../PSMockByteStream.class/methodProperties.json | 4 ++-- .../instance/assertDeviatesLessThan.onSlideResize..st | 4 ---- .../PSOnSlideTest.class/methodProperties.json | 1 - .../instance/assert.deviateLessThan.onResizeOf..st | 6 ------ .../PSUITestCase.class/methodProperties.json | 1 - 7 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st delete mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st index 1a93a3f..eab36ab 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st @@ -1,4 +1,4 @@ data examplePngBytes - ^ #(0 137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 4 0 0 0 4 8 2 0 0 0 38 147 9 41 0 0 0 1 115 82 71 66 0 174 206 28 233 0 0 0 4 103 65 77 65 0 0 177 143 11 252 97 5 0 0 0 9 112 72 89 115 0 0 36 232 0 0 36 232 1 130 99 5 28 0 0 0 28 73 68 65 84 24 87 99 120 43 163 2 68 255 193 0 149 3 161 148 54 250 0 17 18 103 163 15 0 98 205 33 25 33 239 53 132 0 0 0 0 73 69 78 68 174 66 96 130) asByteArray \ No newline at end of file + ^ #(137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 4 0 0 0 4 8 2 0 0 0 38 147 9 41 0 0 0 1 115 82 71 66 0 174 206 28 233 0 0 0 4 103 65 77 65 0 0 177 143 11 252 97 5 0 0 0 9 112 72 89 115 0 0 36 232 0 0 36 232 1 130 99 5 28 0 0 0 28 73 68 65 84 24 87 99 120 43 163 2 68 255 193 0 149 3 161 148 54 250 0 17 18 103 163 15 0 98 205 33 25 33 239 53 132 0 0 0 0 73 69 78 68 174 66 96 130) asByteArray \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st index 21b3ca4..7c0281d 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/reset.st @@ -1,4 +1,4 @@ positioning reset - position := 1 \ No newline at end of file + position := 0 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json index ac51718..ff0aa00 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "examplePngBytes" : "LB 7/13/2018 16:12", + "examplePngBytes" : "LB 7/20/2018 15:28", "newPng" : "LB 7/13/2018 16:13" }, "instance" : { "atEnd" : "LB 7/13/2018 15:45", @@ -10,6 +10,6 @@ "initialize" : "LB 7/13/2018 16:13", "name" : "LB 7/13/2018 16:10", "name:" : "LB 7/13/2018 16:10", - "reset" : "LB 7/13/2018 15:51", + "reset" : "LB 7/20/2018 15:30", "setToEnd" : "LB 7/13/2018 16:04", "skip:" : "LB 7/13/2018 15:45" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st deleted file mode 100644 index a72f3da..0000000 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertDeviatesLessThan.onSlideResize..st +++ /dev/null @@ -1,4 +0,0 @@ -slide resizing -assertDeviatesLessThan: aComparable onSlideResize: aBlock - - self assert: aBlock deviateLessThan: aComparable onResizeOf: self slideContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index b389c7e..2bcc156 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -2,7 +2,6 @@ "class" : { }, "instance" : { - "assertDeviatesLessThan:onSlideResize:" : "LB 7/13/2018 19:01", "collectMenuContentFrom:" : "LM 6/15/2018 19:18", "collectMenuItemContentsFrom:" : "LM 6/15/2018 19:18", "setUp" : "LB 7/13/2018 18:13", diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st deleted file mode 100644 index 4f449e1..0000000 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.deviateLessThan.onResizeOf..st +++ /dev/null @@ -1,6 +0,0 @@ -helper functions -assert: aBlock deviateLessThan: aComparable onResizeOf: aMorph - - | oldValue | - oldValue := aBlock value. - self assert: [(aBlock value - oldValue / oldValue) abs < aComparable] onResizeOf: aMorph \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index 3d2849a..c9c6c97 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -3,7 +3,6 @@ "resources" : "LM 6/15/2018 18:41" }, "instance" : { "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", - "assert:deviateLessThan:onResizeOf:" : "LB 7/13/2018 19:01", "assert:onResizeOf:" : "LB 7/13/2018 18:48", "click:at:" : "LB 7/20/2018 14:11", "do:and:answerRatio:" : "LB 7/20/2018 14:45", From 71923b1b31c46d8035c14e61f1935f16cb9561be Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Fri, 20 Jul 2018 16:00:04 +0200 Subject: [PATCH 033/112] Refactoring: move loading to PSPresentationLoader --- .../instance/createSlideBack.st | 4 ++++ .../instance/initialize.st | 3 ++- .../methodProperties.json | 3 ++- .../PSPresentationLoader.class/README.md | 0 .../instance/abandonMorph..st | 2 +- .../instance/checkSlideDirectory..st | 2 +- .../instance/checkSlideDirectoryName..st | 2 +- .../instance/errorReport..st | 4 ++++ .../instance/errorReport.st | 4 ++++ .../instance/initialize.st | 6 +++++ .../instance/isValidPresentationDirectory..st | 2 +- .../instance/loadMorphFromFile..st | 2 +- .../instance/loadMorphFromStream..st | 2 +- .../instance/loadMorphFromStream.testIn..st | 2 +- .../loadPresentationFromDirectory..st | 7 ++++++ .../instance/loadPresentationUnchecked..st | 13 +++++++++++ .../instance/loadSlideFromDirectory..st | 4 ++-- .../instance/morph.survivesOneCycleIn..st | 2 +- .../instance/presentation..st | 4 ++++ .../instance/presentation.st | 4 ++++ .../instance/slidesDirectoryName.st | 4 ++++ .../instance/sortedMorphFiles..st | 2 +- .../instance/sortedSlideSubdirectories..st | 7 ++++++ .../methodProperties.json | 23 +++++++++++++++++++ .../properties.json | 15 ++++++++++++ .../instance/buildWith..st | 2 +- .../loadPresentationFromDirectory..st | 9 +++++--- .../instance/loadPresentationUnchecked..st | 18 --------------- .../instance/sortedSlideSubdirectories..st | 10 -------- .../updatePresentation.withErrorReport..st | 8 +++++++ .../updateSlideMiniaturesCompletely.st | 11 +++++++++ .../methodProperties.json | 18 ++++----------- .../PSSlide.class/instance/isMagnetic.st | 2 +- .../PSSlide.class/methodProperties.json | 2 +- .../instance/isMagnetic.st | 4 ++++ .../methodProperties.json | 1 + .../PSPresentationLoaderTest.class/README.md | 0 .../instance/loader..st | 4 ++++ .../instance/loader.st | 4 ++++ .../mockEmptyPresentationDirectory.st | 2 +- .../instance/morphLoadingStreamFor..st | 2 +- .../instance/setUp.st | 5 ++++ .../instance/testCanLoadEmptyPresentation.st | 7 +++--- .../instance/testCanLoadEmptySlide.st | 4 ++-- .../testEmptyPresentationDirectoryIsValid.st | 4 ++-- .../instance/testErrorReportExistsPerSlide.st | 7 +++--- .../instance/testInvalidLoadReturnsNil.st | 4 ++++ .../testInvalidSlideDirectoryNames.st | 4 ++-- .../instance/testMissingSlidesDirectory.st | 4 ++-- .../instance/testMorphLoadIsValid.st | 4 ++-- .../instance/testMorphNameIsNotNumber.st | 4 ++-- .../instance/testMorphNameIsNumber.st | 4 ++-- .../instance/testSlidesDirectoryIsEmpty.st | 6 +++++ .../instance/testSortMorphFiles.st | 7 ++++++ .../instance/validMorphFileData.st | 2 +- .../methodProperties.json | 22 ++++++++++++++++++ .../properties.json | 14 +++++++++++ .../instance/testInvalidLoadReturnsNil.st | 4 ---- .../instance/testSingleMorphOnSlide.st | 17 -------------- .../instance/testSlidesDirectoryIsEmpty.st | 6 ----- .../instance/testSortMorphFiles.st | 7 ------ .../methodProperties.json | 16 ------------- 62 files changed, 238 insertions(+), 134 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/README.md rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/abandonMorph..st (75%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/checkSlideDirectory..st (89%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/checkSlideDirectoryName..st (80%) create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport..st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport.st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/isValidPresentationDirectory..st (93%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/loadMorphFromFile..st (92%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/loadMorphFromStream..st (79%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/loadMorphFromStream.testIn..st (93%) create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/loadSlideFromDirectory..st (80%) rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/morph.survivesOneCycleIn..st (96%) create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation..st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation.st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st rename packages/Presenter-Core.package/{PSPresentationTool.class => PSPresentationLoader.class}/instance/sortedMorphFiles..st (85%) create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/properties.json delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedSlideSubdirectories..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/updatePresentation.withErrorReport..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st create mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/isMagnetic.st create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/README.md create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader..st create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader.st rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/mockEmptyPresentationDirectory.st (90%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/morphLoadingStreamFor..st (85%) create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testCanLoadEmptyPresentation.st (57%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testCanLoadEmptySlide.st (53%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testEmptyPresentationDirectoryIsValid.st (54%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testErrorReportExistsPerSlide.st (56%) create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testInvalidSlideDirectoryNames.st (78%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testMissingSlidesDirectory.st (50%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testMorphLoadIsValid.st (85%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testMorphNameIsNotNumber.st (60%) rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/testMorphNameIsNumber.st (62%) create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st rename packages/Presenter-Tests.package/{PSPresentationToolTest.class => PSPresentationLoaderTest.class}/instance/validMorphFileData.st (99%) create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/properties.json delete mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st delete mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSingleMorphOnSlide.st delete mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesDirectoryIsEmpty.st delete mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSortMorphFiles.st diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st new file mode 100644 index 0000000..5893f92 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st @@ -0,0 +1,4 @@ +as yet unclassified +createSlideBack + + ^ self createSlideAfter: self slides size \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st b/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st index 0622707..fd5989e 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/initialize.st @@ -1,4 +1,5 @@ initialize-release initialize - self slides: OrderedCollection new \ No newline at end of file + self slides: OrderedCollection new. + self minimumSlideCount timesRepeat: [self createSlideBack] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json index 851e905..0ce8a01 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json @@ -9,12 +9,13 @@ "clearSubdirectory:in:" : "LM 7/13/2018 18:32", "createDirectory:in:" : "LM 7/13/2018 18:32", "createSlideAfter:" : "LM 7/13/2018 19:04", + "createSlideBack" : "MK 7/20/2018 15:09", "defaultDirectory" : "LM 7/13/2018 18:35", "defaultDirectoryName" : "LM 7/13/2018 18:35", "deleteSlideAt:" : "LM 7/13/2018 17:37", "exportAsPNGsIn:" : "LM 7/13/2018 18:37", "indexOf:" : "LM 7/13/2018 17:55", - "initialize" : "LM 7/13/2018 17:14", + "initialize" : "MK 7/20/2018 15:17", "minimumSlideCount" : "LM 7/13/2018 17:16", "moveSlideAt:to:" : "LM 7/13/2018 18:27", "overwriteQuestion" : "LM 7/13/2018 18:41", diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/README.md b/packages/Presenter-Core.package/PSPresentationLoader.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/abandonMorph..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st similarity index 75% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/abandonMorph..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st index cec0f9c..03a5f74 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/abandonMorph..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified abandonMorph: aMorph aMorph ifNotNil: [aMorph abandon]. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/checkSlideDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st similarity index 89% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/checkSlideDirectory..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st index 5b04b96..26aa864 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/checkSlideDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified checkSlideDirectory: aDirectory ^ (self checkSlideDirectoryName: aDirectory localName) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/checkSlideDirectoryName..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st similarity index 80% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/checkSlideDirectoryName..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st index 280dc87..b1ba120 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/checkSlideDirectoryName..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified checkSlideDirectoryName: aDirectoryName ^ aDirectoryName matchesRegex: 'slide[0-9]+' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport..st new file mode 100644 index 0000000..09b508a --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport..st @@ -0,0 +1,4 @@ +accessing +errorReport: aDictionary + + errorReport := aDictionary \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport.st new file mode 100644 index 0000000..ff76934 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/errorReport.st @@ -0,0 +1,4 @@ +accessing +errorReport + + ^ errorReport diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st new file mode 100644 index 0000000..989230d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st @@ -0,0 +1,6 @@ +initialize-release +initialize + + self + errorReport: Dictionary new; + presentation: PSPresentation new \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/isValidPresentationDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st similarity index 93% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/isValidPresentationDirectory..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st index be302a9..5d83058 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/isValidPresentationDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified isValidPresentationDirectory: aDirectory | slidesDirectory | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromFile..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st similarity index 92% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromFile..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st index 284d686..175ad07 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromFile..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified loadMorphFromFile: aFileDirectory "This was copied from Morph(class)>>#fromFileName:" ^ self loadMorphFromStream: (MultiByteBinaryOrTextStream with: ((FileStream readOnlyFileNamed: aFileDirectory fullName) binary contentsOfEntireFile)) binary reset \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st similarity index 79% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st index 67a48fe..a6cf0a1 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified loadMorphFromStream: aStream ^ self loadMorphFromStream: aStream testIn: World \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream.testIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st similarity index 93% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream.testIn..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st index 2e13acb..5e7c8e6 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream.testIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified loadMorphFromStream: aStream testIn: aWorld | morph | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st new file mode 100644 index 0000000..2dd761c --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st @@ -0,0 +1,7 @@ +as yet unclassified +loadPresentationFromDirectory: aDirectory + + self initialize. + ^ (self isValidPresentationDirectory: aDirectory) + ifTrue: [self loadPresentationUnchecked: aDirectory] + ifFalse: [nil] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st new file mode 100644 index 0000000..ddc5f4e --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st @@ -0,0 +1,13 @@ +as yet unclassified +loadPresentationUnchecked: aDirectory + + | slidesDirectory sortedDirectories | + slidesDirectory := aDirectory / self slidesDirectoryName. + sortedDirectories := self sortedSlideSubdirectories: slidesDirectory. + sortedDirectories do: [:each | + | slide | + slide := self loadSlideFromDirectory: slidesDirectory / each. + self errorReport at: each + put: (slidesDirectory / each) fileNames size - slide submorphs size]. + self presentation minimumSlideCount timesRepeat: [self presentation deleteSlideAt: 1]. + ^ self presentation \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st similarity index 80% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st index 839d4d2..2316e45 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st @@ -1,8 +1,8 @@ -presentation loading +as yet unclassified loadSlideFromDirectory: aDirectory | slide sortedMorphFiles | - slide := self createSlide. + slide := self presentation createSlideBack. sortedMorphFiles := self sortedMorphFiles: aDirectory fileNames. sortedMorphFiles do: [:each | (self loadMorphFromFile: aDirectory / each) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/morph.survivesOneCycleIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st similarity index 96% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/morph.survivesOneCycleIn..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st index 31eb897..5f4d522 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/morph.survivesOneCycleIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified morph: aMorph survivesOneCycleIn: aWorld "Some morphs may be loaded successfully but throw errors every world cycle therefore crashing the image." "World doOneCycle consumes all errors and opens the corresponding debuggers. Therefore we cannot do normal error checking but we can compare the debuggers." diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation..st new file mode 100644 index 0000000..ef66eda --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation..st @@ -0,0 +1,4 @@ +accessing +presentation: aPSPresentation + + presentation := aPSPresentation diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation.st new file mode 100644 index 0000000..3494fa4 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/presentation.st @@ -0,0 +1,4 @@ +accessing +presentation + + ^ presentation diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st new file mode 100644 index 0000000..6a52b0c --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st @@ -0,0 +1,4 @@ +as yet unclassified +slidesDirectoryName + + ^ 'slides' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedMorphFiles..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st similarity index 85% rename from packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedMorphFiles..st rename to packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st index dfff255..c1dbc56 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedMorphFiles..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st @@ -1,4 +1,4 @@ -presentation loading +as yet unclassified sortedMorphFiles: anOrderedCollection ^ anOrderedCollection sorted: [:a :b | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st new file mode 100644 index 0000000..801e821 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st @@ -0,0 +1,7 @@ +as yet unclassified +sortedSlideSubdirectories: aFileDirectory + + | sortedDirectories | + sortedDirectories := OrderedCollection newFrom: aFileDirectory directoryNames. + ^ sortedDirectories sorted: [:a :b | + a splitInteger second < b splitInteger second] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json new file mode 100644 index 0000000..c735896 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -0,0 +1,23 @@ +{ + "class" : { + }, + "instance" : { + "abandonMorph:" : "MK 7/20/2018 14:56", + "checkSlideDirectory:" : "MK 7/20/2018 15:00", + "checkSlideDirectoryName:" : "MK 7/20/2018 15:00", + "errorReport" : "MK 7/20/2018 14:20", + "errorReport:" : "MK 7/20/2018 14:20", + "initialize" : "MK 7/20/2018 14:23", + "isValidPresentationDirectory:" : "MK 7/20/2018 14:59", + "loadMorphFromFile:" : "MK 7/20/2018 14:53", + "loadMorphFromStream:" : "MK 7/20/2018 14:54", + "loadMorphFromStream:testIn:" : "MK 7/20/2018 14:54", + "loadPresentationFromDirectory:" : "MK 7/20/2018 14:43", + "loadPresentationUnchecked:" : "MK 7/20/2018 14:43", + "loadSlideFromDirectory:" : "MK 7/20/2018 15:10", + "morph:survivesOneCycleIn:" : "MK 7/20/2018 14:56", + "presentation" : "MK 7/20/2018 14:20", + "presentation:" : "MK 7/20/2018 14:20", + "slidesDirectoryName" : "MK 7/20/2018 14:45", + "sortedMorphFiles:" : "MK 7/20/2018 14:48", + "sortedSlideSubdirectories:" : "MK 7/20/2018 14:52" } } diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json new file mode 100644 index 0000000..823c5a6 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "Presenter-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "errorReport", + "presentation" ], + "name" : "PSPresentationLoader", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st index 9307d50..aa49d6e 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st @@ -19,7 +19,7 @@ buildWith: builder window := builder build: windowSpec. self createSlideContainerIn: (builder widgetAt: #SlideViewport). - self createSlide. + self selectSlideNumber: 1. self window: window. self afterBuildWith: builder. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st index 450ad0b..f297ceb 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st @@ -1,7 +1,10 @@ presentation loading loadPresentationFromDirectory: aDirectory - (self isValidPresentationDirectory: aDirectory) - ifTrue: [self showErrorReport: (self loadPresentationUnchecked: aDirectory)] - ifFalse: [UIManager default inform: 'I could not load the presentation. + | loader | + loader := PSPresentationLoader new. + (loader loadPresentationFromDirectory: aDirectory) + ifNotNil: [:presentation | + self updatePresentation: presentation withErrorReport: loader errorReport] + ifNil: [UIManager default inform: 'I could not load the presentation. It''s directory might be corrupted.'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st deleted file mode 100644 index 778b716..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st +++ /dev/null @@ -1,18 +0,0 @@ -presentation loading -loadPresentationUnchecked: aDirectory - - | slidesDirectory errorReport sortedDirectories | - errorReport := Dictionary new. - self deleteAllSlides. "will remove all slides up to the minim slide count" - slidesDirectory := aDirectory / self slidesDirectoryName. - sortedDirectories := self sortedSlideSubdirectories: slidesDirectory. - sortedDirectories do: [:each | - | slide | - slide := self loadSlideFromDirectory: slidesDirectory / each. - slide fullBounds. - self updateCurrentMiniature. - errorReport at: each - put: (slidesDirectory / each) fileNames size - slide submorphs size]. - self minimumSlideCount timesRepeat: [self deleteSlideAt: 1]. - self selectSlideNumber: 1. - ^ errorReport \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedSlideSubdirectories..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedSlideSubdirectories..st deleted file mode 100644 index b0b5120..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/sortedSlideSubdirectories..st +++ /dev/null @@ -1,10 +0,0 @@ -presentation loading -sortedSlideSubdirectories: aFileDirectory - - | sortedDirectories | - sortedDirectories := OrderedCollection new. - sortedDirectories := sortedDirectories, (OrderedCollection newFrom: aFileDirectory directoryNames). - sortedDirectories := sortedDirectories collect: [:each | - each splitInteger second asNumber ]. - sortedDirectories sort. - ^ sortedDirectories collect: [:each | 'slide', each] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/updatePresentation.withErrorReport..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/updatePresentation.withErrorReport..st new file mode 100644 index 0000000..6af50ce --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/updatePresentation.withErrorReport..st @@ -0,0 +1,8 @@ +slide miniatures +updatePresentation: aPSPresentation withErrorReport: aDictionary + + self + presentation: aPSPresentation; + selectSlideNumber: 1; + updateSlideMiniaturesCompletely; + showErrorReport: aDictionary \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st new file mode 100644 index 0000000..8eeb00c --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st @@ -0,0 +1,11 @@ +slide miniatures +updateSlideMiniaturesCompletely + + | previousSelection | + previousSelection := self currentSlideNumber. + self updateSlideMiniatures. + 1 to: self slideCount do: [:index | + self selectSlideNumber: index. + World doOneCycle. + self updateCurrentMiniature]. + self selectSlideNumber: previousSelection \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 63ed1db..f4055af 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -6,18 +6,15 @@ "openIn:" : "LB 5/23/2018 16:11", "registerInWorldMenu" : "LM 6/13/2018 12:19" }, "instance" : { - "abandonMorph:" : "MK 6/8/2018 17:37", "addPSTextMorphIn:at:" : "MK 7/6/2018 17:07", "addPSTextMorphIn:at:centeredWithSize:" : "MK 7/6/2018 15:40", "addPSTextMorphIn:at:withSize:" : "MK 7/6/2018 15:40", "afterBuildWith:" : "LM 7/6/2018 17:43", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", - "buildWith:" : "LM 7/6/2018 17:08", + "buildWith:" : "MK 7/20/2018 15:15", "buttonBarTopData" : "JZ 7/6/2018 15:08", "buttonHeight" : "LB 6/22/2018 18:34", - "checkSlideDirectory:" : "JZ 6/29/2018 17:24", - "checkSlideDirectoryName:" : "JZ 6/29/2018 17:03", "clampSlideNumber:" : "LM 7/13/2018 17:52", "createButtonBarTopSpec:" : "JZ 7/6/2018 15:47", "createButtonSpec:with:" : "LM 7/6/2018 17:56", @@ -59,14 +56,8 @@ "insertButtonData" : "JZ 7/6/2018 15:43", "isInteractive" : "LB 7/6/2018 17:09", "isInteractive:" : "LB 7/6/2018 17:19", - "isValidPresentationDirectory:" : "JZ 6/29/2018 17:18", - "loadMorphFromFile:" : "MK 6/8/2018 17:32", - "loadMorphFromStream:" : "MK 7/13/2018 17:49", - "loadMorphFromStream:testIn:" : "LB 6/22/2018 19:28", "loadPresentation" : "WoC 6/27/2018 14:13", - "loadPresentationFromDirectory:" : "LM 6/15/2018 18:22", - "loadPresentationUnchecked:" : "LM 7/13/2018 17:23", - "loadSlideFromDirectory:" : "LM 6/29/2018 20:05", + "loadPresentationFromDirectory:" : "MK 7/20/2018 15:42", "magneticRasterActive" : "LB 7/5/2018 19:48", "magneticRasterActive:" : "LB 7/5/2018 19:49", "magneticRasterButtonColor" : "LB 7/5/2018 21:59", @@ -80,7 +71,6 @@ "miniatures" : "LB 6/29/2018 16:14", "miniatures:" : "LB 6/29/2018 16:14", "minimumSlideCount" : "WoC 6/22/2018 16:10", - "morph:survivesOneCycleIn:" : "LM 6/29/2018 19:48", "moveCurrentSlideTo:" : "LM 7/13/2018 18:29", "moveSlideButtonData" : "JZ 7/6/2018 14:54", "newImageField" : "LM 5/18/2018 17:13", @@ -118,14 +108,14 @@ "slideNumberString:" : "LB 6/29/2018 15:45", "slideSelectionDialogText" : "LB 7/13/2018 14:58", "slidesDirectoryName" : "MK 6/8/2018 18:14", - "sortedMorphFiles:" : "JZ 6/29/2018 17:50", - "sortedSlideSubdirectories:" : "LM 6/17/2018 17:35", "step" : "LB 6/29/2018 17:05", "styleMenuBar:" : "LM 7/13/2018 14:17", "toggleInteractivity" : "LB 7/6/2018 16:58", "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", + "updatePresentation:withErrorReport:" : "MK 7/20/2018 15:41", "updateSlideMiniatures" : "LB 6/29/2018 17:08", + "updateSlideMiniaturesCompletely" : "MK 7/20/2018 15:32", "viewPortLayoutFrame" : "LB 6/29/2018 15:31", "wantsSteps" : "LB 6/29/2018 17:04", "warn:trueChoice:" : "JZ 6/8/2018 17:54", diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/isMagnetic.st b/packages/Presenter-Core.package/PSSlide.class/instance/isMagnetic.st index f997ed8..cf0ee53 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/isMagnetic.st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/isMagnetic.st @@ -1,4 +1,4 @@ magnetic raster isMagnetic - ^ self model magneticRasterActive \ No newline at end of file + ^ self owner isMagnetic \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json index addef46..44693cb 100644 --- a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json @@ -14,7 +14,7 @@ "handlesMouseDown:" : "WoC 5/22/2018 19:23", "initialize" : "LM 7/6/2018 16:48", "isImageFileName:" : "LB 5/18/2018 17:16", - "isMagnetic" : "LB 7/5/2018 21:41", + "isMagnetic" : "MK 7/20/2018 14:29", "layoutFractionsOf:" : "LB 7/6/2018 17:47", "layoutFrameFor:" : "LB 7/6/2018 17:47", "model" : "LB 7/5/2018 20:03", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/isMagnetic.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isMagnetic.st new file mode 100644 index 0000000..5f7b5aa --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isMagnetic.st @@ -0,0 +1,4 @@ +systemwindow-compatibility +isMagnetic + + ^ self model magneticRasterActive \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index 1f92cdb..995f99d 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -20,6 +20,7 @@ "initialize" : "LM 7/13/2018 15:42", "initializeStyle" : "WoC 6/15/2018 16:00", "isCollapsed" : "LM 6/6/2018 18:13", + "isMagnetic" : "MK 7/20/2018 14:29", "isSystemWindow" : "WoC 6/4/2018 17:35", "keyStroke:" : "MK 6/28/2018 13:56", "lookUnfocused" : "WoC 6/4/2018 17:13", diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/README.md b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader..st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader..st new file mode 100644 index 0000000..ec7f5ae --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader..st @@ -0,0 +1,4 @@ +accessing +loader: aPSPresentationLoader + + loader := aPSPresentationLoader \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader.st new file mode 100644 index 0000000..f020720 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/loader.st @@ -0,0 +1,4 @@ +accessing +loader + + ^ loader diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/mockEmptyPresentationDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st similarity index 90% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/mockEmptyPresentationDirectory.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st index 24b6fcf..b41f908 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/mockEmptyPresentationDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st @@ -1,4 +1,4 @@ -loading tests +as yet unclassified mockEmptyPresentationDirectory ^ PSMockFileDirectory from: 'Presentation' -> { diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/morphLoadingStreamFor..st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st similarity index 85% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/morphLoadingStreamFor..st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st index 37cfa67..226b0ba 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/morphLoadingStreamFor..st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st @@ -1,4 +1,4 @@ -loading tests +as yet unclassified morphLoadingStreamFor: aByteArray ^ (MultiByteBinaryOrTextStream with: aByteArray) diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st new file mode 100644 index 0000000..dfb0909 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st @@ -0,0 +1,5 @@ +as yet unclassified +setUp + + super setUp. + self loader: PSPresentationLoader new \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCanLoadEmptyPresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st similarity index 57% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCanLoadEmptyPresentation.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st index 1da24c3..87b53da 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCanLoadEmptyPresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st @@ -1,10 +1,11 @@ -loading tests +as yet unclassified testCanLoadEmptyPresentation | directory errorReport | directory := self mockEmptyPresentationDirectory. - errorReport := self tool loadPresentationUnchecked: directory. + self loader loadPresentationUnchecked: directory. + errorReport := self loader errorReport. self assert: (errorReport values select: [:each | each = 0]) size - equals: (directory / self tool slidesDirectoryName) directoryNames size + equals: (directory / self loader slidesDirectoryName) directoryNames size description: 'There should be 0 errors per slide for an empty presentation' \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCanLoadEmptySlide.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st similarity index 53% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCanLoadEmptySlide.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st index ab79b68..5635f43 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCanLoadEmptySlide.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st @@ -1,8 +1,8 @@ -loading tests +as yet unclassified testCanLoadEmptySlide | directory | directory := PSMockFileDirectory named: 'slide'. self assert: 0 - equals: (self tool loadSlideFromDirectory: directory) submorphs size \ No newline at end of file + equals: (self loader loadSlideFromDirectory: directory) submorphs size \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEmptyPresentationDirectoryIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st similarity index 54% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEmptyPresentationDirectoryIsValid.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st index b5ccbac..bca56a0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEmptyPresentationDirectoryIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st @@ -1,6 +1,6 @@ -loading tests +as yet unclassified testEmptyPresentationDirectoryIsValid | directory | directory := self mockEmptyPresentationDirectory. - self assert: (self tool isValidPresentationDirectory: directory) \ No newline at end of file + self assert: (self loader isValidPresentationDirectory: directory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testErrorReportExistsPerSlide.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st similarity index 56% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testErrorReportExistsPerSlide.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st index ad83ae7..a44131b 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testErrorReportExistsPerSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st @@ -1,10 +1,11 @@ -loading tests +as yet unclassified testErrorReportExistsPerSlide | directory errorReport | directory := self mockEmptyPresentationDirectory. - errorReport := self tool loadPresentationUnchecked: directory. + self loader loadPresentationUnchecked: directory. + errorReport := self loader errorReport. self assert: errorReport keys asSet - equals: (directory / self tool slidesDirectoryName) directoryNames asSet + equals: (directory / self loader slidesDirectoryName) directoryNames asSet description: 'The error report should contain an entry for every loaded slide, even if its empty!' \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st new file mode 100644 index 0000000..6d933fe --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st @@ -0,0 +1,4 @@ +as yet unclassified +testInvalidLoadReturnsNil + + self assert: (self loader loadMorphFromStream: (self morphLoadingStreamFor: '')) equals: nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidSlideDirectoryNames.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st similarity index 78% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidSlideDirectoryNames.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st index f7ef818..720fe3e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidSlideDirectoryNames.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st @@ -1,7 +1,7 @@ -loading tests +as yet unclassified testInvalidSlideDirectoryNames | invalidSlideDirectoryNames | invalidSlideDirectoryNames := {'12slide1' . 'slides1' . 'slide1test' . 'slide' . ''} asOrderedCollection. - self assert: (invalidSlideDirectoryNames noneSatisfy: [:each | (self tool checkSlideDirectoryName: each)]) + self assert: (invalidSlideDirectoryNames noneSatisfy: [:each | (self loader checkSlideDirectoryName: each)]) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMissingSlidesDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st similarity index 50% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMissingSlidesDirectory.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st index c2cac02..8406d57 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMissingSlidesDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st @@ -1,6 +1,6 @@ -loading tests +as yet unclassified testMissingSlidesDirectory | directory | directory := PSMockFileDirectory named: 'myPresentation'. - self assert: (self tool isValidPresentationDirectory: directory) equals: false. \ No newline at end of file + self assert: (self loader isValidPresentationDirectory: directory) equals: false. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphLoadIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st similarity index 85% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphLoadIsValid.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st index 078d9be..c947b67 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphLoadIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st @@ -1,8 +1,8 @@ -loading tests +as yet unclassified testMorphLoadIsValid | morph | - morph := self tool + morph := self loader loadMorphFromStream: (self morphLoadingStreamFor: self validMorphFileData) testIn: self world. self assert: morph isNil not. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphNameIsNotNumber.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st similarity index 60% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphNameIsNotNumber.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st index ad6cfbe..e4b4ba6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphNameIsNotNumber.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st @@ -1,4 +1,4 @@ -loading tests +as yet unclassified testMorphNameIsNotNumber | presentationDirectory | @@ -7,4 +7,4 @@ testMorphNameIsNotNumber 'slide1' -> {'a.morph'} } }. - self assert: false equals: (self tool isValidPresentationDirectory: presentationDirectory) \ No newline at end of file + self assert: false equals: (self loader isValidPresentationDirectory: presentationDirectory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphNameIsNumber.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st similarity index 62% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphNameIsNumber.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st index a19c040..c74a3f0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphNameIsNumber.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st @@ -1,4 +1,4 @@ -loading tests +as yet unclassified testMorphNameIsNumber | presentationDirectory | @@ -7,4 +7,4 @@ testMorphNameIsNumber 'slide1' -> {'1.morph' . '2.morph'} } }. - self assert: true equals: (self tool isValidPresentationDirectory: presentationDirectory) \ No newline at end of file + self assert: true equals: (self loader isValidPresentationDirectory: presentationDirectory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st new file mode 100644 index 0000000..29c37f9 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st @@ -0,0 +1,6 @@ +as yet unclassified +testSlidesDirectoryIsEmpty + + | directory | + directory := PSMockFileDirectory from: 'Presentation' -> {self loader slidesDirectoryName}. + self assert: (self loader isValidPresentationDirectory: directory) equals: false \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st new file mode 100644 index 0000000..6a468d8 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st @@ -0,0 +1,7 @@ +as yet unclassified +testSortMorphFiles + + self assert: {'1.morph'} equals: (self loader sortedMorphFiles: {'1.morph'}). + + self assert: {'2.morph' . '3.morph' . '4.morph'} + equals: (self loader sortedMorphFiles: {'4.morph' . '2.morph' . '3.morph'}) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/validMorphFileData.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st similarity index 99% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/validMorphFileData.st rename to packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st index 92e7316..7b7f4c7 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/validMorphFileData.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st @@ -1,4 +1,4 @@ -loading tests +as yet unclassified validMorphFileData ^ diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json new file mode 100644 index 0000000..7444b14 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -0,0 +1,22 @@ +{ + "class" : { + }, + "instance" : { + "loader" : "MK 7/20/2018 15:44", + "loader:" : "MK 7/20/2018 15:44", + "mockEmptyPresentationDirectory" : "MK 7/20/2018 15:47", + "morphLoadingStreamFor:" : "MK 7/20/2018 15:48", + "setUp" : "MK 7/20/2018 15:46", + "testCanLoadEmptyPresentation" : "MK 7/20/2018 15:49", + "testCanLoadEmptySlide" : "MK 7/20/2018 15:48", + "testEmptyPresentationDirectoryIsValid" : "MK 7/20/2018 15:50", + "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", + "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", + "testInvalidSlideDirectoryNames" : "MK 7/20/2018 15:51", + "testMissingSlidesDirectory" : "MK 7/20/2018 15:53", + "testMorphLoadIsValid" : "MK 7/20/2018 15:53", + "testMorphNameIsNotNumber" : "MK 7/20/2018 15:54", + "testMorphNameIsNumber" : "MK 7/20/2018 15:55", + "testSlidesDirectoryIsEmpty" : "MK 7/20/2018 15:57", + "testSortMorphFiles" : "MK 7/20/2018 15:57", + "validMorphFileData" : "MK 7/20/2018 15:54" } } diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/properties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/properties.json new file mode 100644 index 0000000..cc1b358 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Presenter-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "loader" ], + "name" : "PSPresentationLoaderTest", + "pools" : [ + ], + "super" : "PSUITestCase", + "type" : "normal" } diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st deleted file mode 100644 index ae9ef88..0000000 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st +++ /dev/null @@ -1,4 +0,0 @@ -loading tests -testInvalidLoadReturnsNil - - self assert: (self tool loadMorphFromStream: (self morphLoadingStreamFor: '')) equals: nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSingleMorphOnSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSingleMorphOnSlide.st deleted file mode 100644 index 50bec21..0000000 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSingleMorphOnSlide.st +++ /dev/null @@ -1,17 +0,0 @@ -loading tests -testSingleMorphOnSlide - - | presentationDirectory | - presentationDirectory := PSMockFileDirectory from: 'Presentation' -> { - 'slides' -> { - 'slide1' -> {'a.morph'} - } - }. - self assert: false equals: (self tool isValidPresentationDirectory: presentationDirectory). - - presentationDirectory := PSMockFileDirectory from: 'Presentation' -> { - 'slides' -> { - 'slide1' -> {'1.morph' . '2.morph'} - } - }. - self assert: true equals: (self tool isValidPresentationDirectory: presentationDirectory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesDirectoryIsEmpty.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesDirectoryIsEmpty.st deleted file mode 100644 index 587bb60..0000000 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesDirectoryIsEmpty.st +++ /dev/null @@ -1,6 +0,0 @@ -loading tests -testSlidesDirectoryIsEmpty - - | directory | - directory := PSMockFileDirectory from: 'Presentation' -> {self tool slidesDirectoryName}. - self assert: (self tool isValidPresentationDirectory: directory) equals: false \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSortMorphFiles.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSortMorphFiles.st deleted file mode 100644 index b0470a6..0000000 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSortMorphFiles.st +++ /dev/null @@ -1,7 +0,0 @@ -loading tests -testSortMorphFiles - - self assert: {'1.morph'} equals: (self tool sortedMorphFiles: {'1.morph'}). - - self assert: {'2.morph' . '3.morph' . '4.morph'} - equals: (self tool sortedMorphFiles: {'4.morph' . '2.morph' . '3.morph'}) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 64c42d1..d75b532 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -2,8 +2,6 @@ "class" : { }, "instance" : { - "mockEmptyPresentationDirectory" : "MK 6/17/2018 18:55", - "morphLoadingStreamFor:" : "LM 6/13/2018 16:50", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "LM 5/18/2018 18:21", "slideContainer" : "WoC 6/15/2018 18:21", @@ -11,8 +9,6 @@ "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "LM 5/18/2018 18:48", - "testCanLoadEmptyPresentation" : "LM 6/15/2018 18:48", - "testCanLoadEmptySlide" : "JZ 6/29/2018 18:32", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", "testDefaultSlideCount" : "LM 7/13/2018 17:39", "testDeleteFirstSlide" : "LM 7/13/2018 17:40", @@ -20,11 +16,7 @@ "testDeletionRemovesSlide" : "LM 7/13/2018 17:43", "testDuplicateSlide" : "MK 7/13/2018 17:03", "testDuplicatedSlidesContent" : "MK 7/13/2018 17:37", - "testEmptyPresentationDirectoryIsValid" : "LM 6/15/2018 18:44", "testEnterNonInteractiveMode" : "LB 7/13/2018 18:30", - "testErrorReportExistsPerSlide" : "LM 6/15/2018 18:38", - "testInvalidLoadReturnsNil" : "LM 6/13/2018 17:34", - "testInvalidSlideDirectoryNames" : "JZ 6/29/2018 17:04", "testLayoutedSlidesCreation" : "MK 7/6/2018 17:32", "testLeaveNonInteractiveMode" : "LB 7/13/2018 18:30", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", @@ -33,10 +25,6 @@ "testMiniatureCreated" : "LB 6/29/2018 18:01", "testMiniatureDeleted" : "LB 6/29/2018 18:02", "testMiniatureSelects" : "LB 7/13/2018 19:12", - "testMissingSlidesDirectory" : "LM 6/15/2018 18:39", - "testMorphLoadIsValid" : "LM 6/13/2018 16:50", - "testMorphNameIsNotNumber" : "JZ 6/29/2018 17:32", - "testMorphNameIsNumber" : "JZ 6/29/2018 17:31", "testMoveSlide" : "LB 6/29/2018 15:45", "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", "testMovedSlideStayCurrentSlide" : "LB 6/29/2018 15:45", @@ -47,7 +35,6 @@ "testSelectSlide" : "LM 7/13/2018 17:53", "testSelectSlideClamps" : "LM 7/13/2018 17:53", "testSelectedMiniatureChanges" : "LB 6/29/2018 19:05", - "testSingleMorphOnSlide" : "JZ 6/29/2018 17:23", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", "testSlideContainerPosition" : "LM 6/8/2018 19:55", "testSlideCreation" : "LM 7/13/2018 18:20", @@ -59,12 +46,9 @@ "testSlideRatioIsFixed" : "LB 7/13/2018 19:05", "testSlideResizeRegression" : "LB 7/13/2018 18:59", "testSlideSelectionDialog" : "LB 7/13/2018 14:58", - "testSlidesDirectoryIsEmpty" : "LM 6/15/2018 18:42", "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", - "testSortMorphFiles" : "JZ 6/29/2018 18:00", "testZeroSlidesRegression" : "LM 7/13/2018 17:23", "testnextSlideClampsToMax" : "LM 7/13/2018 17:57", "tool" : "LM 5/16/2018 17:13", - "validMorphFileData" : "LM 6/13/2018 17:48", "window" : "LM 5/11/2018 17:57", "window:" : "LM 5/11/2018 17:59" } } From 24a3f4183329c87b3bfccb67aeaac80801782eb5 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Fri, 20 Jul 2018 16:14:38 +0200 Subject: [PATCH 034/112] Refactoring: Heavy Recategorizing --- .../PSPresentation.class/instance/clampSlideNumber..st | 2 +- .../PSPresentation.class/instance/createSlideBack.st | 2 +- .../PSPresentation.class/instance/indexOf..st | 2 +- .../PSPresentation.class/instance/slidesCollect..st | 2 +- .../PSPresentation.class/instance/slidesDo..st | 2 +- .../PSPresentation.class/instance/slidesWithIndexDo..st | 2 +- .../PSPresentation.class/instance/warn.trueChoice..st | 2 +- .../instance/warn.trueChoice.falseChoice..st | 2 +- .../PSPresentationLoader.class/instance/abandonMorph..st | 2 +- .../PSPresentationLoader.class/instance/checkSlideDirectory..st | 2 +- .../instance/checkSlideDirectoryName..st | 2 +- .../instance/isValidPresentationDirectory..st | 2 +- .../PSPresentationLoader.class/instance/loadMorphFromFile..st | 2 +- .../PSPresentationLoader.class/instance/loadMorphFromStream..st | 2 +- .../instance/loadMorphFromStream.testIn..st | 2 +- .../instance/loadPresentationFromDirectory..st | 2 +- .../instance/loadPresentationUnchecked..st | 2 +- .../instance/loadSlideFromDirectory..st | 2 +- .../instance/morph.survivesOneCycleIn..st | 2 +- .../PSPresentationLoader.class/instance/slidesDirectoryName.st | 2 +- .../PSPresentationLoader.class/instance/sortedMorphFiles..st | 2 +- .../instance/sortedSlideSubdirectories..st | 2 +- .../PSPresentationTool.class/instance/deleteSlide..st | 2 +- .../PSPresentationTool.class/instance/exportAsPNGs.st | 2 +- .../PSPresentationTool.class/instance/exportAsPNGsIn..st | 2 +- .../PSPresentationTool.class/instance/exportFolder.st | 2 +- .../instance/exportSlidesAsPNGsInDirectory..st | 2 +- .../PSPresentationTool.class/instance/loadPresentation.st | 2 +- .../instance/loadPresentationFromDirectory..st | 2 +- .../PSPresentationTool.class/instance/savePresentation.st | 2 +- .../instance/mockEmptyPresentationDirectory.st | 2 +- .../instance/morphLoadingStreamFor..st | 2 +- .../PSPresentationLoaderTest.class/instance/setUp.st | 2 +- .../instance/testCanLoadEmptyPresentation.st | 2 +- .../instance/testCanLoadEmptySlide.st | 2 +- .../instance/testEmptyPresentationDirectoryIsValid.st | 2 +- .../instance/testErrorReportExistsPerSlide.st | 2 +- .../instance/testInvalidLoadReturnsNil.st | 2 +- .../instance/testInvalidSlideDirectoryNames.st | 2 +- .../instance/testMissingSlidesDirectory.st | 2 +- .../instance/testMorphLoadIsValid.st | 2 +- .../instance/testMorphNameIsNotNumber.st | 2 +- .../instance/testMorphNameIsNumber.st | 2 +- .../instance/testSlidesDirectoryIsEmpty.st | 2 +- .../instance/testSortMorphFiles.st | 2 +- .../instance/validMorphFileData.st | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st b/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st index 3aa63ef..7c756cd 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/clampSlideNumber..st @@ -1,4 +1,4 @@ -as yet unclassified +slide management clampSlideNumber: aNumber ^ aNumber diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st index 5893f92..d4f17d8 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/createSlideBack.st @@ -1,4 +1,4 @@ -as yet unclassified +slide management createSlideBack ^ self createSlideAfter: self slides size \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st b/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st index 5dc9b56..4d88493 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/indexOf..st @@ -1,4 +1,4 @@ -as yet unclassified +collection behaviour indexOf: aPSSlide ^ self slides indexOf: aPSSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st index 888f2f8..e2cc27b 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesCollect..st @@ -1,4 +1,4 @@ -as yet unclassified +collection behaviour slidesCollect: aBlock ^ self slides collect: aBlock \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st index 8900af3..8846758 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesDo..st @@ -1,4 +1,4 @@ -as yet unclassified +collection behaviour slidesDo: aBlock self slides do: aBlock \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st index 0c1873d..3eeb1dd 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slidesWithIndexDo..st @@ -1,4 +1,4 @@ -as yet unclassified +collection behaviour slidesWithIndexDo: aBlock ^ self slides withIndexDo: [ :each :index | aBlock value: each value: index ] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st index 2a1e44b..918301a 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice..st @@ -1,4 +1,4 @@ -as yet unclassified +warning warn: aString trueChoice: aBlock self warn: aString trueChoice: aBlock falseChoice: [] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st index 443dfc0..3d36ef1 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/warn.trueChoice.falseChoice..st @@ -1,4 +1,4 @@ -as yet unclassified +warning warn: aString trueChoice: trueBlock falseChoice: falseBlock (UIManager default confirm: aString) diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st index 03a5f74..972e358 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/abandonMorph..st @@ -1,4 +1,4 @@ -as yet unclassified +morph loading abandonMorph: aMorph aMorph ifNotNil: [aMorph abandon]. diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st index 26aa864..f8ec89c 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectory..st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking checkSlideDirectory: aDirectory ^ (self checkSlideDirectoryName: aDirectory localName) diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st index b1ba120..bb7a509 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/checkSlideDirectoryName..st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking checkSlideDirectoryName: aDirectoryName ^ aDirectoryName matchesRegex: 'slide[0-9]+' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st index 5d83058..8037a5c 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/isValidPresentationDirectory..st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking isValidPresentationDirectory: aDirectory | slidesDirectory | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st index 175ad07..3eaa056 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st @@ -1,4 +1,4 @@ -as yet unclassified +morph loading loadMorphFromFile: aFileDirectory "This was copied from Morph(class)>>#fromFileName:" ^ self loadMorphFromStream: (MultiByteBinaryOrTextStream with: ((FileStream readOnlyFileNamed: aFileDirectory fullName) binary contentsOfEntireFile)) binary reset \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st index a6cf0a1..705383c 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st @@ -1,4 +1,4 @@ -as yet unclassified +morph loading loadMorphFromStream: aStream ^ self loadMorphFromStream: aStream testIn: World \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st index 5e7c8e6..11fbbb2 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st @@ -1,4 +1,4 @@ -as yet unclassified +morph loading loadMorphFromStream: aStream testIn: aWorld | morph | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st index 2dd761c..045e88c 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading loadPresentationFromDirectory: aDirectory self initialize. diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st index ddc5f4e..281085d 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationUnchecked..st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading loadPresentationUnchecked: aDirectory | slidesDirectory sortedDirectories | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st index 2316e45..8047e3f 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st @@ -1,4 +1,4 @@ -as yet unclassified +slide loading loadSlideFromDirectory: aDirectory | slide sortedMorphFiles | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st index 5f4d522..3bac00c 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st @@ -1,4 +1,4 @@ -as yet unclassified +morph loading morph: aMorph survivesOneCycleIn: aWorld "Some morphs may be loaded successfully but throw errors every world cycle therefore crashing the image." "World doOneCycle consumes all errors and opens the corresponding debuggers. Therefore we cannot do normal error checking but we can compare the debuggers." diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st index 6a52b0c..6ddf5ef 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing slidesDirectoryName ^ 'slides' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st index c1dbc56..b61c7ce 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedMorphFiles..st @@ -1,4 +1,4 @@ -as yet unclassified +morph loading sortedMorphFiles: anOrderedCollection ^ anOrderedCollection sorted: [:a :b | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st index 801e821..de1f2b8 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/sortedSlideSubdirectories..st @@ -1,4 +1,4 @@ -as yet unclassified +slide loading sortedSlideSubdirectories: aFileDirectory | sortedDirectories | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st index 2efdfa7..059add7 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st @@ -1,4 +1,4 @@ -as yet unclassified +slide management deleteSlide: anIndex | deletedSlide | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st index a664774..dde8e25 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGs.st @@ -1,4 +1,4 @@ -exporting +presentation serialization exportAsPNGs | directory | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st index 5432614..d5aed50 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st @@ -1,4 +1,4 @@ -exporting +presentation serialization exportAsPNGsIn: aDirectory self enablePresentationMode. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st index 3c6ee2d..16345da 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportFolder.st @@ -1,4 +1,4 @@ -exporting +presentation serialization exportFolder ^ (FileDirectory default / self exportFolderName) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st index 0d1b9f2..b43547b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st @@ -1,4 +1,4 @@ -exporting +presentation serialization exportSlidesAsPNGsInDirectory: aDirectory self presentation slidesWithIndexDo: [:each :index | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st index 78d6153..f4785be 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st @@ -1,4 +1,4 @@ -presentation loading +presentation serialization loadPresentation | presentations presentationName | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st index f297ceb..1718f2e 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st @@ -1,4 +1,4 @@ -presentation loading +presentation serialization loadPresentationFromDirectory: aDirectory | loader | diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st index 5e84506..b8c2c0d 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st @@ -1,4 +1,4 @@ -presentation saving +presentation serialization savePresentation self presentation save \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st index b41f908..b9faf62 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing mockEmptyPresentationDirectory ^ PSMockFileDirectory from: 'Presentation' -> { diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st index 226b0ba..24de0f3 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/morphLoadingStreamFor..st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading morphLoadingStreamFor: aByteArray ^ (MultiByteBinaryOrTextStream with: aByteArray) diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st index dfb0909..4f5c36e 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/setUp.st @@ -1,4 +1,4 @@ -as yet unclassified +running setUp super setUp. diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st index 87b53da..14b17a3 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading testCanLoadEmptyPresentation | directory errorReport | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st index 5635f43..fb882f7 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading testCanLoadEmptySlide | directory | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st index bca56a0..78e8d8a 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testEmptyPresentationDirectoryIsValid.st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking testEmptyPresentationDirectoryIsValid | directory | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st index a44131b..7cedd4d 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading testErrorReportExistsPerSlide | directory errorReport | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st index 6d933fe..191ec56 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidLoadReturnsNil.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading testInvalidLoadReturnsNil self assert: (self loader loadMorphFromStream: (self morphLoadingStreamFor: '')) equals: nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st index 720fe3e..815b3fe 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking testInvalidSlideDirectoryNames | invalidSlideDirectoryNames | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st index 8406d57..c07576d 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking testMissingSlidesDirectory | directory | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st index c947b67..68f29a5 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading testMorphLoadIsValid | morph | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st index e4b4ba6..49210b1 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking testMorphNameIsNotNumber | presentationDirectory | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st index c74a3f0..48feaa0 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking testMorphNameIsNumber | presentationDirectory | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st index 29c37f9..5e8954e 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st @@ -1,4 +1,4 @@ -as yet unclassified +directory checking testSlidesDirectoryIsEmpty | directory | diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st index 6a468d8..f70ef35 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading testSortMorphFiles self assert: {'1.morph'} equals: (self loader sortedMorphFiles: {'1.morph'}). diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st index 7b7f4c7..ee63689 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st @@ -1,4 +1,4 @@ -as yet unclassified +presentation loading validMorphFileData ^ From ef20391de69fe6e38f9644ab11c334bad4d094b0 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 16:21:24 +0200 Subject: [PATCH 035/112] Test refac --- .../instance/testContextMenuContent.equals..st | 1 - .../instance/testTextFieldCreatedOnClick.st | 12 ------------ .../instance/testTextFieldCreatedOnDoubleClick.st | 9 +++++++++ .../PSOnSlideTest.class/methodProperties.json | 4 ++-- .../PSSlideAndMorphTest.class/instance/setUp.st | 2 +- ...zeToFit.st => testMorphFitsSlideOnResizeToFit.st} | 2 +- .../instance/testMorphKeepsPositionOnResizeToFit.st | 6 ++++++ ...io.st => testMorphKeepsSideRatioOnResizeToFit.st} | 2 +- .../instance/testSlideResizeToFitKeepsPosition.st | 9 --------- .../PSSlideAndMorphTest.class/methodProperties.json | 8 ++++---- .../instance/testContainerResizing.st | 10 ---------- .../instance/testResizeHandleMagnetic.st | 2 +- .../instance/testResizeHandleNonMagnetic.st | 2 +- .../PSSlideSubmorphTest.class/methodProperties.json | 5 ++--- .../PSUITestCase.class/instance/click.at..st | 2 +- .../PSUITestCase.class/instance/doubleClick.at..st | 4 ++++ .../PSUITestCase.class/instance/drag.from.to..st | 2 +- .../instance/dragndrop.from.to..st | 2 +- .../PSUITestCase.class/instance/keystroke.at..st | 2 +- .../PSUITestCase.class/instance/mouse.does.at..st | 2 +- .../PSUITestCase.class/instance/mouse.downAt..st | 2 +- .../PSUITestCase.class/instance/mouse.upAt..st | 2 +- .../instance/mouseMove.from.to..st | 2 +- .../instance/number.isSimilarTo..st | 4 ---- .../PSUITestCase.class/instance/pressKey.at..st | 2 +- .../PSUITestCase.class/methodProperties.json | 2 +- 26 files changed, 42 insertions(+), 60 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st create mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st rename packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/{testSlideResizeToFit.st => testMorphFitsSlideOnResizeToFit.st} (75%) create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsPositionOnResizeToFit.st rename packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/{testSlideResizeToFitKeepsSideRatio.st => testMorphKeepsSideRatioOnResizeToFit.st} (88%) delete mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsPosition.st delete mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st create mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/doubleClick.at..st delete mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/number.isSimilarTo..st diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st index c6104e1..9b76d8c 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st @@ -2,7 +2,6 @@ context menu tests testContextMenuContent: aMorph equals: aCollection | container menu items | - container := aMorph owner. menu := container createContextMenu. items := self collectMenuContentFrom: menu. diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st deleted file mode 100644 index 9579e93..0000000 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnClick.st +++ /dev/null @@ -1,12 +0,0 @@ -event tests -testTextFieldCreatedOnClick - - | oldSubmorphs addedMorphs container | - oldSubmorphs := self slide submorphs. - "self slide doubleClick: (self mouse: MouseEvent redButton downAt: self slide center)." - self click: MouseEvent redButton at: self slide center. - self click: MouseEvent redButton at: self slide center. - addedMorphs := self slide submorphs difference: oldSubmorphs. - self assert: addedMorphs size = 1. - container := addedMorphs first. - self assert: (container child isKindOf: PSTextMorph) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st new file mode 100644 index 0000000..27e9ed5 --- /dev/null +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st @@ -0,0 +1,9 @@ +event tests +testTextFieldCreatedOnDoubleClick + + | oldSubmorphs addedMorphs | + oldSubmorphs := self slide submorphs. + self doubleClick: MouseEvent redButton at: self slide center. + addedMorphs := self slide submorphs difference: oldSubmorphs. + self assert: addedMorphs size = 1. + self assert: (addedMorphs first child isKindOf: PSTextMorph) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 2bcc156..d261ee7 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -11,5 +11,5 @@ "slideContainer:" : "LB 7/13/2018 18:13", "tearDown" : "LB 7/13/2018 18:13", "testAcceptDropImageFile" : "LB 7/13/2018 21:57", - "testContextMenuContent:equals:" : "LB 6/15/2018 16:39", - "testTextFieldCreatedOnClick" : "LB 7/13/2018 22:09" } } + "testContextMenuContent:equals:" : "LB 7/20/2018 15:32", + "testTextFieldCreatedOnDoubleClick" : "LB 7/20/2018 15:42" } } diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st index 44af3b4..c39c193 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st @@ -3,5 +3,5 @@ setUp super setUp. self morph: (Morph new openInWorld: self world). - self morph position: self slide position + (10@10) + self morph position: self slide position + (30@30) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFit.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphFitsSlideOnResizeToFit.st similarity index 75% rename from packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFit.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphFitsSlideOnResizeToFit.st index b8f399d..97439ad 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFit.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphFitsSlideOnResizeToFit.st @@ -1,4 +1,4 @@ resizeToFit tests -testSlideResizeToFit +testMorphFitsSlideOnResizeToFit self assert: [self slide extent >= self morph extent] onResizeToFit: self morph \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsPositionOnResizeToFit.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsPositionOnResizeToFit.st new file mode 100644 index 0000000..00aca2e --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsPositionOnResizeToFit.st @@ -0,0 +1,6 @@ +resizeToFit tests +testMorphKeepsPositionOnResizeToFit + + | position | + position := self morph position. + self assert: [position = self morph position] onResizeToFit: self morph \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st similarity index 88% rename from packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st rename to packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st index b594c2c..667c220 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsSideRatio.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st @@ -1,5 +1,5 @@ resizeToFit tests -testSlideResizeToFitKeepsSideRatio +testMorphKeepsSideRatioOnResizeToFit self doForDifferentSizes: [:width :height | | sideRatio | diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsPosition.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsPosition.st deleted file mode 100644 index 19b9078..0000000 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideResizeToFitKeepsPosition.st +++ /dev/null @@ -1,9 +0,0 @@ -resizeToFit tests -testSlideResizeToFitKeepsPosition - - self doForDifferentSizes: [:width :height | - | position | - self morph extent: width @ height. - position := self morph position. - self slide resizeMorphToFit: self morph. - self assert: position = self morph position] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json index 235932e..d92b7f2 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json @@ -6,11 +6,11 @@ "doForDifferentSizes:" : "MK 7/13/2018 18:07", "morph" : "LB 7/20/2018 15:04", "morph:" : "LB 7/20/2018 15:04", - "setUp" : "LB 7/20/2018 15:05", + "setUp" : "LB 7/20/2018 16:13", "tearDown" : "LB 6/1/2018 17:51", "testDroppingCreatesContainer" : "LB 7/20/2018 15:07", + "testMorphFitsSlideOnResizeToFit" : "LB 7/20/2018 15:48", + "testMorphKeepsPositionOnResizeToFit" : "LB 7/20/2018 15:56", + "testMorphKeepsSideRatioOnResizeToFit" : "LB 7/20/2018 15:51", "testSlideDropping" : "LB 7/20/2018 15:07", - "testSlideResizeToFit" : "LB 7/20/2018 15:08", - "testSlideResizeToFitKeepsPosition" : "LB 7/20/2018 15:08", - "testSlideResizeToFitKeepsSideRatio" : "LB 7/20/2018 15:08", "testTriggerContextMenu" : "LB 7/20/2018 15:09" } } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st deleted file mode 100644 index 1df8f86..0000000 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizing.st +++ /dev/null @@ -1,10 +0,0 @@ -container tests -testContainerResizing - - | topLeft targetPoint event| - topLeft := self morph topLeft. - targetPoint := self morph bottomRight + (20 @ 20). - event := MouseButtonEvent new setPosition: targetPoint. - self container dragBottomRightEvent: event fromHandle: nil. - self slide fullBounds. - self assert: self morph bounds = (topLeft corner: targetPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st index 24f94e1..5a3ed66 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st @@ -2,7 +2,7 @@ container tests testResizeHandleMagnetic | bottomRightFractions | self slide model magneticRasterActive: true. - self drag: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). + self drag: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). self slide fullBounds. bottomRightFractions := self container layoutFrame rightFraction @ self container layoutFrame bottomFraction. self assert: (bottomRightFractions roundTo: self container rasterResolution) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st index f3717e6..308859c 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st @@ -6,4 +6,4 @@ testResizeHandleNonMagnetic targetPoint := self morph bottomRight + (20 @ 20). self drag: MouseEvent redButton from: self morph bottomRight to: targetPoint. self slide fullBounds. - self assert: self morph bounds = (topLeft corner: targetPoint) \ No newline at end of file + self assert: self morph bounds equals: (topLeft corner: targetPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index c44101b..8e3fbea 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -4,7 +4,6 @@ "instance" : { "container" : "LB 7/20/2018 14:51", "setUp" : "LB 7/20/2018 15:05", - "testContainerResizing" : "LB 7/20/2018 14:51", "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", "testContainerResizingCorner:offset:" : "LB 7/20/2018 14:52", "testContextMenu" : "LB 7/20/2018 15:06", @@ -12,8 +11,8 @@ "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", - "testResizeHandleMagnetic" : "LB 7/20/2018 14:52", - "testResizeHandleNonMagnetic" : "LB 7/20/2018 14:53", + "testResizeHandleMagnetic" : "LB 7/20/2018 16:05", + "testResizeHandleNonMagnetic" : "LB 7/20/2018 16:19", "testSlideContainerExtent" : "LB 7/20/2018 15:15", "testSlideContainerPosition" : "LB 7/20/2018 15:14", "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st index 3408074..740fdcf 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/click.at..st @@ -1,4 +1,4 @@ -inputs +mock inputs click: aMouseButton at: aPoint self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/doubleClick.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/doubleClick.at..st new file mode 100644 index 0000000..796038c --- /dev/null +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/doubleClick.at..st @@ -0,0 +1,4 @@ +mock inputs +doubleClick: aMouseButton at: aPoint + + 2 timesRepeat: [self click: aMouseButton at: aPoint] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st index 29397f6..1480243 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st @@ -1,4 +1,4 @@ -inputs +mock inputs drag: aMouseButton from: aPoint to: anotherPoint self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st index 0916d6c..805343a 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/dragndrop.from.to..st @@ -1,4 +1,4 @@ -inputs +mock inputs dragndrop: aMouseButton from: aPoint to: anotherPoint self drag: aMouseButton from: aPoint to: anotherPoint. diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st index dd0c0f5..3e3fb67 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/keystroke.at..st @@ -1,4 +1,4 @@ -inputs +input events keystroke: char at: point ^ KeyboardEvent new diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st index 0f0ddb8..90afb0b 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.does.at..st @@ -1,4 +1,4 @@ -inputs +input events mouse: aButtonCode does: aType at: aPoint ^ MouseButtonEvent new diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st index dc34dee..716b69a 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.downAt..st @@ -1,4 +1,4 @@ -inputs +input events mouse: aButtonCode downAt: aPoint ^ self mouse: aButtonCode does: #mouseDown at: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st index 8702fe8..2293369 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouse.upAt..st @@ -1,4 +1,4 @@ -inputs +input events mouse: aButtonCode upAt: aPoint ^ self mouse: aButtonCode does: #mouseUp at: aPoint \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st index 268f09c..02ff713 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/mouseMove.from.to..st @@ -1,4 +1,4 @@ -inputs +input events mouseMove: aMouseButton from: aPoint to: anotherPoint ^ MouseMoveEvent new diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/number.isSimilarTo..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/number.isSimilarTo..st deleted file mode 100644 index dbcfde8..0000000 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/number.isSimilarTo..st +++ /dev/null @@ -1,4 +0,0 @@ -helper functions -number: aNumber isSimilarTo: secondNumber - - ^ (aNumber - secondNumber) abs < 0.05 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st index e721069..165f4a4 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/pressKey.at..st @@ -1,4 +1,4 @@ -inputs +mock inputs pressKey: char at: point self hand handleEvent: (self keystroke: char at: point) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index c9c6c97..a4a96ee 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -8,6 +8,7 @@ "do:and:answerRatio:" : "LB 7/20/2018 14:45", "does:answerRatio:" : "LB 7/20/2018 14:24", "does:answerSideRatio:" : "LB 7/20/2018 14:24", + "doubleClick:at:" : "LB 7/20/2018 15:40", "drag:from:to:" : "LB 7/13/2018 18:44", "dragndrop:from:to:" : "LB 7/13/2018 18:44", "getNew:createdIn:" : "LB 6/15/2018 16:46", @@ -17,7 +18,6 @@ "mouse:downAt:" : "LB 7/13/2018 18:43", "mouse:upAt:" : "LB 7/13/2018 18:44", "mouseMove:from:to:" : "LB 7/5/2018 22:57", - "number:isSimilarTo:" : "LB 5/29/2018 17:39", "pressKey:at:" : "LB 7/13/2018 18:29", "setUp" : "LB 7/13/2018 19:04", "tearDown" : "LB 7/13/2018 17:25", From e2560a0e46c0cc4aa74da763f6affd056c91f700 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 16:29:46 +0200 Subject: [PATCH 036/112] Replaced direct event test by mock event [skip ci] --- .../instance/testContainerResizingCorner.offset..st | 7 ++++--- .../PSSlideSubmorphTest.class/methodProperties.json | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st index 4e43f95..d6b70b0 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st @@ -1,10 +1,11 @@ container tests testContainerResizingCorner: aSymbol offset: aPoint - | oldExtent targetPoint event| + | oldExtent targetPoint| oldExtent := self morph extent. targetPoint := (self container resizeHandles at: aSymbol) center + aPoint. - event := MouseButtonEvent new setPosition: targetPoint. - self container dragCorner: aSymbol event: event fromHandle: nil. + "event := MouseButtonEvent new setPosition: targetPoint. + self container dragCorner: aSymbol event: event fromHandle: nil." + self drag: MouseEvent redButton from: targetPoint-aPoint to: targetPoint. self slide fullBounds. self assert: self morph extent equals: oldExtent + aPoint abs \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 8e3fbea..82450be 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -4,15 +4,15 @@ "instance" : { "container" : "LB 7/20/2018 14:51", "setUp" : "LB 7/20/2018 15:05", - "testContainerResizingAllCorners" : "LB 7/6/2018 15:41", - "testContainerResizingCorner:offset:" : "LB 7/20/2018 14:52", + "testContainerResizingAllCorners" : "LB 7/20/2018 16:28", + "testContainerResizingCorner:offset:" : "LB 7/20/2018 16:26", "testContextMenu" : "LB 7/20/2018 15:06", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", "testResizeHandleMagnetic" : "LB 7/20/2018 16:05", - "testResizeHandleNonMagnetic" : "LB 7/20/2018 16:19", + "testResizeHandleNonMagnetic" : "LB 7/20/2018 16:23", "testSlideContainerExtent" : "LB 7/20/2018 15:15", "testSlideContainerPosition" : "LB 7/20/2018 15:14", "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", From 3d7aa17479056b4ea3c1c50fc0475be5d1039073 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 16:42:24 +0200 Subject: [PATCH 037/112] Fixes resize handles tests --- .../instance/testContainerResizingCorner.offset..st | 8 +++----- .../instance/testResizeHandleMagnetic.st | 2 +- .../instance/testResizeHandleNonMagnetic.st | 2 +- .../PSSlideSubmorphTest.class/methodProperties.json | 8 ++++---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st index d6b70b0..3c67a33 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st @@ -1,11 +1,9 @@ container tests testContainerResizingCorner: aSymbol offset: aPoint - | oldExtent targetPoint| + | oldExtent handlePosition | oldExtent := self morph extent. - targetPoint := (self container resizeHandles at: aSymbol) center + aPoint. - "event := MouseButtonEvent new setPosition: targetPoint. - self container dragCorner: aSymbol event: event fromHandle: nil." - self drag: MouseEvent redButton from: targetPoint-aPoint to: targetPoint. + handlePosition := (self container resizeHandles at: aSymbol) center. + self dragndrop: MouseEvent redButton from: handlePosition to: handlePosition+aPoint. self slide fullBounds. self assert: self morph extent equals: oldExtent + aPoint abs \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st index 5a3ed66..0367c2b 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st @@ -2,7 +2,7 @@ container tests testResizeHandleMagnetic | bottomRightFractions | self slide model magneticRasterActive: true. - self drag: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). + self dragndrop: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). self slide fullBounds. bottomRightFractions := self container layoutFrame rightFraction @ self container layoutFrame bottomFraction. self assert: (bottomRightFractions roundTo: self container rasterResolution) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st index 308859c..998d674 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st @@ -4,6 +4,6 @@ testResizeHandleNonMagnetic | topLeft targetPoint | topLeft := self morph topLeft. targetPoint := self morph bottomRight + (20 @ 20). - self drag: MouseEvent redButton from: self morph bottomRight to: targetPoint. + self dragndrop: MouseEvent redButton from: self morph bottomRight to: targetPoint. self slide fullBounds. self assert: self morph bounds equals: (topLeft corner: targetPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 82450be..0173587 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -4,15 +4,15 @@ "instance" : { "container" : "LB 7/20/2018 14:51", "setUp" : "LB 7/20/2018 15:05", - "testContainerResizingAllCorners" : "LB 7/20/2018 16:28", - "testContainerResizingCorner:offset:" : "LB 7/20/2018 16:26", + "testContainerResizingAllCorners" : "LB 7/20/2018 16:33", + "testContainerResizingCorner:offset:" : "LB 7/20/2018 16:40", "testContextMenu" : "LB 7/20/2018 15:06", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", - "testResizeHandleMagnetic" : "LB 7/20/2018 16:05", - "testResizeHandleNonMagnetic" : "LB 7/20/2018 16:23", + "testResizeHandleMagnetic" : "LB 7/20/2018 16:41", + "testResizeHandleNonMagnetic" : "LB 7/20/2018 16:41", "testSlideContainerExtent" : "LB 7/20/2018 15:15", "testSlideContainerPosition" : "LB 7/20/2018 15:14", "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", From 8e7dda60a7332c6bf888e1984559844eaeb3d8dc Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 20 Jul 2018 17:20:00 +0200 Subject: [PATCH 038/112] Refactored container resizing tests --- .../instance/testContainerResizingCorner.offset..st | 8 +++++--- .../instance/testResizeHandleNonMagnetic.st | 9 --------- .../PSSlideSubmorphTest.class/methodProperties.json | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st index 3c67a33..6234825 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st @@ -1,9 +1,11 @@ container tests testContainerResizingCorner: aSymbol offset: aPoint - | oldExtent handlePosition | - oldExtent := self morph extent. + | expectedBounds handlePosition | handlePosition := (self container resizeHandles at: aSymbol) center. + expectedBounds := self morph bounds + withSideOrCorner: aSymbol + setToPoint: handlePosition + aPoint. self dragndrop: MouseEvent redButton from: handlePosition to: handlePosition+aPoint. self slide fullBounds. - self assert: self morph extent equals: oldExtent + aPoint abs \ No newline at end of file + self assert: self morph bounds equals: expectedBounds \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st deleted file mode 100644 index 998d674..0000000 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleNonMagnetic.st +++ /dev/null @@ -1,9 +0,0 @@ -container tests -testResizeHandleNonMagnetic - - | topLeft targetPoint | - topLeft := self morph topLeft. - targetPoint := self morph bottomRight + (20 @ 20). - self dragndrop: MouseEvent redButton from: self morph bottomRight to: targetPoint. - self slide fullBounds. - self assert: self morph bounds equals: (topLeft corner: targetPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 0173587..07d0d58 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -5,14 +5,13 @@ "container" : "LB 7/20/2018 14:51", "setUp" : "LB 7/20/2018 15:05", "testContainerResizingAllCorners" : "LB 7/20/2018 16:33", - "testContainerResizingCorner:offset:" : "LB 7/20/2018 16:40", + "testContainerResizingCorner:offset:" : "LB 7/20/2018 17:11", "testContextMenu" : "LB 7/20/2018 15:06", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", "testResizeHandleMagnetic" : "LB 7/20/2018 16:41", - "testResizeHandleNonMagnetic" : "LB 7/20/2018 16:41", "testSlideContainerExtent" : "LB 7/20/2018 15:15", "testSlideContainerPosition" : "LB 7/20/2018 15:14", "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", From 822325b03362150dbfc707971e65cf880f647499 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 13:52:10 +0200 Subject: [PATCH 039/112] Removed unnecessary parameter on dragging --- .../instance/actionForCorner..st | 2 +- ...tEvent.fromHandle..st => dragBottomLeftEvent..st} | 2 +- ...Event.fromHandle..st => dragBottomRightEvent..st} | 2 +- .../instance/dragCorner.event.fromHandle..st | 3 +-- ...LeftEvent.fromHandle..st => dragTopLeftEvent..st} | 2 +- ...ghtEvent.fromHandle..st => dragTopRightEvent..st} | 2 +- .../PSContentContainer.class/methodProperties.json | 12 ++++++------ 7 files changed, 12 insertions(+), 13 deletions(-) rename packages/Presenter-Core.package/PSContentContainer.class/instance/{dragBottomLeftEvent.fromHandle..st => dragBottomLeftEvent..st} (59%) rename packages/Presenter-Core.package/PSContentContainer.class/instance/{dragBottomRightEvent.fromHandle..st => dragBottomRightEvent..st} (59%) rename packages/Presenter-Core.package/PSContentContainer.class/instance/{dragTopLeftEvent.fromHandle..st => dragTopLeftEvent..st} (59%) rename packages/Presenter-Core.package/PSContentContainer.class/instance/{dragTopRightEvent.fromHandle..st => dragTopRightEvent..st} (59%) diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/actionForCorner..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/actionForCorner..st index 38de936..e862753 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/actionForCorner..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/actionForCorner..st @@ -1,4 +1,4 @@ resizing actionForCorner: aSymbol - ^ ('drag', aSymbol capitalized, 'Event:fromHandle:') asSymbol \ No newline at end of file + ^ ('drag', aSymbol capitalized, 'Event:') asSymbol \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent.fromHandle..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent..st similarity index 59% rename from packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent.fromHandle..st rename to packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent..st index 5b9613d..8c5c5aa 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent.fromHandle..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent..st @@ -1,4 +1,4 @@ resizing -dragBottomLeftEvent: evt fromHandle: handle +dragBottomLeftEvent: evt self extentBottomLeft: (self resizeFractionsOf: evt) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent.fromHandle..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent..st similarity index 59% rename from packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent.fromHandle..st rename to packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent..st index 72a4104..d562c03 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent.fromHandle..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent..st @@ -1,4 +1,4 @@ resizing -dragBottomRightEvent: evt fromHandle: handle +dragBottomRightEvent: evt self extentBottomRight: (self resizeFractionsOf: evt) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st index b5efaa0..209ed77 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st @@ -3,5 +3,4 @@ dragCorner: aSymbol event: event fromHandle: aMorph self perform: (self actionForCorner: aSymbol) - with: event - with: aMorph \ No newline at end of file + with: event \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent.fromHandle..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent..st similarity index 59% rename from packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent.fromHandle..st rename to packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent..st index 90e2b94..59e3972 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent.fromHandle..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent..st @@ -1,4 +1,4 @@ resizing -dragTopLeftEvent: evt fromHandle: handle +dragTopLeftEvent: evt self extentTopLeft: (self resizeFractionsOf: evt) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent.fromHandle..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent..st similarity index 59% rename from packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent.fromHandle..st rename to packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent..st index e5e87ad..b6df532 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent.fromHandle..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent..st @@ -1,4 +1,4 @@ resizing -dragTopRightEvent: evt fromHandle: handle +dragTopRightEvent: evt self extentTopRight: (self resizeFractionsOf: evt) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 62995c7..e96b551 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "for:" : "LB 7/6/2018 18:09" }, "instance" : { - "actionForCorner:" : "LB 7/6/2018 16:30", + "actionForCorner:" : "LB 7/24/2018 13:51", "addHandleAt:" : "LB 7/6/2018 18:07", "addResizeHandles" : "LM 7/13/2018 14:58", "child" : "MK 5/18/2018 20:03", @@ -12,11 +12,11 @@ "createHandleOnMove:" : "LM 7/13/2018 14:59", "defaultContextMenuContent" : "LM 7/13/2018 14:59", "disablePresentationMode" : "WoC 6/17/2018 18:44", - "dragBottomLeftEvent:fromHandle:" : "LB 7/6/2018 16:32", - "dragBottomRightEvent:fromHandle:" : "LB 7/6/2018 16:28", - "dragCorner:event:fromHandle:" : "LB 7/6/2018 16:35", - "dragTopLeftEvent:fromHandle:" : "LB 7/6/2018 16:32", - "dragTopRightEvent:fromHandle:" : "LB 7/6/2018 16:32", + "dragBottomLeftEvent:" : "LB 7/24/2018 13:49", + "dragBottomRightEvent:" : "LB 7/24/2018 13:50", + "dragCorner:event:fromHandle:" : "LB 7/24/2018 13:50", + "dragTopLeftEvent:" : "LB 7/24/2018 13:50", + "dragTopRightEvent:" : "LB 7/24/2018 13:50", "enablePresentationMode" : "LM 6/8/2018 20:10", "extent:" : "MK 5/25/2018 17:11", "extentBottomLeft:" : "LB 7/6/2018 15:57", From cfbfc1e3e53072a361ad487774b8e80df66e44fb Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 14:22:07 +0200 Subject: [PATCH 040/112] Better load method --- .../PSPresentationLoader.class/instance/loadMorphFromFile..st | 2 +- .../PSPresentationLoader.class/methodProperties.json | 2 +- .../PSMockByteStream.class/class/examplePngBytes.st | 2 +- .../PSMockByteStream.class/class/exampleTextMorphBytes.st | 4 ++++ .../PSMockByteStream.class/methodProperties.json | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/class/exampleTextMorphBytes.st diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st index 3eaa056..30586dd 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st @@ -1,4 +1,4 @@ morph loading loadMorphFromFile: aFileDirectory "This was copied from Morph(class)>>#fromFileName:" - ^ self loadMorphFromStream: (MultiByteBinaryOrTextStream with: ((FileStream readOnlyFileNamed: aFileDirectory fullName) binary contentsOfEntireFile)) binary reset \ No newline at end of file + ^ self loadMorphFromStream: (FileStream readOnlyFileNamed: aFileDirectory fullName) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json index c735896..5a68e39 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -9,7 +9,7 @@ "errorReport:" : "MK 7/20/2018 14:20", "initialize" : "MK 7/20/2018 14:23", "isValidPresentationDirectory:" : "MK 7/20/2018 14:59", - "loadMorphFromFile:" : "MK 7/20/2018 14:53", + "loadMorphFromFile:" : "LB 7/24/2018 14:14", "loadMorphFromStream:" : "MK 7/20/2018 14:54", "loadMorphFromStream:testIn:" : "MK 7/20/2018 14:54", "loadPresentationFromDirectory:" : "MK 7/20/2018 14:43", diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st index eab36ab..7f60ae3 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/examplePngBytes.st @@ -1,4 +1,4 @@ data examplePngBytes - ^ #(137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 4 0 0 0 4 8 2 0 0 0 38 147 9 41 0 0 0 1 115 82 71 66 0 174 206 28 233 0 0 0 4 103 65 77 65 0 0 177 143 11 252 97 5 0 0 0 9 112 72 89 115 0 0 36 232 0 0 36 232 1 130 99 5 28 0 0 0 28 73 68 65 84 24 87 99 120 43 163 2 68 255 193 0 149 3 161 148 54 250 0 17 18 103 163 15 0 98 205 33 25 33 239 53 132 0 0 0 0 73 69 78 68 174 66 96 130) asByteArray \ No newline at end of file + ^ #[137 80 78 71 13 10 26 10 0 0 0 13 73 72 68 82 0 0 0 4 0 0 0 4 8 2 0 0 0 38 147 9 41 0 0 0 1 115 82 71 66 0 174 206 28 233 0 0 0 4 103 65 77 65 0 0 177 143 11 252 97 5 0 0 0 9 112 72 89 115 0 0 36 232 0 0 36 232 1 130 99 5 28 0 0 0 28 73 68 65 84 24 87 99 120 43 163 2 68 255 193 0 149 3 161 148 54 250 0 17 18 103 163 15 0 98 205 33 25 33 239 53 132 0 0 0 0 73 69 78 68 174 66 96 130] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/exampleTextMorphBytes.st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/exampleTextMorphBytes.st new file mode 100644 index 0000000..e922374 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/exampleTextMorphBytes.st @@ -0,0 +1,4 @@ +data +exampleTextMorphBytes + + ^ #[239 187 191 39 70 114 111 109 32 83 113 117 101 97 107 54 46 48 97 108 112 104 97 32 111 102 32 49 55 32 65 112 114 105 108 32 50 48 49 56 32 91 108 97 116 101 115 116 32 117 112 100 97 116 101 58 32 35 49 55 57 48 49 93 32 111 110 32 54 32 74 117 110 101 32 50 48 49 56 32 97 116 32 53 58 50 49 58 50 56 32 112 109 39 33 13 13 33 79 98 106 101 99 116 83 99 97 110 110 101 114 32 110 101 119 32 105 110 105 116 105 97 108 105 122 101 33 13 13 13 13 33 115 101 108 102 32 115 109 97 114 116 82 101 102 83 116 114 101 97 109 33 4 0 0 0 4 8 0 0 0 4 17 15 99 108 97 115 115 32 115 116 114 117 99 116 117 114 101 9 0 0 0 3 6 10 68 105 99 116 105 111 110 97 114 121 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 9 0 0 0 3 6 11 65 115 115 111 99 105 97 116 105 111 110 6 10 83 99 114 111 108 108 80 97 110 101 8 0 0 0 23 4 0 0 0 0 17 6 98 111 117 110 100 115 17 5 111 119 110 101 114 17 9 115 117 98 109 111 114 112 104 115 17 10 102 117 108 108 66 111 117 110 100 115 17 5 99 111 108 111 114 17 9 101 120 116 101 110 115 105 111 110 17 11 98 111 114 100 101 114 87 105 100 116 104 17 11 98 111 114 100 101 114 67 111 108 111 114 17 5 109 111 100 101 108 17 8 115 108 111 116 78 97 109 101 17 4 111 112 101 110 17 9 115 99 114 111 108 108 66 97 114 17 8 115 99 114 111 108 108 101 114 17 20 114 101 116 114 97 99 116 97 98 108 101 83 99 114 111 108 108 66 97 114 17 15 115 99 114 111 108 108 66 97 114 79 110 76 101 102 116 17 15 103 101 116 77 101 110 117 83 101 108 101 99 116 111 114 17 20 103 101 116 77 101 110 117 84 105 116 108 101 83 101 108 101 99 116 111 114 17 8 104 97 115 70 111 99 117 115 17 10 104 83 99 114 111 108 108 66 97 114 17 16 104 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 16 118 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 18 115 99 114 111 108 108 66 97 114 84 104 105 99 107 110 101 115 115 16 3 0 66 6 9 84 101 120 116 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 116 101 120 116 83 116 121 108 101 17 4 116 101 120 116 17 8 119 114 97 112 70 108 97 103 17 9 112 97 114 97 103 114 97 112 104 17 6 101 100 105 116 111 114 17 9 99 111 110 116 97 105 110 101 114 17 11 112 114 101 100 101 99 101 115 115 111 114 17 9 115 117 99 99 101 115 115 111 114 17 15 98 97 99 107 103 114 111 117 110 100 67 111 108 111 114 17 7 109 97 114 103 105 110 115 17 11 101 100 105 116 72 105 115 116 111 114 121 17 8 114 101 97 100 79 110 108 121 17 7 97 117 116 111 70 105 116 16 3 0 66 6 18 80 83 67 111 110 116 101 110 116 67 111 110 116 97 105 110 101 114 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 13 114 101 115 105 122 101 72 97 110 100 108 101 115 17 10 104 97 115 72 97 110 100 108 101 115 17 5 99 104 105 108 100 16 3 0 66 6 11 76 97 121 111 117 116 70 114 97 109 101 8 0 0 0] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json index ff0aa00..ec2de39 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json @@ -1,6 +1,7 @@ { "class" : { - "examplePngBytes" : "LB 7/20/2018 15:28", + "examplePngBytes" : "LB 7/24/2018 13:58", + "exampleTextMorphBytes" : "LB 7/24/2018 14:21", "newPng" : "LB 7/13/2018 16:13" }, "instance" : { "atEnd" : "LB 7/13/2018 15:45", From 00a566c86a96b6809165df88f1e982ec4763face Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 14:28:28 +0200 Subject: [PATCH 041/112] added ability to mock FileDirectory in PSPresentationLoader --- .../PSPresentationLoader.class/instance/loadMorphFromFile..st | 4 ---- .../instance/loadMorphInDirectory.fromFile..st | 4 ++++ .../instance/loadSlideFromDirectory..st | 2 +- .../PSPresentationLoader.class/methodProperties.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphInDirectory.fromFile..st diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st deleted file mode 100644 index 30586dd..0000000 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromFile..st +++ /dev/null @@ -1,4 +0,0 @@ -morph loading -loadMorphFromFile: aFileDirectory - "This was copied from Morph(class)>>#fromFileName:" - ^ self loadMorphFromStream: (FileStream readOnlyFileNamed: aFileDirectory fullName) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphInDirectory.fromFile..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphInDirectory.fromFile..st new file mode 100644 index 0000000..eca1189 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphInDirectory.fromFile..st @@ -0,0 +1,4 @@ +morph loading +loadMorphInDirectory: aFileDirectory fromFile: aFileName + "This was copied from Morph(class)>>#fromFileName:" + ^ self loadMorphFromStream: (aFileDirectory readOnlyFileNamed: aFileName) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st index 8047e3f..1f16ef7 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadSlideFromDirectory..st @@ -5,6 +5,6 @@ loadSlideFromDirectory: aDirectory slide := self presentation createSlideBack. sortedMorphFiles := self sortedMorphFiles: aDirectory fileNames. sortedMorphFiles do: [:each | - (self loadMorphFromFile: aDirectory / each) + (self loadMorphInDirectory: aDirectory fromFile: each) ifNotNil: [:morph | slide addMorphBack: morph]]. ^ slide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json index 5a68e39..8c2dd79 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -9,12 +9,12 @@ "errorReport:" : "MK 7/20/2018 14:20", "initialize" : "MK 7/20/2018 14:23", "isValidPresentationDirectory:" : "MK 7/20/2018 14:59", - "loadMorphFromFile:" : "LB 7/24/2018 14:14", "loadMorphFromStream:" : "MK 7/20/2018 14:54", "loadMorphFromStream:testIn:" : "MK 7/20/2018 14:54", + "loadMorphInDirectory:fromFile:" : "LM 7/24/2018 14:27", "loadPresentationFromDirectory:" : "MK 7/20/2018 14:43", "loadPresentationUnchecked:" : "MK 7/20/2018 14:43", - "loadSlideFromDirectory:" : "MK 7/20/2018 15:10", + "loadSlideFromDirectory:" : "LM 7/24/2018 14:25", "morph:survivesOneCycleIn:" : "MK 7/20/2018 14:56", "presentation" : "MK 7/20/2018 14:20", "presentation:" : "MK 7/20/2018 14:20", From e558169901777ad471e1f3eaac4b1abe649bd864 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 15:11:00 +0200 Subject: [PATCH 042/112] Added a complete test for loading PSPresentationLoader --- .../class/slidesDirectoryName.st | 4 ++++ .../instance/loadMorphFromStream.testIn..st | 2 +- .../instance/slidesDirectoryName.st | 2 +- .../methodProperties.json | 6 +++--- .../PSMockByteStream.class/class/on..st | 6 ++++++ .../PSMockByteStream.class/methodProperties.json | 3 ++- .../instance/contents..st | 4 ++++ .../instance/contents.st | 3 +++ .../instance/initialize.st | 3 ++- .../instance/readOnlyFileNamed..st | 5 +++++ .../methodProperties.json | 5 ++++- .../PSMockFileDirectory.class/properties.json | 3 ++- .../instance/fileInObjectAndCode.st | 4 ++++ .../methodProperties.json | 1 + .../mockCompletePresentationDirectory.st | 16 ++++++++++++++++ .../instance/testLoadCompletePresentation.st | 10 ++++++++++ .../methodProperties.json | 2 ++ 17 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/class/slidesDirectoryName.st create mode 100644 packages/Presenter-Tests.package/PSMockByteStream.class/class/on..st create mode 100644 packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents..st create mode 100644 packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st create mode 100644 packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/readOnlyFileNamed..st create mode 100644 packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/fileInObjectAndCode.st create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st create mode 100644 packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/class/slidesDirectoryName.st b/packages/Presenter-Core.package/PSPresentationLoader.class/class/slidesDirectoryName.st new file mode 100644 index 0000000..6ddf5ef --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/class/slidesDirectoryName.st @@ -0,0 +1,4 @@ +accessing +slidesDirectoryName + + ^ 'slides' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st index 11fbbb2..8218d53 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream.testIn..st @@ -6,6 +6,6 @@ loadMorphFromStream: aStream testIn: aWorld on: Error do: [:error | morph := self abandonMorph: morph]. - (morph isNil not and: [self morph: morph survivesOneCycleIn: aWorld]) + (morph notNil and: [self morph: morph survivesOneCycleIn: aWorld]) ifFalse: [morph := self abandonMorph: morph]. ^ morph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st index 6ddf5ef..ff60f11 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/slidesDirectoryName.st @@ -1,4 +1,4 @@ accessing slidesDirectoryName - ^ 'slides' \ No newline at end of file + ^ self class slidesDirectoryName \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json index 8c2dd79..5ed1d99 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - }, + "slidesDirectoryName" : "LM 7/24/2018 14:46" }, "instance" : { "abandonMorph:" : "MK 7/20/2018 14:56", "checkSlideDirectory:" : "MK 7/20/2018 15:00", @@ -10,7 +10,7 @@ "initialize" : "MK 7/20/2018 14:23", "isValidPresentationDirectory:" : "MK 7/20/2018 14:59", "loadMorphFromStream:" : "MK 7/20/2018 14:54", - "loadMorphFromStream:testIn:" : "MK 7/20/2018 14:54", + "loadMorphFromStream:testIn:" : "LM 7/24/2018 15:08", "loadMorphInDirectory:fromFile:" : "LM 7/24/2018 14:27", "loadPresentationFromDirectory:" : "MK 7/20/2018 14:43", "loadPresentationUnchecked:" : "MK 7/20/2018 14:43", @@ -18,6 +18,6 @@ "morph:survivesOneCycleIn:" : "MK 7/20/2018 14:56", "presentation" : "MK 7/20/2018 14:20", "presentation:" : "MK 7/20/2018 14:20", - "slidesDirectoryName" : "MK 7/20/2018 14:45", + "slidesDirectoryName" : "LM 7/24/2018 14:54", "sortedMorphFiles:" : "MK 7/20/2018 14:48", "sortedSlideSubdirectories:" : "MK 7/20/2018 14:52" } } diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/class/on..st b/packages/Presenter-Tests.package/PSMockByteStream.class/class/on..st new file mode 100644 index 0000000..63dc09e --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/class/on..st @@ -0,0 +1,6 @@ +instance creation +on: aByteArray + + ^ self new + collection: aByteArray; + yourself \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json index ec2de39..eba4015 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json @@ -2,7 +2,8 @@ "class" : { "examplePngBytes" : "LB 7/24/2018 13:58", "exampleTextMorphBytes" : "LB 7/24/2018 14:21", - "newPng" : "LB 7/13/2018 16:13" }, + "newPng" : "LB 7/13/2018 16:13", + "on:" : "LM 7/24/2018 14:35" }, "instance" : { "atEnd" : "LB 7/13/2018 15:45", "binary" : "LB 7/13/2018 15:29", diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents..st new file mode 100644 index 0000000..08f42db --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents..st @@ -0,0 +1,4 @@ +accessing +contents: anObject + + contents := anObject \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st new file mode 100644 index 0000000..07aaf6e --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st @@ -0,0 +1,3 @@ +accessing +contents + ^ contents \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/initialize.st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/initialize.st index bbff61b..48a19b0 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/initialize.st +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/initialize.st @@ -5,4 +5,5 @@ initialize name: ''; subdirectories: Set new; exists: true; - isFile: false \ No newline at end of file + isFile: false; + contents: nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/readOnlyFileNamed..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/readOnlyFileNamed..st new file mode 100644 index 0000000..eab3254 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/readOnlyFileNamed..st @@ -0,0 +1,5 @@ +filedirectory compatibility +readOnlyFileNamed: aLocalName + + self assert: (self / aLocalName) exists. + ^ (self / aLocalName) contents \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json index ccbf34e..339ceca 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json @@ -5,11 +5,13 @@ "named:" : "LM 6/15/2018 17:35" }, "instance" : { "/" : "LM 6/15/2018 18:38", + "contents" : "LM 7/24/2018 14:31", + "contents:" : "LM 7/24/2018 15:09", "directoryNames" : "LM 6/15/2018 17:35", "exists" : "LM 6/15/2018 17:23", "exists:" : "LM 6/15/2018 17:23", "fileNames" : "LM 6/15/2018 17:38", - "initialize" : "LM 6/15/2018 17:35", + "initialize" : "LM 7/24/2018 15:09", "isFile" : "LM 6/15/2018 17:34", "isFile:" : "LM 6/15/2018 17:34", "localName" : "JZ 6/29/2018 17:00", @@ -17,5 +19,6 @@ "name:" : "LM 6/15/2018 16:54", "parent" : "LM 6/15/2018 16:54", "parent:" : "LM 6/15/2018 16:54", + "readOnlyFileNamed:" : "LM 7/24/2018 15:03", "subdirectories" : "LM 6/15/2018 16:54", "subdirectories:" : "LM 6/15/2018 16:54" } } diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json index 800bc2a..5138773 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json @@ -10,7 +10,8 @@ "parent", "subdirectories", "exists", - "isFile" ], + "isFile", + "contents" ], "name" : "PSMockFileDirectory", "pools" : [ ], diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/fileInObjectAndCode.st b/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/fileInObjectAndCode.st new file mode 100644 index 0000000..c372591 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/fileInObjectAndCode.st @@ -0,0 +1,4 @@ +loading tests +fileInObjectAndCode + "For loading tests" + ^ self \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json b/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json index af3e132..65300c9 100644 --- a/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json @@ -2,6 +2,7 @@ "class" : { }, "instance" : { + "fileInObjectAndCode" : "LM 7/24/2018 15:01", "handlesKeyboard:" : "WoC 6/15/2018 19:02", "handlesMouseDown:" : "WoC 6/15/2018 19:03", "initialize" : "MK 7/13/2018 18:29", diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st new file mode 100644 index 0000000..40f5df6 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st @@ -0,0 +1,16 @@ +accessing +mockCompletePresentationDirectory + + | directory slidesDirectory | + directory := PSMockFileDirectory from: 'Presentation' -> { + PSPresentationLoader slidesDirectoryName -> { + 'slide1' -> {'1.morph'}. + 'slide2' -> {}. + 'slide3' -> {'1.morph' . '2.morph' } + } + }. + slidesDirectory := directory / PSPresentationLoader slidesDirectoryName. + slidesDirectory / 'slide1' / '1.morph' contents: PSMorphForEventTests new. + slidesDirectory / 'slide3' / '1.morph' contents: PSMorphForEventTests new. + slidesDirectory / 'slide3' / '2.morph' contents: PSMorphForEventTests new. + ^ directory \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st new file mode 100644 index 0000000..b844e8f --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st @@ -0,0 +1,10 @@ +presentation loading +testLoadCompletePresentation + + | directory presentation | + directory := self mockCompletePresentationDirectory. + presentation := PSPresentationLoader new loadPresentationFromDirectory: directory. + self assert: presentation slideCount = 3. + self assert: presentation slides first submorphs size = 1. + self assert: presentation slides second submorphs isEmpty. + self assert: presentation slides third submorphs size = 2. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index 7444b14..399d56c 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -4,6 +4,7 @@ "instance" : { "loader" : "MK 7/20/2018 15:44", "loader:" : "MK 7/20/2018 15:44", + "mockCompletePresentationDirectory" : "LM 7/24/2018 15:06", "mockEmptyPresentationDirectory" : "MK 7/20/2018 15:47", "morphLoadingStreamFor:" : "MK 7/20/2018 15:48", "setUp" : "MK 7/20/2018 15:46", @@ -13,6 +14,7 @@ "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", "testInvalidSlideDirectoryNames" : "MK 7/20/2018 15:51", + "testLoadCompletePresentation" : "LM 7/24/2018 15:07", "testMissingSlidesDirectory" : "MK 7/20/2018 15:53", "testMorphLoadIsValid" : "MK 7/20/2018 15:53", "testMorphNameIsNotNumber" : "MK 7/20/2018 15:54", From fcc7d90d58ae8c238e33ff121603d98e5c6bdb89 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 15:13:22 +0200 Subject: [PATCH 043/112] Rename PSMorphForEventTests --- .../README.md | 0 .../instance/fileInObjectAndCode.st | 0 .../instance/handlesKeyboard..st | 0 .../instance/handlesMouseDown..st | 0 .../instance/initialize.st | 0 .../instance/keyStroke..st | 0 .../instance/mouseDown..st | 0 .../instance/receivedKeyboardEvents..st | 0 .../instance/receivedKeyboardEvents.st | 0 .../instance/receivedMouseEvents..st | 0 .../instance/receivedMouseEvents.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../instance/mockCompletePresentationDirectory.st | 6 +++--- .../PSPresentationLoaderTest.class/methodProperties.json | 2 +- .../instance/testNonInteractivetyInNonInteractiveMode.st | 2 +- .../PSPresentationToolTest.class/methodProperties.json | 2 +- 17 files changed, 7 insertions(+), 7 deletions(-) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/README.md (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/fileInObjectAndCode.st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/handlesKeyboard..st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/handlesMouseDown..st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/initialize.st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/keyStroke..st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/mouseDown..st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/receivedKeyboardEvents..st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/receivedKeyboardEvents.st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/receivedMouseEvents..st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/instance/receivedMouseEvents.st (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/methodProperties.json (100%) rename packages/Presenter-Tests.package/{PSMorphForEventTests.class => PSMockMorph.class}/properties.json (87%) diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/README.md b/packages/Presenter-Tests.package/PSMockMorph.class/README.md similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/README.md rename to packages/Presenter-Tests.package/PSMockMorph.class/README.md diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/fileInObjectAndCode.st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/fileInObjectAndCode.st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/fileInObjectAndCode.st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/fileInObjectAndCode.st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/handlesKeyboard..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/handlesKeyboard..st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/handlesKeyboard..st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/handlesKeyboard..st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/handlesMouseDown..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/handlesMouseDown..st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/handlesMouseDown..st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/handlesMouseDown..st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/initialize.st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/initialize.st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/initialize.st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/initialize.st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/keyStroke..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/keyStroke..st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/keyStroke..st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/keyStroke..st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/mouseDown..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/mouseDown..st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/mouseDown..st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/mouseDown..st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedKeyboardEvents..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents..st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedKeyboardEvents..st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents..st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedKeyboardEvents.st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents.st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedKeyboardEvents.st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents.st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedMouseEvents..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents..st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedMouseEvents..st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents..st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedMouseEvents.st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents.st similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/instance/receivedMouseEvents.st rename to packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents.st diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json similarity index 100% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/methodProperties.json rename to packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json diff --git a/packages/Presenter-Tests.package/PSMorphForEventTests.class/properties.json b/packages/Presenter-Tests.package/PSMockMorph.class/properties.json similarity index 87% rename from packages/Presenter-Tests.package/PSMorphForEventTests.class/properties.json rename to packages/Presenter-Tests.package/PSMockMorph.class/properties.json index a1b94e7..74d306a 100644 --- a/packages/Presenter-Tests.package/PSMorphForEventTests.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockMorph.class/properties.json @@ -8,7 +8,7 @@ "instvars" : [ "receivedMouseEvents", "receivedKeyboardEvents" ], - "name" : "PSMorphForEventTests", + "name" : "PSMockMorph", "pools" : [ ], "super" : "Morph", diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st index 40f5df6..dc312d7 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st @@ -10,7 +10,7 @@ mockCompletePresentationDirectory } }. slidesDirectory := directory / PSPresentationLoader slidesDirectoryName. - slidesDirectory / 'slide1' / '1.morph' contents: PSMorphForEventTests new. - slidesDirectory / 'slide3' / '1.morph' contents: PSMorphForEventTests new. - slidesDirectory / 'slide3' / '2.morph' contents: PSMorphForEventTests new. + slidesDirectory / 'slide1' / '1.morph' contents: PSMockMorph new. + slidesDirectory / 'slide3' / '1.morph' contents: PSMockMorph new. + slidesDirectory / 'slide3' / '2.morph' contents: PSMockMorph new. ^ directory \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index 399d56c..86e4a53 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "loader" : "MK 7/20/2018 15:44", "loader:" : "MK 7/20/2018 15:44", - "mockCompletePresentationDirectory" : "LM 7/24/2018 15:06", + "mockCompletePresentationDirectory" : "LM 7/24/2018 15:12", "mockEmptyPresentationDirectory" : "MK 7/20/2018 15:47", "morphLoadingStreamFor:" : "MK 7/20/2018 15:48", "setUp" : "MK 7/20/2018 15:46", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st index 2005fee..b630d55 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st @@ -2,7 +2,7 @@ presentation mode tests testNonInteractivetyInNonInteractiveMode | testMorph | - testMorph := PSMorphForEventTests new. + testMorph := PSMockMorph new. self tool enablePresentationMode. self slideContainer currentSlide addContent: testMorph. self pressKey: $i at: self slideContainer center. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index d75b532..f2da33d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -29,7 +29,7 @@ "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", "testMovedSlideStayCurrentSlide" : "LB 6/29/2018 15:45", "testNextSlide" : "LM 7/13/2018 17:52", - "testNonInteractivetyInNonInteractiveMode" : "LB 7/13/2018 18:36", + "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", "testPreviousSlideClampsToMin" : "LM 7/13/2018 17:53", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", "testSelectSlide" : "LM 7/13/2018 17:53", From 03d1ee439b21f6e42a379c00f8394bac82e06a5d Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 15:31:48 +0200 Subject: [PATCH 044/112] Refactor PSPresentationLoader to be able to test in different world --- .../instance/initialize.st | 4 ++-- .../instance/loadMorphFromStream..st | 2 +- .../instance/loadPresentationFromDirectory..st | 2 +- .../instance/morph.survivesOneCycleIn..st | 2 +- .../PSPresentationLoader.class/instance/reset.st | 6 ++++++ .../PSPresentationLoader.class/instance/world..st | 4 ++++ .../PSPresentationLoader.class/instance/world.st | 3 +++ .../methodProperties.json | 13 ++++++++----- .../PSPresentationLoader.class/properties.json | 3 ++- .../instance/testLoadCompletePresentation.st | 4 +++- .../methodProperties.json | 2 +- 11 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/reset.st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/world..st create mode 100644 packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st index 989230d..3d4010a 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/initialize.st @@ -2,5 +2,5 @@ initialize-release initialize self - errorReport: Dictionary new; - presentation: PSPresentation new \ No newline at end of file + reset; + world: World \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st index 705383c..e3caad3 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadMorphFromStream..st @@ -1,4 +1,4 @@ morph loading loadMorphFromStream: aStream - ^ self loadMorphFromStream: aStream testIn: World \ No newline at end of file + ^ self loadMorphFromStream: aStream testIn: self world \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st index 045e88c..97c30aa 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/loadPresentationFromDirectory..st @@ -1,7 +1,7 @@ presentation loading loadPresentationFromDirectory: aDirectory - self initialize. + self reset. ^ (self isValidPresentationDirectory: aDirectory) ifTrue: [self loadPresentationUnchecked: aDirectory] ifFalse: [nil] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st index 3bac00c..35e8493 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st @@ -5,7 +5,7 @@ morph: aMorph survivesOneCycleIn: aWorld | debuggersBefore newDebuggers | debuggersBefore := Debugger allInstances. aMorph openInWorld: aWorld. - [World doOneCycle] + [aWorld doOneCycle] on: Error do: [^false]. newDebuggers := Debugger allInstances reject: [:each | diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/reset.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/reset.st new file mode 100644 index 0000000..5e3ea5e --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/reset.st @@ -0,0 +1,6 @@ +initialize-release +reset + + self + errorReport: Dictionary new; + presentation: PSPresentation new \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world..st new file mode 100644 index 0000000..0096aa5 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world..st @@ -0,0 +1,4 @@ +accessing +world: aWorld + + world := aWorld \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st new file mode 100644 index 0000000..a8f5c4f --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st @@ -0,0 +1,3 @@ +accessing +world + ^ world \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json index 5ed1d99..09b1850 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -7,17 +7,20 @@ "checkSlideDirectoryName:" : "MK 7/20/2018 15:00", "errorReport" : "MK 7/20/2018 14:20", "errorReport:" : "MK 7/20/2018 14:20", - "initialize" : "MK 7/20/2018 14:23", + "initialize" : "LM 7/24/2018 15:30", "isValidPresentationDirectory:" : "MK 7/20/2018 14:59", - "loadMorphFromStream:" : "MK 7/20/2018 14:54", + "loadMorphFromStream:" : "LM 7/24/2018 15:22", "loadMorphFromStream:testIn:" : "LM 7/24/2018 15:08", "loadMorphInDirectory:fromFile:" : "LM 7/24/2018 14:27", - "loadPresentationFromDirectory:" : "MK 7/20/2018 14:43", + "loadPresentationFromDirectory:" : "LM 7/24/2018 15:30", "loadPresentationUnchecked:" : "MK 7/20/2018 14:43", "loadSlideFromDirectory:" : "LM 7/24/2018 14:25", - "morph:survivesOneCycleIn:" : "MK 7/20/2018 14:56", + "morph:survivesOneCycleIn:" : "LM 7/24/2018 15:28", "presentation" : "MK 7/20/2018 14:20", "presentation:" : "MK 7/20/2018 14:20", + "reset" : "LM 7/24/2018 15:31", "slidesDirectoryName" : "LM 7/24/2018 14:54", "sortedMorphFiles:" : "MK 7/20/2018 14:48", - "sortedSlideSubdirectories:" : "MK 7/20/2018 14:52" } } + "sortedSlideSubdirectories:" : "MK 7/20/2018 14:52", + "world" : "LM 7/24/2018 15:22", + "world:" : "LM 7/24/2018 15:26" } } diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json index 823c5a6..6b99f2a 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json @@ -7,7 +7,8 @@ "commentStamp" : "", "instvars" : [ "errorReport", - "presentation" ], + "presentation", + "world" ], "name" : "PSPresentationLoader", "pools" : [ ], diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st index b844e8f..dad0908 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st @@ -3,7 +3,9 @@ testLoadCompletePresentation | directory presentation | directory := self mockCompletePresentationDirectory. - presentation := PSPresentationLoader new loadPresentationFromDirectory: directory. + presentation := PSPresentationLoader new + world: self world; + loadPresentationFromDirectory: directory. self assert: presentation slideCount = 3. self assert: presentation slides first submorphs size = 1. self assert: presentation slides second submorphs isEmpty. diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index 86e4a53..919c0f2 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -14,7 +14,7 @@ "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", "testInvalidSlideDirectoryNames" : "MK 7/20/2018 15:51", - "testLoadCompletePresentation" : "LM 7/24/2018 15:07", + "testLoadCompletePresentation" : "LM 7/24/2018 15:24", "testMissingSlidesDirectory" : "MK 7/20/2018 15:53", "testMorphLoadIsValid" : "MK 7/20/2018 15:53", "testMorphNameIsNotNumber" : "MK 7/20/2018 15:54", From 1a526869347a1e1c348dae7f34bb7d08005683df Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 15:40:00 +0200 Subject: [PATCH 045/112] Made regression test an expected failure --- .../PSPresentation.class/instance/exportAsPNGsIn..st | 9 --------- .../PSPresentation.class/methodProperties.json | 1 - .../instance/expectedFailures.st | 4 ++++ .../instance/testSlideResizeRegression.st | 6 ++---- .../PSPresentationToolTest.class/methodProperties.json | 3 ++- 5 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st b/packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st deleted file mode 100644 index 5432614..0000000 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/exportAsPNGsIn..st +++ /dev/null @@ -1,9 +0,0 @@ -exporting -exportAsPNGsIn: aDirectory - - self enablePresentationMode. - self enableNonInteractiveMode. - World doOneCycle. - self exportSlidesAsPNGsInDirectory: aDirectory. - self disablePresentationMode. - UIManager default inform: 'Your presentation has been exported to: ', aDirectory fullName \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json index 0ce8a01..a7cfebf 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json @@ -13,7 +13,6 @@ "defaultDirectory" : "LM 7/13/2018 18:35", "defaultDirectoryName" : "LM 7/13/2018 18:35", "deleteSlideAt:" : "LM 7/13/2018 17:37", - "exportAsPNGsIn:" : "LM 7/13/2018 18:37", "indexOf:" : "LM 7/13/2018 17:55", "initialize" : "MK 7/20/2018 15:17", "minimumSlideCount" : "LM 7/13/2018 17:16", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st new file mode 100644 index 0000000..77ae956 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st @@ -0,0 +1,4 @@ +as yet unclassified +expectedFailures + + ^ #(testSlideResizeRegression) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st index 4c4a5d7..50734bb 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st @@ -1,6 +1,4 @@ window resizing tests testSlideResizeRegression - "Regression test for #32" - self - should: [self assert: [self tool currentSlide extent] constantOnResizeOf: self window] - raise: TestFailure \ No newline at end of file + "Regression test for #32 - expected to fail!" + self assert: [self tool currentSlide extent] constantOnResizeOf: self window \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index f2da33d..dafe4b6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -2,6 +2,7 @@ "class" : { }, "instance" : { + "expectedFailures" : "LB 7/24/2018 15:38", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "LM 5/18/2018 18:21", "slideContainer" : "WoC 6/15/2018 18:21", @@ -44,7 +45,7 @@ "testSlideNavigationInPresentationMode" : "LB 6/29/2018 15:45", "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", "testSlideRatioIsFixed" : "LB 7/13/2018 19:05", - "testSlideResizeRegression" : "LB 7/13/2018 18:59", + "testSlideResizeRegression" : "LB 7/24/2018 15:39", "testSlideSelectionDialog" : "LB 7/13/2018 14:58", "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", "testZeroSlidesRegression" : "LM 7/13/2018 17:23", From 7708bd7cab57b55fc6f575488eeff28df282200c Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 15:40:59 +0200 Subject: [PATCH 046/112] Removed dot --- .../instance/testLoadCompletePresentation.st | 2 +- .../PSPresentationLoaderTest.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st index dad0908..5d3be91 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st @@ -9,4 +9,4 @@ testLoadCompletePresentation self assert: presentation slideCount = 3. self assert: presentation slides first submorphs size = 1. self assert: presentation slides second submorphs isEmpty. - self assert: presentation slides third submorphs size = 2. \ No newline at end of file + self assert: presentation slides third submorphs size = 2 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index 919c0f2..5cfa9bf 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -14,7 +14,7 @@ "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", "testInvalidSlideDirectoryNames" : "MK 7/20/2018 15:51", - "testLoadCompletePresentation" : "LM 7/24/2018 15:24", + "testLoadCompletePresentation" : "LM 7/24/2018 15:33", "testMissingSlidesDirectory" : "MK 7/20/2018 15:53", "testMorphLoadIsValid" : "MK 7/20/2018 15:53", "testMorphNameIsNotNumber" : "MK 7/20/2018 15:54", From 8502cbc5b90090679a5ef6211d66821110eedb5c Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Tue, 24 Jul 2018 15:57:35 +0200 Subject: [PATCH 047/112] Minor changes Started writing class comments --- .../PSContentContainer.class/README.md | 16 ++++++++++++++ .../instance/child..st | 4 ---- .../instance/child.st | 4 ---- .../instance/content..st | 4 ++++ .../instance/content.st | 4 ++++ .../instance/copyChildToHand.st | 2 +- .../instance/createContextMenu.st | 6 +++--- .../instance/grabChild.st | 4 ++-- .../instance/mouseDown..st | 2 +- .../instance/notifySlideRescale..st | 4 ++-- .../instance/removedMorph..st | 2 +- .../instance/resizeChild.st | 2 +- .../instance/setContent..st | 2 +- .../methodProperties.json | 20 +++++++++--------- .../PSContentContainer.class/properties.json | 4 ++-- .../PSFadingMessage.class/README.md | 12 +++++++++++ .../instance/startFadingTime.st | 2 +- .../methodProperties.json | 2 +- .../PSFadingMessage.class/properties.json | 2 +- .../PSMiniature.class/README.md | 11 ++++++++++ .../PSMiniature.class/properties.json | 2 +- .../PSPresentation.class/README.md | 3 ++- .../PSPresentation.class/properties.json | 2 +- .../instance/deleteAllSlides.st | 6 ------ .../instance/deleteSlide..st | 7 ------- .../methodProperties.json | 2 -- .../PSScalingFontAttribute.class/README.md | 16 ++++++++++++++ .../instance/^equals.st | 8 +++---- .../instance/dominates..st | 4 ++-- .../methodProperties.json | 4 ++-- .../properties.json | 2 +- .../PSSlide.class/README.md | 5 +++++ .../PSSlide.class/properties.json | 2 +- .../PSSlideContainer.class/README.md | 21 +++++++++++++++++++ .../ensurePreviousOwnerIsNotSubmorph.st | 2 +- .../instance/notification..st | 4 ++-- .../methodProperties.json | 4 ++-- .../PSSlideContainer.class/properties.json | 8 ++----- .../instance/testAcceptDropImageFile.st | 2 +- .../testTextFieldCreatedOnDoubleClick.st | 2 +- .../PSOnSlideTest.class/methodProperties.json | 4 ++-- 41 files changed, 141 insertions(+), 78 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/child..st delete mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/child.st create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/content..st create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/content.st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteAllSlides.st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/README.md b/packages/Presenter-Core.package/PSContentContainer.class/README.md index e69de29..84bd490 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/README.md +++ b/packages/Presenter-Core.package/PSContentContainer.class/README.md @@ -0,0 +1,16 @@ +A PSContentContainer is a container for a single morph put on a slide. +It manages resizing and the context menu for its morph. + +Instance Variables + content: + hasHandles: + resizeHandles: + +content + - The morph the container contains + +hasHandles + - Shows whether the container's handles exist + +resizeHandles + - Dictionary containing the resizeHandles at the container's corners diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/child..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/child..st deleted file mode 100644 index c0ba0ee..0000000 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/child..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -child: aMorph - - child := aMorph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/child.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/child.st deleted file mode 100644 index a797afa..0000000 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/child.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -child - - ^ child diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/content..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/content..st new file mode 100644 index 0000000..360fcbf --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/content..st @@ -0,0 +1,4 @@ +accessing +content: aMorph + + content := aMorph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/content.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/content.st new file mode 100644 index 0000000..29099ea --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/content.st @@ -0,0 +1,4 @@ +accessing +content + + ^ content diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st index 5dab4f3..94fef03 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/copyChildToHand.st @@ -2,7 +2,7 @@ context menu copyChildToHand | copy | - copy := self child copy. + copy := self content copy. copy center: ActiveHand center. ActiveHand grabMorph: copy. ^ copy \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st index 2c257d0..82e5da7 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st @@ -5,9 +5,9 @@ createContextMenu menu := MenuMorph new defaultTarget: self. menu addList: self defaultContextMenuContent; - defaultTarget: self child. - (self child hasProperty: #wantsCustomContextMenu) ifTrue: [ - menu addList: self child customContextMenuContent]. + defaultTarget: self content. + (self content hasProperty: #wantsCustomContextMenu) ifTrue: [ + menu addList: self content customContextMenuContent]. menu setInvokingView: self. menu popUpEvent: self activeHand lastEvent in: self world. ^ menu "just for testing reasons" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st index fdc115c..149b564 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/grabChild.st @@ -1,5 +1,5 @@ context menu grabChild - self child center: self world activeHand position. - self world activeHand grabMorph: self child \ No newline at end of file + self content center: self world activeHand position. + self world activeHand grabMorph: self content \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/mouseDown..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/mouseDown..st index 5abc994..0698167 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/mouseDown..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/mouseDown..st @@ -3,4 +3,4 @@ mouseDown: evt self ifAnyHandleContains: evt position do: [:handle | ^ evt hand newMouseFocus: handle]. - evt hand grabMorph: self child \ No newline at end of file + evt hand grabMorph: self content \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/notifySlideRescale..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/notifySlideRescale..st index 11056b4..db919c8 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/notifySlideRescale..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/notifySlideRescale..st @@ -1,5 +1,5 @@ scaling notifySlideRescale: newExtent - (self child hasProperty: #acceptRescale) - ifTrue: [self child rescale: newExtent] \ No newline at end of file + (self content hasProperty: #acceptRescale) + ifTrue: [self content rescale: newExtent] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st index 12c8399..6a67394 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/removedMorph..st @@ -1,5 +1,5 @@ submorphs-add/remove removedMorph: aMorph - aMorph = self child + aMorph = self content ifTrue: [self abandon] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st index 3f0c93d..4721526 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st @@ -1,5 +1,5 @@ resizing resizeChild - self child + self content bounds: self bounds \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st index 7701d3c..0a518df 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st @@ -3,7 +3,7 @@ setContent: aMorph self position: aMorph position; - child: aMorph; + content: aMorph; extent: aMorph extent; addMorph: aMorph; addMouseCaptureFilter: self \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 62995c7..79d0d1a 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -5,10 +5,10 @@ "actionForCorner:" : "LB 7/6/2018 16:30", "addHandleAt:" : "LB 7/6/2018 18:07", "addResizeHandles" : "LM 7/13/2018 14:58", - "child" : "MK 5/18/2018 20:03", - "child:" : "LM 5/21/2018 12:48", - "copyChildToHand" : "LB 7/13/2018 17:22", - "createContextMenu" : "LB 6/15/2018 21:42", + "content" : "MK 7/24/2018 14:08", + "content:" : "MK 7/24/2018 14:08", + "copyChildToHand" : "MK 7/24/2018 14:08", + "createContextMenu" : "MK 7/24/2018 14:08", "createHandleOnMove:" : "LM 7/13/2018 14:59", "defaultContextMenuContent" : "LM 7/13/2018 14:59", "disablePresentationMode" : "WoC 6/17/2018 18:44", @@ -24,7 +24,7 @@ "extentTopLeft:" : "LB 7/6/2018 15:57", "extentTopRight:" : "LB 7/6/2018 15:57", "filterEvent:for:" : "MK 6/1/2018 18:02", - "grabChild" : "LB 7/13/2018 16:57", + "grabChild" : "MK 7/24/2018 14:08", "handleLayerNumber" : "MK 5/25/2018 16:26", "handlesMouseDown:" : "WoC 5/22/2018 19:48", "hasHandles" : "MK 5/18/2018 19:42", @@ -32,15 +32,15 @@ "ifAnyHandleContains:do:" : "MK 5/25/2018 17:06", "initialize" : "LB 7/6/2018 15:35", "isMagnetic" : "LB 7/5/2018 21:38", - "mouseDown:" : "MK 6/1/2018 16:25", - "notifySlideRescale:" : "LM 6/17/2018 19:02", + "mouseDown:" : "MK 7/24/2018 14:08", + "notifySlideRescale:" : "MK 7/24/2018 14:08", "placeHandles" : "LB 7/6/2018 18:10", "rasterResolution" : "LB 7/5/2018 19:42", "removeResizeHandles" : "MK 5/25/2018 16:18", - "removedMorph:" : "WoC 7/13/2018 16:51", - "resizeChild" : "WoC 7/13/2018 16:52", + "removedMorph:" : "MK 7/24/2018 14:08", + "resizeChild" : "MK 7/24/2018 14:08", "resizeFractionsOf:" : "LB 7/6/2018 17:48", "resizeHandleSize" : "MK 5/18/2018 19:13", "resizeHandles" : "MK 5/18/2018 17:43", "resizeHandles:" : "LB 7/6/2018 15:35", - "setContent:" : "LB 7/6/2018 18:08" } } + "setContent:" : "MK 7/24/2018 14:08" } } diff --git a/packages/Presenter-Core.package/PSContentContainer.class/properties.json b/packages/Presenter-Core.package/PSContentContainer.class/properties.json index fbb2cc3..32adfc9 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/properties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/properties.json @@ -4,11 +4,11 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 15:20", "instvars" : [ "resizeHandles", "hasHandles", - "child" ], + "content" ], "name" : "PSContentContainer", "pools" : [ ], diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/README.md b/packages/Presenter-Core.package/PSFadingMessage.class/README.md index e69de29..a33a3da 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/README.md +++ b/packages/Presenter-Core.package/PSFadingMessage.class/README.md @@ -0,0 +1,12 @@ +A PSFadingMessage is a pop-up message fading away after a short time. +It is used in PowerSqueak-presentations in the presentation mode. + +Instance Variables + content: + remaining: + +content + - The string being shown + +remaining + - The time remaining until the message is deleted diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st index f14c23e..7fcefb4 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/startFadingTime.st @@ -1,4 +1,4 @@ accessing startFadingTime - ^ 1000.0 \ No newline at end of file + ^ 1000 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index f3aa54e..98af293 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -8,7 +8,7 @@ "initialize" : "LM 7/13/2018 14:30", "remaining" : "WoC 6/15/2018 17:41", "remaining:" : "LB 7/6/2018 18:03", - "startFadingTime" : "LM 7/13/2018 14:25", + "startFadingTime" : "MK 7/24/2018 14:26", "step" : "MK 7/13/2018 18:01", "stepTime" : "WoC 6/15/2018 17:55", "totalVisibleTime" : "LM 7/13/2018 14:30", diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/properties.json b/packages/Presenter-Core.package/PSFadingMessage.class/properties.json index df17bb4..8bc0e67 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/properties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 14:31", "instvars" : [ "remaining", "content" ], diff --git a/packages/Presenter-Core.package/PSMiniature.class/README.md b/packages/Presenter-Core.package/PSMiniature.class/README.md index e69de29..272dc0b 100644 --- a/packages/Presenter-Core.package/PSMiniature.class/README.md +++ b/packages/Presenter-Core.package/PSMiniature.class/README.md @@ -0,0 +1,11 @@ +A PSMiniature is a small representation for a PSSlide that updates whenever the corresponding slide's content is changed. + +Instance Variables + model: + slide: + +model + - The corresponding PSPresentationTool + +slide + - The slide being represented by this miniature diff --git a/packages/Presenter-Core.package/PSMiniature.class/properties.json b/packages/Presenter-Core.package/PSMiniature.class/properties.json index d1933a3..d0b3080 100644 --- a/packages/Presenter-Core.package/PSMiniature.class/properties.json +++ b/packages/Presenter-Core.package/PSMiniature.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 15:56", "instvars" : [ "slide", "model" ], diff --git a/packages/Presenter-Core.package/PSPresentation.class/README.md b/packages/Presenter-Core.package/PSPresentation.class/README.md index e88e14a..827cd96 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/README.md +++ b/packages/Presenter-Core.package/PSPresentation.class/README.md @@ -1,6 +1,7 @@ A PSPresentation is a container for PSSlides. It manages slide creation, deletion and related tasks. -PSPresentations are also responsible for saving and loading themselves +PSPresentations are also responsible for saving themselves. +For loading a PSPresentation use a PSPresentationLoader. Instance Variables slides: diff --git a/packages/Presenter-Core.package/PSPresentation.class/properties.json b/packages/Presenter-Core.package/PSPresentation.class/properties.json index ca6f72a..83b2c25 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentation.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "LM 7/13/2018 18:30", + "commentStamp" : "MK 7/24/2018 13:52", "instvars" : [ "slides" ], "name" : "PSPresentation", diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteAllSlides.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteAllSlides.st deleted file mode 100644 index b05090d..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteAllSlides.st +++ /dev/null @@ -1,6 +0,0 @@ -slide management -deleteAllSlides - - [self slideCount > self minimumSlideCount] - whileTrue: [self deleteSlide]. - self deleteSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st deleted file mode 100644 index 059add7..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st +++ /dev/null @@ -1,7 +0,0 @@ -slide management -deleteSlide: anIndex - - | deletedSlide | - deletedSlide := self presentation deleteSlideAt: anIndex. - self miniatures removeKey: deletedSlide ifAbsent: []. - self updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index f4055af..1df3c73 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -36,9 +36,7 @@ "currentSlideNumber:" : "MK 5/6/2018 15:56", "defaultDirectory" : "JZ 6/8/2018 17:01", "defaultDirectoryName" : "JZ 6/8/2018 16:52", - "deleteAllSlides" : "LM 6/29/2018 20:03", "deleteSlide" : "LM 7/13/2018 17:23", - "deleteSlide:" : "LM 7/13/2018 17:23", "deleteSlideAt:" : "LM 7/13/2018 17:37", "disableNonInteractiveMode" : "LB 7/6/2018 17:24", "disablePresentationMode" : "LM 7/13/2018 18:20", diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md b/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md index e69de29..f1f9748 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md @@ -0,0 +1,16 @@ +A PSScalingFontAttribute scales the font of a text according to a scaling factor. +The actual text size is calculated multiplying a basic text size with that factor. + +Instance Variables + basicTextSize: + scalingSource: + style: + +basicTextSize + - The unscaled text size + +scalingSource + - Source of the scaling factor + +style + - The TextStyle the font is taken of. diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st index fd232d8..775d8fb 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st @@ -1,6 +1,6 @@ comparing -= other += otherTextAttribute - ^ (other class == self class) - and: [other style == self style] - and: [other scalingSource == self scalingSource] \ No newline at end of file + ^ (otherTextAttribute class == self class) + and: [otherTextAttribute style == self style] + and: [otherTextAttribute scalingSource == self scalingSource] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st index 5edda34..581c38e 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st @@ -1,4 +1,4 @@ testing -dominates: other +dominates: otherTextAttribute - ^ (other isKindOf: TextFontChange) or: [other class == self class] \ No newline at end of file + ^ (otherTextAttribute isKindOf: TextFontChange) or: [otherTextAttribute class == self class] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json index 227007f..ab33cae 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json @@ -2,12 +2,12 @@ "class" : { "styled:sized:scaledBy:" : "LB 6/8/2018 12:42" }, "instance" : { - "=" : "LB 6/8/2018 12:29", + "=" : "MK 7/24/2018 15:33", "actualTextSize" : "LB 6/8/2018 12:32", "basicTextSize" : "LB 6/8/2018 12:31", "basicTextSize:" : "LB 6/8/2018 12:31", "couldDeriveFromPrettyPrinting" : "LB 6/8/2018 12:29", - "dominates:" : "LB 6/8/2018 14:07", + "dominates:" : "MK 7/24/2018 15:28", "emphasizeScanner:" : "LB 6/8/2018 12:33", "font" : "LB 6/8/2018 12:45", "forFontInStyle:do:" : "LB 6/8/2018 16:16", diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json index 19a6fa8..8095f73 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 15:53", "instvars" : [ "style", "basicTextSize", diff --git a/packages/Presenter-Core.package/PSSlide.class/README.md b/packages/Presenter-Core.package/PSSlide.class/README.md index e69de29..4ac931d 100644 --- a/packages/Presenter-Core.package/PSSlide.class/README.md +++ b/packages/Presenter-Core.package/PSSlide.class/README.md @@ -0,0 +1,5 @@ +A PSSlide is a Morph to place content on. +Every morph put on a PSSlide is put into a PSContentContainer. +Whenever it is resized, all the contents are rescaled with a fix width-to-hight ratio. + +Instance Variables diff --git a/packages/Presenter-Core.package/PSSlide.class/properties.json b/packages/Presenter-Core.package/PSSlide.class/properties.json index c6b23d8..9be954f 100644 --- a/packages/Presenter-Core.package/PSSlide.class/properties.json +++ b/packages/Presenter-Core.package/PSSlide.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 15:31", "instvars" : [ ], "name" : "PSSlide", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/README.md b/packages/Presenter-Core.package/PSSlideContainer.class/README.md index e69de29..6668366 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/README.md +++ b/packages/Presenter-Core.package/PSSlideContainer.class/README.md @@ -0,0 +1,21 @@ +A PSSlideContainer is a container for a slide. +It manages displaying the slide, saves the corresponding PSPresentationTool when entering the presentation mode and handles keystroke events. +The PSSlideContainer pretends to be a system window in order to be in the foreground after closing a system window that was put on a slide. + +Instance Variables + currentSlide: + isInteractive: + notification: + previousOwner: + +currentSlide + - The slide currently displayed + +isInteractive + - Shows whether the presentation is in interactive or noninteractive mode + +notification + - Contains the currently displayed PSFadingMessage in order to avoid overlapping messages + +previousOwner + - Saves the PSSlideContainer's owner when entering the presentation mode diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st index dec6b16..c27713d 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st @@ -6,4 +6,4 @@ ensurePreviousOwnerIsNotSubmorph morph ifNotNil: [ window := morph model window. window owner removeMorph: window. - window openInWorld.] \ No newline at end of file + window openInWorld] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/notification..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/notification..st index 4379723..0ae8e4d 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/notification..st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/notification..st @@ -1,4 +1,4 @@ accessing -notification: anObject +notification: aPSFadingMessage - notification := anObject + notification := aPSFadingMessage \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index 995f99d..87f8fcd 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -13,7 +13,7 @@ "disablePresentationMode" : "LB 7/6/2018 17:27", "enableNonInteractiveMode" : "LB 7/6/2018 17:03", "enablePresentationMode" : "JZ 6/29/2018 19:01", - "ensurePreviousOwnerIsNotSubmorph" : "JZ 6/29/2018 19:06", + "ensurePreviousOwnerIsNotSubmorph" : "MK 7/24/2018 15:16", "filterEvent:for:" : "LB 7/6/2018 17:08", "handlesKeyboard:" : "WoC 6/15/2018 17:00", "in:tryToEvaluate:" : "WoC 6/15/2018 17:07", @@ -26,7 +26,7 @@ "lookUnfocused" : "WoC 6/4/2018 17:13", "makeMeVisible" : "WoC 6/3/2018 00:10", "notification" : "WoC 6/15/2018 19:21", - "notification:" : "WoC 6/15/2018 19:21", + "notification:" : "MK 7/24/2018 14:37", "occupiesWorld" : "LB 7/6/2018 17:43", "occupyWorld:" : "JZ 6/29/2018 19:01", "presentationCommandShortcuts" : "LM 7/13/2018 15:39", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/properties.json b/packages/Presenter-Core.package/PSSlideContainer.class/properties.json index 70f16c1..e82376b 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/properties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/properties.json @@ -4,16 +4,12 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 15:02", "instvars" : [ "currentSlide", "previousOwner", "isInteractive", - "presentationShortcuts", - "presentationCreationShortcuts", - "notification", - "presentationCommandShortcuts", - "presentationCreationCommandShortcuts" ], + "notification" ], "name" : "PSSlideContainer", "pools" : [ ], diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st index a89343a..b620193 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st @@ -7,5 +7,5 @@ testAcceptDropImageFile handleDroppedItem: PSMockByteStream newPng event: (UserInputEvent new setPosition: self slide center). createdImages := (self slide submorphs difference: oldSubMorphs) - select: [:each | each child isKindOf: SketchMorph]. + select: [:each | each content isKindOf: SketchMorph]. self assert: createdImages size equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st index 27e9ed5..5b2083f 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st @@ -6,4 +6,4 @@ testTextFieldCreatedOnDoubleClick self doubleClick: MouseEvent redButton at: self slide center. addedMorphs := self slide submorphs difference: oldSubmorphs. self assert: addedMorphs size = 1. - self assert: (addedMorphs first child isKindOf: PSTextMorph) \ No newline at end of file + self assert: (addedMorphs first content isKindOf: PSTextMorph) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index d261ee7..66552b2 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -10,6 +10,6 @@ "slideContainer" : "LB 7/13/2018 18:12", "slideContainer:" : "LB 7/13/2018 18:13", "tearDown" : "LB 7/13/2018 18:13", - "testAcceptDropImageFile" : "LB 7/13/2018 21:57", + "testAcceptDropImageFile" : "MK 7/24/2018 14:08", "testContextMenuContent:equals:" : "LB 7/20/2018 15:32", - "testTextFieldCreatedOnDoubleClick" : "LB 7/20/2018 15:42" } } + "testTextFieldCreatedOnDoubleClick" : "MK 7/24/2018 14:08" } } From 8460d76f639adbf336d9e1498d04aed4fc5441e8 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 15:57:58 +0200 Subject: [PATCH 048/112] Removed unnecessary method --- .../instance/dragCorner.event.fromHandle..st | 6 ------ .../PSContentContainer.class/methodProperties.json | 1 - 2 files changed, 7 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st deleted file mode 100644 index 209ed77..0000000 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st +++ /dev/null @@ -1,6 +0,0 @@ -resizing -dragCorner: aSymbol event: event fromHandle: aMorph - - self - perform: (self actionForCorner: aSymbol) - with: event \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index e96b551..2685292 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -14,7 +14,6 @@ "disablePresentationMode" : "WoC 6/17/2018 18:44", "dragBottomLeftEvent:" : "LB 7/24/2018 13:49", "dragBottomRightEvent:" : "LB 7/24/2018 13:50", - "dragCorner:event:fromHandle:" : "LB 7/24/2018 13:50", "dragTopLeftEvent:" : "LB 7/24/2018 13:50", "dragTopRightEvent:" : "LB 7/24/2018 13:50", "enablePresentationMode" : "LM 6/8/2018 20:10", From 0256ad72b0d24d42f42e7765219de1745b751fdf Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Tue, 24 Jul 2018 16:00:53 +0200 Subject: [PATCH 049/112] refactoring --- .../askForNumberWithQuestion.andDo..st | 9 +++++++ .../instance/buttonBarTopData.st | 6 +++-- .../instance/deleteSlide..st | 2 +- .../instance/exportAsPNGsIn..st | 8 +++--- .../instance/exportMessage.st | 3 +++ .../exportSlidesAsPNGsInDirectory..st | 2 +- .../instance/loadCorruptionMessage.st | 5 ++++ .../instance/loadPresentation.st | 19 +++++--------- .../loadPresentationFromDirectory..st | 3 +-- .../instance/loadQuestionMessage.st | 3 +++ .../instance/menuBarButtonData.st | 6 +++-- .../instance/miniatureOf..st | 9 ++++--- .../instance/openSlideMoveDialog.st | 9 +++---- .../instance/openSlideSelectionDialog.st | 9 ------- .../instance/slideMoveText.st | 4 +++ .../instance/slideName..st | 4 +++ .../instance/slideSelectionDialogText.st | 4 --- .../methodProperties.json | 26 +++++++++++-------- .../instance/dominates..st | 2 +- .../methodProperties.json | 2 +- .../PSSlide.class/instance/doubleClick..st | 4 +-- .../instance/handleDroppedImage.event..st | 3 +-- .../instance/handleDroppedItem.event..st | 2 +- .../instance/isImageFileName..st | 4 +-- .../PSSlide.class/instance/isImageStream..st | 4 +++ .../PSSlide.class/instance/mouseDown..st | 3 +-- .../instance/prepareToBeSaved.st | 2 +- .../PSSlide.class/methodProperties.json | 13 +++++----- .../instance/deleteNotification.st | 3 ++- .../instance/disableNonInteractiveMode.st | 3 +-- .../instance/disablePresentationMode.st | 3 ++- .../instance/enableNonInteractiveMode.st | 3 +-- .../instance/enablePresentationMode.st | 3 +-- .../ensurePreviousOwnerIsNotSubmorph.st | 5 ++-- .../instance/isInPresentationMode.st | 4 +++ .../instance/keyStroke..st | 2 +- .../instance/occupiesWorld.st | 2 +- .../instance/shouldShowCursor.andNotify..st | 5 ++++ .../instance/showSlide..st | 6 ++--- .../PSSlideContainer.class/instance/step.st | 2 +- .../methodProperties.json | 20 +++++++------- .../PSTextMorph.class/README.md | 4 +-- .../PSTextMorph.class/properties.json | 2 +- .../instance/testSlideSelectionDialog.st | 7 ----- .../methodProperties.json | 1 - 45 files changed, 135 insertions(+), 110 deletions(-) create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/askForNumberWithQuestion.andDo..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/exportMessage.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/loadCorruptionMessage.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/loadQuestionMessage.st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMoveText.st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/slideName..st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st create mode 100644 packages/Presenter-Core.package/PSSlide.class/instance/isImageStream..st create mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/isInPresentationMode.st create mode 100644 packages/Presenter-Core.package/PSSlideContainer.class/instance/shouldShowCursor.andNotify..st delete mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForNumberWithQuestion.andDo..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForNumberWithQuestion.andDo..st new file mode 100644 index 0000000..65e04cb --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForNumberWithQuestion.andDo..st @@ -0,0 +1,9 @@ +slide management +askForNumberWithQuestion: aString andDo: aBlock + + | userInput | + userInput := UIManager default request: aString. + userInput ifEmpty: [^ self]. "Check for cancel" + (aBlock value: userInput) + on: Error + do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st index 6cc17f6..aad5566 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st @@ -1,9 +1,11 @@ toolbuilder buttonBarTopData - ^ { self createSlideButtonData. + ^ { + self createSlideButtonData. self previousSlideButtonData. self nextSlideButtonData. self moveSlideButtonData. self presentationModeButtonData. - self magneticRasterButtonData} \ No newline at end of file + self magneticRasterButtonData + } \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st index 059add7..4c9a792 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlide..st @@ -2,6 +2,6 @@ slide management deleteSlide: anIndex | deletedSlide | - deletedSlide := self presentation deleteSlideAt: anIndex. + deletedSlide := self presentation deleteSlideAt: anIndex. self miniatures removeKey: deletedSlide ifAbsent: []. self updateSlideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st index d5aed50..7acafdd 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st @@ -1,9 +1,11 @@ presentation serialization exportAsPNGsIn: aDirectory - + self enablePresentationMode. self enableNonInteractiveMode. + World doOneCycle. self exportSlidesAsPNGsInDirectory: aDirectory. - self disablePresentationMode. - UIManager default inform: 'Your presentation has been exported to: ', aDirectory fullName \ No newline at end of file + + self disablePresentationMode. + UIManager default inform: self exportMessage , aDirectory fullName \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportMessage.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportMessage.st new file mode 100644 index 0000000..fb91d23 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportMessage.st @@ -0,0 +1,3 @@ +accessing +exportMessage + ^ 'Your presentation has been exported to: ' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st index b43547b..58a9cae 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportSlidesAsPNGsInDirectory..st @@ -4,4 +4,4 @@ exportSlidesAsPNGsInDirectory: aDirectory self presentation slidesWithIndexDo: [:each :index | self selectSlideNumber: index. World doOneCycle. - each exportAsPNGNamed: (aDirectory / ('slide', index, '.png')) fullName] \ No newline at end of file + each exportAsPNGNamed: (aDirectory / (self slideName: index)) fullName] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadCorruptionMessage.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadCorruptionMessage.st new file mode 100644 index 0000000..c2ef709 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadCorruptionMessage.st @@ -0,0 +1,5 @@ +accessing +loadCorruptionMessage + + ^ 'I could not load the presentation. +It''s directory might be corrupted.' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st index f4785be..66d335a 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st @@ -1,16 +1,11 @@ presentation serialization loadPresentation - + | presentations presentationName | - self - warn: self riskyOperationMessage - trueChoice: [] - falseChoice: [^ self]. + self warn: self riskyOperationMessage trueChoice: [] falseChoice: [ ^ self ]. presentations := self defaultDirectory directoryNames. - presentationName := UIManager default - chooseFrom: presentations - values: presentations - title: 'Which presentation do you want me to load?'. - presentationName ifNotNil: [self loadPresentationFromDirectory: self defaultDirectory / presentationName]. - "self updateSlideNumbers" - \ No newline at end of file + presentationName := UIManager default + chooseFrom: presentations + values: presentations + title: self loadQuestionMessage. + presentationName ifNotNil: [ self loadPresentationFromDirectory: self defaultDirectory / presentationName ] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st index 1718f2e..316c570 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st @@ -6,5 +6,4 @@ loadPresentationFromDirectory: aDirectory (loader loadPresentationFromDirectory: aDirectory) ifNotNil: [:presentation | self updatePresentation: presentation withErrorReport: loader errorReport] - ifNil: [UIManager default inform: 'I could not load the presentation. -It''s directory might be corrupted.'] \ No newline at end of file + ifNil: [UIManager default inform: self loadCorruptionMessage] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadQuestionMessage.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadQuestionMessage.st new file mode 100644 index 0000000..5ccaa22 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadQuestionMessage.st @@ -0,0 +1,3 @@ +accessing +loadQuestionMessage + ^ 'Which presentation do you want me to load?' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st index 30c6f35..2d3add2 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st @@ -1,6 +1,8 @@ toolbuilder menuBarButtonData - ^ {self fileButtonData. + ^ { + self fileButtonData. self insertButtonData. - self slideButtonData} \ No newline at end of file + self slideButtonData + } \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/miniatureOf..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/miniatureOf..st index b5db82d..c85e06b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/miniatureOf..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/miniatureOf..st @@ -1,6 +1,9 @@ slide miniatures miniatureOf: aPSSlide - ^ self miniatures at: aPSSlide ifAbsentPut: [(PSMiniature forSlide: aPSSlide) - model: self; - yourself] \ No newline at end of file + ^ self miniatures + at: aPSSlide + ifAbsentPut: [ + (PSMiniature forSlide: aPSSlide) + model: self; + yourself] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st index 45a61f8..446100c 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st @@ -1,9 +1,6 @@ slide management openSlideMoveDialog - | userInput | - userInput := UIManager default request: 'Where should I move the current slide???'. - userInput ifEmpty: [^ self]. "Check for cancel" - [self moveCurrentSlideTo: userInput asNumber] - on: Error - do: [UIManager inform: 'Not a valid number'] \ No newline at end of file + self + askForNumberWithQuestion: self slideMoveText + andDo: [:userInput | [self moveCurrentSlideTo: userInput asNumber]] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st deleted file mode 100644 index 1b59ba6..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideSelectionDialog.st +++ /dev/null @@ -1,9 +0,0 @@ -slide management -openSlideSelectionDialog - - | userInput | - userInput := UIManager default request: self slideSelectionDialogText. - userInput ifEmpty: [^ self]. "Check for cancel" - [self selectSlideNumber: userInput asNumber] - on: Error - do: [UIManager inform: 'Not a valid number'] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMoveText.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMoveText.st new file mode 100644 index 0000000..14cafa1 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideMoveText.st @@ -0,0 +1,4 @@ +accessing +slideMoveText + + ^ 'Where should I move the current slide to?' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideName..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideName..st new file mode 100644 index 0000000..0596869 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideName..st @@ -0,0 +1,4 @@ +presentation serialization +slideName: aNumber + + ^ 'slide' , aNumber , '.png' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st deleted file mode 100644 index 1143e6e..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideSelectionDialogText.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -slideSelectionDialogText - - ^ 'Which slide should I select???' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index f4055af..5a4f173 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -10,10 +10,11 @@ "addPSTextMorphIn:at:centeredWithSize:" : "MK 7/6/2018 15:40", "addPSTextMorphIn:at:withSize:" : "MK 7/6/2018 15:40", "afterBuildWith:" : "LM 7/6/2018 17:43", + "askForNumberWithQuestion:andDo:" : "WoC 7/24/2018 15:29", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", "buildWith:" : "MK 7/20/2018 15:15", - "buttonBarTopData" : "JZ 7/6/2018 15:08", + "buttonBarTopData" : "WoC 7/24/2018 15:13", "buttonHeight" : "LB 6/22/2018 18:34", "clampSlideNumber:" : "LM 7/13/2018 17:52", "createButtonBarTopSpec:" : "JZ 7/6/2018 15:47", @@ -38,7 +39,7 @@ "defaultDirectoryName" : "JZ 6/8/2018 16:52", "deleteAllSlides" : "LM 6/29/2018 20:03", "deleteSlide" : "LM 7/13/2018 17:23", - "deleteSlide:" : "LM 7/13/2018 17:23", + "deleteSlide:" : "WoC 7/24/2018 15:41", "deleteSlideAt:" : "LM 7/13/2018 17:37", "disableNonInteractiveMode" : "LB 7/6/2018 17:24", "disablePresentationMode" : "LM 7/13/2018 18:20", @@ -46,26 +47,29 @@ "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LM 7/13/2018 18:17", "exportAsPNGs" : "LM 7/13/2018 18:38", - "exportAsPNGsIn:" : "LM 7/13/2018 16:30", + "exportAsPNGsIn:" : "WoC 7/24/2018 15:49", "exportFolder" : "LM 7/13/2018 16:28", "exportFolderName" : "LM 7/13/2018 16:02", - "exportSlidesAsPNGsInDirectory:" : "LM 7/13/2018 18:58", + "exportMessage" : "WoC 7/24/2018 15:47", + "exportSlidesAsPNGsInDirectory:" : "WoC 7/24/2018 15:54", "fileButtonData" : "JZ 7/6/2018 15:42", "highlightCurrentMiniature" : "LB 6/29/2018 17:22", "initialize" : "LM 7/13/2018 18:00", "insertButtonData" : "JZ 7/6/2018 15:43", "isInteractive" : "LB 7/6/2018 17:09", "isInteractive:" : "LB 7/6/2018 17:19", - "loadPresentation" : "WoC 6/27/2018 14:13", - "loadPresentationFromDirectory:" : "MK 7/20/2018 15:42", + "loadCorruptionMessage" : "WoC 7/24/2018 15:44", + "loadPresentation" : "WoC 7/24/2018 15:56", + "loadPresentationFromDirectory:" : "WoC 7/24/2018 15:44", + "loadQuestionMessage" : "WoC 7/24/2018 15:48", "magneticRasterActive" : "LB 7/5/2018 19:48", "magneticRasterActive:" : "LB 7/5/2018 19:49", "magneticRasterButtonColor" : "LB 7/5/2018 21:59", "magneticRasterButtonData" : "JZ 7/6/2018 15:37", - "menuBarButtonData" : "LM 7/13/2018 14:18", + "menuBarButtonData" : "WoC 7/24/2018 15:14", "menuBarColor" : "LM 7/13/2018 14:13", "menuBarHeight" : "JZ 7/6/2018 15:47", - "miniatureOf:" : "LB 6/29/2018 17:28", + "miniatureOf:" : "WoC 7/24/2018 15:16", "miniatureViewLayoutFrame" : "LB 6/29/2018 15:31", "miniatureViewWidth" : "LB 6/29/2018 15:31", "miniatures" : "LB 6/29/2018 16:14", @@ -83,8 +87,7 @@ "openMenuWith:" : "WoC 7/13/2018 18:39", "openSlideLayoutChooser" : "MK 7/6/2018 16:28", "openSlideMenu" : "WoC 7/13/2018 18:42", - "openSlideMoveDialog" : "LM 7/13/2018 15:12", - "openSlideSelectionDialog" : "LB 7/13/2018 16:22", + "openSlideMoveDialog" : "WoC 7/24/2018 15:36", "presentation" : "LM 7/13/2018 17:15", "presentation:" : "LM 7/13/2018 17:15", "presentationMode" : "LM 5/25/2018 16:57", @@ -104,9 +107,10 @@ "slideCount" : "LM 7/13/2018 17:34", "slideLayoutNames" : "MK 7/13/2018 17:08", "slideMiniatures" : "LM 7/13/2018 18:19", + "slideMoveText" : "WoC 7/24/2018 15:57", + "slideName:" : "WoC 7/24/2018 15:54", "slideNumberString" : "LB 6/22/2018 16:08", "slideNumberString:" : "LB 6/29/2018 15:45", - "slideSelectionDialogText" : "LB 7/13/2018 14:58", "slidesDirectoryName" : "MK 6/8/2018 18:14", "step" : "LB 6/29/2018 17:05", "styleMenuBar:" : "LM 7/13/2018 14:17", diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st index 5edda34..5ae3bfd 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st @@ -1,4 +1,4 @@ testing dominates: other - ^ (other isKindOf: TextFontChange) or: [other class == self class] \ No newline at end of file + ^ (other isKindOf: TextFontChange) or: [other class == self class] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json index 227007f..755bbe8 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json @@ -7,7 +7,7 @@ "basicTextSize" : "LB 6/8/2018 12:31", "basicTextSize:" : "LB 6/8/2018 12:31", "couldDeriveFromPrettyPrinting" : "LB 6/8/2018 12:29", - "dominates:" : "LB 6/8/2018 14:07", + "dominates:" : "WoC 7/24/2018 15:12", "emphasizeScanner:" : "LB 6/8/2018 12:33", "font" : "LB 6/8/2018 12:45", "forFontInStyle:do:" : "LB 6/8/2018 16:16", diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/doubleClick..st b/packages/Presenter-Core.package/PSSlide.class/instance/doubleClick..st index 321208d..0d7a68d 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/doubleClick..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/doubleClick..st @@ -1,5 +1,5 @@ event handling doubleClick: evt - evt redButtonPressed ifTrue: [ - self addContent: (PSTextMorph new center: evt position)] \ No newline at end of file + evt redButtonPressed + ifTrue: [self addContent: (PSTextMorph new center: evt position)] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedImage.event..st b/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedImage.event..st index a2653e2..82ad5c2 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedImage.event..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedImage.event..st @@ -5,5 +5,4 @@ handleDroppedImage: aFileStream event: anEvent morph := SketchMorph fromStream: aFileStream. self resizeMorphToFit: morph. morph center: anEvent position. - self acceptDroppingMorph: morph event: anEvent - \ No newline at end of file + self acceptDroppingMorph: morph event: anEvent \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedItem.event..st b/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedItem.event..st index 8cef640..d7f1dfc 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedItem.event..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/handleDroppedItem.event..st @@ -1,6 +1,6 @@ dropping/grabbing handleDroppedItem: anItem event: anEvent - ((anItem isKindOf: FileStream) and: [self isImageFileName: anItem name]) + (self isImageStream: anItem) ifTrue: [self handleDroppedImage: anItem event: anEvent] ifFalse: [super handleDroppedItem: anItem event: anEvent] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/isImageFileName..st b/packages/Presenter-Core.package/PSSlide.class/instance/isImageFileName..st index ec9ec50..ca29a2d 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/isImageFileName..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/isImageFileName..st @@ -1,5 +1,5 @@ dropping/grabbing isImageFileName: aString - ^ ImageReadWriter allTypicalFileExtensions anySatisfy: - [:ending | aString endsWith: ending] \ No newline at end of file + ^ ImageReadWriter allTypicalFileExtensions + anySatisfy: [:ending | aString endsWith: ending] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/isImageStream..st b/packages/Presenter-Core.package/PSSlide.class/instance/isImageStream..st new file mode 100644 index 0000000..ff7d93f --- /dev/null +++ b/packages/Presenter-Core.package/PSSlide.class/instance/isImageStream..st @@ -0,0 +1,4 @@ +dropping/grabbing +isImageStream: anItem + + ^ (anItem isKindOf: FileStream) and: [self isImageFileName: anItem name] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st index 0919a68..d410454 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st @@ -3,5 +3,4 @@ mouseDown: evt super mouseDown: evt. evt redButtonPressed - ifTrue: [self waitForDoubleClick: evt]. - "self fullBounds" \ No newline at end of file + ifTrue: [self waitForDoubleClick: evt] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/prepareToBeSaved.st b/packages/Presenter-Core.package/PSSlide.class/instance/prepareToBeSaved.st index 172a0b9..9a050f1 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/prepareToBeSaved.st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/prepareToBeSaved.st @@ -2,4 +2,4 @@ presentation saving prepareToBeSaved super prepareToBeSaved. - self setModel: 0 \ No newline at end of file + self setModel: 0 "we needed a value, otherwise we get a MorphicModel1 as model and cannot load the presentation" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json index 44693cb..488bc08 100644 --- a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json @@ -6,20 +6,21 @@ "addContent:" : "LB 7/5/2018 19:57", "changed" : "LB 6/29/2018 16:57", "disablePresentationMode" : "LB 7/6/2018 18:00", - "doubleClick:" : "LM 5/25/2018 17:20", + "doubleClick:" : "WoC 7/24/2018 14:59", "enablePresentationMode" : "MK 5/25/2018 15:11", "extent:" : "LB 6/6/2018 14:49", - "handleDroppedImage:event:" : "LB 5/18/2018 17:38", - "handleDroppedItem:event:" : "LB 5/18/2018 17:33", + "handleDroppedImage:event:" : "WoC 7/24/2018 15:09", + "handleDroppedItem:event:" : "WoC 7/24/2018 15:05", "handlesMouseDown:" : "WoC 5/22/2018 19:23", "initialize" : "LM 7/6/2018 16:48", - "isImageFileName:" : "LB 5/18/2018 17:16", + "isImageFileName:" : "WoC 7/24/2018 15:00", + "isImageStream:" : "WoC 7/24/2018 15:05", "isMagnetic" : "MK 7/20/2018 14:29", "layoutFractionsOf:" : "LB 7/6/2018 17:47", "layoutFrameFor:" : "LB 7/6/2018 17:47", "model" : "LB 7/5/2018 20:03", - "mouseDown:" : "LB 7/6/2018 17:58", - "prepareToBeSaved" : "LB 6/22/2018 19:33", + "mouseDown:" : "WoC 7/24/2018 14:59", + "prepareToBeSaved" : "WoC 7/24/2018 14:50", "resizeMorphHeightToFit:" : "LB 5/18/2018 17:36", "resizeMorphToFit:" : "LB 5/18/2018 17:36", "resizeMorphWidthToFit:" : "LM 5/18/2018 19:26", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/deleteNotification.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/deleteNotification.st index 7513f14..ec52054 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/deleteNotification.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/deleteNotification.st @@ -1,4 +1,5 @@ notifications deleteNotification - self notification ifNotNil: [self notification abandon] \ No newline at end of file + self notification + ifNotNil: [self notification abandon] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/disableNonInteractiveMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/disableNonInteractiveMode.st index ec0db60..921376f 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/disableNonInteractiveMode.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/disableNonInteractiveMode.st @@ -1,5 +1,4 @@ presentation mode disableNonInteractiveMode - ActiveHand showHardwareCursor: true. - self showNotification: 'interactive mode' \ No newline at end of file + self shouldShowCursor: true andNotify: 'interactive mode' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st index fc43943..6a4395e 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st @@ -3,7 +3,8 @@ disablePresentationMode self ensurePreviousOwnerIsNotSubmorph. self previousOwner addMorph: self. - self color: self defaultColor; + self + color: self defaultColor; deleteNotification; stopStepping diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enableNonInteractiveMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enableNonInteractiveMode.st index 937d841..09aec0a 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enableNonInteractiveMode.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enableNonInteractiveMode.st @@ -1,5 +1,4 @@ presentation mode enableNonInteractiveMode - ActiveHand showHardwareCursor: false. - self showNotification: 'non interactive mode' \ No newline at end of file + self shouldShowCursor: false andNotify: 'non interactive mode' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st index 9978f7f..622622f 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st @@ -2,9 +2,8 @@ presentation mode enablePresentationMode self previousOwner: self owner. - self owner removeMorph: self. self - occupyWorld: self previousOwner world; + occupyWorld: self world; startStepping; color: Color black; showNotification: 'Press ''i'' to toggle interactivity' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st index dec6b16..6f489f9 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st @@ -5,5 +5,6 @@ ensurePreviousOwnerIsNotSubmorph morph := self findDeepSubmorphThat: [:m | m = self previousOwner ] ifAbsent: [nil]. morph ifNotNil: [ window := morph model window. - window owner removeMorph: window. - window openInWorld.] \ No newline at end of file + window + delete; + openInWorld] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/isInPresentationMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isInPresentationMode.st new file mode 100644 index 0000000..3a28027 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isInPresentationMode.st @@ -0,0 +1,4 @@ +testing +isInPresentationMode + + ^ self model presentationMode \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/keyStroke..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/keyStroke..st index 4a80348..46c7299 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/keyStroke..st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/keyStroke..st @@ -3,7 +3,7 @@ keyStroke: evt | shortcuts choices | choices := self chooseShortcutsDictionary: evt. - shortcuts := self model presentationMode + shortcuts := self isInPresentationMode ifTrue: [choices first] ifFalse: [choices second]. diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st index f344001..57bc3e6 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st @@ -1,4 +1,4 @@ -stepping and presenter +testing occupiesWorld ^ self extent = self world extent diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/shouldShowCursor.andNotify..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/shouldShowCursor.andNotify..st new file mode 100644 index 0000000..f302615 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/shouldShowCursor.andNotify..st @@ -0,0 +1,5 @@ +presentation mode +shouldShowCursor: aBoolean andNotify: aString + + ActiveHand showHardwareCursor: aBoolean. + self showNotification: aString \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st index cef66d3..e6e2435 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st @@ -2,6 +2,6 @@ display showSlide: aPSSlide self currentSlide ifNotNil: [self removeMorph: self currentSlide]. - aPSSlide ifNotNil: - [self currentSlide: aPSSlide. - self addMorph: self currentSlide fullFrame: (LayoutFrame fractions: (0@0 corner: 1@1))]. \ No newline at end of file + self + currentSlide: aPSSlide; + addMorph: self currentSlide fullFrame: (LayoutFrame fractions: (0@0 corner: 1@1)) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st index afb3a1f..4941115 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st @@ -1,6 +1,6 @@ stepping and presenter step - self model presentationMode ifFalse: [^self]. + self isInPresentationMode ifFalse: [^self]. self occupiesWorld ifFalse: [self occupyWorld: self world] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index 995f99d..2d9cda6 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -8,21 +8,22 @@ "currentSlide" : "MK 5/6/2018 13:56", "currentSlide:" : "MK 5/6/2018 15:51", "defaultColor" : "MK 5/25/2018 15:41", - "deleteNotification" : "WoC 6/15/2018 19:25", - "disableNonInteractiveMode" : "LB 7/6/2018 17:04", - "disablePresentationMode" : "LB 7/6/2018 17:27", - "enableNonInteractiveMode" : "LB 7/6/2018 17:03", - "enablePresentationMode" : "JZ 6/29/2018 19:01", - "ensurePreviousOwnerIsNotSubmorph" : "JZ 6/29/2018 19:06", + "deleteNotification" : "WoC 7/24/2018 14:58", + "disableNonInteractiveMode" : "WoC 7/24/2018 14:17", + "disablePresentationMode" : "WoC 7/24/2018 14:15", + "enableNonInteractiveMode" : "WoC 7/24/2018 14:17", + "enablePresentationMode" : "WoC 7/24/2018 14:08", + "ensurePreviousOwnerIsNotSubmorph" : "WoC 7/24/2018 14:11", "filterEvent:for:" : "LB 7/6/2018 17:08", "handlesKeyboard:" : "WoC 6/15/2018 17:00", "in:tryToEvaluate:" : "WoC 6/15/2018 17:07", "initialize" : "LM 7/13/2018 15:42", "initializeStyle" : "WoC 6/15/2018 16:00", "isCollapsed" : "LM 6/6/2018 18:13", + "isInPresentationMode" : "WoC 7/24/2018 14:35", "isMagnetic" : "MK 7/20/2018 14:29", "isSystemWindow" : "WoC 6/4/2018 17:35", - "keyStroke:" : "MK 6/28/2018 13:56", + "keyStroke:" : "WoC 7/24/2018 14:35", "lookUnfocused" : "WoC 6/4/2018 17:13", "makeMeVisible" : "WoC 6/3/2018 00:10", "notification" : "WoC 6/15/2018 19:21", @@ -41,8 +42,9 @@ "previousOwner:" : "MK 5/25/2018 15:32", "sharedCommandShortcuts" : "MK 6/28/2018 14:00", "sharedShortcuts" : "LB 6/29/2018 15:45", + "shouldShowCursor:andNotify:" : "WoC 7/24/2018 14:16", "showNotification:" : "LM 6/22/2018 15:40", - "showSlide:" : "LB 5/6/2018 16:49", - "step" : "LB 7/6/2018 17:44", + "showSlide:" : "WoC 7/24/2018 14:30", + "step" : "WoC 7/24/2018 14:37", "stepTime" : "JZ 6/29/2018 18:56", "wantsDroppedMorph:event:" : "MK 6/7/2018 09:29" } } diff --git a/packages/Presenter-Core.package/PSTextMorph.class/README.md b/packages/Presenter-Core.package/PSTextMorph.class/README.md index b9621a3..ff033c7 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/README.md +++ b/packages/Presenter-Core.package/PSTextMorph.class/README.md @@ -1,7 +1,7 @@ -A PSTextMorph is a TestMorph for PowerSqueak-presentations, that enables scaling, coloring, resizing for text and background-coloring. +A PSTextMorph is a TextMorph for PowerSqueak-presentations, that enables scaling, coloring, resizing for text and background-coloring. Instance Variables - textScale: Number + textScale: textScale - scaling factor for text diff --git a/packages/Presenter-Core.package/PSTextMorph.class/properties.json b/packages/Presenter-Core.package/PSTextMorph.class/properties.json index 8811052..6b9791e 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/properties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ "DefaultTextStyle" ], - "commentStamp" : "WoC 7/13/2018 16:46", + "commentStamp" : "WoC 7/24/2018 13:55", "instvars" : [ "textScale" ], "name" : "PSTextMorph", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st deleted file mode 100644 index 5e32bc6..0000000 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideSelectionDialog.st +++ /dev/null @@ -1,7 +0,0 @@ -slide navigation tests -testSlideSelectionDialog - - self - should: [self tool openSlideSelectionDialog] - raise: ProvideAnswerNotification - description: self tool slideSelectionDialogText \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index d75b532..551f6bf 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -45,7 +45,6 @@ "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", "testSlideRatioIsFixed" : "LB 7/13/2018 19:05", "testSlideResizeRegression" : "LB 7/13/2018 18:59", - "testSlideSelectionDialog" : "LB 7/13/2018 14:58", "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", "testZeroSlidesRegression" : "LM 7/13/2018 17:23", "testnextSlideClampsToMax" : "LM 7/13/2018 17:57", From f1d7f82b5ef27b2af29584c32ac86d9aca3fa56c Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 16:32:01 +0200 Subject: [PATCH 050/112] Changed stepTime of PSFadingMessage to be more realistic with Squeak performance --- .../PSFadingMessage.class/instance/stepTime.st | 2 +- .../PSFadingMessage.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/stepTime.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/stepTime.st index c4f0474..adcdc4c 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/stepTime.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/stepTime.st @@ -1,4 +1,4 @@ stepping and presenter stepTime - ^ 10 \ No newline at end of file + ^ 20 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index f3aa54e..7d32436 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -10,7 +10,7 @@ "remaining:" : "LB 7/6/2018 18:03", "startFadingTime" : "LM 7/13/2018 14:25", "step" : "MK 7/13/2018 18:01", - "stepTime" : "WoC 6/15/2018 17:55", + "stepTime" : "LM 7/24/2018 15:44", "totalVisibleTime" : "LM 7/13/2018 14:30", "updateColor" : "LM 7/13/2018 14:55", "withMessage:" : "MK 7/13/2018 18:02" } } From 2e3ae65eeb257145d0afac85833fd794ef37fd84 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 16:44:36 +0200 Subject: [PATCH 051/112] Changed World doOneCycle to redrawLater+displayWorldSafely --- .../instance/updateSlideMiniaturesCompletely.st | 3 ++- .../PSPresentationTool.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st index 8eeb00c..fc34854 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/updateSlideMiniaturesCompletely.st @@ -6,6 +6,7 @@ updateSlideMiniaturesCompletely self updateSlideMiniatures. 1 to: self slideCount do: [:index | self selectSlideNumber: index. - World doOneCycle. + self currentSlide redrawLater. + self currentSlide world displayWorldSafely. self updateCurrentMiniature]. self selectSlideNumber: previousSelection \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index c4a7f7c..a19ef9f 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -117,7 +117,7 @@ "updateCurrentMiniature" : "LB 6/29/2018 17:21", "updatePresentation:withErrorReport:" : "MK 7/20/2018 15:41", "updateSlideMiniatures" : "LB 6/29/2018 17:08", - "updateSlideMiniaturesCompletely" : "MK 7/20/2018 15:32", + "updateSlideMiniaturesCompletely" : "LM 7/24/2018 16:41", "viewPortLayoutFrame" : "LB 6/29/2018 15:31", "wantsSteps" : "LB 6/29/2018 17:04", "warn:trueChoice:" : "JZ 6/8/2018 17:54", From 3b24358892647cad679684eedd90b5cf85c7b725 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 16:51:50 +0200 Subject: [PATCH 052/112] Added test for is the world in presentation mode always occupied after one step --- .../instance/testOccupiesWorldOnStep.st | 8 ++++++++ .../instance/testSlideContainerPosition.st | 2 +- .../PSPresentationToolTest.class/methodProperties.json | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st new file mode 100644 index 0000000..4bf8db9 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st @@ -0,0 +1,8 @@ +presentation mode tests +testOccupiesWorldOnStep + + self tool enablePresentationMode. + self slideContainer extent: self slideContainer extent / 2. + self deny: self slideContainer occupiesWorld. + self slideContainer step. + self assert: self slideContainer occupiesWorld \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st index 1838435..3b86c1f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st @@ -1,5 +1,5 @@ presentation mode tests testSlideContainerPosition - self tool slideContainer enablePresentationMode. + self tool enablePresentationMode. self assert: self tool slideContainer position equals: 0@0 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index dafe4b6..e4afc28 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -31,13 +31,14 @@ "testMovedSlideStayCurrentSlide" : "LB 6/29/2018 15:45", "testNextSlide" : "LM 7/13/2018 17:52", "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", + "testOccupiesWorldOnStep" : "LB 7/24/2018 16:48", "testPreviousSlideClampsToMin" : "LM 7/13/2018 17:53", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", "testSelectSlide" : "LM 7/13/2018 17:53", "testSelectSlideClamps" : "LM 7/13/2018 17:53", "testSelectedMiniatureChanges" : "LB 6/29/2018 19:05", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", - "testSlideContainerPosition" : "LM 6/8/2018 19:55", + "testSlideContainerPosition" : "LB 7/24/2018 16:47", "testSlideCreation" : "LM 7/13/2018 18:20", "testSlideCreationReturnsSlide" : "LM 5/18/2018 18:37", "testSlideCreationSelectsNewSlide" : "LM 7/13/2018 17:56", From c9fc875c85dac2cd30bbb48138cc514f623e913f Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Tue, 24 Jul 2018 17:03:37 +0200 Subject: [PATCH 053/112] refactorings --- .../instance/addContentMenuItemsTo..st | 6 ++++++ .../instance/createContextMenu.st | 14 +++++--------- .../PSContentContainer.class/instance/extent..st | 5 +++-- .../instance/filterEvent.for..st | 2 +- .../instance/invokeContextMenu.st | 9 +++++++++ .../instance/openMenu..st | 6 ++++++ .../instance/rasterResolution.st | 2 +- .../instance/removeResizeHandles.st | 5 +++-- .../instance/resizeFractionsOf..st | 3 ++- .../methodProperties.json | 15 +++++++++------ .../instance/deleteSlideAt..st | 2 +- .../PSPresentation.class/methodProperties.json | 2 +- .../instance/showErrorReport..st | 7 +++---- .../instance/successfullLoadText.st | 3 +++ .../methodProperties.json | 3 ++- .../instance/invokeContextMenu.st | 4 ++++ .../methodProperties.json | 3 ++- .../instance/testContextMenuContent.equals..st | 2 +- .../PSOnSlideTest.class/methodProperties.json | 2 +- 19 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/addContentMenuItemsTo..st create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/invokeContextMenu.st create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/openMenu..st create mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/successfullLoadText.st create mode 100644 packages/Presenter-Tests.package/PSMockContentContainer.class/instance/invokeContextMenu.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addContentMenuItemsTo..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addContentMenuItemsTo..st new file mode 100644 index 0000000..800cc1b --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/addContentMenuItemsTo..st @@ -0,0 +1,6 @@ +context menu +addContentMenuItemsTo: aMenu + + aMenu defaultTarget: self content. + (self content hasProperty: #wantsCustomContextMenu) + ifTrue: [aMenu addList: self content customContextMenuContent] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st index 82e5da7..7732e47 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/createContextMenu.st @@ -2,12 +2,8 @@ context menu createContextMenu | menu | - menu := MenuMorph new defaultTarget: self. - menu - addList: self defaultContextMenuContent; - defaultTarget: self content. - (self content hasProperty: #wantsCustomContextMenu) ifTrue: [ - menu addList: self content customContextMenuContent]. - menu setInvokingView: self. - menu popUpEvent: self activeHand lastEvent in: self world. - ^ menu "just for testing reasons" \ No newline at end of file + menu := MenuMorph new + defaultTarget: self; + yourself. + menu addList: self defaultContextMenuContent. + ^ menu \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/extent..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/extent..st index 8090bc5..5abe2fe 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/extent..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/extent..st @@ -3,6 +3,7 @@ extent: aPoint (self extent closeTo: aPoint) ifTrue: [^ self]. super extent: aPoint. - self resizeChild. - self placeHandles + self + resizeChild; + placeHandles \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/filterEvent.for..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/filterEvent.for..st index ffe1359..ed443c9 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/filterEvent.for..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/filterEvent.for..st @@ -4,6 +4,6 @@ filterEvent: evt for: aMorphOrNil (self containsPoint: evt position) ifTrue: [ evt isMouseDown ifTrue: [ evt yellowButtonPressed ifTrue: [ - self createContextMenu. + self invokeContextMenu. evt ignore]]]. ^ evt \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/invokeContextMenu.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/invokeContextMenu.st new file mode 100644 index 0000000..9d80e02 --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/invokeContextMenu.st @@ -0,0 +1,9 @@ +context menu +invokeContextMenu + + | menu | + menu := self createContextMenu. + self + addContentMenuItemsTo: menu; + openMenu: menu. + ^ menu "just for testing reasons" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/openMenu..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/openMenu..st new file mode 100644 index 0000000..600c410 --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/openMenu..st @@ -0,0 +1,6 @@ +context menu +openMenu: aMenu + + aMenu + setInvokingView: self; + popUpEvent: self activeHand lastEvent in: self world \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st index 2604cab..2a070c3 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st @@ -1,4 +1,4 @@ magnetic raster rasterResolution - ^ (0.04@0.03) \ No newline at end of file + ^ (0.04 @ 0.03) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/removeResizeHandles.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/removeResizeHandles.st index b4238ea..3ac0d54 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/removeResizeHandles.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/removeResizeHandles.st @@ -1,6 +1,7 @@ handles removeResizeHandles - self resizeHandles do: [:each | each abandon]. - self resizeHandles removeAll. + self resizeHandles + do: [:each | each abandon]; + removeAll. self hasHandles: false \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st index bcc7bd5..999de54 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st @@ -3,5 +3,6 @@ resizeFractionsOf: anEvent | layoutFractions | layoutFractions := self owner layoutFractionsOf: anEvent cursorPoint. - self isMagnetic ifTrue: [layoutFractions := layoutFractions roundTo: self rasterResolution]. + self isMagnetic + ifTrue: [layoutFractions := layoutFractions roundTo: self rasterResolution]. ^ layoutFractions \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 6e0f599..1c8a8ac 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -3,12 +3,13 @@ "for:" : "LB 7/6/2018 18:09" }, "instance" : { "actionForCorner:" : "LB 7/24/2018 13:51", + "addContentMenuItemsTo:" : "WoC 7/24/2018 16:47", "addHandleAt:" : "LB 7/6/2018 18:07", "addResizeHandles" : "LM 7/13/2018 14:58", "content" : "MK 7/24/2018 14:08", "content:" : "MK 7/24/2018 14:08", "copyChildToHand" : "MK 7/24/2018 14:08", - "createContextMenu" : "MK 7/24/2018 14:08", + "createContextMenu" : "WoC 7/24/2018 16:54", "createHandleOnMove:" : "LM 7/13/2018 14:59", "defaultContextMenuContent" : "LM 7/13/2018 14:59", "disablePresentationMode" : "WoC 6/17/2018 18:44", @@ -17,12 +18,12 @@ "dragTopLeftEvent:" : "LB 7/24/2018 13:50", "dragTopRightEvent:" : "LB 7/24/2018 13:50", "enablePresentationMode" : "LM 6/8/2018 20:10", - "extent:" : "MK 5/25/2018 17:11", + "extent:" : "WoC 7/24/2018 16:59", "extentBottomLeft:" : "LB 7/6/2018 15:57", "extentBottomRight:" : "LB 7/6/2018 15:57", "extentTopLeft:" : "LB 7/6/2018 15:57", "extentTopRight:" : "LB 7/6/2018 15:57", - "filterEvent:for:" : "MK 6/1/2018 18:02", + "filterEvent:for:" : "WoC 7/24/2018 16:53", "grabChild" : "MK 7/24/2018 14:08", "handleLayerNumber" : "MK 5/25/2018 16:26", "handlesMouseDown:" : "WoC 5/22/2018 19:48", @@ -30,15 +31,17 @@ "hasHandles:" : "MK 5/25/2018 17:01", "ifAnyHandleContains:do:" : "MK 5/25/2018 17:06", "initialize" : "LB 7/6/2018 15:35", + "invokeContextMenu" : "WoC 7/24/2018 16:52", "isMagnetic" : "LB 7/5/2018 21:38", "mouseDown:" : "MK 7/24/2018 14:08", "notifySlideRescale:" : "MK 7/24/2018 14:08", + "openMenu:" : "WoC 7/24/2018 16:52", "placeHandles" : "LB 7/6/2018 18:10", - "rasterResolution" : "LB 7/5/2018 19:42", - "removeResizeHandles" : "MK 5/25/2018 16:18", + "rasterResolution" : "WoC 7/24/2018 17:00", + "removeResizeHandles" : "WoC 7/24/2018 17:00", "removedMorph:" : "MK 7/24/2018 14:08", "resizeChild" : "MK 7/24/2018 14:08", - "resizeFractionsOf:" : "LB 7/6/2018 17:48", + "resizeFractionsOf:" : "WoC 7/24/2018 17:01", "resizeHandleSize" : "MK 5/18/2018 19:13", "resizeHandles" : "MK 5/18/2018 17:43", "resizeHandles:" : "LB 7/6/2018 15:35", diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st b/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st index 98aae71..5d7339d 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/deleteSlideAt..st @@ -4,6 +4,6 @@ deleteSlideAt: anIndex | deletedSlide | self slideCount = self minimumSlideCount ifTrue: [ self createSlideAfter: anIndex ]. "There should never be zero slides" - deletedSlide := self slides removeAt: anIndex. + deletedSlide := self slides removeAt: anIndex. deletedSlide abandon. ^ deletedSlide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json index a7cfebf..9cb1ee6 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json @@ -12,7 +12,7 @@ "createSlideBack" : "MK 7/20/2018 15:09", "defaultDirectory" : "LM 7/13/2018 18:35", "defaultDirectoryName" : "LM 7/13/2018 18:35", - "deleteSlideAt:" : "LM 7/13/2018 17:37", + "deleteSlideAt:" : "WoC 7/24/2018 16:37", "indexOf:" : "LM 7/13/2018 17:55", "initialize" : "MK 7/20/2018 15:17", "minimumSlideCount" : "LM 7/13/2018 17:16", diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st index c561276..7c1471a 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st @@ -1,8 +1,7 @@ notifications showErrorReport: aDictionary - | corruptedSlides | - corruptedSlides := aDictionary select: [:each | each > 0]. + corruptedSlides := aDictionary select: [ :each | each > 0 ]. corruptedSlides - ifEmpty: [UIManager inform: 'I successfully loaded the presentation.'] - ifNotEmpty: [UIManager inform: (self buildErrorReportString: corruptedSlides)] \ No newline at end of file + ifEmpty: [ UIManager inform: self successfullLoadText ] + ifNotEmpty: [ UIManager inform: (self buildErrorReportString: corruptedSlides) ] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/successfullLoadText.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/successfullLoadText.st new file mode 100644 index 0000000..517fc6d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/successfullLoadText.st @@ -0,0 +1,3 @@ +accessing +successfullLoadText + ^ 'I successfully loaded the presentation.' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index c4a7f7c..b4560fd 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -97,7 +97,7 @@ "savePresentation" : "LM 7/13/2018 18:47", "selectSlide:" : "LM 7/13/2018 17:55", "selectSlideNumber:" : "WoC 6/29/2018 19:18", - "showErrorReport:" : "LM 7/13/2018 15:13", + "showErrorReport:" : "WoC 7/24/2018 16:33", "slideAt:" : "LM 7/13/2018 18:12", "slideButtonData" : "LM 7/6/2018 17:27", "slideContainer" : "MK 5/6/2018 15:32", @@ -112,6 +112,7 @@ "slidesDirectoryName" : "MK 6/8/2018 18:14", "step" : "LB 6/29/2018 17:05", "styleMenuBar:" : "LM 7/13/2018 14:17", + "successfullLoadText" : "WoC 7/24/2018 16:33", "toggleInteractivity" : "LB 7/6/2018 16:58", "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", diff --git a/packages/Presenter-Tests.package/PSMockContentContainer.class/instance/invokeContextMenu.st b/packages/Presenter-Tests.package/PSMockContentContainer.class/instance/invokeContextMenu.st new file mode 100644 index 0000000..b73fb84 --- /dev/null +++ b/packages/Presenter-Tests.package/PSMockContentContainer.class/instance/invokeContextMenu.st @@ -0,0 +1,4 @@ +context menu +invokeContextMenu + + self menuCreated: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json index b3c0f07..9946ab4 100644 --- a/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json @@ -2,7 +2,8 @@ "class" : { }, "instance" : { - "createContextMenu" : "MK 6/1/2018 20:03", + "createContextMenu" : "WoC 7/24/2018 16:56", "initialize" : "MK 6/1/2018 20:02", + "invokeContextMenu" : "WoC 7/24/2018 16:57", "menuCreated" : "MK 6/1/2018 20:02", "menuCreated:" : "MK 6/1/2018 20:03" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st index 9b76d8c..4454615 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st @@ -3,7 +3,7 @@ testContextMenuContent: aMorph equals: aCollection | container menu items | container := aMorph owner. - menu := container createContextMenu. + menu := container invokeContextMenu. items := self collectMenuContentFrom: menu. self assert: (items = aCollection). menu abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 66552b2..8f90a80 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -11,5 +11,5 @@ "slideContainer:" : "LB 7/13/2018 18:13", "tearDown" : "LB 7/13/2018 18:13", "testAcceptDropImageFile" : "MK 7/24/2018 14:08", - "testContextMenuContent:equals:" : "LB 7/20/2018 15:32", + "testContextMenuContent:equals:" : "WoC 7/24/2018 16:53", "testTextFieldCreatedOnDoubleClick" : "MK 7/24/2018 14:08" } } From b2b6bca0b8579979ff8080eaeb4a26edcba5a72a Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 17:06:37 +0200 Subject: [PATCH 054/112] Removed parent from PSMockFileDirectory --- .../PSMockFileDirectory.class/README.md | 33 +++++++++++++++++++ .../instance/parent..st | 4 --- .../instance/parent.st | 4 --- .../methodProperties.json | 2 -- .../PSMockFileDirectory.class/properties.json | 3 +- 5 files changed, 34 insertions(+), 12 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent..st delete mode 100644 packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent.st diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md b/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md index e69de29..56c840c 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md @@ -0,0 +1,33 @@ +A PSMockFileDirectory mocks a standard FileDirectory without doing actual FileIO. +Supports most common operatons, like asking for fileNames/subdirectoryNames, etc. +Can even mock non-existent files. +PSMockFileDirectories can be easily instantiated to simulate complex directory structures via the PSMockFileDirectory>>#from: method. +This method accepts an association of the following scheme: +'aDirectoryName' -> { + 'aFileName'. + 'aSubDirectoryName' -> { + ... + } +} + +Instance Variables + contents: + exists: + isFile: + name: + subdirectories: + +contents + - an Object, simulating the contents of the file + +exists + - Boolean, marking whether the file/directory exists + +isFile + - whether the PSMockFileDirectory simulates a file (simulates a directory if false) + +name + - Name of the File/Directory + +subdirectories + - Collection containing all subdirectories and all contained files diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent..st deleted file mode 100644 index 859e203..0000000 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -parent: anObject - - parent := anObject diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent.st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent.st deleted file mode 100644 index 10ddb78..0000000 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/parent.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -parent - - ^ parent diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json index 339ceca..fea4a12 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json @@ -17,8 +17,6 @@ "localName" : "JZ 6/29/2018 17:00", "name" : "LM 6/15/2018 16:59", "name:" : "LM 6/15/2018 16:54", - "parent" : "LM 6/15/2018 16:54", - "parent:" : "LM 6/15/2018 16:54", "readOnlyFileNamed:" : "LM 7/24/2018 15:03", "subdirectories" : "LM 6/15/2018 16:54", "subdirectories:" : "LM 6/15/2018 16:54" } } diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json index 5138773..444fc24 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json @@ -4,10 +4,9 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "LM 7/24/2018 16:58", "instvars" : [ "name", - "parent", "subdirectories", "exists", "isFile", From e9024054b1e07d1116e9a12bf003a643e3be5b93 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Tue, 24 Jul 2018 17:14:22 +0200 Subject: [PATCH 055/112] More class comments Minor changes --- .../PSPresentationLoader.class/README.md | 11 ++++++++ .../properties.json | 2 +- .../PSPresentationTool.class/README.md | 28 +++++++++++++++++++ .../instance/buildWith..st | 1 - .../instance/buttonBarTopData.st | 2 +- .../instance/buttonHeight.st | 2 +- .../instance/createSlideButtonData.st | 2 +- .../instance/exportAsPNGsIn..st | 10 ++++--- .../instance/fileButtonData.st | 2 +- .../instance/insertButtonData.st | 2 +- .../instance/loadPresentation.st | 3 +- .../instance/magneticRasterButtonData.st | 2 +- .../instance/menuBarButtonData.st | 2 +- .../instance/moveSlideButtonData.st | 2 +- .../instance/nextSlideButtonData.st | 2 +- .../instance/presentation..st | 5 ++-- .../instance/presentation.st | 1 + .../instance/presentationModeButtonData.st | 2 +- .../instance/previousSlideButtonData.st | 2 +- .../instance/slideButtonData.st | 2 +- .../instance/styleMenuBar..st | 2 +- .../instance/window..st | 4 --- .../instance/window.st | 4 --- .../methodProperties.json | 16 +++++------ .../PSPresentationTool.class/properties.json | 3 +- .../ensurePreviousOwnerIsNotSubmorph.st | 3 +- .../methodProperties.json | 2 +- 27 files changed, 75 insertions(+), 44 deletions(-) delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/window..st delete mode 100644 packages/Presenter-Core.package/PSPresentationTool.class/instance/window.st diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/README.md b/packages/Presenter-Core.package/PSPresentationLoader.class/README.md index e69de29..b320595 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/README.md +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/README.md @@ -0,0 +1,11 @@ +A PSPresentationLoader loads a PSPresentation from a given file directory. Therefore PSPresentationLoader>>#loadPresentationFromDirectory is used and returns the presentation. + +Instance Variables + errorReport: + presentation: + +errorReport + - Dictionary containing the number of morphs per slide that could not be loaded + +presentation + - The presentation the loader is loading \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json index 823c5a6..100944e 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 16:37", "instvars" : [ "errorReport", "presentation" ], diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/README.md b/packages/Presenter-Core.package/PSPresentationTool.class/README.md index e69de29..033cd19 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/README.md +++ b/packages/Presenter-Core.package/PSPresentationTool.class/README.md @@ -0,0 +1,28 @@ +A PSPresentationTool is xxxxxxxxx. + +Instance Variables + currentSlideNumber: + isInteractive: + magneticRasterActive: + miniatures: + presentation: + presentationMode: + slideContainer: + +isInteractive + - Shows whether the presentation is in interactive or noninteractive mode + +magneticRasterActive + - Shows whether the magnetic raster is activated or not + +miniatures + - Dictionary containing a PSMiniature for every slide of the current PSPresentation + +presentation + - The current PSPresentation + +presentationMode + - Shows whether the tool is in presentation mode + +slideContainer + - The PSSlideContainer that contains and displays the currently selected slide \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st index aa49d6e..7ebb761 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st @@ -20,7 +20,6 @@ buildWith: builder self createSlideContainerIn: (builder widgetAt: #SlideViewport). self selectSlideNumber: 1. - self window: window. self afterBuildWith: builder. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st index 6cc17f6..db3bd9f 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons buttonBarTopData ^ { self createSlideButtonData. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonHeight.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonHeight.st index afeebde..9574522 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonHeight.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonHeight.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons buttonHeight ^ Preferences standardButtonFont height * 3 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st index 465bc8c..d29b768 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons createSlideButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st index d5aed50..ed568dc 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/exportAsPNGsIn..st @@ -1,9 +1,11 @@ presentation serialization exportAsPNGsIn: aDirectory - self enablePresentationMode. - self enableNonInteractiveMode. + self + enablePresentationMode; + enableNonInteractiveMode. World doOneCycle. - self exportSlidesAsPNGsInDirectory: aDirectory. - self disablePresentationMode. + self + exportSlidesAsPNGsInDirectory: aDirectory; + disablePresentationMode. UIManager default inform: 'Your presentation has been exported to: ', aDirectory fullName \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/fileButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/fileButtonData.st index ce96231..ef65939 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/fileButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/fileButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons fileButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/insertButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/insertButtonData.st index 731fc8a..2c54967 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/insertButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/insertButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons insertButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st index f4785be..7a10ea4 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st @@ -11,6 +11,5 @@ loadPresentation chooseFrom: presentations values: presentations title: 'Which presentation do you want me to load?'. - presentationName ifNotNil: [self loadPresentationFromDirectory: self defaultDirectory / presentationName]. - "self updateSlideNumbers" + presentationName ifNotNil: [self loadPresentationFromDirectory: self defaultDirectory / presentationName] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonData.st index c2a03fc..03179e1 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons magneticRasterButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st index 30c6f35..bc995d7 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons menuBarButtonData ^ {self fileButtonData. diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveSlideButtonData.st index 511a3a5..7490d55 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveSlideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/moveSlideButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons moveSlideButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlideButtonData.st index 99dd58c..9c9e6d1 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlideButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons nextSlideButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st index 081d91e..6aff492 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation..st @@ -1,3 +1,4 @@ accessing -presentation: anObject - presentation := anObject \ No newline at end of file +presentation: aPSPresentation + + presentation := aPSPresentation \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st index da0ea79..db60b59 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentation.st @@ -1,3 +1,4 @@ accessing presentation + ^ presentation \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentationModeButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentationModeButtonData.st index 99a154d..e96221f 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentationModeButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/presentationModeButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons presentationModeButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/previousSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/previousSlideButtonData.st index 8525c71..ab322b4 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/previousSlideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/previousSlideButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons previousSlideButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideButtonData.st index 486789e..41ab056 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slideButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons slideButtonData ^ Dictionary withAll: { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st index 0d65775..70a2e4f 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/styleMenuBar..st @@ -1,5 +1,5 @@ toolbuilder styleMenuBar: aBuilder - "Only for esthetics, only works with Morphs!" + "Only for aesthetics, only works with Morphs!" self menuBarButtonData do: [ :each | (aBuilder widgetAt: (each at: #name)) borderWidth: 0] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/window..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/window..st deleted file mode 100644 index fd5420c..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/window..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -window: aPluggableSystemWindow - - window := aPluggableSystemWindow diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/window.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/window.st deleted file mode 100644 index 76296fa..0000000 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/window.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -window - - ^ window diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 1df3c73..e6398b3 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -12,7 +12,7 @@ "afterBuildWith:" : "LM 7/6/2018 17:43", "barFrameFrom:height:" : "LB 6/22/2018 18:28", "buildErrorReportString:" : "MK 6/8/2018 18:38", - "buildWith:" : "MK 7/20/2018 15:15", + "buildWith:" : "MK 7/24/2018 16:57", "buttonBarTopData" : "JZ 7/6/2018 15:08", "buttonHeight" : "LB 6/22/2018 18:34", "clampSlideNumber:" : "LM 7/13/2018 17:52", @@ -44,7 +44,7 @@ "enableNonInteractiveMode" : "LB 7/6/2018 17:24", "enablePresentationMode" : "LM 7/13/2018 18:17", "exportAsPNGs" : "LM 7/13/2018 18:38", - "exportAsPNGsIn:" : "LM 7/13/2018 16:30", + "exportAsPNGsIn:" : "MK 7/24/2018 17:06", "exportFolder" : "LM 7/13/2018 16:28", "exportFolderName" : "LM 7/13/2018 16:02", "exportSlidesAsPNGsInDirectory:" : "LM 7/13/2018 18:58", @@ -54,7 +54,7 @@ "insertButtonData" : "JZ 7/6/2018 15:43", "isInteractive" : "LB 7/6/2018 17:09", "isInteractive:" : "LB 7/6/2018 17:19", - "loadPresentation" : "WoC 6/27/2018 14:13", + "loadPresentation" : "MK 7/24/2018 16:31", "loadPresentationFromDirectory:" : "MK 7/20/2018 15:42", "magneticRasterActive" : "LB 7/5/2018 19:48", "magneticRasterActive:" : "LB 7/5/2018 19:49", @@ -83,8 +83,8 @@ "openSlideMenu" : "WoC 7/13/2018 18:42", "openSlideMoveDialog" : "LM 7/13/2018 15:12", "openSlideSelectionDialog" : "LB 7/13/2018 16:22", - "presentation" : "LM 7/13/2018 17:15", - "presentation:" : "LM 7/13/2018 17:15", + "presentation" : "MK 7/24/2018 16:40", + "presentation:" : "MK 7/24/2018 16:40", "presentationMode" : "LM 5/25/2018 16:57", "presentationMode:" : "LM 5/25/2018 16:57", "presentationModeButtonData" : "LB 6/22/2018 15:49", @@ -107,7 +107,7 @@ "slideSelectionDialogText" : "LB 7/13/2018 14:58", "slidesDirectoryName" : "MK 6/8/2018 18:14", "step" : "LB 6/29/2018 17:05", - "styleMenuBar:" : "LM 7/13/2018 14:17", + "styleMenuBar:" : "MK 7/24/2018 17:02", "toggleInteractivity" : "LB 7/6/2018 16:58", "toggleMagneticRaster" : "LB 7/5/2018 21:52", "updateCurrentMiniature" : "LB 6/29/2018 17:21", @@ -117,6 +117,4 @@ "viewPortLayoutFrame" : "LB 6/29/2018 15:31", "wantsSteps" : "LB 6/29/2018 17:04", "warn:trueChoice:" : "JZ 6/8/2018 17:54", - "warn:trueChoice:falseChoice:" : "LM 7/13/2018 18:43", - "window" : "LM 6/1/2018 20:15", - "window:" : "LM 6/1/2018 20:15" } } + "warn:trueChoice:falseChoice:" : "LM 7/13/2018 18:43" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/properties.json b/packages/Presenter-Core.package/PSPresentationTool.class/properties.json index f4ff85c..734dccf 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/properties.json @@ -4,9 +4,8 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 16:55", "instvars" : [ - "window", "slideContainer", "presentation", "slides", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st index c27713d..a4a2076 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st @@ -4,6 +4,7 @@ ensurePreviousOwnerIsNotSubmorph | morph window | morph := self findDeepSubmorphThat: [:m | m = self previousOwner ] ifAbsent: [nil]. morph ifNotNil: [ - window := morph model window. + "window := morph model window." + window := previousOwner owner. window owner removeMorph: window. window openInWorld] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index 87f8fcd..344967f 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -13,7 +13,7 @@ "disablePresentationMode" : "LB 7/6/2018 17:27", "enableNonInteractiveMode" : "LB 7/6/2018 17:03", "enablePresentationMode" : "JZ 6/29/2018 19:01", - "ensurePreviousOwnerIsNotSubmorph" : "MK 7/24/2018 15:16", + "ensurePreviousOwnerIsNotSubmorph" : "MK 7/24/2018 16:54", "filterEvent:for:" : "LB 7/6/2018 17:08", "handlesKeyboard:" : "WoC 6/15/2018 17:00", "in:tryToEvaluate:" : "WoC 6/15/2018 17:07", From f1513fed08dfce4ffc34537ecc0ad75e395b445e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 17:22:11 +0200 Subject: [PATCH 056/112] Added tests for fadingmessage --- .../PSFadingMessageTest.class/README.md | 0 .../PSFadingMessageTest.class/instance/message..st | 4 ++++ .../PSFadingMessageTest.class/instance/message.st | 4 ++++ .../PSFadingMessageTest.class/instance/setUp.st | 6 ++++++ .../instance/stepCount.st | 4 ++++ .../instance/testDecaysAfterFadingTime.st | 6 ++++++ .../instance/testNotDecaysBeforeFadingTime.st | 6 ++++++ .../methodProperties.json | 10 ++++++++++ .../PSFadingMessageTest.class/properties.json | 14 ++++++++++++++ 9 files changed, 54 insertions(+) create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/README.md create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message..st create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message.st create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/stepCount.st create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/properties.json diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/README.md b/packages/Presenter-Tests.package/PSFadingMessageTest.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message..st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message..st new file mode 100644 index 0000000..99a3a5e --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message..st @@ -0,0 +1,4 @@ +accessing +message: aPSFadingMessage + + message := aPSFadingMessage \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message.st new file mode 100644 index 0000000..d808932 --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/message.st @@ -0,0 +1,4 @@ +accessing +message + + ^ message \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st new file mode 100644 index 0000000..5ece7e6 --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st @@ -0,0 +1,6 @@ +as yet unclassified +setUp + + super setUp. + self message: (PSFadingMessage for: 'Lorem Ipsum'). + self message openInWorld: self world \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/stepCount.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/stepCount.st new file mode 100644 index 0000000..e15b476 --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/stepCount.st @@ -0,0 +1,4 @@ +accessing +stepCount + + ^ self message totalVisibleTime / self message stepTime \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st new file mode 100644 index 0000000..d815e8c --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st @@ -0,0 +1,6 @@ +as yet unclassified +testDecaysAfterFadingTime + + self stepCount + 1 timesRepeat: + [self message step]. + self assert: self message owner equals: nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st new file mode 100644 index 0000000..79edc83 --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st @@ -0,0 +1,6 @@ +as yet unclassified +testNotDecaysBeforeFadingTime + + self stepCount - 1 timesRepeat: + [self message step]. + self deny: self message owner = nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json new file mode 100644 index 0000000..7ab783f --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + }, + "instance" : { + "message" : "LB 7/24/2018 17:12", + "message:" : "LB 7/24/2018 17:12", + "setUp" : "LB 7/24/2018 17:13", + "stepCount" : "LB 7/24/2018 17:21", + "testDecaysAfterFadingTime" : "LB 7/24/2018 17:21", + "testNotDecaysBeforeFadingTime" : "LB 7/24/2018 17:21" } } diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/properties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/properties.json new file mode 100644 index 0000000..b46663f --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Presenter-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "message" ], + "name" : "PSFadingMessageTest", + "pools" : [ + ], + "super" : "PSUITestCase", + "type" : "normal" } From f1bdcf9d62b25474f579a8a3305c0a6dc9ba89c1 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Tue, 24 Jul 2018 17:24:12 +0200 Subject: [PATCH 057/112] Merging --- .../PSPresentationTool.class/README.md | 2 +- .../PSPresentationTool.class/instance/buttonBarTopData.st | 2 +- .../PSPresentationTool.class/instance/menuBarButtonData.st | 2 +- .../PSPresentationTool.class/properties.json | 2 +- .../instance/ensurePreviousOwnerIsNotSubmorph.st | 5 ++--- .../PSSlideContainer.class/methodProperties.json | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/README.md b/packages/Presenter-Core.package/PSPresentationTool.class/README.md index 033cd19..9951790 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/README.md +++ b/packages/Presenter-Core.package/PSPresentationTool.class/README.md @@ -1,4 +1,4 @@ -A PSPresentationTool is xxxxxxxxx. +A PSPresentationTool is a tool to create and edit PSPresentations. Instance Variables currentSlideNumber: diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st index aad5566..4551ae3 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons buttonBarTopData ^ { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st index 2d3add2..a3dbd2b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st @@ -1,4 +1,4 @@ -toolbuilder +toolbuilder buttons menuBarButtonData ^ { diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/properties.json b/packages/Presenter-Core.package/PSPresentationTool.class/properties.json index 734dccf..d98bcf3 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 16:55", + "commentStamp" : "MK 7/24/2018 17:21", "instvars" : [ "slideContainer", "presentation", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st index a4a2076..5c1393b 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/ensurePreviousOwnerIsNotSubmorph.st @@ -4,7 +4,6 @@ ensurePreviousOwnerIsNotSubmorph | morph window | morph := self findDeepSubmorphThat: [:m | m = self previousOwner ] ifAbsent: [nil]. morph ifNotNil: [ - "window := morph model window." - window := previousOwner owner. + window := self previousOwner owner. window owner removeMorph: window. - window openInWorld] \ No newline at end of file + window openInWorld] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index 5f35207..ca6eddc 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -13,7 +13,7 @@ "disablePresentationMode" : "WoC 7/24/2018 14:15", "enableNonInteractiveMode" : "WoC 7/24/2018 14:17", "enablePresentationMode" : "WoC 7/24/2018 14:08", - "ensurePreviousOwnerIsNotSubmorph" : "MK 7/24/2018 16:54", + "ensurePreviousOwnerIsNotSubmorph" : "MK 7/24/2018 17:23", "filterEvent:for:" : "LB 7/6/2018 17:08", "handlesKeyboard:" : "WoC 6/15/2018 17:00", "in:tryToEvaluate:" : "WoC 6/15/2018 17:07", From c2a62de8151020c6f982579f201b5eb9424c8b93 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 17:24:47 +0200 Subject: [PATCH 058/112] categorized fading message tests --- .../PSFadingMessageTest.class/instance/setUp.st | 2 +- .../instance/testDecaysAfterFadingTime.st | 2 +- .../instance/testNotDecaysBeforeFadingTime.st | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st index 5ece7e6..8dc138e 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/setUp.st @@ -1,4 +1,4 @@ -as yet unclassified +running setUp super setUp. diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st index d815e8c..7b9f3e0 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st @@ -1,4 +1,4 @@ -as yet unclassified +decaying testDecaysAfterFadingTime self stepCount + 1 timesRepeat: diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st index 79edc83..74abe4f 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st @@ -1,4 +1,4 @@ -as yet unclassified +decaying testNotDecaysBeforeFadingTime self stepCount - 1 timesRepeat: From c1adee977e3a812719f8674729733a05075942b9 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 17:32:37 +0200 Subject: [PATCH 059/112] Removed unneccessary assertion --- .../instance/setUpSlideDeletion.st | 3 +-- .../instance/testSlideDeletionMovesSlideSelection.st | 2 +- .../PSPresentationToolTest.class/methodProperties.json | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st index c97edb5..933143b 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st @@ -1,5 +1,4 @@ slide deletion tests setUpSlideDeletion - self tool createSlide. - self assert: self tool slideCount = 2. \ No newline at end of file + self tool createSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index 8cb8ed7..582a478 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -8,4 +8,4 @@ testSlideDeletionMovesSlideSelection self tool deleteSlideAt: 2. self assert: self slides first = slide. - self assert: self tool currentSlide = slide. \ No newline at end of file + self assert: self tool currentSlide = slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 45c8013..1a9186c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "expectedFailures" : "LB 7/24/2018 15:38", "setUp" : "LB 5/23/2018 16:11", - "setUpSlideDeletion" : "LM 5/18/2018 18:21", + "setUpSlideDeletion" : "LM 7/24/2018 17:31", "slideContainer" : "WoC 6/15/2018 18:21", "slides" : "LM 7/13/2018 17:42", "slides:" : "LM 7/13/2018 18:22", @@ -42,7 +42,7 @@ "testSlideCreation" : "LM 7/13/2018 18:20", "testSlideCreationReturnsSlide" : "LM 5/18/2018 18:37", "testSlideCreationSelectsNewSlide" : "LM 7/13/2018 17:56", - "testSlideDeletionMovesSlideSelection" : "LM 7/13/2018 17:56", + "testSlideDeletionMovesSlideSelection" : "LM 7/24/2018 17:28", "testSlideNavigationInPresentationMode" : "LB 6/29/2018 15:45", "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", "testSlideRatioIsFixed" : "LB 7/13/2018 19:05", From 3499269df2fb73892ad5611d5a8e9fd3469430ce Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 17:39:51 +0200 Subject: [PATCH 060/112] Change handle color --- .../PSContentContainer.class/instance/createHandleOnMove..st | 2 +- .../PSContentContainer.class/instance/handleColor.st | 4 ++++ .../PSContentContainer.class/methodProperties.json | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st index 33a1067..f6427cf 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st @@ -4,6 +4,6 @@ createHandleOnMove: aSymbol | handle | handle := RectangleMorph new extent: self resizeHandleSize; - color: Color black. + color: self handleColor. handle on: #mouseMove send: aSymbol to: self. ^ handle \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st new file mode 100644 index 0000000..955b3dd --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st @@ -0,0 +1,4 @@ +accessing +handleColor + + ^ Color gray \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 1c8a8ac..28fd837 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -10,7 +10,7 @@ "content:" : "MK 7/24/2018 14:08", "copyChildToHand" : "MK 7/24/2018 14:08", "createContextMenu" : "WoC 7/24/2018 16:54", - "createHandleOnMove:" : "LM 7/13/2018 14:59", + "createHandleOnMove:" : "LM 7/24/2018 17:35", "defaultContextMenuContent" : "LM 7/13/2018 14:59", "disablePresentationMode" : "WoC 6/17/2018 18:44", "dragBottomLeftEvent:" : "LB 7/24/2018 13:49", @@ -25,6 +25,7 @@ "extentTopRight:" : "LB 7/6/2018 15:57", "filterEvent:for:" : "WoC 7/24/2018 16:53", "grabChild" : "MK 7/24/2018 14:08", + "handleColor" : "LM 7/24/2018 17:37", "handleLayerNumber" : "MK 5/25/2018 16:26", "handlesMouseDown:" : "WoC 5/22/2018 19:48", "hasHandles" : "MK 5/18/2018 19:42", From 63f0e77b68d10ab9d646b1ba5a15765c0bc5b8f1 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Tue, 24 Jul 2018 17:42:43 +0200 Subject: [PATCH 061/112] refactoring --- .../instance/currentSlide.st | 4 ++ .../instance/currentSlideNumber.st | 4 ++ .../instance/slideCount.st | 4 ++ .../instance/testEnterNonInteractiveMode.st | 3 -- .../instance/testLeaveNonInteractiveMode.st | 8 +--- ...nInteractiveModeWhenLeavingPresentation.st | 7 ++++ .../testMovedSlideStayCurrentSlide.st | 2 +- ...estNotEnterNonInteractiveModeInEditMode.st | 5 +++ .../instance/testPreviousSlideClampsToMin.st | 4 +- .../instance/testSelectSlide.st | 4 +- .../instance/testSelectSlideClamps.st | 4 +- .../instance/testSlideCreation.st | 4 +- .../instance/testSlideCreationReturnsSlide.st | 2 +- .../testSlideCreationSelectsNewSlide.st | 4 +- .../testSlideDeletionMovesSlideSelection.st | 2 +- .../testSlideNavigationInPresentationMode.st | 5 ++- .../testSlideNumberLabelSelectsCorrectly.st | 8 ++-- .../instance/testSlideRatioIsFixed.st | 2 +- .../instance/testSlideResizeRegression.st | 2 +- .../instance/testZeroSlidesRegression.st | 8 ++-- .../instance/testnextSlideClampsToMax.st | 4 +- .../methodProperties.json | 37 +++++++++++-------- 22 files changed, 75 insertions(+), 52 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlide.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlideNumber.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideCount.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlide.st new file mode 100644 index 0000000..0e94e28 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlide.st @@ -0,0 +1,4 @@ +accessing +currentSlide + + ^ self tool currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlideNumber.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlideNumber.st new file mode 100644 index 0000000..4508469 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/currentSlideNumber.st @@ -0,0 +1,4 @@ +accessing +currentSlideNumber + + ^ self tool currentSlideNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideCount.st new file mode 100644 index 0000000..031332b --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideCount.st @@ -0,0 +1,4 @@ +accessing +slideCount + + ^ self tool slideCount \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index 03c18c5..118a7c8 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -1,8 +1,5 @@ presentation mode tests testEnterNonInteractiveMode - - self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: true. self tool enablePresentationMode. self pressKey: $i at: self slideContainer center. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st index c01f0bc..425f015 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st @@ -4,11 +4,5 @@ testLeaveNonInteractiveMode self tool enablePresentationMode. self pressKey: $i at: self slideContainer center. self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: true. - - self pressKey: $i at: self slideContainer center. - self pressKey: Character escape at: self slideContainer center. - self assert: self tool isInteractive equals: true. - - self tool disablePresentationMode + self assert: self tool isInteractive equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st new file mode 100644 index 0000000..2094c20 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st @@ -0,0 +1,7 @@ +presentation mode tests +testLeaveNonInteractiveModeWhenLeavingPresentation + + self pressKey: $i at: self slideContainer center. + self pressKey: Character escape at: self slideContainer center. + self assert: self tool isInteractive equals: true + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st index 4d5940a..0bec238 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st @@ -7,4 +7,4 @@ testMovedSlideStayCurrentSlide self tool selectSlideNumber: 1. self tool moveCurrentSlideTo: 5. - self assert: slide = self tool currentSlide \ No newline at end of file + self assert: slide = self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st new file mode 100644 index 0000000..05d0f30 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st @@ -0,0 +1,5 @@ +presentation mode tests +testNotEnterNonInteractiveModeInEditMode + + self pressKey: $i at: self slideContainer center. + self assert: self tool isInteractive equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st index 74199b9..9c50cfa 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st @@ -1,6 +1,6 @@ slide navigation tests testPreviousSlideClampsToMin - self assert: self tool currentSlide = self slides first. + self assert: self currentSlide = self slides first. self tool previousSlide. - self assert: self tool currentSlide = self slides first. \ No newline at end of file + self assert: self currentSlide = self slides first. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st index 61fdd32..ffc25ce 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st @@ -3,7 +3,7 @@ testSelectSlide self tool createSlide. self tool selectSlideNumber: 1. - self assert: self tool currentSlide = self slides first. + self assert: self currentSlide = self slides first. self tool selectSlideNumber: 2. - self assert: self tool currentSlide = self slides second \ No newline at end of file + self assert: self currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index 15342ac..1b90d44 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -6,7 +6,7 @@ testSelectSlideClamps self assert: self tool currentSlide = self slides last. self tool selectSlideNumber: 0. - self assert: self tool currentSlide = self slides first. + self assert: self currentSlide = self slides first. self tool selectSlideNumber: -1. - self assert: self tool currentSlide = self slides first. \ No newline at end of file + self assert: self currentSlide = self slides first. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st index 4f27e23..024132f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st @@ -2,8 +2,8 @@ slide creation tests testSlideCreation | slideCount newSlide | - slideCount := self tool slideCount. + slideCount := self slideCount. newSlide := self tool createSlide. - self assert: self tool slideCount = (slideCount + 1). + self assert: self slideCount = (slideCount + 1). self assert: (self slides includes: newSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st index 564cdc0..44dd75c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st @@ -3,4 +3,4 @@ testSlideCreationReturnsSlide | slide | slide := self tool createSlide. - self assert: slide = self tool currentSlide. \ No newline at end of file + self assert: slide = self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st index 8e639c3..d3bd744 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st @@ -1,6 +1,6 @@ slide creation tests testSlideCreationSelectsNewSlide - self assert: self tool currentSlide = self slides first. + self assert: self currentSlide = self slides first. self tool createSlide. - self assert: self tool currentSlide = self slides second. \ No newline at end of file + self assert: self currentSlide = self slides second. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index 8cb8ed7..3a29507 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -8,4 +8,4 @@ testSlideDeletionMovesSlideSelection self tool deleteSlideAt: 2. self assert: self slides first = slide. - self assert: self tool currentSlide = slide. \ No newline at end of file + self assert: self currentSlide = slide. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st index bbaf851..c37c468 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st @@ -5,6 +5,7 @@ testSlideNavigationInPresentationMode createSlide; selectSlideNumber: 1; enablePresentationMode. - self assert: self tool slideContainer currentSlide equals: self tool currentSlide. + + self assert: self tool slideContainer currentSlide equals: self currentSlide. self tool selectSlideNumber: 2. - self assert: self tool slideContainer currentSlide equals: self tool currentSlide \ No newline at end of file + self assert: self tool slideContainer currentSlide equals: self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st index a3e297d..60d91eb 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st @@ -4,10 +4,12 @@ testSlideNumberLabelSelectsCorrectly | numberOfSlides index | numberOfSlides := 5. numberOfSlides timesRepeat: [self tool createSlide]. + index := numberOfSlides atRandom. self tool slideNumberString: index asString asText. - self assert: index equals: self tool currentSlideNumber. + self assert: index equals: self currentSlideNumber. + index := numberOfSlides atRandom. - self tool slideNumberString: (index asString, '/', numberOfSlides) asText. - self assert: index equals: self tool currentSlideNumber. + self tool slideNumberString: (index asString , '/' , numberOfSlides) asText. + self assert: index equals: self currentSlideNumber. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st index e3e39d6..182f87b 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st @@ -2,6 +2,6 @@ window resizing tests testSlideRatioIsFixed | slide | - slide := self tool currentSlide. + slide := self currentSlide. self assert: (self does: slide answerSideRatio: slide sideRatio). self assert: [self does: slide answerSideRatio: slide sideRatio] onResizeOf: self window \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st index 50734bb..533e5cc 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideResizeRegression.st @@ -1,4 +1,4 @@ window resizing tests testSlideResizeRegression "Regression test for #32 - expected to fail!" - self assert: [self tool currentSlide extent] constantOnResizeOf: self window \ No newline at end of file + self assert: [self currentSlide extent] constantOnResizeOf: self window \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st index c86d897..0f27cb6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st @@ -2,13 +2,13 @@ slide deletion tests testZeroSlidesRegression | deletedSlide | - self assert: self tool slideCount = 1. - deletedSlide := self tool currentSlide. + self assert: self slideCount = 1. + deletedSlide := self currentSlide. self tool deleteSlideAt: 1. self - assert: self tool slideCount = 1 + assert: self slideCount = 1 description: 'There should never be 0 slides'. self - assert: self tool currentSlide ~= deletedSlide + assert: self currentSlide ~= deletedSlide description: 'The slide should actually be deleted' \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st index 0b0d76d..1f0a2e4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st @@ -1,6 +1,6 @@ slide navigation tests testnextSlideClampsToMax - self assert: self tool currentSlide = self slides last. + self assert: self currentSlide = self slides last. self tool nextSlide. - self assert: self tool currentSlide = self slides last. \ No newline at end of file + self assert: self currentSlide = self slides last. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 45c8013..e701c33 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -2,10 +2,13 @@ "class" : { }, "instance" : { + "currentSlide" : "WoC 7/24/2018 17:27", + "currentSlideNumber" : "WoC 7/24/2018 17:32", "expectedFailures" : "LB 7/24/2018 15:38", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "LM 5/18/2018 18:21", "slideContainer" : "WoC 6/15/2018 18:21", + "slideCount" : "WoC 7/24/2018 17:27", "slides" : "LM 7/13/2018 17:42", "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", @@ -17,9 +20,10 @@ "testDeletionRemovesSlide" : "LM 7/13/2018 17:43", "testDuplicateSlide" : "MK 7/13/2018 17:03", "testDuplicatedSlidesContent" : "MK 7/13/2018 17:37", - "testEnterNonInteractiveMode" : "LB 7/13/2018 18:30", + "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", "testLayoutedSlidesCreation" : "MK 7/6/2018 17:32", - "testLeaveNonInteractiveMode" : "LB 7/13/2018 18:30", + "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", + "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "LB 7/5/2018 22:36", "testMiniatureChangesIfSlideChanges" : "WoC 6/29/2018 19:23", @@ -28,28 +32,29 @@ "testMiniatureSelects" : "LB 7/13/2018 19:12", "testMoveSlide" : "LB 6/29/2018 15:45", "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", - "testMovedSlideStayCurrentSlide" : "LB 6/29/2018 15:45", + "testMovedSlideStayCurrentSlide" : "WoC 7/24/2018 17:37", "testNextSlide" : "LM 7/13/2018 17:52", "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", + "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", "testOccupiesWorldOnStep" : "LB 7/24/2018 16:48", - "testPreviousSlideClampsToMin" : "LM 7/13/2018 17:53", + "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", - "testSelectSlide" : "LM 7/13/2018 17:53", - "testSelectSlideClamps" : "LM 7/13/2018 17:53", + "testSelectSlide" : "WoC 7/24/2018 17:36", + "testSelectSlideClamps" : "WoC 7/24/2018 17:35", "testSelectedMiniatureChanges" : "LB 6/29/2018 19:05", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", "testSlideContainerPosition" : "LB 7/24/2018 16:47", - "testSlideCreation" : "LM 7/13/2018 18:20", - "testSlideCreationReturnsSlide" : "LM 5/18/2018 18:37", - "testSlideCreationSelectsNewSlide" : "LM 7/13/2018 17:56", - "testSlideDeletionMovesSlideSelection" : "LM 7/13/2018 17:56", - "testSlideNavigationInPresentationMode" : "LB 6/29/2018 15:45", - "testSlideNumberLabelSelectsCorrectly" : "LB 6/22/2018 16:35", - "testSlideRatioIsFixed" : "LB 7/13/2018 19:05", - "testSlideResizeRegression" : "LB 7/24/2018 15:39", + "testSlideCreation" : "WoC 7/24/2018 17:35", + "testSlideCreationReturnsSlide" : "WoC 7/24/2018 17:34", + "testSlideCreationSelectsNewSlide" : "WoC 7/24/2018 17:34", + "testSlideDeletionMovesSlideSelection" : "WoC 7/24/2018 17:33", + "testSlideNavigationInPresentationMode" : "WoC 7/24/2018 17:33", + "testSlideNumberLabelSelectsCorrectly" : "WoC 7/24/2018 17:32", + "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", + "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", - "testZeroSlidesRegression" : "LM 7/13/2018 17:23", - "testnextSlideClampsToMax" : "LM 7/13/2018 17:57", + "testZeroSlidesRegression" : "WoC 7/24/2018 17:28", + "testnextSlideClampsToMax" : "WoC 7/24/2018 17:29", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", "window:" : "LM 5/11/2018 17:59" } } From b45448512f21bbd9a18537303f66db078a30c4ba Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 24 Jul 2018 17:48:38 +0200 Subject: [PATCH 062/112] Recatored presentationloadertest --- .../mockCompletePresentationDirectory.st | 4 +--- .../mockEmptyPresentationDirectory.st | 4 +--- .../testInvalidSlideDirectoryNames.st | 3 ++- .../instance/testLoadCompletePresentation.st | 6 ++--- .../instance/testMissingSlidesDirectory.st | 2 +- .../instance/testMorphLoadIsValid.st | 7 +++--- .../instance/testMorphNameIsNotNumber.st | 6 ++--- .../instance/testMorphNameIsNumber.st | 6 ++--- .../instance/testSlidesDirectoryIsEmpty.st | 2 +- .../instance/testSortMorphFiles.st | 2 -- .../instance/validMorphFileData.st | 5 ++--- .../methodProperties.json | 22 +++++++++---------- 12 files changed, 29 insertions(+), 40 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st index dc312d7..94a3caa 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockCompletePresentationDirectory.st @@ -6,9 +6,7 @@ mockCompletePresentationDirectory PSPresentationLoader slidesDirectoryName -> { 'slide1' -> {'1.morph'}. 'slide2' -> {}. - 'slide3' -> {'1.morph' . '2.morph' } - } - }. + 'slide3' -> {'1.morph' . '2.morph' }}}. slidesDirectory := directory / PSPresentationLoader slidesDirectoryName. slidesDirectory / 'slide1' / '1.morph' contents: PSMockMorph new. slidesDirectory / 'slide3' / '1.morph' contents: PSMockMorph new. diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st index b9faf62..00d9ae3 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/mockEmptyPresentationDirectory.st @@ -5,6 +5,4 @@ mockEmptyPresentationDirectory 'slides' -> { 'slide1'. 'slide2'. - 'slide5' "The number actually should not matter" - } - } \ No newline at end of file + 'slide5' "The number actually should not matter"}} \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st index 815b3fe..8c6ac3e 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testInvalidSlideDirectoryNames.st @@ -3,5 +3,6 @@ testInvalidSlideDirectoryNames | invalidSlideDirectoryNames | invalidSlideDirectoryNames := {'12slide1' . 'slides1' . 'slide1test' . 'slide' . ''} asOrderedCollection. - self assert: (invalidSlideDirectoryNames noneSatisfy: [:each | (self loader checkSlideDirectoryName: each)]) + self assert: (invalidSlideDirectoryNames + noneSatisfy: [:each | (self loader checkSlideDirectoryName: each)]) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st index 5d3be91..140ff45 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st @@ -6,7 +6,7 @@ testLoadCompletePresentation presentation := PSPresentationLoader new world: self world; loadPresentationFromDirectory: directory. - self assert: presentation slideCount = 3. - self assert: presentation slides first submorphs size = 1. + self assert: presentation slideCount equals: 3. + self assert: presentation slides first submorphs size equals: 1. self assert: presentation slides second submorphs isEmpty. - self assert: presentation slides third submorphs size = 2 \ No newline at end of file + self assert: presentation slides third submorphs size equals: 2 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st index c07576d..09fafdf 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMissingSlidesDirectory.st @@ -3,4 +3,4 @@ testMissingSlidesDirectory | directory | directory := PSMockFileDirectory named: 'myPresentation'. - self assert: (self loader isValidPresentationDirectory: directory) equals: false. \ No newline at end of file + self deny: (self loader isValidPresentationDirectory: directory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st index 68f29a5..69b0a81 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st @@ -3,8 +3,7 @@ testMorphLoadIsValid | morph | morph := self loader - loadMorphFromStream: (self morphLoadingStreamFor: self validMorphFileData) + loadMorphFromStream: (self morphLoadingStreamFor: self validMorphFileData) testIn: self world. - self assert: morph isNil not. - self assert: morph class = PSContentContainer. - morph ifNotNil: [morph abandon.] \ No newline at end of file + self assert: morph notNil. + self assert: morph class equals: PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st index 49210b1..8ad5698 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNotNumber.st @@ -4,7 +4,5 @@ testMorphNameIsNotNumber | presentationDirectory | presentationDirectory := PSMockFileDirectory from: 'Presentation' -> { 'slides' -> { - 'slide1' -> {'a.morph'} - } - }. - self assert: false equals: (self loader isValidPresentationDirectory: presentationDirectory) \ No newline at end of file + 'slide1' -> {'a.morph'}}}. + self deny: (self loader isValidPresentationDirectory: presentationDirectory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st index 48feaa0..dd120ce 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphNameIsNumber.st @@ -4,7 +4,5 @@ testMorphNameIsNumber | presentationDirectory | presentationDirectory := PSMockFileDirectory from: 'Presentation' -> { 'slides' -> { - 'slide1' -> {'1.morph' . '2.morph'} - } - }. - self assert: true equals: (self loader isValidPresentationDirectory: presentationDirectory) \ No newline at end of file + 'slide1' -> {'1.morph' . '2.morph'}}}. + self assert: (self loader isValidPresentationDirectory: presentationDirectory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st index 5e8954e..b4a783c 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSlidesDirectoryIsEmpty.st @@ -3,4 +3,4 @@ testSlidesDirectoryIsEmpty | directory | directory := PSMockFileDirectory from: 'Presentation' -> {self loader slidesDirectoryName}. - self assert: (self loader isValidPresentationDirectory: directory) equals: false \ No newline at end of file + self deny: (self loader isValidPresentationDirectory: directory) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st index f70ef35..dfe272b 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st @@ -1,7 +1,5 @@ presentation loading testSortMorphFiles - self assert: {'1.morph'} equals: (self loader sortedMorphFiles: {'1.morph'}). - self assert: {'2.morph' . '3.morph' . '4.morph'} equals: (self loader sortedMorphFiles: {'4.morph' . '2.morph' . '3.morph'}) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st index ee63689..60fea90 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st @@ -1,5 +1,4 @@ presentation loading validMorphFileData - - ^ -#[239 187 191 39 70 114 111 109 32 83 113 117 101 97 107 54 46 48 97 108 112 104 97 32 111 102 32 49 55 32 65 112 114 105 108 32 50 48 49 56 32 91 108 97 116 101 115 116 32 117 112 100 97 116 101 58 32 35 49 55 57 48 49 93 32 111 110 32 54 32 74 117 110 101 32 50 48 49 56 32 97 116 32 53 58 50 49 58 50 56 32 112 109 39 33 13 13 33 79 98 106 101 99 116 83 99 97 110 110 101 114 32 110 101 119 32 105 110 105 116 105 97 108 105 122 101 33 13 13 13 13 33 115 101 108 102 32 115 109 97 114 116 82 101 102 83 116 114 101 97 109 33 4 0 0 0 4 8 0 0 0 4 17 15 99 108 97 115 115 32 115 116 114 117 99 116 117 114 101 9 0 0 0 3 6 10 68 105 99 116 105 111 110 97 114 121 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 9 0 0 0 3 6 11 65 115 115 111 99 105 97 116 105 111 110 6 10 83 99 114 111 108 108 80 97 110 101 8 0 0 0 23 4 0 0 0 0 17 6 98 111 117 110 100 115 17 5 111 119 110 101 114 17 9 115 117 98 109 111 114 112 104 115 17 10 102 117 108 108 66 111 117 110 100 115 17 5 99 111 108 111 114 17 9 101 120 116 101 110 115 105 111 110 17 11 98 111 114 100 101 114 87 105 100 116 104 17 11 98 111 114 100 101 114 67 111 108 111 114 17 5 109 111 100 101 108 17 8 115 108 111 116 78 97 109 101 17 4 111 112 101 110 17 9 115 99 114 111 108 108 66 97 114 17 8 115 99 114 111 108 108 101 114 17 20 114 101 116 114 97 99 116 97 98 108 101 83 99 114 111 108 108 66 97 114 17 15 115 99 114 111 108 108 66 97 114 79 110 76 101 102 116 17 15 103 101 116 77 101 110 117 83 101 108 101 99 116 111 114 17 20 103 101 116 77 101 110 117 84 105 116 108 101 83 101 108 101 99 116 111 114 17 8 104 97 115 70 111 99 117 115 17 10 104 83 99 114 111 108 108 66 97 114 17 16 104 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 16 118 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 18 115 99 114 111 108 108 66 97 114 84 104 105 99 107 110 101 115 115 16 3 0 66 6 9 84 101 120 116 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 116 101 120 116 83 116 121 108 101 17 4 116 101 120 116 17 8 119 114 97 112 70 108 97 103 17 9 112 97 114 97 103 114 97 112 104 17 6 101 100 105 116 111 114 17 9 99 111 110 116 97 105 110 101 114 17 11 112 114 101 100 101 99 101 115 115 111 114 17 9 115 117 99 99 101 115 115 111 114 17 15 98 97 99 107 103 114 111 117 110 100 67 111 108 111 114 17 7 109 97 114 103 105 110 115 17 11 101 100 105 116 72 105 115 116 111 114 121 17 8 114 101 97 100 79 110 108 121 17 7 97 117 116 111 70 105 116 16 3 0 66 6 18 80 83 67 111 110 116 101 110 116 67 111 110 116 97 105 110 101 114 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 13 114 101 115 105 122 101 72 97 110 100 108 101 115 17 10 104 97 115 72 97 110 100 108 101 115 17 5 99 104 105 108 100 16 3 0 66 6 11 76 97 121 111 117 116 70 114 97 109 101 8 0 0 0 9 4 0 0 0 1 17 12 108 101 102 116 70 114 97 99 116 105 111 110 17 10 108 101 102 116 79 102 102 115 101 116 17 11 116 111 112 70 114 97 99 116 105 111 110 17 9 116 111 112 79 102 102 115 101 116 17 13 114 105 103 104 116 70 114 97 99 116 105 111 110 17 11 114 105 103 104 116 79 102 102 115 101 116 17 14 98 111 116 116 111 109 70 114 97 99 116 105 111 110 17 12 98 111 116 116 111 109 79 102 102 115 101 116 16 3 0 66 6 10 73 109 97 103 101 77 111 114 112 104 8 0 0 0 8 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 5 105 109 97 103 101 16 3 0 66 6 12 77 111 114 112 104 105 99 77 111 100 101 108 8 0 0 0 12 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 16 3 0 66 6 13 84 101 120 116 65 116 116 114 105 98 117 116 101 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 9 76 111 111 107 117 112 75 101 121 8 0 0 0 2 4 0 0 0 0 17 3 107 101 121 16 3 0 66 6 18 80 108 117 103 103 97 98 108 101 84 101 120 116 77 111 114 112 104 8 0 0 0 33 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 0 206 10 0 0 0 217 10 0 0 0 227 10 0 0 0 249 10 0 0 1 10 10 0 0 1 27 10 0 0 1 49 10 0 0 1 59 10 0 0 1 71 10 0 0 1 89 10 0 0 1 107 17 9 116 101 120 116 77 111 114 112 104 17 15 103 101 116 84 101 120 116 83 101 108 101 99 116 111 114 17 15 115 101 116 84 101 120 116 83 101 108 101 99 116 111 114 17 20 103 101 116 83 101 108 101 99 116 105 111 110 83 101 108 101 99 116 111 114 17 18 104 97 115 85 110 97 99 99 101 112 116 101 100 69 100 105 116 115 17 24 97 115 107 66 101 102 111 114 101 68 105 115 99 97 114 100 105 110 103 69 100 105 116 115 17 17 115 101 108 101 99 116 105 111 110 73 110 116 101 114 118 97 108 17 19 104 97 115 69 100 105 116 105 110 103 67 111 110 102 108 105 99 116 115 17 16 101 100 105 116 84 101 120 116 83 101 108 101 99 116 111 114 17 15 119 97 110 116 115 87 114 97 112 66 111 114 100 101 114 16 3 0 66 6 7 84 84 67 70 111 110 116 8 0 0 0 12 4 0 0 0 1 17 14 116 116 99 68 101 115 99 114 105 112 116 105 111 110 17 9 112 111 105 110 116 83 105 122 101 17 15 102 111 114 101 103 114 111 117 110 100 67 111 108 111 114 17 5 99 97 99 104 101 17 11 100 101 114 105 118 97 116 105 118 101 115 17 12 102 97 108 108 98 97 99 107 70 111 110 116 17 6 104 101 105 103 104 116 17 6 97 115 99 101 110 116 17 7 100 101 115 99 101 110 116 17 8 109 97 120 65 115 99 105 105 17 15 99 111 108 111 114 84 111 67 97 99 104 101 77 97 112 16 3 0 66 6 12 83 105 109 112 108 101 66 111 114 100 101 114 8 0 0 0 4 4 0 0 0 0 17 9 98 97 115 101 67 111 108 111 114 17 5 99 111 108 111 114 17 5 119 105 100 116 104 1 1 16 3 0 66 6 9 66 121 116 101 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 18 73 100 101 110 116 105 116 121 68 105 99 116 105 111 110 97 114 121 8 0 0 0 3 4 0 0 0 0 17 5 116 97 108 108 121 17 5 97 114 114 97 121 16 3 0 66 6 20 76 97 114 103 101 80 111 115 105 116 105 118 101 73 110 116 101 103 101 114 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 5 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 10 66 121 116 101 83 121 109 98 111 108 8 0 0 0 1 4 0 0 0 0 1 1 16 3 0 66 6 4 70 111 114 109 8 0 0 0 6 4 0 0 0 0 17 4 98 105 116 115 17 5 119 105 100 116 104 17 6 104 101 105 103 104 116 17 5 100 101 112 116 104 17 6 111 102 102 115 101 116 1 1 1 1 16 3 0 66 6 16 68 105 115 112 108 97 121 84 114 97 110 115 102 111 114 109 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 16 77 111 114 112 104 105 99 84 114 97 110 115 102 111 114 109 8 0 0 0 4 4 0 0 0 0 17 6 111 102 102 115 101 116 17 5 97 110 103 108 101 17 5 115 99 97 108 101 16 3 0 66 6 14 84 114 97 110 115 102 111 114 109 77 111 114 112 104 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 9 116 114 97 110 115 102 111 114 109 17 9 115 109 111 111 116 104 105 110 103 17 11 108 111 99 97 108 66 111 117 110 100 115 1 1 1 1 16 3 0 66 6 11 80 83 84 101 120 116 77 111 114 112 104 8 0 0 0 35 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 0 206 10 0 0 0 217 10 0 0 0 227 10 0 0 0 249 10 0 0 1 10 10 0 0 1 27 10 0 0 1 49 10 0 0 1 59 10 0 0 1 71 10 0 0 1 89 10 0 0 1 107 10 0 0 4 148 10 0 0 4 159 10 0 0 4 176 10 0 0 4 193 10 0 0 4 215 10 0 0 4 235 10 0 0 5 5 10 0 0 5 24 10 0 0 5 45 10 0 0 5 63 17 13 98 97 115 105 99 84 101 120 116 83 105 122 101 17 9 116 101 120 116 83 99 97 108 101 1 1 16 3 0 66 6 5 80 111 105 110 116 8 0 0 0 3 4 0 0 0 0 17 1 120 17 1 121 16 3 0 66 6 12 83 109 97 108 108 70 108 111 97 116 54 52 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 9 77 97 103 110 105 116 117 100 101 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 9 87 101 97 107 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 1 1 1 1 1 16 3 0 66 6 17 65 114 114 97 121 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 5 70 108 111 97 116 8 0 0 0 1 4 0 0 0 0 1 1 1 1 16 3 0 66 6 9 82 101 99 116 97 110 103 108 101 8 0 0 0 3 4 0 0 0 0 17 6 111 114 105 103 105 110 17 6 99 111 114 110 101 114 16 3 0 66 6 14 82 101 99 116 97 110 103 108 101 77 111 114 112 104 8 0 0 0 9 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 1 1 1 1 1 1 16 3 0 66 6 6 83 116 114 105 110 103 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 22 83 101 113 117 101 110 99 101 97 98 108 101 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 10 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 12 69 118 101 110 116 72 97 110 100 108 101 114 8 0 0 0 37 4 0 0 0 0 17 18 109 111 117 115 101 68 111 119 110 82 101 99 105 112 105 101 110 116 17 17 109 111 117 115 101 68 111 119 110 83 101 108 101 99 116 111 114 17 18 109 111 117 115 101 77 111 118 101 82 101 99 105 112 105 101 110 116 17 17 109 111 117 115 101 77 111 118 101 83 101 108 101 99 116 111 114 17 23 109 111 117 115 101 83 116 105 108 108 68 111 119 110 82 101 99 105 112 105 101 110 116 17 22 109 111 117 115 101 83 116 105 108 108 68 111 119 110 83 101 108 101 99 116 111 114 17 16 109 111 117 115 101 85 112 82 101 99 105 112 105 101 110 116 17 15 109 111 117 115 101 85 112 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 69 110 116 101 114 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 69 110 116 101 114 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 76 101 97 118 101 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 76 101 97 118 101 83 101 108 101 99 116 111 114 17 27 109 111 117 115 101 69 110 116 101 114 68 114 97 103 103 105 110 103 82 101 99 105 112 105 101 110 116 17 26 109 111 117 115 101 69 110 116 101 114 68 114 97 103 103 105 110 103 83 101 108 101 99 116 111 114 17 27 109 111 117 115 101 76 101 97 118 101 68 114 97 103 103 105 110 103 82 101 99 105 112 105 101 110 116 17 26 109 111 117 115 101 76 101 97 118 101 68 114 97 103 103 105 110 103 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 87 104 101 101 108 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 87 104 101 101 108 83 101 108 101 99 116 111 114 17 18 107 101 121 83 116 114 111 107 101 82 101 99 105 112 105 101 110 116 17 17 107 101 121 83 116 114 111 107 101 83 101 108 101 99 116 111 114 17 14 107 101 121 85 112 82 101 99 105 112 105 101 110 116 17 13 107 101 121 85 112 83 101 108 101 99 116 111 114 17 16 107 101 121 68 111 119 110 82 101 99 105 112 105 101 110 116 17 15 107 101 121 68 111 119 110 83 101 108 101 99 116 111 114 17 14 118 97 108 117 101 80 97 114 97 109 101 116 101 114 17 18 115 116 97 114 116 68 114 97 103 82 101 99 105 112 105 101 110 116 17 17 115 116 97 114 116 68 114 97 103 83 101 108 101 99 116 111 114 17 19 100 111 117 98 108 101 67 108 105 99 107 83 101 108 101 99 116 111 114 17 20 100 111 117 98 108 101 67 108 105 99 107 82 101 99 105 112 105 101 110 116 17 26 100 111 117 98 108 101 67 108 105 99 107 84 105 109 101 111 117 116 83 101 108 101 99 116 111 114 17 27 100 111 117 98 108 101 67 108 105 99 107 84 105 109 101 111 117 116 82 101 99 105 112 105 101 110 116 17 13 99 108 105 99 107 83 101 108 101 99 116 111 114 17 14 99 108 105 99 107 82 101 99 105 112 105 101 110 116 17 28 107 101 121 98 111 97 114 100 70 111 99 117 115 67 104 97 110 103 101 82 101 99 105 112 105 101 110 116 17 27 107 101 121 98 111 97 114 100 70 111 99 117 115 67 104 97 110 103 101 83 101 108 101 99 116 111 114 17 19 119 97 110 116 115 69 118 101 114 121 77 111 117 115 101 77 111 118 101 16 3 0 66 6 9 83 99 114 111 108 108 66 97 114 8 0 0 0 37 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 17 6 115 108 105 100 101 114 17 5 118 97 108 117 101 17 16 115 101 116 86 97 108 117 101 83 101 108 101 99 116 111 114 17 16 103 101 116 86 97 108 117 101 83 101 108 101 99 116 111 114 17 12 115 108 105 100 101 114 83 104 97 100 111 119 17 11 115 108 105 100 101 114 67 111 108 111 114 17 10 100 101 115 99 101 110 100 105 110 103 17 12 109 105 110 105 109 117 109 86 97 108 117 101 17 12 109 97 120 105 109 117 109 86 97 108 117 101 17 7 113 117 97 110 116 117 109 17 23 103 101 116 77 105 110 105 109 117 109 86 97 108 117 101 83 101 108 101 99 116 111 114 17 23 103 101 116 77 97 120 105 109 117 109 86 97 108 117 101 83 101 108 101 99 116 111 114 17 11 111 114 105 101 110 116 97 116 105 111 110 17 10 109 101 110 117 66 117 116 116 111 110 17 8 117 112 66 117 116 116 111 110 17 10 100 111 119 110 66 117 116 116 111 110 17 10 112 97 103 105 110 103 65 114 101 97 17 11 115 99 114 111 108 108 68 101 108 116 97 17 9 112 97 103 101 68 101 108 116 97 17 8 105 110 116 101 114 118 97 108 17 12 109 101 110 117 83 101 108 101 99 116 111 114 17 15 116 105 109 101 79 102 77 111 117 115 101 68 111 119 110 17 16 116 105 109 101 79 102 76 97 115 116 83 99 114 111 108 108 17 17 110 101 120 116 80 97 103 101 68 105 114 101 99 116 105 111 110 17 18 99 117 114 114 101 110 116 83 99 114 111 108 108 68 101 108 97 121 16 3 0 66 6 8 82 117 110 65 114 114 97 121 8 0 0 0 6 4 0 0 0 0 17 4 114 117 110 115 17 6 118 97 108 117 101 115 17 9 108 97 115 116 73 110 100 101 120 17 7 108 97 115 116 82 117 110 17 10 108 97 115 116 79 102 102 115 101 116 16 3 0 66 6 9 84 101 120 116 83 116 121 108 101 8 0 0 0 13 4 0 0 0 0 17 9 102 111 110 116 65 114 114 97 121 17 14 102 111 110 116 70 97 109 105 108 121 83 105 122 101 17 8 108 105 110 101 71 114 105 100 17 8 98 97 115 101 108 105 110 101 17 9 97 108 105 103 110 109 101 110 116 17 11 102 105 114 115 116 73 110 100 101 110 116 17 10 114 101 115 116 73 110 100 101 110 116 17 11 114 105 103 104 116 73 110 100 101 110 116 17 9 116 97 98 115 65 114 114 97 121 17 15 109 97 114 103 105 110 84 97 98 115 65 114 114 97 121 17 7 108 101 97 100 105 110 103 17 16 100 101 102 97 117 108 116 70 111 110 116 73 110 100 101 120 16 3 0 66 6 12 65 98 115 116 114 97 99 116 70 111 110 116 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 66 105 116 109 97 112 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 12 66 111 120 101 100 70 108 111 97 116 54 52 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 8 70 114 97 99 116 105 111 110 8 0 0 0 3 4 0 0 0 0 17 9 110 117 109 101 114 97 116 111 114 17 11 100 101 110 111 109 105 110 97 116 111 114 1 1 1 16 3 0 66 6 16 72 97 115 104 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 3 4 0 0 0 0 10 0 0 6 91 10 0 0 6 98 16 3 0 66 6 12 78 101 119 80 97 114 97 103 114 97 112 104 8 0 0 0 18 4 0 0 0 0 17 4 116 101 120 116 17 9 116 101 120 116 83 116 121 108 101 17 19 102 105 114 115 116 67 104 97 114 97 99 116 101 114 73 110 100 101 120 17 9 99 111 110 116 97 105 110 101 114 17 5 108 105 110 101 115 17 20 112 111 115 105 116 105 111 110 87 104 101 110 67 111 109 112 111 115 101 100 17 11 111 102 102 115 101 116 84 111 69 110 100 17 9 109 97 120 82 105 103 104 116 88 17 14 115 101 108 101 99 116 105 111 110 83 116 97 114 116 17 13 115 101 108 101 99 116 105 111 110 83 116 111 112 17 17 119 97 110 116 115 67 111 108 117 109 110 66 114 101 97 107 115 17 7 102 111 99 117 115 101 100 17 9 99 97 114 101 116 82 101 99 116 17 9 115 104 111 119 67 97 114 101 116 17 10 99 97 114 101 116 67 111 108 111 114 17 14 115 101 108 101 99 116 105 111 110 67 111 108 111 114 17 23 117 110 102 111 99 117 115 101 100 83 101 108 101 99 116 105 111 110 67 111 108 111 114 16 3 0 66 6 14 84 101 120 116 70 111 110 116 67 104 97 110 103 101 8 0 0 0 2 4 0 0 0 0 17 10 102 111 110 116 78 117 109 98 101 114 1 1 16 3 0 66 6 14 77 111 114 112 104 69 120 116 101 110 115 105 111 110 8 0 0 0 12 4 0 0 0 0 17 6 108 111 99 107 101 100 17 7 118 105 115 105 98 108 101 17 6 115 116 105 99 107 121 17 11 98 97 108 108 111 111 110 84 101 120 116 17 19 98 97 108 108 111 111 110 84 101 120 116 83 101 108 101 99 116 111 114 17 12 101 120 116 101 114 110 97 108 78 97 109 101 17 12 105 115 80 97 114 116 115 68 111 110 111 114 17 10 97 99 116 111 114 83 116 97 116 101 17 6 112 108 97 121 101 114 17 12 101 118 101 110 116 72 97 110 100 108 101 114 17 15 111 116 104 101 114 80 114 111 112 101 114 116 105 101 115 1 1 1 1 1 16 3 0 66 6 16 84 114 97 110 115 108 117 99 101 110 116 67 111 108 111 114 8 0 0 0 5 4 0 0 0 0 17 3 114 103 98 17 11 99 97 99 104 101 100 68 101 112 116 104 17 16 99 97 99 104 101 100 66 105 116 80 97 116 116 101 114 110 17 5 97 108 112 104 97 16 3 0 66 6 7 80 83 83 108 105 100 101 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 112 114 101 115 101 110 116 101 114 17 5 109 111 100 101 108 17 6 99 117 114 115 111 114 17 7 112 97 100 100 105 110 103 17 15 98 97 99 107 103 114 111 117 110 100 77 111 114 112 104 17 16 116 117 114 116 108 101 84 114 97 105 108 115 70 111 114 109 17 9 116 117 114 116 108 101 80 101 110 17 19 108 97 115 116 84 117 114 116 108 101 80 111 115 105 116 105 111 110 115 17 10 105 115 80 97 114 116 115 66 105 110 17 14 105 110 100 105 99 97 116 101 67 117 114 115 111 114 17 19 119 97 110 116 115 77 111 117 115 101 79 118 101 114 72 97 108 111 115 17 10 119 111 114 108 100 83 116 97 116 101 17 10 103 114 105 100 100 105 110 103 79 110 16 3 0 66 6 5 67 111 108 111 114 8 0 0 0 4 4 0 0 0 0 10 0 0 18 147 10 0 0 18 152 10 0 0 18 165 16 3 0 66 6 13 68 105 115 112 108 97 121 77 101 100 105 117 109 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 12 80 97 115 116 101 85 112 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 18 253 10 0 0 19 8 10 0 0 19 15 10 0 0 19 23 10 0 0 19 32 10 0 0 19 49 10 0 0 19 67 10 0 0 19 78 10 0 0 19 99 10 0 0 19 111 10 0 0 19 127 10 0 0 19 148 10 0 0 19 160 16 3 0 66 6 8 73 110 116 101 114 118 97 108 8 0 0 0 4 4 0 0 0 0 17 5 115 116 97 114 116 17 4 115 116 111 112 17 4 115 116 101 112 16 3 0 66 10 0 0 0 66 8 0 0 0 3 4 0 0 0 0 10 0 0 3 255 17 5 118 97 108 117 101 16 3 0 66 6 13 66 111 114 100 101 114 101 100 77 111 114 112 104 8 0 0 0 9 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 16 3 0 66 6 16 76 97 121 111 117 116 80 114 111 112 101 114 116 105 101 115 8 0 0 0 4 4 0 0 0 0 17 9 104 82 101 115 105 122 105 110 103 17 9 118 82 101 115 105 122 105 110 103 17 13 100 105 115 97 98 108 101 76 97 121 111 117 116 16 3 0 66 6 11 80 114 111 116 111 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 8 84 101 120 116 76 105 110 101 8 0 0 0 11 4 0 0 0 0 17 4 108 101 102 116 17 5 114 105 103 104 116 17 3 116 111 112 17 6 98 111 116 116 111 109 17 10 102 105 114 115 116 73 110 100 101 120 17 9 108 97 115 116 73 110 100 101 120 17 14 105 110 116 101 114 110 97 108 83 112 97 99 101 115 17 12 112 97 100 100 105 110 103 87 105 100 116 104 17 8 98 97 115 101 108 105 110 101 17 10 108 101 102 116 77 97 114 103 105 110 16 3 0 66 6 11 66 111 114 100 101 114 83 116 121 108 101 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 83 121 109 98 111 108 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 17 79 114 100 101 114 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 4 4 0 0 0 0 17 5 97 114 114 97 121 17 10 102 105 114 115 116 73 110 100 101 120 17 9 108 97 115 116 73 110 100 101 120 16 3 0 66 6 13 68 105 115 112 108 97 121 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 1 1 16 3 0 66 6 6 78 117 109 98 101 114 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 9 68 105 115 107 80 114 111 120 121 8 0 0 0 5 4 0 0 0 0 17 16 103 108 111 98 97 108 79 98 106 101 99 116 78 97 109 101 17 11 112 114 101 83 101 108 101 99 116 111 114 17 19 99 111 110 115 116 114 117 99 116 111 114 83 101 108 101 99 116 111 114 17 15 99 111 110 115 116 114 117 99 116 111 114 65 114 103 115 16 3 0 66 6 20 84 101 120 116 77 111 114 112 104 70 111 114 69 100 105 116 86 105 101 119 8 0 0 0 24 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 1 192 10 0 0 1 203 10 0 0 1 209 10 0 0 1 219 10 0 0 1 230 10 0 0 1 238 10 0 0 1 249 10 0 0 2 6 10 0 0 2 17 10 0 0 2 34 10 0 0 2 43 10 0 0 2 56 10 0 0 2 66 17 8 101 100 105 116 86 105 101 119 17 10 97 99 99 101 112 116 79 110 67 82 1 1 16 3 0 66 10 0 0 0 32 8 0 0 0 3 4 0 0 0 0 10 0 0 6 91 10 0 0 6 98 1 1 1 1 1 16 3 0 66 6 6 83 108 105 100 101 114 8 0 0 0 25 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 13 138 10 0 0 13 146 10 0 0 13 153 10 0 0 13 171 10 0 0 13 189 10 0 0 13 203 10 0 0 13 216 10 0 0 13 228 10 0 0 13 242 10 0 0 14 0 10 0 0 14 9 10 0 0 14 34 10 0 0 14 59 1 1 16 3 0 66 6 5 77 111 114 112 104 8 0 0 0 7 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 1 1 16 3 0 66 6 17 84 101 120 116 70 111 110 116 82 101 102 101 114 101 110 99 101 8 0 0 0 3 4 0 0 0 0 10 0 0 17 184 17 4 102 111 110 116 1 16 3 0 66 6 4 84 101 120 116 8 0 0 0 3 4 0 0 0 0 17 6 115 116 114 105 110 103 17 4 114 117 110 115 1 1 1 1 16 3 0 66 6 7 73 110 116 101 103 101 114 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 10 66 121 116 101 83 116 114 105 110 103 8 0 0 0 1 4 0 0 0 0 17 12 115 117 112 101 114 99 108 97 115 115 101 115 16 3 0 32 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 16 3 0 66 10 0 0 0 79 10 0 0 3 119 16 3 0 66 10 0 0 1 131 10 0 0 9 122 16 3 0 66 10 0 0 2 79 10 0 0 24 61 16 3 0 66 10 0 0 2 177 10 0 0 6 145 16 3 0 66 10 0 0 3 56 10 0 0 24 61 16 3 0 66 10 0 0 3 202 10 0 0 6 145 16 3 0 66 10 0 0 3 119 10 0 0 20 192 1 1 1 16 3 0 66 10 0 0 3 234 10 0 0 8 223 16 3 0 66 10 0 0 4 8 10 0 0 0 79 16 3 0 66 10 0 0 5 84 10 0 0 15 234 16 3 0 66 10 0 0 5 237 10 0 0 21 226 1 1 16 3 0 66 10 0 0 6 61 10 0 0 0 32 16 3 0 66 10 0 0 6 36 10 0 0 9 22 16 3 0 66 10 0 0 6 109 10 0 0 24 197 16 3 0 66 10 0 0 6 145 10 0 0 21 74 1 1 1 16 3 0 66 10 0 0 6 170 10 0 0 9 22 16 3 0 66 10 0 0 6 191 10 0 0 21 253 1 1 16 3 0 66 10 0 0 6 219 10 0 0 19 212 1 1 1 1 16 3 0 66 10 0 0 7 23 10 0 0 6 145 1 16 3 0 66 10 0 0 7 56 10 0 0 7 23 16 3 0 66 10 0 0 7 110 10 0 0 24 61 1 1 1 1 16 3 0 66 10 0 0 7 209 10 0 0 4 8 1 1 16 3 0 66 10 0 0 8 223 10 0 0 6 145 16 3 0 66 10 0 0 8 195 10 0 0 9 56 16 3 0 66 10 0 0 8 248 10 0 0 6 170 16 3 0 66 10 0 0 8 168 10 0 0 6 145 1 1 1 1 1 16 3 0 66 10 0 0 9 22 10 0 0 9 223 1 16 3 0 66 10 0 0 9 56 10 0 0 22 113 1 1 1 1 16 3 0 66 10 0 0 9 81 10 0 0 6 145 16 3 0 66 10 0 0 9 122 10 0 0 20 192 1 1 1 1 1 1 16 3 0 66 10 0 0 9 198 10 0 0 9 22 1 1 1 16 3 0 66 10 0 0 9 223 10 0 0 10 5 16 3 0 66 10 0 0 10 5 10 0 0 6 145 1 16 3 0 66 10 0 0 10 32 10 0 0 6 145 16 3 0 66 10 0 0 13 62 10 0 0 23 173 16 3 0 66 10 0 0 14 244 10 0 0 9 22 16 3 0 66 10 0 0 15 234 10 0 0 6 145 16 3 0 66 10 0 0 15 58 10 0 0 6 145 16 3 0 66 10 0 0 16 6 10 0 0 9 22 16 3 0 66 10 0 0 16 28 10 0 0 9 56 1 16 3 0 66 10 0 0 16 57 10 0 0 22 113 1 1 1 16 3 0 66 10 0 0 16 108 10 0 0 10 5 16 3 0 66 10 0 0 16 150 10 0 0 6 145 16 3 0 66 10 0 0 17 158 10 0 0 3 202 1 1 16 3 0 66 10 0 0 17 202 10 0 0 6 145 1 1 1 1 1 16 3 0 66 10 0 0 18 119 10 0 0 19 176 16 3 0 66 10 0 0 18 194 10 0 0 19 241 16 3 0 66 10 0 0 21 253 10 0 0 9 198 16 3 0 66 10 0 0 19 212 10 0 0 22 82 16 3 0 66 10 0 0 19 241 10 0 0 20 192 16 3 0 66 10 0 0 19 176 10 0 0 6 145 16 3 0 66 10 0 0 0 66 10 0 0 3 234 16 3 0 66 10 0 0 21 101 10 0 0 6 145 16 3 0 66 10 0 0 21 5 10 0 0 6 145 16 3 0 66 10 0 0 20 192 10 0 0 24 61 16 3 0 66 10 0 0 21 74 17 3 110 105 108 16 3 0 66 10 0 0 21 226 10 0 0 6 145 16 3 0 66 10 0 0 20 118 10 0 0 9 223 16 3 0 66 10 0 0 22 19 10 0 0 9 223 16 3 0 66 10 0 0 22 82 10 0 0 6 145 1 1 16 3 0 66 10 0 0 22 113 10 0 0 8 223 1 16 3 0 66 10 0 0 22 136 10 0 0 6 145 16 3 0 66 10 0 0 22 230 10 0 0 1 131 1 1 16 3 0 66 10 0 0 0 32 10 0 0 16 108 1 1 1 1 1 16 3 0 66 10 0 0 23 173 10 0 0 3 119 1 1 16 3 0 66 10 0 0 24 61 10 0 0 6 145 1 1 16 3 0 66 10 0 0 24 114 10 0 0 17 158 1 16 3 0 66 10 0 0 24 159 10 0 0 9 22 1 1 1 1 16 3 0 66 10 0 0 24 197 10 0 0 22 113 1 16 3 0 66 10 0 0 24 221 10 0 0 9 198 16 10 2 79 15 15 144 242 24 241 106 10 63 255 255 255 8 0 0 0 5 16 35 7 209 15 15 144 242 24 241 106 10 0 0 29 50 8 0 0 0 1 16 10 7 110 15 15 160 243 24 225 105 10 0 0 29 71 8 0 0 0 1 16 24 22 230 15 0 0 0 9 64 86 10 0 0 29 92 8 0 0 0 0 1 16 4 19 176 4 57 158 103 153 4 0 0 0 32 11 128 6 1 7 255 230 230 230 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 9 8 0 0 0 17 1 16 3 0 66 6 23 117 110 102 111 99 117 115 101 100 83 101 108 101 99 116 105 111 110 67 111 108 111 114 16 4 19 176 4 7 52 129 32 1 1 16 3 0 66 6 11 100 114 111 112 69 110 97 98 108 101 100 2 1 1 1 16 3 0 66 6 10 98 108 105 110 107 83 116 97 114 116 16 7 6 109 4 0 0 0 142 4 0 0 0 72 4 0 0 0 252 4 0 0 0 207 4 0 0 0 94 4 0 0 0 3 16 3 0 66 6 10 99 97 114 101 116 67 111 108 111 114 16 4 19 176 4 58 216 212 0 4 0 0 0 32 11 128 6 1 7 255 235 141 0 1 16 3 0 66 6 21 105 110 100 105 99 97 116 101 75 101 121 98 111 97 114 100 70 111 99 117 115 6 5 110 101 118 101 114 1 16 3 0 66 6 10 97 110 105 109 97 116 105 111 110 115 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 6 14 115 101 108 101 99 116 105 111 110 67 111 108 111 114 16 4 19 176 4 7 86 25 134 4 0 0 0 32 11 128 6 1 7 255 29 97 97 16 3 0 66 6 11 100 114 97 103 69 110 97 98 108 101 100 2 1 16 3 0 66 6 17 115 105 103 110 97 108 67 111 110 110 101 99 116 105 111 110 115 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 1 4 0 0 0 0 16 4 19 176 4 0 0 0 0 4 0 0 0 32 11 128 6 1 7 255 0 0 1 16 13 15 58 8 0 0 0 1 16 5 22 136 10 0 0 5 84 1 6 30 102 97 109 105 108 121 78 97 109 101 58 112 111 105 110 116 83 105 122 101 58 101 109 112 104 97 115 105 115 58 8 0 0 0 3 17 17 66 105 116 115 116 114 101 97 109 86 101 114 97 83 97 110 115 4 0 0 0 20 4 0 0 0 0 1 4 0 0 0 28 4 0 0 0 22 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 16 5 22 136 6 13 84 101 120 116 67 111 110 115 116 97 110 116 115 1 6 3 97 116 58 8 0 0 0 1 6 16 68 101 102 97 117 108 116 84 97 98 115 65 114 114 97 121 16 5 22 136 10 0 0 31 159 1 10 0 0 31 175 8 0 0 0 1 6 22 68 101 102 97 117 108 116 77 97 114 103 105 110 84 97 98 115 65 114 114 97 121 4 0 0 0 2 1 16 3 24 159 17 33 68 105 101 115 32 105 115 116 32 101 105 110 32 84 101 120 116 109 111 114 112 104 32 109 105 116 32 73 110 104 97 108 116 16 6 14 244 8 0 0 0 1 4 0 0 0 33 8 0 0 0 1 8 0 0 0 1 16 3 24 114 1 10 0 0 31 48 4 0 0 0 24 4 0 0 0 1 4 0 0 0 23 2 16 18 16 150 10 0 0 31 253 16 13 15 58 10 0 0 31 43 1 4 0 0 0 28 4 0 0 0 22 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 10 0 0 31 155 10 0 0 31 203 4 0 0 0 2 1 4 0 0 0 1 16 3 9 81 16 3 8 168 4 0 0 0 3 4 0 0 0 0 16 3 8 168 4 0 0 0 148 4 0 152 150 127 8 0 0 0 3 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 0 4 0 0 0 28 4 0 0 0 1 4 0 0 0 13 4 0 0 0 2 4 0 0 0 21 4 0 0 0 22 1 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 28 4 0 0 0 56 4 0 0 0 14 4 0 0 0 23 4 0 0 0 0 4 0 0 0 22 4 0 0 0 22 1 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 56 4 0 0 0 84 4 0 0 0 24 4 0 0 0 33 4 0 0 0 0 4 0 0 0 37 4 0 0 0 22 1 16 3 8 168 4 0 0 0 0 4 0 0 0 0 4 0 0 0 32 4 0 0 0 127 1 1 3 3 1 1 10 0 0 30 58 10 0 0 30 182 10 0 0 29 216 1 1 1 1 1 15 0 48 0 0 0 0 1 1 1 10 0 0 29 71 3 1 16 5 18 119 4 0 0 0 0 1 1 4 0 0 0 0 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 3 8 0 0 0 5 1 1 16 3 0 66 6 13 99 108 105 112 83 117 98 109 111 114 112 104 115 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 4 7 56 16 3 8 168 4 255 255 255 6 4 255 255 255 13 14 0 0 0 0 0 0 0 0 14 63 240 0 0 0 0 0 0 4 0 0 0 1 10 0 0 29 117 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 15 8 0 0 0 23 1 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 82 101 97 100 79 110 108 121 16 4 19 176 4 44 169 74 238 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 1 1 16 3 0 66 6 9 109 105 110 72 101 105 103 104 116 4 0 0 0 20 16 3 0 66 6 19 97 100 111 114 110 109 101 110 116 78 111 114 109 97 108 69 100 105 116 16 4 19 176 4 55 185 57 125 1 1 1 16 3 0 66 6 11 98 111 114 100 101 114 83 116 121 108 101 16 4 5 237 1 16 4 19 176 4 0 80 20 5 4 0 0 0 32 11 128 6 1 7 255 1 1 1 4 0 0 0 1 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 15 119 114 97 112 66 111 114 100 101 114 67 111 108 111 114 16 5 18 119 4 49 44 75 18 1 1 4 0 0 0 76 16 3 0 66 6 13 97 100 111 114 110 109 101 110 116 68 105 102 102 16 4 19 176 4 21 40 169 38 1 1 1 16 3 0 66 6 15 97 100 111 114 110 109 101 110 116 82 101 102 117 115 101 16 4 19 176 4 25 248 142 148 1 1 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 67 111 110 102 108 105 99 116 16 4 19 176 4 47 244 1 0 1 1 16 3 0 66 6 8 109 105 110 87 105 100 116 104 4 0 0 0 10 16 3 0 66 6 19 102 114 97 109 101 65 100 111 114 110 109 101 110 116 87 105 100 116 104 4 0 0 0 2 16 3 0 66 6 22 107 101 121 98 111 97 114 100 67 97 112 116 117 114 101 70 105 108 116 101 114 115 16 2 8 248 10 0 0 29 71 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 68 105 102 102 69 100 105 116 16 4 19 176 4 43 58 28 164 1 1 16 3 0 66 6 13 97 99 99 101 112 116 82 101 115 99 97 108 101 2 4 0 0 0 1 10 0 0 35 0 1 1 3 16 37 13 62 15 24 80 242 24 241 106 1 8 0 0 0 6 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 4 19 176 4 18 228 185 46 4 0 0 0 32 11 128 6 1 7 255 75 75 75 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 18 109 111 117 115 101 68 111 119 110 73 110 83 108 105 100 101 114 58 10 0 0 36 98 6 15 115 99 114 111 108 108 65 98 115 111 108 117 116 101 58 1 1 10 0 0 36 98 6 16 109 111 117 115 101 85 112 73 110 83 108 105 100 101 114 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 0 80 20 5 1 1 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 5 18 119 4 18 228 185 46 1 1 4 0 0 0 178 16 12 17 202 3 3 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 33 154 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 33 154 16 9 9 122 15 24 81 96 24 241 106 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 81 96 24 241 106 10 0 0 37 237 8 0 0 0 0 1 16 4 19 176 4 0 0 3 255 4 0 0 0 32 11 128 6 1 7 255 0 0 255 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 38 100 133 0 22 255 1 1 1 25 0 18 255 1 1 1 25 0 14 255 1 1 1 33 0 10 255 1 1 1 33 0 7 255 1 1 1 97 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 14 115 99 114 111 108 108 68 111 119 110 73 110 105 116 1 1 1 1 10 0 0 36 98 6 17 102 105 110 105 115 104 101 100 83 99 114 111 108 108 105 110 103 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 240 252 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 80 242 24 240 252 10 0 0 39 93 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 38 100 141 0 7 255 1 1 1 33 0 10 255 1 1 1 33 0 14 255 1 1 1 25 0 18 255 1 1 1 25 0 22 255 1 1 1 89 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 12 115 99 114 111 108 108 85 112 73 110 105 116 1 1 1 1 10 0 0 36 98 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 240 252 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 80 242 24 240 252 10 0 0 40 171 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 31 100 133 0 18 255 1 1 1 25 0 18 255 1 1 1 25 0 18 255 1 1 1 25 0 18 255 1 1 1 133 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 20 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 68 111 119 110 58 1 1 1 1 1 1 10 0 0 36 98 6 21 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 69 110 116 101 114 58 10 0 0 36 98 6 21 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 76 101 97 118 101 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 5 18 119 4 13 195 112 220 1 1 4 0 0 0 89 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 15 115 99 114 111 108 108 80 97 103 101 73 110 105 116 58 1 1 1 1 10 0 0 36 98 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 63 255 252 0 4 0 0 0 32 11 128 6 1 7 255 255 255 0 4 0 0 0 2 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 43 7 10 0 0 29 71 1 3 10 0 0 36 115 10 0 0 34 48 6 16 118 83 99 114 111 108 108 66 97 114 86 97 108 117 101 58 1 10 0 0 37 106 10 0 0 36 137 3 1 4 0 0 0 0 4 0 0 0 1 1 1 6 8 118 101 114 116 105 99 97 108 10 0 0 40 171 10 0 0 39 93 10 0 0 37 237 10 0 0 42 38 4 0 0 0 28 4 0 0 1 24 14 63 240 0 0 0 0 0 0 6 28 118 83 99 114 111 108 108 66 97 114 77 101 110 117 66 117 116 116 111 110 80 114 101 115 115 101 100 58 1 1 1 1 10 0 0 29 92 3 3 1 1 3 16 37 13 62 15 0 0 0 0 64 8 1 8 0 0 0 6 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 10 0 0 36 137 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 36 182 10 0 0 43 227 10 0 0 36 207 1 1 10 0 0 43 227 10 0 0 36 231 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 0 80 20 5 1 1 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 16 5 18 119 4 18 228 185 46 1 1 4 0 0 0 178 16 12 17 202 3 3 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 33 154 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 33 154 16 9 9 122 15 255 192 0 0 64 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 255 192 0 0 64 8 10 0 0 45 52 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 24 64 109 0 10 255 1 1 1 25 0 14 255 1 1 1 21 0 7 255 1 1 1 81 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 38 198 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 128 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 0 0 0 0 128 8 10 0 0 46 107 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 24 64 117 0 7 255 1 1 1 21 0 14 255 1 1 1 25 0 10 255 1 1 1 73 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 40 36 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 128 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 0 0 0 0 128 8 10 0 0 47 162 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 17 64 109 0 10 255 1 1 1 25 0 10 255 1 1 1 109 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 41 107 1 1 1 1 1 1 10 0 0 43 227 10 0 0 41 140 10 0 0 43 227 10 0 0 41 168 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 16 5 18 119 4 13 195 112 220 1 1 4 0 0 0 89 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 42 98 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 43 7 4 0 0 0 2 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 43 7 10 0 0 29 71 1 3 10 0 0 43 244 10 0 0 34 48 6 16 104 83 99 114 111 108 108 66 97 114 86 97 108 117 101 58 1 10 0 0 44 177 10 0 0 36 137 3 1 4 0 0 0 0 4 0 0 0 1 1 1 6 10 104 111 114 105 122 111 110 116 97 108 10 0 0 47 162 10 0 0 46 107 10 0 0 45 52 10 0 0 48 218 4 0 0 0 10 4 0 0 0 100 10 0 0 43 174 6 28 104 83 99 114 111 108 108 66 97 114 77 101 110 117 66 117 116 116 111 110 80 114 101 115 115 101 100 58 1 1 1 1 10 0 0 30 109 6 10 119 104 101 110 78 101 101 100 101 100 4 0 0 0 10 10 0 0 29 113 1 1 1 2 2 16 4 20 118 4 0 0 0 34 4 0 0 0 33 4 0 0 0 1 3 1 1 4 0 0 0 11 16 3 16 57 4 0 0 0 237 4 0 0 0 100 16 9 9 122 15 15 64 237 15 224 247 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 6 28 100 114 97 103 67 111 114 110 101 114 58 101 118 101 110 116 58 102 114 111 109 72 97 110 100 108 101 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 6 18 109 111 114 112 104 105 99 76 97 121 101 114 78 117 109 98 101 114 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 24 160 237 25 64 247 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 2 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 24 161 101 25 65 111 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 3 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 15 65 101 15 225 111 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 4 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 6 11 108 97 121 111 117 116 70 114 97 109 101 16 9 2 177 16 3 16 57 4 0 0 0 47 4 0 0 1 60 4 0 0 0 0 16 3 16 57 4 0 0 0 1 4 0 0 0 79 4 0 0 0 0 16 3 16 57 4 0 0 0 197 4 0 0 1 60 4 0 0 0 0 16 3 16 57 4 0 0 0 41 4 0 0 0 79 4 0 0 0 0 16 3 0 66 6 16 108 97 121 111 117 116 80 114 111 112 101 114 116 105 101 115 16 4 21 5 6 9 115 112 97 99 101 70 105 108 108 10 0 0 54 239 3 1 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 4 22 19 8 0 0 0 10 10 0 0 50 182 10 0 0 51 187 10 0 0 52 152 10 0 0 53 117 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 4 2 10 0 0 29 71 33 13 13] \ No newline at end of file + "This is the binary data for an example morph (a PSTextMorph)" + ^ #[239 187 191 39 70 114 111 109 32 83 113 117 101 97 107 54 46 48 97 108 112 104 97 32 111 102 32 49 55 32 65 112 114 105 108 32 50 48 49 56 32 91 108 97 116 101 115 116 32 117 112 100 97 116 101 58 32 35 49 55 57 48 49 93 32 111 110 32 54 32 74 117 110 101 32 50 48 49 56 32 97 116 32 53 58 50 49 58 50 56 32 112 109 39 33 13 13 33 79 98 106 101 99 116 83 99 97 110 110 101 114 32 110 101 119 32 105 110 105 116 105 97 108 105 122 101 33 13 13 13 13 33 115 101 108 102 32 115 109 97 114 116 82 101 102 83 116 114 101 97 109 33 4 0 0 0 4 8 0 0 0 4 17 15 99 108 97 115 115 32 115 116 114 117 99 116 117 114 101 9 0 0 0 3 6 10 68 105 99 116 105 111 110 97 114 121 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 9 0 0 0 3 6 11 65 115 115 111 99 105 97 116 105 111 110 6 10 83 99 114 111 108 108 80 97 110 101 8 0 0 0 23 4 0 0 0 0 17 6 98 111 117 110 100 115 17 5 111 119 110 101 114 17 9 115 117 98 109 111 114 112 104 115 17 10 102 117 108 108 66 111 117 110 100 115 17 5 99 111 108 111 114 17 9 101 120 116 101 110 115 105 111 110 17 11 98 111 114 100 101 114 87 105 100 116 104 17 11 98 111 114 100 101 114 67 111 108 111 114 17 5 109 111 100 101 108 17 8 115 108 111 116 78 97 109 101 17 4 111 112 101 110 17 9 115 99 114 111 108 108 66 97 114 17 8 115 99 114 111 108 108 101 114 17 20 114 101 116 114 97 99 116 97 98 108 101 83 99 114 111 108 108 66 97 114 17 15 115 99 114 111 108 108 66 97 114 79 110 76 101 102 116 17 15 103 101 116 77 101 110 117 83 101 108 101 99 116 111 114 17 20 103 101 116 77 101 110 117 84 105 116 108 101 83 101 108 101 99 116 111 114 17 8 104 97 115 70 111 99 117 115 17 10 104 83 99 114 111 108 108 66 97 114 17 16 104 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 16 118 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 18 115 99 114 111 108 108 66 97 114 84 104 105 99 107 110 101 115 115 16 3 0 66 6 9 84 101 120 116 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 116 101 120 116 83 116 121 108 101 17 4 116 101 120 116 17 8 119 114 97 112 70 108 97 103 17 9 112 97 114 97 103 114 97 112 104 17 6 101 100 105 116 111 114 17 9 99 111 110 116 97 105 110 101 114 17 11 112 114 101 100 101 99 101 115 115 111 114 17 9 115 117 99 99 101 115 115 111 114 17 15 98 97 99 107 103 114 111 117 110 100 67 111 108 111 114 17 7 109 97 114 103 105 110 115 17 11 101 100 105 116 72 105 115 116 111 114 121 17 8 114 101 97 100 79 110 108 121 17 7 97 117 116 111 70 105 116 16 3 0 66 6 18 80 83 67 111 110 116 101 110 116 67 111 110 116 97 105 110 101 114 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 13 114 101 115 105 122 101 72 97 110 100 108 101 115 17 10 104 97 115 72 97 110 100 108 101 115 17 5 99 104 105 108 100 16 3 0 66 6 11 76 97 121 111 117 116 70 114 97 109 101 8 0 0 0 9 4 0 0 0 1 17 12 108 101 102 116 70 114 97 99 116 105 111 110 17 10 108 101 102 116 79 102 102 115 101 116 17 11 116 111 112 70 114 97 99 116 105 111 110 17 9 116 111 112 79 102 102 115 101 116 17 13 114 105 103 104 116 70 114 97 99 116 105 111 110 17 11 114 105 103 104 116 79 102 102 115 101 116 17 14 98 111 116 116 111 109 70 114 97 99 116 105 111 110 17 12 98 111 116 116 111 109 79 102 102 115 101 116 16 3 0 66 6 10 73 109 97 103 101 77 111 114 112 104 8 0 0 0 8 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 5 105 109 97 103 101 16 3 0 66 6 12 77 111 114 112 104 105 99 77 111 100 101 108 8 0 0 0 12 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 16 3 0 66 6 13 84 101 120 116 65 116 116 114 105 98 117 116 101 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 9 76 111 111 107 117 112 75 101 121 8 0 0 0 2 4 0 0 0 0 17 3 107 101 121 16 3 0 66 6 18 80 108 117 103 103 97 98 108 101 84 101 120 116 77 111 114 112 104 8 0 0 0 33 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 0 206 10 0 0 0 217 10 0 0 0 227 10 0 0 0 249 10 0 0 1 10 10 0 0 1 27 10 0 0 1 49 10 0 0 1 59 10 0 0 1 71 10 0 0 1 89 10 0 0 1 107 17 9 116 101 120 116 77 111 114 112 104 17 15 103 101 116 84 101 120 116 83 101 108 101 99 116 111 114 17 15 115 101 116 84 101 120 116 83 101 108 101 99 116 111 114 17 20 103 101 116 83 101 108 101 99 116 105 111 110 83 101 108 101 99 116 111 114 17 18 104 97 115 85 110 97 99 99 101 112 116 101 100 69 100 105 116 115 17 24 97 115 107 66 101 102 111 114 101 68 105 115 99 97 114 100 105 110 103 69 100 105 116 115 17 17 115 101 108 101 99 116 105 111 110 73 110 116 101 114 118 97 108 17 19 104 97 115 69 100 105 116 105 110 103 67 111 110 102 108 105 99 116 115 17 16 101 100 105 116 84 101 120 116 83 101 108 101 99 116 111 114 17 15 119 97 110 116 115 87 114 97 112 66 111 114 100 101 114 16 3 0 66 6 7 84 84 67 70 111 110 116 8 0 0 0 12 4 0 0 0 1 17 14 116 116 99 68 101 115 99 114 105 112 116 105 111 110 17 9 112 111 105 110 116 83 105 122 101 17 15 102 111 114 101 103 114 111 117 110 100 67 111 108 111 114 17 5 99 97 99 104 101 17 11 100 101 114 105 118 97 116 105 118 101 115 17 12 102 97 108 108 98 97 99 107 70 111 110 116 17 6 104 101 105 103 104 116 17 6 97 115 99 101 110 116 17 7 100 101 115 99 101 110 116 17 8 109 97 120 65 115 99 105 105 17 15 99 111 108 111 114 84 111 67 97 99 104 101 77 97 112 16 3 0 66 6 12 83 105 109 112 108 101 66 111 114 100 101 114 8 0 0 0 4 4 0 0 0 0 17 9 98 97 115 101 67 111 108 111 114 17 5 99 111 108 111 114 17 5 119 105 100 116 104 1 1 16 3 0 66 6 9 66 121 116 101 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 18 73 100 101 110 116 105 116 121 68 105 99 116 105 111 110 97 114 121 8 0 0 0 3 4 0 0 0 0 17 5 116 97 108 108 121 17 5 97 114 114 97 121 16 3 0 66 6 20 76 97 114 103 101 80 111 115 105 116 105 118 101 73 110 116 101 103 101 114 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 5 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 10 66 121 116 101 83 121 109 98 111 108 8 0 0 0 1 4 0 0 0 0 1 1 16 3 0 66 6 4 70 111 114 109 8 0 0 0 6 4 0 0 0 0 17 4 98 105 116 115 17 5 119 105 100 116 104 17 6 104 101 105 103 104 116 17 5 100 101 112 116 104 17 6 111 102 102 115 101 116 1 1 1 1 16 3 0 66 6 16 68 105 115 112 108 97 121 84 114 97 110 115 102 111 114 109 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 16 77 111 114 112 104 105 99 84 114 97 110 115 102 111 114 109 8 0 0 0 4 4 0 0 0 0 17 6 111 102 102 115 101 116 17 5 97 110 103 108 101 17 5 115 99 97 108 101 16 3 0 66 6 14 84 114 97 110 115 102 111 114 109 77 111 114 112 104 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 9 116 114 97 110 115 102 111 114 109 17 9 115 109 111 111 116 104 105 110 103 17 11 108 111 99 97 108 66 111 117 110 100 115 1 1 1 1 16 3 0 66 6 11 80 83 84 101 120 116 77 111 114 112 104 8 0 0 0 35 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 0 206 10 0 0 0 217 10 0 0 0 227 10 0 0 0 249 10 0 0 1 10 10 0 0 1 27 10 0 0 1 49 10 0 0 1 59 10 0 0 1 71 10 0 0 1 89 10 0 0 1 107 10 0 0 4 148 10 0 0 4 159 10 0 0 4 176 10 0 0 4 193 10 0 0 4 215 10 0 0 4 235 10 0 0 5 5 10 0 0 5 24 10 0 0 5 45 10 0 0 5 63 17 13 98 97 115 105 99 84 101 120 116 83 105 122 101 17 9 116 101 120 116 83 99 97 108 101 1 1 16 3 0 66 6 5 80 111 105 110 116 8 0 0 0 3 4 0 0 0 0 17 1 120 17 1 121 16 3 0 66 6 12 83 109 97 108 108 70 108 111 97 116 54 52 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 9 77 97 103 110 105 116 117 100 101 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 9 87 101 97 107 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 1 1 1 1 1 16 3 0 66 6 17 65 114 114 97 121 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 5 70 108 111 97 116 8 0 0 0 1 4 0 0 0 0 1 1 1 1 16 3 0 66 6 9 82 101 99 116 97 110 103 108 101 8 0 0 0 3 4 0 0 0 0 17 6 111 114 105 103 105 110 17 6 99 111 114 110 101 114 16 3 0 66 6 14 82 101 99 116 97 110 103 108 101 77 111 114 112 104 8 0 0 0 9 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 1 1 1 1 1 1 16 3 0 66 6 6 83 116 114 105 110 103 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 22 83 101 113 117 101 110 99 101 97 98 108 101 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 10 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 12 69 118 101 110 116 72 97 110 100 108 101 114 8 0 0 0 37 4 0 0 0 0 17 18 109 111 117 115 101 68 111 119 110 82 101 99 105 112 105 101 110 116 17 17 109 111 117 115 101 68 111 119 110 83 101 108 101 99 116 111 114 17 18 109 111 117 115 101 77 111 118 101 82 101 99 105 112 105 101 110 116 17 17 109 111 117 115 101 77 111 118 101 83 101 108 101 99 116 111 114 17 23 109 111 117 115 101 83 116 105 108 108 68 111 119 110 82 101 99 105 112 105 101 110 116 17 22 109 111 117 115 101 83 116 105 108 108 68 111 119 110 83 101 108 101 99 116 111 114 17 16 109 111 117 115 101 85 112 82 101 99 105 112 105 101 110 116 17 15 109 111 117 115 101 85 112 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 69 110 116 101 114 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 69 110 116 101 114 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 76 101 97 118 101 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 76 101 97 118 101 83 101 108 101 99 116 111 114 17 27 109 111 117 115 101 69 110 116 101 114 68 114 97 103 103 105 110 103 82 101 99 105 112 105 101 110 116 17 26 109 111 117 115 101 69 110 116 101 114 68 114 97 103 103 105 110 103 83 101 108 101 99 116 111 114 17 27 109 111 117 115 101 76 101 97 118 101 68 114 97 103 103 105 110 103 82 101 99 105 112 105 101 110 116 17 26 109 111 117 115 101 76 101 97 118 101 68 114 97 103 103 105 110 103 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 87 104 101 101 108 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 87 104 101 101 108 83 101 108 101 99 116 111 114 17 18 107 101 121 83 116 114 111 107 101 82 101 99 105 112 105 101 110 116 17 17 107 101 121 83 116 114 111 107 101 83 101 108 101 99 116 111 114 17 14 107 101 121 85 112 82 101 99 105 112 105 101 110 116 17 13 107 101 121 85 112 83 101 108 101 99 116 111 114 17 16 107 101 121 68 111 119 110 82 101 99 105 112 105 101 110 116 17 15 107 101 121 68 111 119 110 83 101 108 101 99 116 111 114 17 14 118 97 108 117 101 80 97 114 97 109 101 116 101 114 17 18 115 116 97 114 116 68 114 97 103 82 101 99 105 112 105 101 110 116 17 17 115 116 97 114 116 68 114 97 103 83 101 108 101 99 116 111 114 17 19 100 111 117 98 108 101 67 108 105 99 107 83 101 108 101 99 116 111 114 17 20 100 111 117 98 108 101 67 108 105 99 107 82 101 99 105 112 105 101 110 116 17 26 100 111 117 98 108 101 67 108 105 99 107 84 105 109 101 111 117 116 83 101 108 101 99 116 111 114 17 27 100 111 117 98 108 101 67 108 105 99 107 84 105 109 101 111 117 116 82 101 99 105 112 105 101 110 116 17 13 99 108 105 99 107 83 101 108 101 99 116 111 114 17 14 99 108 105 99 107 82 101 99 105 112 105 101 110 116 17 28 107 101 121 98 111 97 114 100 70 111 99 117 115 67 104 97 110 103 101 82 101 99 105 112 105 101 110 116 17 27 107 101 121 98 111 97 114 100 70 111 99 117 115 67 104 97 110 103 101 83 101 108 101 99 116 111 114 17 19 119 97 110 116 115 69 118 101 114 121 77 111 117 115 101 77 111 118 101 16 3 0 66 6 9 83 99 114 111 108 108 66 97 114 8 0 0 0 37 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 17 6 115 108 105 100 101 114 17 5 118 97 108 117 101 17 16 115 101 116 86 97 108 117 101 83 101 108 101 99 116 111 114 17 16 103 101 116 86 97 108 117 101 83 101 108 101 99 116 111 114 17 12 115 108 105 100 101 114 83 104 97 100 111 119 17 11 115 108 105 100 101 114 67 111 108 111 114 17 10 100 101 115 99 101 110 100 105 110 103 17 12 109 105 110 105 109 117 109 86 97 108 117 101 17 12 109 97 120 105 109 117 109 86 97 108 117 101 17 7 113 117 97 110 116 117 109 17 23 103 101 116 77 105 110 105 109 117 109 86 97 108 117 101 83 101 108 101 99 116 111 114 17 23 103 101 116 77 97 120 105 109 117 109 86 97 108 117 101 83 101 108 101 99 116 111 114 17 11 111 114 105 101 110 116 97 116 105 111 110 17 10 109 101 110 117 66 117 116 116 111 110 17 8 117 112 66 117 116 116 111 110 17 10 100 111 119 110 66 117 116 116 111 110 17 10 112 97 103 105 110 103 65 114 101 97 17 11 115 99 114 111 108 108 68 101 108 116 97 17 9 112 97 103 101 68 101 108 116 97 17 8 105 110 116 101 114 118 97 108 17 12 109 101 110 117 83 101 108 101 99 116 111 114 17 15 116 105 109 101 79 102 77 111 117 115 101 68 111 119 110 17 16 116 105 109 101 79 102 76 97 115 116 83 99 114 111 108 108 17 17 110 101 120 116 80 97 103 101 68 105 114 101 99 116 105 111 110 17 18 99 117 114 114 101 110 116 83 99 114 111 108 108 68 101 108 97 121 16 3 0 66 6 8 82 117 110 65 114 114 97 121 8 0 0 0 6 4 0 0 0 0 17 4 114 117 110 115 17 6 118 97 108 117 101 115 17 9 108 97 115 116 73 110 100 101 120 17 7 108 97 115 116 82 117 110 17 10 108 97 115 116 79 102 102 115 101 116 16 3 0 66 6 9 84 101 120 116 83 116 121 108 101 8 0 0 0 13 4 0 0 0 0 17 9 102 111 110 116 65 114 114 97 121 17 14 102 111 110 116 70 97 109 105 108 121 83 105 122 101 17 8 108 105 110 101 71 114 105 100 17 8 98 97 115 101 108 105 110 101 17 9 97 108 105 103 110 109 101 110 116 17 11 102 105 114 115 116 73 110 100 101 110 116 17 10 114 101 115 116 73 110 100 101 110 116 17 11 114 105 103 104 116 73 110 100 101 110 116 17 9 116 97 98 115 65 114 114 97 121 17 15 109 97 114 103 105 110 84 97 98 115 65 114 114 97 121 17 7 108 101 97 100 105 110 103 17 16 100 101 102 97 117 108 116 70 111 110 116 73 110 100 101 120 16 3 0 66 6 12 65 98 115 116 114 97 99 116 70 111 110 116 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 66 105 116 109 97 112 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 12 66 111 120 101 100 70 108 111 97 116 54 52 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 8 70 114 97 99 116 105 111 110 8 0 0 0 3 4 0 0 0 0 17 9 110 117 109 101 114 97 116 111 114 17 11 100 101 110 111 109 105 110 97 116 111 114 1 1 1 16 3 0 66 6 16 72 97 115 104 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 3 4 0 0 0 0 10 0 0 6 91 10 0 0 6 98 16 3 0 66 6 12 78 101 119 80 97 114 97 103 114 97 112 104 8 0 0 0 18 4 0 0 0 0 17 4 116 101 120 116 17 9 116 101 120 116 83 116 121 108 101 17 19 102 105 114 115 116 67 104 97 114 97 99 116 101 114 73 110 100 101 120 17 9 99 111 110 116 97 105 110 101 114 17 5 108 105 110 101 115 17 20 112 111 115 105 116 105 111 110 87 104 101 110 67 111 109 112 111 115 101 100 17 11 111 102 102 115 101 116 84 111 69 110 100 17 9 109 97 120 82 105 103 104 116 88 17 14 115 101 108 101 99 116 105 111 110 83 116 97 114 116 17 13 115 101 108 101 99 116 105 111 110 83 116 111 112 17 17 119 97 110 116 115 67 111 108 117 109 110 66 114 101 97 107 115 17 7 102 111 99 117 115 101 100 17 9 99 97 114 101 116 82 101 99 116 17 9 115 104 111 119 67 97 114 101 116 17 10 99 97 114 101 116 67 111 108 111 114 17 14 115 101 108 101 99 116 105 111 110 67 111 108 111 114 17 23 117 110 102 111 99 117 115 101 100 83 101 108 101 99 116 105 111 110 67 111 108 111 114 16 3 0 66 6 14 84 101 120 116 70 111 110 116 67 104 97 110 103 101 8 0 0 0 2 4 0 0 0 0 17 10 102 111 110 116 78 117 109 98 101 114 1 1 16 3 0 66 6 14 77 111 114 112 104 69 120 116 101 110 115 105 111 110 8 0 0 0 12 4 0 0 0 0 17 6 108 111 99 107 101 100 17 7 118 105 115 105 98 108 101 17 6 115 116 105 99 107 121 17 11 98 97 108 108 111 111 110 84 101 120 116 17 19 98 97 108 108 111 111 110 84 101 120 116 83 101 108 101 99 116 111 114 17 12 101 120 116 101 114 110 97 108 78 97 109 101 17 12 105 115 80 97 114 116 115 68 111 110 111 114 17 10 97 99 116 111 114 83 116 97 116 101 17 6 112 108 97 121 101 114 17 12 101 118 101 110 116 72 97 110 100 108 101 114 17 15 111 116 104 101 114 80 114 111 112 101 114 116 105 101 115 1 1 1 1 1 16 3 0 66 6 16 84 114 97 110 115 108 117 99 101 110 116 67 111 108 111 114 8 0 0 0 5 4 0 0 0 0 17 3 114 103 98 17 11 99 97 99 104 101 100 68 101 112 116 104 17 16 99 97 99 104 101 100 66 105 116 80 97 116 116 101 114 110 17 5 97 108 112 104 97 16 3 0 66 6 7 80 83 83 108 105 100 101 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 112 114 101 115 101 110 116 101 114 17 5 109 111 100 101 108 17 6 99 117 114 115 111 114 17 7 112 97 100 100 105 110 103 17 15 98 97 99 107 103 114 111 117 110 100 77 111 114 112 104 17 16 116 117 114 116 108 101 84 114 97 105 108 115 70 111 114 109 17 9 116 117 114 116 108 101 80 101 110 17 19 108 97 115 116 84 117 114 116 108 101 80 111 115 105 116 105 111 110 115 17 10 105 115 80 97 114 116 115 66 105 110 17 14 105 110 100 105 99 97 116 101 67 117 114 115 111 114 17 19 119 97 110 116 115 77 111 117 115 101 79 118 101 114 72 97 108 111 115 17 10 119 111 114 108 100 83 116 97 116 101 17 10 103 114 105 100 100 105 110 103 79 110 16 3 0 66 6 5 67 111 108 111 114 8 0 0 0 4 4 0 0 0 0 10 0 0 18 147 10 0 0 18 152 10 0 0 18 165 16 3 0 66 6 13 68 105 115 112 108 97 121 77 101 100 105 117 109 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 12 80 97 115 116 101 85 112 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 18 253 10 0 0 19 8 10 0 0 19 15 10 0 0 19 23 10 0 0 19 32 10 0 0 19 49 10 0 0 19 67 10 0 0 19 78 10 0 0 19 99 10 0 0 19 111 10 0 0 19 127 10 0 0 19 148 10 0 0 19 160 16 3 0 66 6 8 73 110 116 101 114 118 97 108 8 0 0 0 4 4 0 0 0 0 17 5 115 116 97 114 116 17 4 115 116 111 112 17 4 115 116 101 112 16 3 0 66 10 0 0 0 66 8 0 0 0 3 4 0 0 0 0 10 0 0 3 255 17 5 118 97 108 117 101 16 3 0 66 6 13 66 111 114 100 101 114 101 100 77 111 114 112 104 8 0 0 0 9 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 16 3 0 66 6 16 76 97 121 111 117 116 80 114 111 112 101 114 116 105 101 115 8 0 0 0 4 4 0 0 0 0 17 9 104 82 101 115 105 122 105 110 103 17 9 118 82 101 115 105 122 105 110 103 17 13 100 105 115 97 98 108 101 76 97 121 111 117 116 16 3 0 66 6 11 80 114 111 116 111 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 8 84 101 120 116 76 105 110 101 8 0 0 0 11 4 0 0 0 0 17 4 108 101 102 116 17 5 114 105 103 104 116 17 3 116 111 112 17 6 98 111 116 116 111 109 17 10 102 105 114 115 116 73 110 100 101 120 17 9 108 97 115 116 73 110 100 101 120 17 14 105 110 116 101 114 110 97 108 83 112 97 99 101 115 17 12 112 97 100 100 105 110 103 87 105 100 116 104 17 8 98 97 115 101 108 105 110 101 17 10 108 101 102 116 77 97 114 103 105 110 16 3 0 66 6 11 66 111 114 100 101 114 83 116 121 108 101 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 83 121 109 98 111 108 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 17 79 114 100 101 114 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 4 4 0 0 0 0 17 5 97 114 114 97 121 17 10 102 105 114 115 116 73 110 100 101 120 17 9 108 97 115 116 73 110 100 101 120 16 3 0 66 6 13 68 105 115 112 108 97 121 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 1 1 16 3 0 66 6 6 78 117 109 98 101 114 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 9 68 105 115 107 80 114 111 120 121 8 0 0 0 5 4 0 0 0 0 17 16 103 108 111 98 97 108 79 98 106 101 99 116 78 97 109 101 17 11 112 114 101 83 101 108 101 99 116 111 114 17 19 99 111 110 115 116 114 117 99 116 111 114 83 101 108 101 99 116 111 114 17 15 99 111 110 115 116 114 117 99 116 111 114 65 114 103 115 16 3 0 66 6 20 84 101 120 116 77 111 114 112 104 70 111 114 69 100 105 116 86 105 101 119 8 0 0 0 24 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 1 192 10 0 0 1 203 10 0 0 1 209 10 0 0 1 219 10 0 0 1 230 10 0 0 1 238 10 0 0 1 249 10 0 0 2 6 10 0 0 2 17 10 0 0 2 34 10 0 0 2 43 10 0 0 2 56 10 0 0 2 66 17 8 101 100 105 116 86 105 101 119 17 10 97 99 99 101 112 116 79 110 67 82 1 1 16 3 0 66 10 0 0 0 32 8 0 0 0 3 4 0 0 0 0 10 0 0 6 91 10 0 0 6 98 1 1 1 1 1 16 3 0 66 6 6 83 108 105 100 101 114 8 0 0 0 25 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 13 138 10 0 0 13 146 10 0 0 13 153 10 0 0 13 171 10 0 0 13 189 10 0 0 13 203 10 0 0 13 216 10 0 0 13 228 10 0 0 13 242 10 0 0 14 0 10 0 0 14 9 10 0 0 14 34 10 0 0 14 59 1 1 16 3 0 66 6 5 77 111 114 112 104 8 0 0 0 7 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 1 1 16 3 0 66 6 17 84 101 120 116 70 111 110 116 82 101 102 101 114 101 110 99 101 8 0 0 0 3 4 0 0 0 0 10 0 0 17 184 17 4 102 111 110 116 1 16 3 0 66 6 4 84 101 120 116 8 0 0 0 3 4 0 0 0 0 17 6 115 116 114 105 110 103 17 4 114 117 110 115 1 1 1 1 16 3 0 66 6 7 73 110 116 101 103 101 114 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 10 66 121 116 101 83 116 114 105 110 103 8 0 0 0 1 4 0 0 0 0 17 12 115 117 112 101 114 99 108 97 115 115 101 115 16 3 0 32 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 16 3 0 66 10 0 0 0 79 10 0 0 3 119 16 3 0 66 10 0 0 1 131 10 0 0 9 122 16 3 0 66 10 0 0 2 79 10 0 0 24 61 16 3 0 66 10 0 0 2 177 10 0 0 6 145 16 3 0 66 10 0 0 3 56 10 0 0 24 61 16 3 0 66 10 0 0 3 202 10 0 0 6 145 16 3 0 66 10 0 0 3 119 10 0 0 20 192 1 1 1 16 3 0 66 10 0 0 3 234 10 0 0 8 223 16 3 0 66 10 0 0 4 8 10 0 0 0 79 16 3 0 66 10 0 0 5 84 10 0 0 15 234 16 3 0 66 10 0 0 5 237 10 0 0 21 226 1 1 16 3 0 66 10 0 0 6 61 10 0 0 0 32 16 3 0 66 10 0 0 6 36 10 0 0 9 22 16 3 0 66 10 0 0 6 109 10 0 0 24 197 16 3 0 66 10 0 0 6 145 10 0 0 21 74 1 1 1 16 3 0 66 10 0 0 6 170 10 0 0 9 22 16 3 0 66 10 0 0 6 191 10 0 0 21 253 1 1 16 3 0 66 10 0 0 6 219 10 0 0 19 212 1 1 1 1 16 3 0 66 10 0 0 7 23 10 0 0 6 145 1 16 3 0 66 10 0 0 7 56 10 0 0 7 23 16 3 0 66 10 0 0 7 110 10 0 0 24 61 1 1 1 1 16 3 0 66 10 0 0 7 209 10 0 0 4 8 1 1 16 3 0 66 10 0 0 8 223 10 0 0 6 145 16 3 0 66 10 0 0 8 195 10 0 0 9 56 16 3 0 66 10 0 0 8 248 10 0 0 6 170 16 3 0 66 10 0 0 8 168 10 0 0 6 145 1 1 1 1 1 16 3 0 66 10 0 0 9 22 10 0 0 9 223 1 16 3 0 66 10 0 0 9 56 10 0 0 22 113 1 1 1 1 16 3 0 66 10 0 0 9 81 10 0 0 6 145 16 3 0 66 10 0 0 9 122 10 0 0 20 192 1 1 1 1 1 1 16 3 0 66 10 0 0 9 198 10 0 0 9 22 1 1 1 16 3 0 66 10 0 0 9 223 10 0 0 10 5 16 3 0 66 10 0 0 10 5 10 0 0 6 145 1 16 3 0 66 10 0 0 10 32 10 0 0 6 145 16 3 0 66 10 0 0 13 62 10 0 0 23 173 16 3 0 66 10 0 0 14 244 10 0 0 9 22 16 3 0 66 10 0 0 15 234 10 0 0 6 145 16 3 0 66 10 0 0 15 58 10 0 0 6 145 16 3 0 66 10 0 0 16 6 10 0 0 9 22 16 3 0 66 10 0 0 16 28 10 0 0 9 56 1 16 3 0 66 10 0 0 16 57 10 0 0 22 113 1 1 1 16 3 0 66 10 0 0 16 108 10 0 0 10 5 16 3 0 66 10 0 0 16 150 10 0 0 6 145 16 3 0 66 10 0 0 17 158 10 0 0 3 202 1 1 16 3 0 66 10 0 0 17 202 10 0 0 6 145 1 1 1 1 1 16 3 0 66 10 0 0 18 119 10 0 0 19 176 16 3 0 66 10 0 0 18 194 10 0 0 19 241 16 3 0 66 10 0 0 21 253 10 0 0 9 198 16 3 0 66 10 0 0 19 212 10 0 0 22 82 16 3 0 66 10 0 0 19 241 10 0 0 20 192 16 3 0 66 10 0 0 19 176 10 0 0 6 145 16 3 0 66 10 0 0 0 66 10 0 0 3 234 16 3 0 66 10 0 0 21 101 10 0 0 6 145 16 3 0 66 10 0 0 21 5 10 0 0 6 145 16 3 0 66 10 0 0 20 192 10 0 0 24 61 16 3 0 66 10 0 0 21 74 17 3 110 105 108 16 3 0 66 10 0 0 21 226 10 0 0 6 145 16 3 0 66 10 0 0 20 118 10 0 0 9 223 16 3 0 66 10 0 0 22 19 10 0 0 9 223 16 3 0 66 10 0 0 22 82 10 0 0 6 145 1 1 16 3 0 66 10 0 0 22 113 10 0 0 8 223 1 16 3 0 66 10 0 0 22 136 10 0 0 6 145 16 3 0 66 10 0 0 22 230 10 0 0 1 131 1 1 16 3 0 66 10 0 0 0 32 10 0 0 16 108 1 1 1 1 1 16 3 0 66 10 0 0 23 173 10 0 0 3 119 1 1 16 3 0 66 10 0 0 24 61 10 0 0 6 145 1 1 16 3 0 66 10 0 0 24 114 10 0 0 17 158 1 16 3 0 66 10 0 0 24 159 10 0 0 9 22 1 1 1 1 16 3 0 66 10 0 0 24 197 10 0 0 22 113 1 16 3 0 66 10 0 0 24 221 10 0 0 9 198 16 10 2 79 15 15 144 242 24 241 106 10 63 255 255 255 8 0 0 0 5 16 35 7 209 15 15 144 242 24 241 106 10 0 0 29 50 8 0 0 0 1 16 10 7 110 15 15 160 243 24 225 105 10 0 0 29 71 8 0 0 0 1 16 24 22 230 15 0 0 0 9 64 86 10 0 0 29 92 8 0 0 0 0 1 16 4 19 176 4 57 158 103 153 4 0 0 0 32 11 128 6 1 7 255 230 230 230 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 9 8 0 0 0 17 1 16 3 0 66 6 23 117 110 102 111 99 117 115 101 100 83 101 108 101 99 116 105 111 110 67 111 108 111 114 16 4 19 176 4 7 52 129 32 1 1 16 3 0 66 6 11 100 114 111 112 69 110 97 98 108 101 100 2 1 1 1 16 3 0 66 6 10 98 108 105 110 107 83 116 97 114 116 16 7 6 109 4 0 0 0 142 4 0 0 0 72 4 0 0 0 252 4 0 0 0 207 4 0 0 0 94 4 0 0 0 3 16 3 0 66 6 10 99 97 114 101 116 67 111 108 111 114 16 4 19 176 4 58 216 212 0 4 0 0 0 32 11 128 6 1 7 255 235 141 0 1 16 3 0 66 6 21 105 110 100 105 99 97 116 101 75 101 121 98 111 97 114 100 70 111 99 117 115 6 5 110 101 118 101 114 1 16 3 0 66 6 10 97 110 105 109 97 116 105 111 110 115 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 6 14 115 101 108 101 99 116 105 111 110 67 111 108 111 114 16 4 19 176 4 7 86 25 134 4 0 0 0 32 11 128 6 1 7 255 29 97 97 16 3 0 66 6 11 100 114 97 103 69 110 97 98 108 101 100 2 1 16 3 0 66 6 17 115 105 103 110 97 108 67 111 110 110 101 99 116 105 111 110 115 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 1 4 0 0 0 0 16 4 19 176 4 0 0 0 0 4 0 0 0 32 11 128 6 1 7 255 0 0 1 16 13 15 58 8 0 0 0 1 16 5 22 136 10 0 0 5 84 1 6 30 102 97 109 105 108 121 78 97 109 101 58 112 111 105 110 116 83 105 122 101 58 101 109 112 104 97 115 105 115 58 8 0 0 0 3 17 17 66 105 116 115 116 114 101 97 109 86 101 114 97 83 97 110 115 4 0 0 0 20 4 0 0 0 0 1 4 0 0 0 28 4 0 0 0 22 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 16 5 22 136 6 13 84 101 120 116 67 111 110 115 116 97 110 116 115 1 6 3 97 116 58 8 0 0 0 1 6 16 68 101 102 97 117 108 116 84 97 98 115 65 114 114 97 121 16 5 22 136 10 0 0 31 159 1 10 0 0 31 175 8 0 0 0 1 6 22 68 101 102 97 117 108 116 77 97 114 103 105 110 84 97 98 115 65 114 114 97 121 4 0 0 0 2 1 16 3 24 159 17 33 68 105 101 115 32 105 115 116 32 101 105 110 32 84 101 120 116 109 111 114 112 104 32 109 105 116 32 73 110 104 97 108 116 16 6 14 244 8 0 0 0 1 4 0 0 0 33 8 0 0 0 1 8 0 0 0 1 16 3 24 114 1 10 0 0 31 48 4 0 0 0 24 4 0 0 0 1 4 0 0 0 23 2 16 18 16 150 10 0 0 31 253 16 13 15 58 10 0 0 31 43 1 4 0 0 0 28 4 0 0 0 22 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 10 0 0 31 155 10 0 0 31 203 4 0 0 0 2 1 4 0 0 0 1 16 3 9 81 16 3 8 168 4 0 0 0 3 4 0 0 0 0 16 3 8 168 4 0 0 0 148 4 0 152 150 127 8 0 0 0 3 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 0 4 0 0 0 28 4 0 0 0 1 4 0 0 0 13 4 0 0 0 2 4 0 0 0 21 4 0 0 0 22 1 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 28 4 0 0 0 56 4 0 0 0 14 4 0 0 0 23 4 0 0 0 0 4 0 0 0 22 4 0 0 0 22 1 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 56 4 0 0 0 84 4 0 0 0 24 4 0 0 0 33 4 0 0 0 0 4 0 0 0 37 4 0 0 0 22 1 16 3 8 168 4 0 0 0 0 4 0 0 0 0 4 0 0 0 32 4 0 0 0 127 1 1 3 3 1 1 10 0 0 30 58 10 0 0 30 182 10 0 0 29 216 1 1 1 1 1 15 0 48 0 0 0 0 1 1 1 10 0 0 29 71 3 1 16 5 18 119 4 0 0 0 0 1 1 4 0 0 0 0 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 3 8 0 0 0 5 1 1 16 3 0 66 6 13 99 108 105 112 83 117 98 109 111 114 112 104 115 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 4 7 56 16 3 8 168 4 255 255 255 6 4 255 255 255 13 14 0 0 0 0 0 0 0 0 14 63 240 0 0 0 0 0 0 4 0 0 0 1 10 0 0 29 117 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 15 8 0 0 0 23 1 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 82 101 97 100 79 110 108 121 16 4 19 176 4 44 169 74 238 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 1 1 16 3 0 66 6 9 109 105 110 72 101 105 103 104 116 4 0 0 0 20 16 3 0 66 6 19 97 100 111 114 110 109 101 110 116 78 111 114 109 97 108 69 100 105 116 16 4 19 176 4 55 185 57 125 1 1 1 16 3 0 66 6 11 98 111 114 100 101 114 83 116 121 108 101 16 4 5 237 1 16 4 19 176 4 0 80 20 5 4 0 0 0 32 11 128 6 1 7 255 1 1 1 4 0 0 0 1 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 15 119 114 97 112 66 111 114 100 101 114 67 111 108 111 114 16 5 18 119 4 49 44 75 18 1 1 4 0 0 0 76 16 3 0 66 6 13 97 100 111 114 110 109 101 110 116 68 105 102 102 16 4 19 176 4 21 40 169 38 1 1 1 16 3 0 66 6 15 97 100 111 114 110 109 101 110 116 82 101 102 117 115 101 16 4 19 176 4 25 248 142 148 1 1 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 67 111 110 102 108 105 99 116 16 4 19 176 4 47 244 1 0 1 1 16 3 0 66 6 8 109 105 110 87 105 100 116 104 4 0 0 0 10 16 3 0 66 6 19 102 114 97 109 101 65 100 111 114 110 109 101 110 116 87 105 100 116 104 4 0 0 0 2 16 3 0 66 6 22 107 101 121 98 111 97 114 100 67 97 112 116 117 114 101 70 105 108 116 101 114 115 16 2 8 248 10 0 0 29 71 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 68 105 102 102 69 100 105 116 16 4 19 176 4 43 58 28 164 1 1 16 3 0 66 6 13 97 99 99 101 112 116 82 101 115 99 97 108 101 2 4 0 0 0 1 10 0 0 35 0 1 1 3 16 37 13 62 15 24 80 242 24 241 106 1 8 0 0 0 6 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 4 19 176 4 18 228 185 46 4 0 0 0 32 11 128 6 1 7 255 75 75 75 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 18 109 111 117 115 101 68 111 119 110 73 110 83 108 105 100 101 114 58 10 0 0 36 98 6 15 115 99 114 111 108 108 65 98 115 111 108 117 116 101 58 1 1 10 0 0 36 98 6 16 109 111 117 115 101 85 112 73 110 83 108 105 100 101 114 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 0 80 20 5 1 1 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 5 18 119 4 18 228 185 46 1 1 4 0 0 0 178 16 12 17 202 3 3 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 33 154 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 33 154 16 9 9 122 15 24 81 96 24 241 106 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 81 96 24 241 106 10 0 0 37 237 8 0 0 0 0 1 16 4 19 176 4 0 0 3 255 4 0 0 0 32 11 128 6 1 7 255 0 0 255 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 38 100 133 0 22 255 1 1 1 25 0 18 255 1 1 1 25 0 14 255 1 1 1 33 0 10 255 1 1 1 33 0 7 255 1 1 1 97 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 14 115 99 114 111 108 108 68 111 119 110 73 110 105 116 1 1 1 1 10 0 0 36 98 6 17 102 105 110 105 115 104 101 100 83 99 114 111 108 108 105 110 103 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 240 252 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 80 242 24 240 252 10 0 0 39 93 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 38 100 141 0 7 255 1 1 1 33 0 10 255 1 1 1 33 0 14 255 1 1 1 25 0 18 255 1 1 1 25 0 22 255 1 1 1 89 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 12 115 99 114 111 108 108 85 112 73 110 105 116 1 1 1 1 10 0 0 36 98 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 240 252 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 80 242 24 240 252 10 0 0 40 171 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 31 100 133 0 18 255 1 1 1 25 0 18 255 1 1 1 25 0 18 255 1 1 1 25 0 18 255 1 1 1 133 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 20 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 68 111 119 110 58 1 1 1 1 1 1 10 0 0 36 98 6 21 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 69 110 116 101 114 58 10 0 0 36 98 6 21 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 76 101 97 118 101 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 5 18 119 4 13 195 112 220 1 1 4 0 0 0 89 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 15 115 99 114 111 108 108 80 97 103 101 73 110 105 116 58 1 1 1 1 10 0 0 36 98 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 63 255 252 0 4 0 0 0 32 11 128 6 1 7 255 255 255 0 4 0 0 0 2 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 43 7 10 0 0 29 71 1 3 10 0 0 36 115 10 0 0 34 48 6 16 118 83 99 114 111 108 108 66 97 114 86 97 108 117 101 58 1 10 0 0 37 106 10 0 0 36 137 3 1 4 0 0 0 0 4 0 0 0 1 1 1 6 8 118 101 114 116 105 99 97 108 10 0 0 40 171 10 0 0 39 93 10 0 0 37 237 10 0 0 42 38 4 0 0 0 28 4 0 0 1 24 14 63 240 0 0 0 0 0 0 6 28 118 83 99 114 111 108 108 66 97 114 77 101 110 117 66 117 116 116 111 110 80 114 101 115 115 101 100 58 1 1 1 1 10 0 0 29 92 3 3 1 1 3 16 37 13 62 15 0 0 0 0 64 8 1 8 0 0 0 6 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 10 0 0 36 137 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 36 182 10 0 0 43 227 10 0 0 36 207 1 1 10 0 0 43 227 10 0 0 36 231 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 0 80 20 5 1 1 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 16 5 18 119 4 18 228 185 46 1 1 4 0 0 0 178 16 12 17 202 3 3 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 33 154 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 33 154 16 9 9 122 15 255 192 0 0 64 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 255 192 0 0 64 8 10 0 0 45 52 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 24 64 109 0 10 255 1 1 1 25 0 14 255 1 1 1 21 0 7 255 1 1 1 81 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 38 198 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 128 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 0 0 0 0 128 8 10 0 0 46 107 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 24 64 117 0 7 255 1 1 1 21 0 14 255 1 1 1 25 0 10 255 1 1 1 73 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 40 36 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 128 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 0 0 0 0 128 8 10 0 0 47 162 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 17 64 109 0 10 255 1 1 1 25 0 10 255 1 1 1 109 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 41 107 1 1 1 1 1 1 10 0 0 43 227 10 0 0 41 140 10 0 0 43 227 10 0 0 41 168 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 16 5 18 119 4 13 195 112 220 1 1 4 0 0 0 89 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 42 98 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 43 7 4 0 0 0 2 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 43 7 10 0 0 29 71 1 3 10 0 0 43 244 10 0 0 34 48 6 16 104 83 99 114 111 108 108 66 97 114 86 97 108 117 101 58 1 10 0 0 44 177 10 0 0 36 137 3 1 4 0 0 0 0 4 0 0 0 1 1 1 6 10 104 111 114 105 122 111 110 116 97 108 10 0 0 47 162 10 0 0 46 107 10 0 0 45 52 10 0 0 48 218 4 0 0 0 10 4 0 0 0 100 10 0 0 43 174 6 28 104 83 99 114 111 108 108 66 97 114 77 101 110 117 66 117 116 116 111 110 80 114 101 115 115 101 100 58 1 1 1 1 10 0 0 30 109 6 10 119 104 101 110 78 101 101 100 101 100 4 0 0 0 10 10 0 0 29 113 1 1 1 2 2 16 4 20 118 4 0 0 0 34 4 0 0 0 33 4 0 0 0 1 3 1 1 4 0 0 0 11 16 3 16 57 4 0 0 0 237 4 0 0 0 100 16 9 9 122 15 15 64 237 15 224 247 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 6 28 100 114 97 103 67 111 114 110 101 114 58 101 118 101 110 116 58 102 114 111 109 72 97 110 100 108 101 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 6 18 109 111 114 112 104 105 99 76 97 121 101 114 78 117 109 98 101 114 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 24 160 237 25 64 247 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 2 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 24 161 101 25 65 111 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 3 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 15 65 101 15 225 111 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 4 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 6 11 108 97 121 111 117 116 70 114 97 109 101 16 9 2 177 16 3 16 57 4 0 0 0 47 4 0 0 1 60 4 0 0 0 0 16 3 16 57 4 0 0 0 1 4 0 0 0 79 4 0 0 0 0 16 3 16 57 4 0 0 0 197 4 0 0 1 60 4 0 0 0 0 16 3 16 57 4 0 0 0 41 4 0 0 0 79 4 0 0 0 0 16 3 0 66 6 16 108 97 121 111 117 116 80 114 111 112 101 114 116 105 101 115 16 4 21 5 6 9 115 112 97 99 101 70 105 108 108 10 0 0 54 239 3 1 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 4 22 19 8 0 0 0 10 10 0 0 50 182 10 0 0 51 187 10 0 0 52 152 10 0 0 53 117 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 4 2 10 0 0 29 71 33 13 13] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index 5cfa9bf..f92000e 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -4,8 +4,8 @@ "instance" : { "loader" : "MK 7/20/2018 15:44", "loader:" : "MK 7/20/2018 15:44", - "mockCompletePresentationDirectory" : "LM 7/24/2018 15:12", - "mockEmptyPresentationDirectory" : "MK 7/20/2018 15:47", + "mockCompletePresentationDirectory" : "LB 7/24/2018 17:33", + "mockEmptyPresentationDirectory" : "LB 7/24/2018 17:33", "morphLoadingStreamFor:" : "MK 7/20/2018 15:48", "setUp" : "MK 7/20/2018 15:46", "testCanLoadEmptyPresentation" : "MK 7/20/2018 15:49", @@ -13,12 +13,12 @@ "testEmptyPresentationDirectoryIsValid" : "MK 7/20/2018 15:50", "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", - "testInvalidSlideDirectoryNames" : "MK 7/20/2018 15:51", - "testLoadCompletePresentation" : "LM 7/24/2018 15:33", - "testMissingSlidesDirectory" : "MK 7/20/2018 15:53", - "testMorphLoadIsValid" : "MK 7/20/2018 15:53", - "testMorphNameIsNotNumber" : "MK 7/20/2018 15:54", - "testMorphNameIsNumber" : "MK 7/20/2018 15:55", - "testSlidesDirectoryIsEmpty" : "MK 7/20/2018 15:57", - "testSortMorphFiles" : "MK 7/20/2018 15:57", - "validMorphFileData" : "MK 7/20/2018 15:54" } } + "testInvalidSlideDirectoryNames" : "LB 7/24/2018 17:35", + "testLoadCompletePresentation" : "LB 7/24/2018 17:41", + "testMissingSlidesDirectory" : "LB 7/24/2018 17:39", + "testMorphLoadIsValid" : "LB 7/24/2018 17:44", + "testMorphNameIsNotNumber" : "LB 7/24/2018 17:39", + "testMorphNameIsNumber" : "LB 7/24/2018 17:39", + "testSlidesDirectoryIsEmpty" : "LB 7/24/2018 17:39", + "testSortMorphFiles" : "LB 7/24/2018 17:46", + "validMorphFileData" : "LB 7/24/2018 17:47" } } From 4a532a2da7694c0d579b26934e7a5a21a5af3a14 Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Tue, 24 Jul 2018 17:58:36 +0200 Subject: [PATCH 063/112] only recategorized --- .../Presenter-Core.package/PSMiniature.class/class/forSlide..st | 2 +- .../PSTextMorph.class/class/DefaultTextStyle.st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Core.package/PSMiniature.class/class/forSlide..st b/packages/Presenter-Core.package/PSMiniature.class/class/forSlide..st index 8351208..f1d82e4 100644 --- a/packages/Presenter-Core.package/PSMiniature.class/class/forSlide..st +++ b/packages/Presenter-Core.package/PSMiniature.class/class/forSlide..st @@ -1,4 +1,4 @@ -as yet unclassified +instance creation forSlide: aPSSlide ^ self new diff --git a/packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st b/packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st index 04a3b26..82ece7c 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st @@ -1,4 +1,4 @@ -as yet unclassified +constants DefaultTextStyle ^ DefaultTextStyle From 9af2518c838574d1b0e8e577eb0ddd619e1d6af2 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Tue, 24 Jul 2018 18:00:28 +0200 Subject: [PATCH 064/112] Small changes to class comments --- .../Presenter-Core.package/PSContentContainer.class/README.md | 1 + .../PSContentContainer.class/properties.json | 2 +- .../Presenter-Core.package/PSPresentationLoader.class/README.md | 2 +- .../PSPresentationLoader.class/properties.json | 2 +- .../PSScalingFontAttribute.class/README.md | 2 +- .../PSScalingFontAttribute.class/properties.json | 2 +- packages/Presenter-Core.package/PSSlide.class/README.md | 2 +- packages/Presenter-Core.package/PSSlide.class/properties.json | 2 +- .../Presenter-Core.package/PSSlideContainer.class/README.md | 2 +- .../PSSlideContainer.class/properties.json | 2 +- packages/Presenter-Core.package/PSTextMorph.class/README.md | 2 +- .../Presenter-Core.package/PSTextMorph.class/properties.json | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/Presenter-Core.package/PSContentContainer.class/README.md b/packages/Presenter-Core.package/PSContentContainer.class/README.md index 84bd490..6b22b96 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/README.md +++ b/packages/Presenter-Core.package/PSContentContainer.class/README.md @@ -1,5 +1,6 @@ A PSContentContainer is a container for a single morph put on a slide. It manages resizing and the context menu for its morph. +Resizing is done with "handles", small rectangles, which can be dragged to resize the child morph. Instance Variables content: diff --git a/packages/Presenter-Core.package/PSContentContainer.class/properties.json b/packages/Presenter-Core.package/PSContentContainer.class/properties.json index 32adfc9..dee4f6e 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/properties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 15:20", + "commentStamp" : "LM 7/24/2018 17:46", "instvars" : [ "resizeHandles", "hasHandles", diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/README.md b/packages/Presenter-Core.package/PSPresentationLoader.class/README.md index b320595..5a366d6 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/README.md +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/README.md @@ -1,4 +1,4 @@ -A PSPresentationLoader loads a PSPresentation from a given file directory. Therefore PSPresentationLoader>>#loadPresentationFromDirectory is used and returns the presentation. +A PSPresentationLoader loads a PSPresentation from a given file directory. For this purpose PSPresentationLoader>>#loadPresentationFromDirectory is used and returns the presentation. Instance Variables errorReport: diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json index 3583082..8db41d3 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 16:37", + "commentStamp" : "LM 7/24/2018 17:50", "instvars" : [ "errorReport", "presentation", diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md b/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md index f1f9748..aac71f6 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md @@ -1,5 +1,5 @@ A PSScalingFontAttribute scales the font of a text according to a scaling factor. -The actual text size is calculated multiplying a basic text size with that factor. +The actual text size is calculated by multiplying a basic text size with that factor. Instance Variables basicTextSize: diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json index 8095f73..8ac48a4 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 15:53", + "commentStamp" : "LM 7/24/2018 17:54", "instvars" : [ "style", "basicTextSize", diff --git a/packages/Presenter-Core.package/PSSlide.class/README.md b/packages/Presenter-Core.package/PSSlide.class/README.md index 4ac931d..b5a4534 100644 --- a/packages/Presenter-Core.package/PSSlide.class/README.md +++ b/packages/Presenter-Core.package/PSSlide.class/README.md @@ -1,5 +1,5 @@ A PSSlide is a Morph to place content on. Every morph put on a PSSlide is put into a PSContentContainer. -Whenever it is resized, all the contents are rescaled with a fix width-to-hight ratio. +Whenever it is resized, all the contents are rescaled with a fixed width-to-hight ratio. Instance Variables diff --git a/packages/Presenter-Core.package/PSSlide.class/properties.json b/packages/Presenter-Core.package/PSSlide.class/properties.json index 9be954f..2502215 100644 --- a/packages/Presenter-Core.package/PSSlide.class/properties.json +++ b/packages/Presenter-Core.package/PSSlide.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 15:31", + "commentStamp" : "LM 7/24/2018 17:55", "instvars" : [ ], "name" : "PSSlide", diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/README.md b/packages/Presenter-Core.package/PSSlideContainer.class/README.md index 6668366..a7da234 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/README.md +++ b/packages/Presenter-Core.package/PSSlideContainer.class/README.md @@ -1,5 +1,5 @@ A PSSlideContainer is a container for a slide. -It manages displaying the slide, saves the corresponding PSPresentationTool when entering the presentation mode and handles keystroke events. +It manages displaying the slide, saves the previous owner when entering the presentation mode and handles keystroke events. The PSSlideContainer pretends to be a system window in order to be in the foreground after closing a system window that was put on a slide. Instance Variables diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/properties.json b/packages/Presenter-Core.package/PSSlideContainer.class/properties.json index e82376b..d67a8fd 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/properties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 15:02", + "commentStamp" : "LM 7/24/2018 17:57", "instvars" : [ "currentSlide", "previousOwner", diff --git a/packages/Presenter-Core.package/PSTextMorph.class/README.md b/packages/Presenter-Core.package/PSTextMorph.class/README.md index ff033c7..74bf407 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/README.md +++ b/packages/Presenter-Core.package/PSTextMorph.class/README.md @@ -1,4 +1,4 @@ -A PSTextMorph is a TextMorph for PowerSqueak-presentations, that enables scaling, coloring, resizing for text and background-coloring. +A PSTextMorph is a TextMorph for PowerSqueak-presentations, that enables scaling, coloring and resizing for text and background-coloring. Instance Variables textScale: diff --git a/packages/Presenter-Core.package/PSTextMorph.class/properties.json b/packages/Presenter-Core.package/PSTextMorph.class/properties.json index 6b9791e..2ae6da9 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/properties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ "DefaultTextStyle" ], - "commentStamp" : "WoC 7/24/2018 13:55", + "commentStamp" : "LM 7/24/2018 17:59", "instvars" : [ "textScale" ], "name" : "PSTextMorph", From b64644e2bc5e0aa15aa8e8a9da6c4dc2a4a56f02 Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Tue, 24 Jul 2018 18:06:29 +0200 Subject: [PATCH 065/112] Minor changes From 21c32b4259548b40507a412660b6206af7be7ed9 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Tue, 24 Jul 2018 18:10:45 +0200 Subject: [PATCH 066/112] Class comments for Presenter-Tests --- .../PSMockByteStream.class/README.md | 7 +++++++ .../PSMockByteStream.class/properties.json | 2 +- .../PSMockContentContainer.class/README.md | 8 ++++++++ .../PSMockContentContainer.class/properties.json | 2 +- .../PSMockMorph.class/README.md | 12 ++++++++++++ .../instance/receivedKeyboardEvents..st | 4 ++-- .../instance/receivedMouseEvents..st | 4 ++-- .../PSMockMorph.class/methodProperties.json | 4 ++-- .../PSMockMorph.class/properties.json | 2 +- .../PSMockSlide.class/README.md | 8 ++++++++ .../instance/receivedPresentationModeEnable..st | 4 ++-- .../PSMockSlide.class/methodProperties.json | 2 +- .../PSMockSlide.class/properties.json | 2 +- .../PSTestWorld.class/README.md | 6 ++++++ .../PSTestWorld.class/instance/hand..st | 4 ++-- .../PSTestWorld.class/instance/setUp.st | 2 +- .../PSTestWorld.class/instance/tearDown.st | 5 ----- .../PSTestWorld.class/instance/world..st | 4 ++-- .../PSTestWorld.class/methodProperties.json | 7 +++---- .../PSTestWorld.class/properties.json | 2 +- 20 files changed, 63 insertions(+), 28 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSTestWorld.class/instance/tearDown.st diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/README.md b/packages/Presenter-Tests.package/PSMockByteStream.class/README.md index e69de29..a24523f 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/README.md +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/README.md @@ -0,0 +1,7 @@ +A PSMockByteStream mocks a byte stream for a file. + +Instance Variables + name: + +name + - Name of the mocked file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json index 6b17924..1897972 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 17:37", "instvars" : [ "name" ], "name" : "PSMockByteStream", diff --git a/packages/Presenter-Tests.package/PSMockContentContainer.class/README.md b/packages/Presenter-Tests.package/PSMockContentContainer.class/README.md index e69de29..3e18353 100644 --- a/packages/Presenter-Tests.package/PSMockContentContainer.class/README.md +++ b/packages/Presenter-Tests.package/PSMockContentContainer.class/README.md @@ -0,0 +1,8 @@ +A PSMockContentContainer mocks a PSContentContainer. +Remembers whether methods for menu creation are called. + +Instance Variables + menuCreated: + +menuCreated + - Boolean whether a menu has been created yet diff --git a/packages/Presenter-Tests.package/PSMockContentContainer.class/properties.json b/packages/Presenter-Tests.package/PSMockContentContainer.class/properties.json index eeb0f4f..7eb02a3 100644 --- a/packages/Presenter-Tests.package/PSMockContentContainer.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockContentContainer.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 17:44", "instvars" : [ "menuCreated" ], "name" : "PSMockContentContainer", diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/README.md b/packages/Presenter-Tests.package/PSMockMorph.class/README.md index e69de29..27b7d7b 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/README.md +++ b/packages/Presenter-Tests.package/PSMockMorph.class/README.md @@ -0,0 +1,12 @@ +A PSMockMorph mocks Morph. +It remembers the number of received keyboard and mouse events. + +Instance Variables + receivedKeyboardEvents: + receivedMouseEvents: + +receivedKeyboardEvents + - Number of received keyboard events + +receivedMouseEvents + - Number of received mouse events diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents..st index 767bdec..718096a 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents..st +++ b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedKeyboardEvents..st @@ -1,4 +1,4 @@ accessing -receivedKeyboardEvents: anObject +receivedKeyboardEvents: aNumber - receivedKeyboardEvents := anObject + receivedKeyboardEvents := aNumber diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents..st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents..st index 3a19a20..667416f 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents..st +++ b/packages/Presenter-Tests.package/PSMockMorph.class/instance/receivedMouseEvents..st @@ -1,4 +1,4 @@ accessing -receivedMouseEvents: anObject +receivedMouseEvents: aNumber - receivedMouseEvents := anObject + receivedMouseEvents := aNumber diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json index 65300c9..b0a6615 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json @@ -9,6 +9,6 @@ "keyStroke:" : "WoC 6/15/2018 19:03", "mouseDown:" : "WoC 6/15/2018 19:03", "receivedKeyboardEvents" : "WoC 6/15/2018 18:58", - "receivedKeyboardEvents:" : "WoC 6/15/2018 18:58", + "receivedKeyboardEvents:" : "MK 7/24/2018 18:01", "receivedMouseEvents" : "WoC 6/15/2018 18:58", - "receivedMouseEvents:" : "WoC 6/15/2018 18:58" } } + "receivedMouseEvents:" : "MK 7/24/2018 18:01" } } diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/properties.json b/packages/Presenter-Tests.package/PSMockMorph.class/properties.json index 74d306a..d56134a 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockMorph.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 18:04", "instvars" : [ "receivedMouseEvents", "receivedKeyboardEvents" ], diff --git a/packages/Presenter-Tests.package/PSMockSlide.class/README.md b/packages/Presenter-Tests.package/PSMockSlide.class/README.md index e69de29..3a02b32 100644 --- a/packages/Presenter-Tests.package/PSMockSlide.class/README.md +++ b/packages/Presenter-Tests.package/PSMockSlide.class/README.md @@ -0,0 +1,8 @@ +A PSMockSlide mocks a PSSlide. +Remembers whether methods for enabling the presentation mode are called. + +Instance Variables + receivedPresentationModeEnable: + +receivedPresentationModeEnable + - Whether the call to enter the presentation mode has been received diff --git a/packages/Presenter-Tests.package/PSMockSlide.class/instance/receivedPresentationModeEnable..st b/packages/Presenter-Tests.package/PSMockSlide.class/instance/receivedPresentationModeEnable..st index 8321fa1..af8cd94 100644 --- a/packages/Presenter-Tests.package/PSMockSlide.class/instance/receivedPresentationModeEnable..st +++ b/packages/Presenter-Tests.package/PSMockSlide.class/instance/receivedPresentationModeEnable..st @@ -1,4 +1,4 @@ accessing -receivedPresentationModeEnable: anObject +receivedPresentationModeEnable: aBoolean - receivedPresentationModeEnable := anObject + receivedPresentationModeEnable := aBoolean diff --git a/packages/Presenter-Tests.package/PSMockSlide.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockSlide.class/methodProperties.json index c66bc05..d60ae3b 100644 --- a/packages/Presenter-Tests.package/PSMockSlide.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockSlide.class/methodProperties.json @@ -5,4 +5,4 @@ "enablePresentationMode" : "LM 6/8/2018 19:58", "initialize" : "LM 6/8/2018 19:58", "receivedPresentationModeEnable" : "LM 6/8/2018 19:58", - "receivedPresentationModeEnable:" : "LM 6/8/2018 19:58" } } + "receivedPresentationModeEnable:" : "MK 7/24/2018 17:51" } } diff --git a/packages/Presenter-Tests.package/PSMockSlide.class/properties.json b/packages/Presenter-Tests.package/PSMockSlide.class/properties.json index fa8de84..f712286 100644 --- a/packages/Presenter-Tests.package/PSMockSlide.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockSlide.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 17:51", "instvars" : [ "receivedPresentationModeEnable" ], "name" : "PSMockSlide", diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/README.md b/packages/Presenter-Tests.package/PSTestWorld.class/README.md index e69de29..9ca95ff 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/README.md +++ b/packages/Presenter-Tests.package/PSTestWorld.class/README.md @@ -0,0 +1,6 @@ +A PSTestWorld is a test resource for PSUITestCases. +It is derived from the UserInputEventTests. + +Instance Variables + hand: + world: diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/hand..st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/hand..st index 1f7d90d..c092656 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/hand..st +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/hand..st @@ -1,4 +1,4 @@ accessing -hand: anObject +hand: aHandMorph - hand := anObject + hand := aHandMorph diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st index 04ae1e2..56f2071 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st @@ -1,6 +1,6 @@ running setUp - + "Inspired of UserInputEventTest" super setUp. self world: ((PasteUpMorph newWorldForProject: nil) diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/tearDown.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/tearDown.st deleted file mode 100644 index 9735746..0000000 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/tearDown.st +++ /dev/null @@ -1,5 +0,0 @@ -running -tearDown - - self hand showHardwareCursor: true. "Nasty side-effect" - super tearDown \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/world..st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/world..st index 8cbc1ae..ec20b1a 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/world..st +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/world..st @@ -1,4 +1,4 @@ accessing -world: anObject +world: aWorld - world := anObject + world := aWorld diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json index da6b3a3..b9144d7 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json @@ -3,8 +3,7 @@ }, "instance" : { "hand" : "LB 5/29/2018 17:26", - "hand:" : "LB 5/29/2018 17:26", - "setUp" : "LB 7/13/2018 22:17", - "tearDown" : "LB 5/29/2018 17:26", + "hand:" : "MK 7/24/2018 17:54", + "setUp" : "MK 7/24/2018 18:00", "world" : "LB 5/29/2018 17:26", - "world:" : "LB 5/29/2018 17:26" } } + "world:" : "MK 7/24/2018 17:53" } } diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/properties.json b/packages/Presenter-Tests.package/PSTestWorld.class/properties.json index 27919fe..75e3146 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/properties.json +++ b/packages/Presenter-Tests.package/PSTestWorld.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "MK 7/24/2018 18:00", "instvars" : [ "world", "hand" ], From 0de91a2f26515b300dd136f974bfe4af80f6ac64 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Tue, 24 Jul 2018 18:11:35 +0200 Subject: [PATCH 067/112] refactorings --- .../instance/testDecaysAfterFadingTime.st | 4 ++-- .../instance/testNotDecaysBeforeFadingTime.st | 4 ++-- .../PSFadingMessageTest.class/methodProperties.json | 4 ++-- .../PSOnSlideTest.class/instance/setUp.st | 7 ++++--- .../PSOnSlideTest.class/instance/submorphs.st | 4 ++++ .../instance/testAcceptDropImageFile.st | 5 ++++- .../instance/testTextFieldCreatedOnDoubleClick.st | 5 +++-- .../PSOnSlideTest.class/methodProperties.json | 7 ++++--- .../instance/testBuildWith.st | 2 +- .../instance/testDefaultSlideCount.st | 4 ++-- .../instance/testLayoutedSlidesCreation.st | 2 +- .../instance/testMagneticRasterButton.st | 2 ++ .../instance/testMiniatureSelects.st | 2 ++ .../PSPresentationToolTest.class/methodProperties.json | 10 +++++----- .../instance/doForDifferentSizes..st | 4 +--- .../PSSlideAndMorphTest.class/instance/setUp.st | 2 +- .../instance/testDroppingCreatesContainer.st | 2 +- .../instance/testMorphKeepsSideRatioOnResizeToFit.st | 3 +-- .../PSSlideAndMorphTest.class/methodProperties.json | 8 ++++---- .../instance/testContainerResizingAllCorners.st | 8 ++++---- .../instance/testResizeHandleMagnetic.st | 1 + .../instance/testSlideContainerExtent.st | 2 +- .../instance/testSlideContainerPosition.st | 2 +- .../PSSlideSubmorphTest.class/methodProperties.json | 8 ++++---- .../PSUITestCase.class/instance/drag.from.to..st | 5 +++-- .../PSUITestCase.class/methodProperties.json | 2 +- 26 files changed, 61 insertions(+), 48 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSOnSlideTest.class/instance/submorphs.st diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st index 7b9f3e0..46e4fb4 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st @@ -1,6 +1,6 @@ decaying testDecaysAfterFadingTime - self stepCount + 1 timesRepeat: - [self message step]. + self stepCount + 1 + timesRepeat: [self message step]. self assert: self message owner equals: nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st index 74abe4f..7cdf2ed 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st @@ -1,6 +1,6 @@ decaying testNotDecaysBeforeFadingTime - self stepCount - 1 timesRepeat: - [self message step]. + self stepCount - 1 + timesRepeat: [self message step]. self deny: self message owner = nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json index 7ab783f..211a65b 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json @@ -6,5 +6,5 @@ "message:" : "LB 7/24/2018 17:12", "setUp" : "LB 7/24/2018 17:13", "stepCount" : "LB 7/24/2018 17:21", - "testDecaysAfterFadingTime" : "LB 7/24/2018 17:21", - "testNotDecaysBeforeFadingTime" : "LB 7/24/2018 17:21" } } + "testDecaysAfterFadingTime" : "WoC 7/24/2018 17:52", + "testNotDecaysBeforeFadingTime" : "WoC 7/24/2018 17:52" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st index 0812272..03174a0 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/setUp.st @@ -6,6 +6,7 @@ setUp self slideContainer setModel: PSPresentationTool new. self slide: PSSlide new. self slide setModel: self slideContainer model. - self slideContainer showSlide: self slide. - self slideContainer extent: self world extent / 2. - self slideContainer openInWorld: self world \ No newline at end of file + self slideContainer + showSlide: self slide; + extent: self world extent / 2; + openInWorld: self world \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/submorphs.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/submorphs.st new file mode 100644 index 0000000..6f8fb72 --- /dev/null +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/submorphs.st @@ -0,0 +1,4 @@ +accessing +submorphs + + ^ self slide submorphs \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st index b620193..2abbeca 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st @@ -3,9 +3,12 @@ testAcceptDropImageFile | oldSubMorphs createdImages | oldSubMorphs := self slide submorphs. + self slide handleDroppedItem: PSMockByteStream newPng event: (UserInputEvent new setPosition: self slide center). - createdImages := (self slide submorphs difference: oldSubMorphs) + + createdImages := (self submorphs difference: oldSubMorphs) select: [:each | each content isKindOf: SketchMorph]. + self assert: createdImages size equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st index 5b2083f..c99a97f 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st @@ -2,8 +2,9 @@ event tests testTextFieldCreatedOnDoubleClick | oldSubmorphs addedMorphs | - oldSubmorphs := self slide submorphs. + oldSubmorphs := self submorphs. self doubleClick: MouseEvent redButton at: self slide center. - addedMorphs := self slide submorphs difference: oldSubmorphs. + addedMorphs := self submorphs difference: oldSubmorphs. + self assert: addedMorphs size = 1. self assert: (addedMorphs first content isKindOf: PSTextMorph) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 8f90a80..10b22e5 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -4,12 +4,13 @@ "instance" : { "collectMenuContentFrom:" : "LM 6/15/2018 19:18", "collectMenuItemContentsFrom:" : "LM 6/15/2018 19:18", - "setUp" : "LB 7/13/2018 18:13", + "setUp" : "WoC 7/24/2018 17:54", "slide" : "LB 6/1/2018 17:49", "slide:" : "LB 6/1/2018 17:49", "slideContainer" : "LB 7/13/2018 18:12", "slideContainer:" : "LB 7/13/2018 18:13", + "submorphs" : "WoC 7/24/2018 17:55", "tearDown" : "LB 7/13/2018 18:13", - "testAcceptDropImageFile" : "MK 7/24/2018 14:08", + "testAcceptDropImageFile" : "WoC 7/24/2018 17:56", "testContextMenuContent:equals:" : "WoC 7/24/2018 16:53", - "testTextFieldCreatedOnDoubleClick" : "MK 7/24/2018 14:08" } } + "testTextFieldCreatedOnDoubleClick" : "WoC 7/24/2018 17:55" } } diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testBuildWith.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testBuildWith.st index 1810654..21518c9 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testBuildWith.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testBuildWith.st @@ -1,4 +1,4 @@ ui creation tests testBuildWith - self assert: self tool class = PSPresentationTool \ No newline at end of file + self assert: self tool class equals: PSPresentationTool \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st index 8214899..63cfac5 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st @@ -1,5 +1,5 @@ slide creation tests testDefaultSlideCount - self assert: self tool slideCount = 1. - self assert: self tool currentSlide = (self tool slideAt: 1). \ No newline at end of file + self assert: self slideCount = 1. + self assert: self currentSlide = (self tool slideAt: 1). \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st index f7b1389..2f390a6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st @@ -2,4 +2,4 @@ slide creation tests testLayoutedSlidesCreation "Assure that layout creation does not throw an error." self tool slideLayoutNames values do: [:each | each value]. - self assert: self tool slideCount = (self tool slideLayoutNames size + 1) \ No newline at end of file + self assert: self slideCount = (self tool slideLayoutNames size + 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st index f815ade..8533d03 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st @@ -5,8 +5,10 @@ testMagneticRasterButton button := self window allMorphs detect: [:m | m externalName = (self tool magneticRasterButtonData at: #name)]. modeBefore := self tool magneticRasterActive. + self click: MouseEvent redButton at: button boundsInWorld center. self assert: self tool magneticRasterActive equals: modeBefore not. + self click: MouseEvent redButton at: button boundsInWorld center. self assert: self tool magneticRasterActive equals: modeBefore. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index 254994e..e102b97 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -3,7 +3,9 @@ testMiniatureSelects | slideToSelect miniatureToClick | 5 timesRepeat: [self tool createSlide]. + slideToSelect := self slides third. miniatureToClick := self tool miniatureOf: slideToSelect. self click: MouseEvent redButton at: miniatureToClick boundsInWorld center. + self assert: self tool currentSlide equals: slideToSelect \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index e171043..97cad9d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -12,24 +12,24 @@ "slides" : "LM 7/13/2018 17:42", "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", - "testBuildWith" : "LM 5/18/2018 18:48", + "testBuildWith" : "WoC 7/24/2018 17:51", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", - "testDefaultSlideCount" : "LM 7/13/2018 17:39", + "testDefaultSlideCount" : "WoC 7/24/2018 17:51", "testDeleteFirstSlide" : "LM 7/13/2018 17:40", "testDeletionDecreasesSlideCount" : "LM 7/13/2018 17:23", "testDeletionRemovesSlide" : "LM 7/13/2018 17:43", "testDuplicateSlide" : "MK 7/13/2018 17:03", "testDuplicatedSlidesContent" : "MK 7/13/2018 17:37", "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", - "testLayoutedSlidesCreation" : "MK 7/6/2018 17:32", + "testLayoutedSlidesCreation" : "WoC 7/24/2018 17:48", "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", - "testMagneticRasterButton" : "LB 7/5/2018 22:36", + "testMagneticRasterButton" : "WoC 7/24/2018 17:47", "testMiniatureChangesIfSlideChanges" : "WoC 6/29/2018 19:23", "testMiniatureCreated" : "LB 6/29/2018 18:01", "testMiniatureDeleted" : "LB 6/29/2018 18:02", - "testMiniatureSelects" : "LB 7/13/2018 19:12", + "testMiniatureSelects" : "WoC 7/24/2018 17:44", "testMoveSlide" : "LB 6/29/2018 15:45", "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", "testMovedSlideStayCurrentSlide" : "WoC 7/24/2018 17:37", diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/doForDifferentSizes..st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/doForDifferentSizes..st index 4fbbba1..dde2cc0 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/doForDifferentSizes..st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/doForDifferentSizes..st @@ -3,6 +3,4 @@ doForDifferentSizes: aBlock self slide extent x - 100 to: self slide extent x + 100 by: 10 do: [:width | self slide extent y - 100 to: self slide extent y + 100 by: 10 do: [:height | - aBlock value: width value: height - ] - ] \ No newline at end of file + aBlock value: width value: height]] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st index c39c193..286a60d 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/setUp.st @@ -3,5 +3,5 @@ setUp super setUp. self morph: (Morph new openInWorld: self world). - self morph position: self slide position + (30@30) + self morph position: self slide position + (30 @ 30) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st index 9c9c463..b41e343 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st @@ -2,4 +2,4 @@ dropping tests testDroppingCreatesContainer self slide acceptDroppingMorph: self morph event: nil. - self assert: self morph owner class = PSContentContainer \ No newline at end of file + self assert: self morph owner class equals: PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st index 667c220..39d9b11 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st @@ -1,8 +1,7 @@ resizeToFit tests testMorphKeepsSideRatioOnResizeToFit - self doForDifferentSizes: [:width :height | - | sideRatio | + self doForDifferentSizes: [:width :height | | sideRatio | self morph extent: width @ height. sideRatio := self morph extent y / self morph extent x. self slide resizeMorphToFit: self morph. diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json index d92b7f2..9bdc835 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json @@ -3,14 +3,14 @@ }, "instance" : { "assert:onResizeToFit:" : "MK 7/13/2018 18:07", - "doForDifferentSizes:" : "MK 7/13/2018 18:07", + "doForDifferentSizes:" : "WoC 7/24/2018 17:57", "morph" : "LB 7/20/2018 15:04", "morph:" : "LB 7/20/2018 15:04", - "setUp" : "LB 7/20/2018 16:13", + "setUp" : "WoC 7/24/2018 17:59", "tearDown" : "LB 6/1/2018 17:51", - "testDroppingCreatesContainer" : "LB 7/20/2018 15:07", + "testDroppingCreatesContainer" : "WoC 7/24/2018 17:57", "testMorphFitsSlideOnResizeToFit" : "LB 7/20/2018 15:48", "testMorphKeepsPositionOnResizeToFit" : "LB 7/20/2018 15:56", - "testMorphKeepsSideRatioOnResizeToFit" : "LB 7/20/2018 15:51", + "testMorphKeepsSideRatioOnResizeToFit" : "WoC 7/24/2018 17:58", "testSlideDropping" : "LB 7/20/2018 15:07", "testTriggerContextMenu" : "LB 7/20/2018 15:09" } } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st index 1b08ff3..41cb314 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st @@ -2,7 +2,7 @@ container tests testContainerResizingAllCorners self - testContainerResizingCorner: #topLeft offset: -20@ -20; - testContainerResizingCorner: #topRight offset: 20@ -20; - testContainerResizingCorner: #bottomRight offset: 20@20; - testContainerResizingCorner: #bottomLeft offset: -20@20 \ No newline at end of file + testContainerResizingCorner: #topLeft offset: -20 @ -20; + testContainerResizingCorner: #topRight offset: 20 @ -20; + testContainerResizingCorner: #bottomRight offset: 20 @ 20; + testContainerResizingCorner: #bottomLeft offset: -20 @ 20 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st index 0367c2b..4567dea 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st @@ -1,5 +1,6 @@ container tests testResizeHandleMagnetic + | bottomRightFractions | self slide model magneticRasterActive: true. self dragndrop: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st index a2a15fc..0102b58 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerExtent.st @@ -1,4 +1,4 @@ container tests testSlideContainerExtent - self assert: self container extent = self morph extent \ No newline at end of file + self assert: self container extent equals: self morph extent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st index 51d7f99..9524b2f 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSlideContainerPosition.st @@ -1,4 +1,4 @@ container tests testSlideContainerPosition - self assert: self container position = self morph position \ No newline at end of file + self assert: self container position equals: self morph position \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 07d0d58..34fc73d 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -4,16 +4,16 @@ "instance" : { "container" : "LB 7/20/2018 14:51", "setUp" : "LB 7/20/2018 15:05", - "testContainerResizingAllCorners" : "LB 7/20/2018 16:33", + "testContainerResizingAllCorners" : "WoC 7/24/2018 17:59", "testContainerResizingCorner:offset:" : "LB 7/20/2018 17:11", "testContextMenu" : "LB 7/20/2018 15:06", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", - "testResizeHandleMagnetic" : "LB 7/20/2018 16:41", - "testSlideContainerExtent" : "LB 7/20/2018 15:15", - "testSlideContainerPosition" : "LB 7/20/2018 15:14", + "testResizeHandleMagnetic" : "WoC 7/24/2018 18:05", + "testSlideContainerExtent" : "WoC 7/24/2018 18:05", + "testSlideContainerPosition" : "WoC 7/24/2018 18:06", "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", "testSubmorphRelativeSizeOnResize" : "LB 7/20/2018 14:59", "testSubmorphSideRatioOnResize" : "LB 7/20/2018 14:59" } } diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st index 1480243..1954252 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/drag.from.to..st @@ -1,5 +1,6 @@ mock inputs drag: aMouseButton from: aPoint to: anotherPoint - self hand handleEvent: (self mouse: aMouseButton downAt: aPoint). - self hand handleEvent: (self mouseMove: aMouseButton from: aPoint to: anotherPoint) \ No newline at end of file + self hand + handleEvent: (self mouse: aMouseButton downAt: aPoint); + handleEvent: (self mouseMove: aMouseButton from: aPoint to: anotherPoint) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index a4a96ee..ee3955d 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -9,7 +9,7 @@ "does:answerRatio:" : "LB 7/20/2018 14:24", "does:answerSideRatio:" : "LB 7/20/2018 14:24", "doubleClick:at:" : "LB 7/20/2018 15:40", - "drag:from:to:" : "LB 7/13/2018 18:44", + "drag:from:to:" : "WoC 7/24/2018 17:49", "dragndrop:from:to:" : "LB 7/13/2018 18:44", "getNew:createdIn:" : "LB 6/15/2018 16:46", "hand" : "LM 6/15/2018 18:41", From 06b81d8c587f27cdb30597a22e5e83db033d376a Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Tue, 24 Jul 2018 18:17:07 +0200 Subject: [PATCH 068/112] Minor changes on class comments --- .../Presenter-Tests.package/PSMockFileDirectory.class/README.md | 2 +- .../PSMockFileDirectory.class/properties.json | 2 +- packages/Presenter-Tests.package/PSMockMorph.class/README.md | 1 + .../Presenter-Tests.package/PSMockMorph.class/properties.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md b/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md index 56c840c..8f6881f 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/README.md @@ -1,5 +1,5 @@ A PSMockFileDirectory mocks a standard FileDirectory without doing actual FileIO. -Supports most common operatons, like asking for fileNames/subdirectoryNames, etc. +Supports most common operations like asking for fileNames/subdirectoryNames, etc. Can even mock non-existent files. PSMockFileDirectories can be easily instantiated to simulate complex directory structures via the PSMockFileDirectory>>#from: method. This method accepts an association of the following scheme: diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json index 444fc24..dd32079 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "LM 7/24/2018 16:58", + "commentStamp" : "MK 7/24/2018 18:16", "instvars" : [ "name", "subdirectories", diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/README.md b/packages/Presenter-Tests.package/PSMockMorph.class/README.md index 27b7d7b..f6a06cc 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/README.md +++ b/packages/Presenter-Tests.package/PSMockMorph.class/README.md @@ -1,5 +1,6 @@ A PSMockMorph mocks Morph. It remembers the number of received keyboard and mouse events. +Also used as content in PSMockFileDirectories to avoid the creation of a ReadStream. Instance Variables receivedKeyboardEvents: diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/properties.json b/packages/Presenter-Tests.package/PSMockMorph.class/properties.json index d56134a..ac024ce 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/properties.json +++ b/packages/Presenter-Tests.package/PSMockMorph.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "MK 7/24/2018 18:04", + "commentStamp" : "MK 7/24/2018 18:14", "instvars" : [ "receivedMouseEvents", "receivedKeyboardEvents" ], From 0c431da5d0370696b5b907d68b77a3a16bd5ae97 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Tue, 24 Jul 2018 18:20:07 +0200 Subject: [PATCH 069/112] refactoring --- .../instance/testSubmorphRelativePositionOnResize.st | 5 ++++- .../PSSlideSubmorphTest.class/methodProperties.json | 2 +- .../instance/testBackgroundColorDialog.st | 3 +++ .../PSTextMorphTest.class/instance/testFontColorDialog.st | 2 ++ .../PSTextMorphTest.class/instance/testTextFieldRescale.st | 3 +-- .../PSTextMorphTest.class/methodProperties.json | 6 +++--- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st index b0293b9..9f40354 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativePositionOnResize.st @@ -3,4 +3,7 @@ testSubmorphRelativePositionOnResize | oldRatio | oldRatio := self morph position - self slide position / self morph extent. - self assert: [self do: self morph position - self slide position and: self morph extent answerRatio: oldRatio] \ No newline at end of file + self assert: [self + do: self morph position - self slide position + and: self morph extent + answerRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 34fc73d..cf330d7 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -14,6 +14,6 @@ "testResizeHandleMagnetic" : "WoC 7/24/2018 18:05", "testSlideContainerExtent" : "WoC 7/24/2018 18:05", "testSlideContainerPosition" : "WoC 7/24/2018 18:06", - "testSubmorphRelativePositionOnResize" : "LB 7/20/2018 14:59", + "testSubmorphRelativePositionOnResize" : "WoC 7/24/2018 18:15", "testSubmorphRelativeSizeOnResize" : "LB 7/20/2018 14:59", "testSubmorphSideRatioOnResize" : "LB 7/20/2018 14:59" } } diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st index 37dcc8d..cf6191f 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st @@ -2,9 +2,12 @@ style tests testBackgroundColorDialog | newPicker newColor | + newPicker := self getNew: NewColorPickerMorph createdIn: [self textField showBackgroundColorDialog]. self assert: newPicker size equals: 1. + newColor := Color random. (newPicker at: 1) selectedColor: newColor. self assert: self textField color equals: newColor. + newPicker do: [:each | each delete] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st index 069253d..a0dc36a 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st @@ -4,7 +4,9 @@ testFontColorDialog | newPicker newColor | newPicker := self getNew: NewColorPickerMorph createdIn: [self textField showFontColorDialog]. self assert: newPicker size equals: 1. + newColor := Color random. (newPicker at: 1) selectedColor: newColor. self assert: self textField selectionColor equals: newColor. + newPicker do: [:each | each delete] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st index 914a78e..894a119 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st @@ -2,7 +2,6 @@ rescaling tests testTextFieldRescale | oldSize | - self flag: #TODO. oldSize := self textField textScale * self textField selectionFontSize. self slide extent: self slide extent * 2. - self assert: oldSize * 2 = (self textField textScale * self textField selectionFontSize) \ No newline at end of file + self assert: oldSize * 2 equals: self textField textScale * self textField selectionFontSize \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 16a4c4b..95c94cd 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -5,12 +5,12 @@ "defaultText" : "LB 6/1/2018 18:09", "setUp" : "LB 6/1/2018 18:12", "tearDown" : "LB 6/1/2018 18:21", - "testBackgroundColorDialog" : "LB 6/15/2018 16:46", + "testBackgroundColorDialog" : "WoC 7/24/2018 18:18", "testContextMenu" : "MK 6/1/2018 19:45", - "testFontColorDialog" : "LB 6/15/2018 16:46", + "testFontColorDialog" : "WoC 7/24/2018 18:18", "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "LB 6/12/2018 17:15", "testLocalFontSize" : "LB 6/12/2018 17:15", - "testTextFieldRescale" : "LB 6/8/2018 14:59", + "testTextFieldRescale" : "WoC 7/24/2018 18:16", "textField" : "LB 6/1/2018 18:21", "textField:" : "MK 7/13/2018 18:11" } } From 59840f1cf116a73901584a9c94b7706989a4e091 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 11:11:44 +0200 Subject: [PATCH 070/112] Replaced anObject with fitting names in PSMockFileDirectory --- .../PSMockFileDirectory.class/instance/exists..st | 4 ++-- .../PSMockFileDirectory.class/instance/isFile..st | 4 ++-- .../PSMockFileDirectory.class/instance/name..st | 4 ++-- .../PSMockFileDirectory.class/instance/subdirectories..st | 4 ++-- .../PSMockFileDirectory.class/methodProperties.json | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/exists..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/exists..st index b8e4a4c..ded5444 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/exists..st +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/exists..st @@ -1,4 +1,4 @@ accessing -exists: anObject +exists: aBoolean - exists := anObject + exists := aBoolean diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/isFile..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/isFile..st index a90d3c7..45bbe45 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/isFile..st +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/isFile..st @@ -1,4 +1,4 @@ accessing -isFile: anObject +isFile: aBoolean - isFile := anObject + isFile := aBoolean diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/name..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/name..st index ac65480..047483c 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/name..st +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/name..st @@ -1,4 +1,4 @@ accessing -name: anObject +name: aString - name := anObject + name := aString \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/subdirectories..st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/subdirectories..st index dc389dd..c1f76f1 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/subdirectories..st +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/subdirectories..st @@ -1,4 +1,4 @@ accessing -subdirectories: anObject +subdirectories: aCollection - subdirectories := anObject + subdirectories := aCollection \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json index fea4a12..6ad2bf1 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json @@ -9,14 +9,14 @@ "contents:" : "LM 7/24/2018 15:09", "directoryNames" : "LM 6/15/2018 17:35", "exists" : "LM 6/15/2018 17:23", - "exists:" : "LM 6/15/2018 17:23", + "exists:" : "LM 7/25/2018 11:10", "fileNames" : "LM 6/15/2018 17:38", "initialize" : "LM 7/24/2018 15:09", "isFile" : "LM 6/15/2018 17:34", - "isFile:" : "LM 6/15/2018 17:34", + "isFile:" : "LM 7/25/2018 11:10", "localName" : "JZ 6/29/2018 17:00", "name" : "LM 6/15/2018 16:59", - "name:" : "LM 6/15/2018 16:54", + "name:" : "LM 7/25/2018 11:10", "readOnlyFileNamed:" : "LM 7/24/2018 15:03", "subdirectories" : "LM 6/15/2018 16:54", - "subdirectories:" : "LM 6/15/2018 16:54" } } + "subdirectories:" : "LM 7/25/2018 11:11" } } From d155b58f646f1a4d11bac5f8f81843e88fe4df5c Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Wed, 25 Jul 2018 11:21:14 +0200 Subject: [PATCH 071/112] refactoring --- .../instance/createContextMenu.st | 4 ---- .../PSMockContentContainer.class/methodProperties.json | 1 - 2 files changed, 5 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSMockContentContainer.class/instance/createContextMenu.st diff --git a/packages/Presenter-Tests.package/PSMockContentContainer.class/instance/createContextMenu.st b/packages/Presenter-Tests.package/PSMockContentContainer.class/instance/createContextMenu.st deleted file mode 100644 index af11ce9..0000000 --- a/packages/Presenter-Tests.package/PSMockContentContainer.class/instance/createContextMenu.st +++ /dev/null @@ -1,4 +0,0 @@ -context menu -createContextMenu - - self menuCreated: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json index 9946ab4..d11fd91 100644 --- a/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockContentContainer.class/methodProperties.json @@ -2,7 +2,6 @@ "class" : { }, "instance" : { - "createContextMenu" : "WoC 7/24/2018 16:56", "initialize" : "MK 6/1/2018 20:02", "invokeContextMenu" : "WoC 7/24/2018 16:57", "menuCreated" : "MK 6/1/2018 20:02", From e2d1af61760f4fdc357439e3ceae738f19797327 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 11:22:53 +0200 Subject: [PATCH 072/112] Refactor setUp of PSTestWorld --- .../instance/fileInObjectAndCode.st | 2 +- .../PSMockMorph.class/methodProperties.json | 2 +- .../PSTestWorld.class/instance/createWorld.st | 12 ++++++++++ .../instance/initializeHand.st | 9 ++++++++ .../PSTestWorld.class/instance/setUp.st | 22 +++++-------------- .../PSTestWorld.class/methodProperties.json | 4 +++- 6 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSTestWorld.class/instance/createWorld.st create mode 100644 packages/Presenter-Tests.package/PSTestWorld.class/instance/initializeHand.st diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/instance/fileInObjectAndCode.st b/packages/Presenter-Tests.package/PSMockMorph.class/instance/fileInObjectAndCode.st index c372591..bf6aeac 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/instance/fileInObjectAndCode.st +++ b/packages/Presenter-Tests.package/PSMockMorph.class/instance/fileInObjectAndCode.st @@ -1,4 +1,4 @@ loading tests fileInObjectAndCode - "For loading tests" + "Imitates a Stream for loading tests" ^ self \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json index b0a6615..a274ef3 100644 --- a/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockMorph.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "fileInObjectAndCode" : "LM 7/24/2018 15:01", + "fileInObjectAndCode" : "LM 7/25/2018 11:12", "handlesKeyboard:" : "WoC 6/15/2018 19:02", "handlesMouseDown:" : "WoC 6/15/2018 19:03", "initialize" : "MK 7/13/2018 18:29", diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/createWorld.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/createWorld.st new file mode 100644 index 0000000..0e37043 --- /dev/null +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/createWorld.st @@ -0,0 +1,12 @@ +running +createWorld + + self world: ((PasteUpMorph newWorldForProject: nil) + extent: Display extent; + viewBox: (0@0 extent: Display extent); + yourself). + + (self world instVarNamed: #worldState) + instVarNamed: #canvas + put: (Form extent: Display extent depth: 32) getCanvas. + \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/initializeHand.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/initializeHand.st new file mode 100644 index 0000000..72f5366 --- /dev/null +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/initializeHand.st @@ -0,0 +1,9 @@ +running +initializeHand + + self hand: HandMorph new. + + self world + removeHand: self world firstHand; "the default hand" + addHand: self hand; + activeHand: self hand \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st index 56f2071..9e75e32 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSTestWorld.class/instance/setUp.st @@ -1,21 +1,9 @@ running setUp - "Inspired of UserInputEventTest" + "Inspired by UserInputEventTest" super setUp. - self world: ((PasteUpMorph newWorldForProject: nil) - extent: Display extent; - viewBox: (0@0 extent: Display extent); - yourself); - name: 'TestWorld'. - - (self world instVarNamed: #worldState) - instVarNamed: #canvas - put: (Form extent: Display extent depth: 32) getCanvas. - - self hand: HandMorph new. - - self world - removeHand: self world firstHand; "the default hand" - addHand: self hand; - activeHand: self hand \ No newline at end of file + self + name: 'TestWorld'; + createWorld; + initializeHand \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json index b9144d7..bb214da 100644 --- a/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTestWorld.class/methodProperties.json @@ -2,8 +2,10 @@ "class" : { }, "instance" : { + "createWorld" : "LM 7/25/2018 11:22", "hand" : "LB 5/29/2018 17:26", "hand:" : "MK 7/24/2018 17:54", - "setUp" : "MK 7/24/2018 18:00", + "initializeHand" : "LM 7/25/2018 11:20", + "setUp" : "LM 7/25/2018 11:22", "world" : "LB 5/29/2018 17:26", "world:" : "MK 7/24/2018 17:53" } } From d5326e8cbac7e3594eeca16b749c2ea03ec5862d Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Wed, 25 Jul 2018 11:42:07 +0200 Subject: [PATCH 073/112] refactoring --- .../PSTextMorphTest.class/instance/testLocalFontColor.st | 4 +--- .../PSTextMorphTest.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st index 3689994..fbbf98b 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st @@ -9,6 +9,4 @@ testLocalFontColor self textField textMorph selectFrom: begin to: end. self textField selectionColor: color. self textField textMorph selectFrom: begin to: end. - self assert: self textField selectionColor equals: color - ] - ] \ No newline at end of file + self assert: self textField selectionColor equals: color]] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 95c94cd..94f69a7 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -9,7 +9,7 @@ "testContextMenu" : "MK 6/1/2018 19:45", "testFontColorDialog" : "WoC 7/24/2018 18:18", "testFontSizeDialog" : "MK 7/13/2018 18:10", - "testLocalFontColor" : "LB 6/12/2018 17:15", + "testLocalFontColor" : "JZ 7/25/2018 11:41", "testLocalFontSize" : "LB 6/12/2018 17:15", "testTextFieldRescale" : "WoC 7/24/2018 18:16", "textField" : "LB 6/1/2018 18:21", From a52ded5f0405f1c6dedd987ea9be3244d8da43ca Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 11:43:57 +0200 Subject: [PATCH 074/112] Remove getNew:createdIn: and added some documentation --- .../instance/openColorDialogWIth.selecting..st | 6 ++++-- .../instance/showBackgroundColorDialog.st | 2 +- .../PSTextMorph.class/instance/showFontColorDialog.st | 2 +- .../PSTextMorph.class/methodProperties.json | 6 +++--- .../instance/testBackgroundColorDialog.st | 8 +++----- .../instance/testFontColorDialog.st | 7 +++---- .../PSTextMorphTest.class/methodProperties.json | 4 ++-- .../PSUITestCase.class/instance/assert.onResizeOf..st | 1 + .../PSUITestCase.class/instance/do.and.answerRatio..st | 5 +++-- .../PSUITestCase.class/instance/does.answerRatio..st | 2 +- .../PSUITestCase.class/instance/getNew.createdIn..st | 7 ------- .../PSUITestCase.class/methodProperties.json | 9 ++++----- 12 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 packages/Presenter-Tests.package/PSUITestCase.class/instance/getNew.createdIn..st diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st index 4557496..d364ae1 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/openColorDialogWIth.selecting..st @@ -1,8 +1,10 @@ styling openColorDialogWIth: aColor selecting: aSymbol - (NewColorPickerMorph + ^ (NewColorPickerMorph on: self originalColor: aColor setColorSelector: aSymbol) - openNear: self fullBoundsInWorld \ No newline at end of file + openNear: self fullBoundsInWorld; + yourself + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st index dc2f828..dd6d3d5 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showBackgroundColorDialog.st @@ -1,4 +1,4 @@ styling showBackgroundColorDialog - self openColorDialogWIth: self color selecting: #color: \ No newline at end of file + ^ self openColorDialogWIth: self color selecting: #color: \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st index 9970d2b..921706a 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st @@ -1,4 +1,4 @@ styling showFontColorDialog - self openColorDialogWIth: self selectionColor selecting: #selectionColor: \ No newline at end of file + ^ self openColorDialogWIth: self selectionColor selecting: #selectionColor: \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index 89147a0..a33a66c 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -17,7 +17,7 @@ "initializeProperties" : "WoC 7/13/2018 16:28", "initializeStyle" : "WoC 7/13/2018 16:29", "initializeTextAttribute" : "LB 6/12/2018 16:48", - "openColorDialogWIth:selecting:" : "WoC 7/13/2018 16:31", + "openColorDialogWIth:selecting:" : "LM 7/25/2018 11:31", "rescale:" : "LB 6/17/2018 13:23", "selectionAddAttribute:" : "LB 6/8/2018 15:11", "selectionAddAttribute:onNoSelection:" : "LB 6/15/2018 19:30", @@ -27,8 +27,8 @@ "selectionFontSize" : "LB 6/8/2018 15:04", "selectionFontSize:" : "LB 6/15/2018 19:27", "setText:" : "MK 7/6/2018 16:58", - "showBackgroundColorDialog" : "WoC 7/13/2018 16:55", - "showFontColorDialog" : "WoC 7/13/2018 16:32", + "showBackgroundColorDialog" : "LM 7/25/2018 11:30", + "showFontColorDialog" : "LM 7/25/2018 11:32", "showFontSizeDialog" : "LM 7/13/2018 15:14", "textEdited:" : "LB 6/17/2018 18:46", "textScale" : "WoC 7/13/2018 16:27", diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st index cf6191f..e660c48 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testBackgroundColorDialog.st @@ -2,12 +2,10 @@ style tests testBackgroundColorDialog | newPicker newColor | - - newPicker := self getNew: NewColorPickerMorph createdIn: [self textField showBackgroundColorDialog]. - self assert: newPicker size equals: 1. + newPicker := self textField showBackgroundColorDialog. newColor := Color random. - (newPicker at: 1) selectedColor: newColor. + newPicker selectedColor: newColor. self assert: self textField color equals: newColor. - newPicker do: [:each | each delete] \ No newline at end of file + newPicker abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st index a0dc36a..8956c14 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testFontColorDialog.st @@ -2,11 +2,10 @@ style tests testFontColorDialog | newPicker newColor | - newPicker := self getNew: NewColorPickerMorph createdIn: [self textField showFontColorDialog]. - self assert: newPicker size equals: 1. + newPicker := self textField showFontColorDialog. newColor := Color random. - (newPicker at: 1) selectedColor: newColor. + newPicker selectedColor: newColor. self assert: self textField selectionColor equals: newColor. - newPicker do: [:each | each delete] \ No newline at end of file + newPicker abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 95c94cd..43e9402 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -5,9 +5,9 @@ "defaultText" : "LB 6/1/2018 18:09", "setUp" : "LB 6/1/2018 18:12", "tearDown" : "LB 6/1/2018 18:21", - "testBackgroundColorDialog" : "WoC 7/24/2018 18:18", + "testBackgroundColorDialog" : "LM 7/25/2018 11:35", "testContextMenu" : "MK 6/1/2018 19:45", - "testFontColorDialog" : "WoC 7/24/2018 18:18", + "testFontColorDialog" : "LM 7/25/2018 11:34", "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "LB 6/12/2018 17:15", "testLocalFontSize" : "LB 6/12/2018 17:15", diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st index 8a19305..c660ba3 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st @@ -4,6 +4,7 @@ assert: aBlock onResizeOf: aMorph 100 to: 2000 by: 100 do: [ :width | 100 to: 2000 by: 100 do: [ :height | aMorph extent: width@height. + "Setting the extent does not update everything immediately, for the update, we need fullBounds." aMorph fullBounds. self assert: aBlock. ] diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st index 7476bd9..7eb843c 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/do.and.answerRatio..st @@ -1,4 +1,5 @@ helper functions do: onePoint and: otherPoint answerRatio: aPoint - - ^ (onePoint - (otherPoint * aPoint)) abs < (1@1) \ No newline at end of file + "Checks whether onePoint and otherPoint are in the aPoint sideRatio. + Has a tolerance of one pixel, as it is used for UI tests and some versions of Squeak round screen coordinates to pixels." + ^ (onePoint - (otherPoint * aPoint)) abs < (1 @ 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st index fbb3a16..7ccce1d 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/does.answerRatio..st @@ -1,4 +1,4 @@ helper functions does: aPoint answerRatio: aNumber - + "Has a tolerance of one pixel, as it is used for UI tests and some versions of Squeak round screen coordinates to pixels." ^ (aPoint y - (aPoint x * aNumber)) abs < 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/getNew.createdIn..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/getNew.createdIn..st deleted file mode 100644 index ed2c90e..0000000 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/getNew.createdIn..st +++ /dev/null @@ -1,7 +0,0 @@ -helper functions -getNew: aClass createdIn: aBlock - - | instancesBefore | - instancesBefore := aClass allInstances. - aBlock value. - ^ aClass allInstances difference: instancesBefore \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index ee3955d..03e2962 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -3,17 +3,16 @@ "resources" : "LM 6/15/2018 18:41" }, "instance" : { "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", - "assert:onResizeOf:" : "LB 7/13/2018 18:48", + "assert:onResizeOf:" : "LM 7/25/2018 11:38", "click:at:" : "LB 7/20/2018 14:11", - "do:and:answerRatio:" : "LB 7/20/2018 14:45", - "does:answerRatio:" : "LB 7/20/2018 14:24", + "do:and:answerRatio:" : "LM 7/25/2018 11:28", + "does:answerRatio:" : "LM 7/25/2018 11:27", "does:answerSideRatio:" : "LB 7/20/2018 14:24", "doubleClick:at:" : "LB 7/20/2018 15:40", "drag:from:to:" : "WoC 7/24/2018 17:49", "dragndrop:from:to:" : "LB 7/13/2018 18:44", - "getNew:createdIn:" : "LB 6/15/2018 16:46", "hand" : "LM 6/15/2018 18:41", - "keystroke:at:" : "WoC 6/15/2018 18:26", + "keystroke:at:" : "LM 7/25/2018 11:39", "mouse:does:at:" : "LB 7/13/2018 18:24", "mouse:downAt:" : "LB 7/13/2018 18:43", "mouse:upAt:" : "LB 7/13/2018 18:44", From 13965e5733a501598ba5fefe67a2d0fea261f2c8 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 11:44:01 +0200 Subject: [PATCH 075/112] Refactoring --- .../instance/testNotDecaysBeforeFadingTime.st | 2 +- .../PSFadingMessageTest.class/methodProperties.json | 2 +- .../PSMockByteStream.class/instance/initialize.st | 2 +- .../PSMockByteStream.class/methodProperties.json | 2 +- ...Content.equals..st => assertContextMenuContent.equals..st} | 4 ++-- .../PSOnSlideTest.class/instance/collectMenuContentFrom..st | 2 +- .../PSOnSlideTest.class/methodProperties.json | 4 ++-- .../PSSlideSubmorphTest.class/instance/testContextMenu.st | 2 +- .../PSSlideSubmorphTest.class/methodProperties.json | 2 +- .../PSTextMorphTest.class/instance/testContextMenu.st | 2 +- .../PSTextMorphTest.class/methodProperties.json | 2 +- .../PSUITestCase.class/instance/assert.onResizeOf..st | 4 +--- .../PSUITestCase.class/methodProperties.json | 2 +- 13 files changed, 15 insertions(+), 17 deletions(-) rename packages/Presenter-Tests.package/PSOnSlideTest.class/instance/{testContextMenuContent.equals..st => assertContextMenuContent.equals..st} (64%) diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st index 7cdf2ed..c58157d 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st @@ -3,4 +3,4 @@ testNotDecaysBeforeFadingTime self stepCount - 1 timesRepeat: [self message step]. - self deny: self message owner = nil \ No newline at end of file + self assert: self message owner notNil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json index 211a65b..b1c3fb3 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json @@ -7,4 +7,4 @@ "setUp" : "LB 7/24/2018 17:13", "stepCount" : "LB 7/24/2018 17:21", "testDecaysAfterFadingTime" : "WoC 7/24/2018 17:52", - "testNotDecaysBeforeFadingTime" : "WoC 7/24/2018 17:52" } } + "testNotDecaysBeforeFadingTime" : "MK 7/25/2018 11:26" } } diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st index d203d35..780e754 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/instance/initialize.st @@ -2,5 +2,5 @@ initialize-release initialize super initialize. - self reset. + self reset \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json index eba4015..998ef23 100644 --- a/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockByteStream.class/methodProperties.json @@ -9,7 +9,7 @@ "binary" : "LB 7/13/2018 15:29", "close" : "LB 7/13/2018 15:36", "collection:" : "LB 7/13/2018 16:11", - "initialize" : "LB 7/13/2018 16:13", + "initialize" : "MK 7/25/2018 11:16", "name" : "LB 7/13/2018 16:10", "name:" : "LB 7/13/2018 16:10", "reset" : "LB 7/20/2018 15:30", diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st similarity index 64% rename from packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st rename to packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st index 4454615..fcc728b 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st @@ -1,9 +1,9 @@ context menu tests -testContextMenuContent: aMorph equals: aCollection +assertContextMenuContent: aMorph equals: aCollection | container menu items | container := aMorph owner. menu := container invokeContextMenu. items := self collectMenuContentFrom: menu. - self assert: (items = aCollection). + self assert: items equals: aCollection. menu abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/collectMenuContentFrom..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/collectMenuContentFrom..st index fb2bc81..3c24556 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/collectMenuContentFrom..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/collectMenuContentFrom..st @@ -5,6 +5,6 @@ collectMenuContentFrom: aMenu (each isKindOf: MenuItemMorph ) ifTrue: [self collectMenuItemContentsFrom: each] ifFalse: [ - ((each isKindOf: Morph) and:[each knownName = 'line']) + ((each isKindOf: Morph) and: [each knownName = 'line']) ifTrue: ['-'] ifFalse: [nil]]] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 10b22e5..dcbbf99 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -2,7 +2,8 @@ "class" : { }, "instance" : { - "collectMenuContentFrom:" : "LM 6/15/2018 19:18", + "assertContextMenuContent:equals:" : "MK 7/25/2018 11:35", + "collectMenuContentFrom:" : "MK 7/25/2018 11:28", "collectMenuItemContentsFrom:" : "LM 6/15/2018 19:18", "setUp" : "WoC 7/24/2018 17:54", "slide" : "LB 6/1/2018 17:49", @@ -12,5 +13,4 @@ "submorphs" : "WoC 7/24/2018 17:55", "tearDown" : "LB 7/13/2018 18:13", "testAcceptDropImageFile" : "WoC 7/24/2018 17:56", - "testContextMenuContent:equals:" : "WoC 7/24/2018 16:53", "testTextFieldCreatedOnDoubleClick" : "WoC 7/24/2018 17:55" } } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st index 9067453..df91262 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContextMenu.st @@ -1,4 +1,4 @@ context menu tests testContextMenu - self testContextMenuContent: self morph equals: self container defaultContextMenuContent \ No newline at end of file + self assertContextMenuContent: self morph equals: self container defaultContextMenuContent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 34fc73d..20728c3 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -6,7 +6,7 @@ "setUp" : "LB 7/20/2018 15:05", "testContainerResizingAllCorners" : "WoC 7/24/2018 17:59", "testContainerResizingCorner:offset:" : "LB 7/20/2018 17:11", - "testContextMenu" : "LB 7/20/2018 15:06", + "testContextMenu" : "MK 7/25/2018 11:33", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st index 70ed8aa..17ee286 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st @@ -1,5 +1,5 @@ context menu tests testContextMenu - self testContextMenuContent: self textField equals: + self assertContextMenuContent: self textField equals: (self textField owner defaultContextMenuContent, self textField customContextMenuContent) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 16a4c4b..5087925 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -6,7 +6,7 @@ "setUp" : "LB 6/1/2018 18:12", "tearDown" : "LB 6/1/2018 18:21", "testBackgroundColorDialog" : "LB 6/15/2018 16:46", - "testContextMenu" : "MK 6/1/2018 19:45", + "testContextMenu" : "MK 7/25/2018 11:33", "testFontColorDialog" : "LB 6/15/2018 16:46", "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "LB 6/12/2018 17:15", diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st index 8a19305..301ea56 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st @@ -5,6 +5,4 @@ assert: aBlock onResizeOf: aMorph 100 to: 2000 by: 100 do: [ :height | aMorph extent: width@height. aMorph fullBounds. - self assert: aBlock. - ] - ] \ No newline at end of file + self assert: aBlock]] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index ee3955d..d6789f6 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -3,7 +3,7 @@ "resources" : "LM 6/15/2018 18:41" }, "instance" : { "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", - "assert:onResizeOf:" : "LB 7/13/2018 18:48", + "assert:onResizeOf:" : "MK 7/25/2018 11:43", "click:at:" : "LB 7/20/2018 14:11", "do:and:answerRatio:" : "LB 7/20/2018 14:45", "does:answerRatio:" : "LB 7/20/2018 14:24", From c5a931b955b83dbf1005298f424bdecdd1941b72 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 11:47:13 +0200 Subject: [PATCH 076/112] refactoring --- .../PSFadingMessageTest.class/methodProperties.json | 2 +- .../instance/testContextMenuContent.equals..st | 1 + .../instance/testTextFieldCreatedOnDoubleClick.st | 2 +- .../PSOnSlideTest.class/methodProperties.json | 4 ++-- .../instance/testDroppingCreatesContainer.st | 8 ++++++-- .../instance/testKeepsBoundsOnDrop.st | 8 ++++++++ .../instance/testSlideDropping.st | 10 ---------- .../instance/testTriggerContextMenu.st | 3 ++- .../PSSlideAndMorphTest.class/methodProperties.json | 6 +++--- 9 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testKeepsBoundsOnDrop.st delete mode 100644 packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json index 211a65b..4330c29 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json @@ -7,4 +7,4 @@ "setUp" : "LB 7/24/2018 17:13", "stepCount" : "LB 7/24/2018 17:21", "testDecaysAfterFadingTime" : "WoC 7/24/2018 17:52", - "testNotDecaysBeforeFadingTime" : "WoC 7/24/2018 17:52" } } + "testNotDecaysBeforeFadingTime" : "WoC 7/25/2018 11:24" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st index 4454615..167ae38 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st @@ -5,5 +5,6 @@ testContextMenuContent: aMorph equals: aCollection container := aMorph owner. menu := container invokeContextMenu. items := self collectMenuContentFrom: menu. + self assert: (items = aCollection). menu abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st index c99a97f..7e9ea47 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st @@ -6,5 +6,5 @@ testTextFieldCreatedOnDoubleClick self doubleClick: MouseEvent redButton at: self slide center. addedMorphs := self submorphs difference: oldSubmorphs. - self assert: addedMorphs size = 1. + self assert: addedMorphs size equals: 1. self assert: (addedMorphs first content isKindOf: PSTextMorph) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 10b22e5..2c9df9a 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -12,5 +12,5 @@ "submorphs" : "WoC 7/24/2018 17:55", "tearDown" : "LB 7/13/2018 18:13", "testAcceptDropImageFile" : "WoC 7/24/2018 17:56", - "testContextMenuContent:equals:" : "WoC 7/24/2018 16:53", - "testTextFieldCreatedOnDoubleClick" : "WoC 7/24/2018 17:55" } } + "testContextMenuContent:equals:" : "WoC 7/25/2018 11:27", + "testTextFieldCreatedOnDoubleClick" : "WoC 7/25/2018 11:28" } } diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st index b41e343..4dc93fc 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st @@ -1,5 +1,9 @@ dropping tests testDroppingCreatesContainer - self slide acceptDroppingMorph: self morph event: nil. - self assert: self morph owner class equals: PSContentContainer \ No newline at end of file + self slide + acceptDroppingMorph: self morph + event: nil. + self + assert: self morph owner class + equals: PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testKeepsBoundsOnDrop.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testKeepsBoundsOnDrop.st new file mode 100644 index 0000000..0fe2fdd --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testKeepsBoundsOnDrop.st @@ -0,0 +1,8 @@ +dropping tests +testKeepsBoundsOnDrop + + | bounds | + bounds := self morph bounds. + + self slide acceptDroppingMorph: self morph event: nil. + self assert: self morph bounds equals: bounds \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st deleted file mode 100644 index f8af756..0000000 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testSlideDropping.st +++ /dev/null @@ -1,10 +0,0 @@ -dropping tests -testSlideDropping - - | morphExtent morphPosition | - morphPosition := self morph position. - morphExtent := self morph extent. - - self slide acceptDroppingMorph: self morph event: nil. - self assert: self morph position = morphPosition. - self assert: self morph extent = morphExtent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st index 7e111cf..5636d14 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st @@ -4,5 +4,6 @@ testTriggerContextMenu | container | container := (PSMockContentContainer for: self morph). self slide addMorph: container fullFrame: (self slide layoutFrameFor: container). - self click: MouseEvent yellowButton at: container center. + + self click: MouseEvent yellowButton at: container center. self assert: container menuCreated equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json index 9bdc835..2b7f5e1 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json @@ -8,9 +8,9 @@ "morph:" : "LB 7/20/2018 15:04", "setUp" : "WoC 7/24/2018 17:59", "tearDown" : "LB 6/1/2018 17:51", - "testDroppingCreatesContainer" : "WoC 7/24/2018 17:57", + "testDroppingCreatesContainer" : "WoC 7/25/2018 11:30", + "testKeepsBoundsOnDrop" : "WoC 7/25/2018 11:46", "testMorphFitsSlideOnResizeToFit" : "LB 7/20/2018 15:48", "testMorphKeepsPositionOnResizeToFit" : "LB 7/20/2018 15:56", "testMorphKeepsSideRatioOnResizeToFit" : "WoC 7/24/2018 17:58", - "testSlideDropping" : "LB 7/20/2018 15:07", - "testTriggerContextMenu" : "LB 7/20/2018 15:09" } } + "testTriggerContextMenu" : "WoC 7/25/2018 11:35" } } From 7130f22bee2e615f44de2d7f125b230f68497c71 Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Wed, 25 Jul 2018 11:49:43 +0200 Subject: [PATCH 077/112] refactoring --- .../PSMockFileDirectory.class/instance/contents.st | 1 + .../PSMockFileDirectory.class/methodProperties.json | 2 +- .../PSTextMorphTest.class/instance/testLocalFontSize.st | 4 +--- .../PSTextMorphTest.class/methodProperties.json | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st index 07aaf6e..a4e49c7 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/instance/contents.st @@ -1,3 +1,4 @@ accessing contents + ^ contents \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json index 6ad2bf1..a8b4e3e 100644 --- a/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSMockFileDirectory.class/methodProperties.json @@ -5,7 +5,7 @@ "named:" : "LM 6/15/2018 17:35" }, "instance" : { "/" : "LM 6/15/2018 18:38", - "contents" : "LM 7/24/2018 14:31", + "contents" : "JZ 7/25/2018 11:48", "contents:" : "LM 7/24/2018 15:09", "directoryNames" : "LM 6/15/2018 17:35", "exists" : "LM 6/15/2018 17:23", diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st index 94e28aa..4d60582 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st @@ -9,6 +9,4 @@ testLocalFontSize self textField textMorph selectFrom: begin to: end. self textField selectionFontSize: size. self textField textMorph selectFrom: begin to: end. - self assert: self textField selectionFontSize equals: size - ] - ] \ No newline at end of file + self assert: self textField selectionFontSize equals: size]] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 94f69a7..47e911a 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -10,7 +10,7 @@ "testFontColorDialog" : "WoC 7/24/2018 18:18", "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "JZ 7/25/2018 11:41", - "testLocalFontSize" : "LB 6/12/2018 17:15", + "testLocalFontSize" : "JZ 7/25/2018 11:47", "testTextFieldRescale" : "WoC 7/24/2018 18:16", "textField" : "LB 6/1/2018 18:21", "textField:" : "MK 7/13/2018 18:11" } } From b5196bc5b7abb0700a89f01acded336592f9c51e Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 11:50:52 +0200 Subject: [PATCH 078/112] small changes --- .../PSTextMorphTest.class/instance/testTextFieldRescale.st | 5 ++++- .../PSTextMorphTest.class/methodProperties.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st index 894a119..a4937a5 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st @@ -4,4 +4,7 @@ testTextFieldRescale | oldSize | oldSize := self textField textScale * self textField selectionFontSize. self slide extent: self slide extent * 2. - self assert: oldSize * 2 equals: self textField textScale * self textField selectionFontSize \ No newline at end of file + + self + assert: oldSize * 2 + equals: self textField textScale * self textField selectionFontSize \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 5cabbd2..28623ea 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -11,6 +11,6 @@ "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "JZ 7/25/2018 11:41", "testLocalFontSize" : "LB 6/12/2018 17:15", - "testTextFieldRescale" : "WoC 7/24/2018 18:16", + "testTextFieldRescale" : "WoC 7/25/2018 11:50", "textField" : "LB 6/1/2018 18:21", "textField:" : "MK 7/13/2018 18:11" } } From 89a28dd95f47ec30a9aa199cdeaa5f574fea2893 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 12:09:57 +0200 Subject: [PATCH 079/112] Refactoring --- .../instance/defaultDragOffset.st | 4 ++++ .../instance/testContainerResizingAllCorners.st | 8 ++++---- ...gCorner.offset..st => testContainerResizingCorner..st} | 6 +++--- .../PSSlideSubmorphTest.class/methodProperties.json | 5 +++-- 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/defaultDragOffset.st rename packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/{testContainerResizingCorner.offset..st => testContainerResizingCorner..st} (71%) diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/defaultDragOffset.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/defaultDragOffset.st new file mode 100644 index 0000000..f4f1b71 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/defaultDragOffset.st @@ -0,0 +1,4 @@ +accessing +defaultDragOffset + + ^ 10 @ 10 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st index 41cb314..8970d3d 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingAllCorners.st @@ -2,7 +2,7 @@ container tests testContainerResizingAllCorners self - testContainerResizingCorner: #topLeft offset: -20 @ -20; - testContainerResizingCorner: #topRight offset: 20 @ -20; - testContainerResizingCorner: #bottomRight offset: 20 @ 20; - testContainerResizingCorner: #bottomLeft offset: -20 @ 20 \ No newline at end of file + testContainerResizingCorner: #topLeft; + testContainerResizingCorner: #topRight; + testContainerResizingCorner: #bottomRight; + testContainerResizingCorner: #bottomLeft \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st similarity index 71% rename from packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st rename to packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st index 6234825..8f2dbb5 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner.offset..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st @@ -1,11 +1,11 @@ container tests -testContainerResizingCorner: aSymbol offset: aPoint +testContainerResizingCorner: aSymbol | expectedBounds handlePosition | handlePosition := (self container resizeHandles at: aSymbol) center. expectedBounds := self morph bounds withSideOrCorner: aSymbol - setToPoint: handlePosition + aPoint. - self dragndrop: MouseEvent redButton from: handlePosition to: handlePosition+aPoint. + setToPoint: handlePosition + self defaultDragOffset. + self dragndrop: MouseEvent redButton from: handlePosition to: handlePosition + self defaultDragOffset. self slide fullBounds. self assert: self morph bounds equals: expectedBounds \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index 18096e2..b083956 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -3,9 +3,10 @@ }, "instance" : { "container" : "LB 7/20/2018 14:51", + "defaultDragOffset" : "MK 7/25/2018 11:50", "setUp" : "LB 7/20/2018 15:05", - "testContainerResizingAllCorners" : "WoC 7/24/2018 17:59", - "testContainerResizingCorner:offset:" : "LB 7/20/2018 17:11", + "testContainerResizingAllCorners" : "MK 7/25/2018 11:52", + "testContainerResizingCorner:" : "MK 7/25/2018 11:51", "testContextMenu" : "MK 7/25/2018 11:33", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", From 24150980f825da8a14dd9ac4f841fdcae4c690b3 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 12:10:37 +0200 Subject: [PATCH 080/112] Refactored PSFadingMessageTest --- .../PSFadingMessageTest.class/instance/isAbandoned..st | 4 ++++ .../instance/testDecaysAfterFadingTime.st | 5 +++-- .../instance/testNotDecaysBeforeFadingTime.st | 5 +++-- .../PSFadingMessageTest.class/methodProperties.json | 5 +++-- .../instance/testContextMenuContent.equals..st | 5 +++-- .../PSOnSlideTest.class/methodProperties.json | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/isAbandoned..st diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/isAbandoned..st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/isAbandoned..st new file mode 100644 index 0000000..969d2a0 --- /dev/null +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/isAbandoned..st @@ -0,0 +1,4 @@ +decaying +isAbandoned: aMorph + + ^ aMorph owner = nil \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st index 46e4fb4..d73d4df 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st @@ -1,6 +1,7 @@ decaying testDecaysAfterFadingTime - self stepCount + 1 + self + stepCount + 1 timesRepeat: [self message step]. - self assert: self message owner equals: nil \ No newline at end of file + self assert: (self isAbandoned: self message) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st index 7cdf2ed..855e063 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st @@ -1,6 +1,7 @@ decaying testNotDecaysBeforeFadingTime - self stepCount - 1 + self + stepCount - 1 timesRepeat: [self message step]. - self deny: self message owner = nil \ No newline at end of file + self deny: (self isAbandoned: self message) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json index 211a65b..3deb467 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json @@ -2,9 +2,10 @@ "class" : { }, "instance" : { + "isAbandoned:" : "LM 7/25/2018 11:50", "message" : "LB 7/24/2018 17:12", "message:" : "LB 7/24/2018 17:12", "setUp" : "LB 7/24/2018 17:13", "stepCount" : "LB 7/24/2018 17:21", - "testDecaysAfterFadingTime" : "WoC 7/24/2018 17:52", - "testNotDecaysBeforeFadingTime" : "WoC 7/24/2018 17:52" } } + "testDecaysAfterFadingTime" : "LM 7/25/2018 11:50", + "testNotDecaysBeforeFadingTime" : "LM 7/25/2018 11:51" } } diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st index 4454615..1715ee0 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testContextMenuContent.equals..st @@ -1,9 +1,10 @@ context menu tests testContextMenuContent: aMorph equals: aCollection - + | container menu items | container := aMorph owner. menu := container invokeContextMenu. items := self collectMenuContentFrom: menu. - self assert: (items = aCollection). + + self assert: items equals: aCollection. menu abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 10b22e5..c1fa381 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -12,5 +12,5 @@ "submorphs" : "WoC 7/24/2018 17:55", "tearDown" : "LB 7/13/2018 18:13", "testAcceptDropImageFile" : "WoC 7/24/2018 17:56", - "testContextMenuContent:equals:" : "WoC 7/24/2018 16:53", + "testContextMenuContent:equals:" : "LM 7/25/2018 12:10", "testTextFieldCreatedOnDoubleClick" : "WoC 7/24/2018 17:55" } } From b0d74ddf06fe34acdceee787b7688caa80686296 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 12:11:41 +0200 Subject: [PATCH 081/112] Merge branch 'master' of https://github.com/hpi-swa-teaching/SWT18-Project-09.git --- .../PSTextMorphTest.class/instance/testTextFieldRescale.st | 4 ++-- .../PSTextMorphTest.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st index a4937a5..293eca1 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st @@ -2,9 +2,9 @@ rescaling tests testTextFieldRescale | oldSize | - oldSize := self textField textScale * self textField selectionFontSize. + oldSize := self textField textScale. self slide extent: self slide extent * 2. self assert: oldSize * 2 - equals: self textField textScale * self textField selectionFontSize \ No newline at end of file + equals: self textField textScale \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 28623ea..0c5ec15 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -11,6 +11,6 @@ "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "JZ 7/25/2018 11:41", "testLocalFontSize" : "LB 6/12/2018 17:15", - "testTextFieldRescale" : "WoC 7/25/2018 11:50", + "testTextFieldRescale" : "WoC 7/25/2018 12:09", "textField" : "LB 6/1/2018 18:21", "textField:" : "MK 7/13/2018 18:11" } } From c44e323644602075b37416fa61daa90c743af8b8 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 25 Jul 2018 12:13:18 +0200 Subject: [PATCH 082/112] Refac --- .../instance/handleColor.st | 2 +- .../instance/magnetizeLayoutFractions..st | 4 ++++ .../instance/resizeChild.st | 3 +-- .../instance/resizeFractionsOf..st | 2 +- .../instance/setContent..st | 2 +- .../methodProperties.json | 7 +++--- .../instance/initialize.st | 2 +- .../instance/remaining..st | 4 ---- .../instance/remaining.st | 4 ---- .../instance/remainingTime..st | 4 ++++ .../instance/remainingTime.st | 4 ++++ .../PSFadingMessage.class/instance/step.st | 4 ++-- .../instance/updateColor.st | 2 +- .../methodProperties.json | 10 ++++---- .../PSFadingMessage.class/properties.json | 4 ++-- .../PSMiniature.class/instance/slide..st | 2 +- .../PSMiniature.class/methodProperties.json | 2 +- .../instance/expectedFailures.st | 2 +- .../instance/testDeleteFirstSlide.st | 2 +- .../testDeletionDecreasesSlideCount.st | 2 +- .../instance/testDeletionRemovesSlide.st | 2 +- .../instance/testDuplicateSlide.st | 2 +- .../instance/testDuplicatedSlidesContent.st | 4 ++-- .../instance/testLayoutedSlidesCreation.st | 2 +- .../instance/testLoadingProvidesWarning.st | 2 +- .../testMiniatureChangesIfSlideChanges.st | 2 +- .../testSavingShouldProvideWarning.st | 2 +- .../instance/testSlideCreation.st | 2 +- .../testSlideCreationSelectsNewSlide.st | 4 ++-- .../testSlideDeletionMovesSlideSelection.st | 4 ++-- .../testSlideNavigationInPresentationMode.st | 4 ++-- .../instance/testZeroSlidesRegression.st | 6 ++--- .../methodProperties.json | 24 +++++++++---------- 33 files changed, 66 insertions(+), 62 deletions(-) create mode 100644 packages/Presenter-Core.package/PSContentContainer.class/instance/magnetizeLayoutFractions..st delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining..st delete mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining.st create mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime..st create mode 100644 packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st index 955b3dd..fef53af 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/handleColor.st @@ -1,4 +1,4 @@ accessing handleColor - ^ Color gray \ No newline at end of file + ^ Color black \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/magnetizeLayoutFractions..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/magnetizeLayoutFractions..st new file mode 100644 index 0000000..574e3e3 --- /dev/null +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/magnetizeLayoutFractions..st @@ -0,0 +1,4 @@ +magnetic raster +magnetizeLayoutFractions: aPoint + + ^ aPoint roundTo: self rasterResolution \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st index 4721526..c54cc7c 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeChild.st @@ -1,5 +1,4 @@ resizing resizeChild - self content - bounds: self bounds \ No newline at end of file + self content bounds: self bounds \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st index 999de54..0d369d3 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st @@ -4,5 +4,5 @@ resizeFractionsOf: anEvent | layoutFractions | layoutFractions := self owner layoutFractionsOf: anEvent cursorPoint. self isMagnetic - ifTrue: [layoutFractions := layoutFractions roundTo: self rasterResolution]. + ifTrue: [layoutFractions := self magnetizeLayoutFractions: layoutFractions]. ^ layoutFractions \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st index 0a518df..6a0e260 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st @@ -1,4 +1,4 @@ -contentHandling +initialize-release setContent: aMorph self diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 28fd837..7854f58 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -25,7 +25,7 @@ "extentTopRight:" : "LB 7/6/2018 15:57", "filterEvent:for:" : "WoC 7/24/2018 16:53", "grabChild" : "MK 7/24/2018 14:08", - "handleColor" : "LM 7/24/2018 17:37", + "handleColor" : "LB 7/25/2018 11:08", "handleLayerNumber" : "MK 5/25/2018 16:26", "handlesMouseDown:" : "WoC 5/22/2018 19:48", "hasHandles" : "MK 5/18/2018 19:42", @@ -34,6 +34,7 @@ "initialize" : "LB 7/6/2018 15:35", "invokeContextMenu" : "WoC 7/24/2018 16:52", "isMagnetic" : "LB 7/5/2018 21:38", + "magnetizeLayoutFractions:" : "LB 7/25/2018 11:59", "mouseDown:" : "MK 7/24/2018 14:08", "notifySlideRescale:" : "MK 7/24/2018 14:08", "openMenu:" : "WoC 7/24/2018 16:52", @@ -41,8 +42,8 @@ "rasterResolution" : "WoC 7/24/2018 17:00", "removeResizeHandles" : "WoC 7/24/2018 17:00", "removedMorph:" : "MK 7/24/2018 14:08", - "resizeChild" : "MK 7/24/2018 14:08", - "resizeFractionsOf:" : "WoC 7/24/2018 17:01", + "resizeChild" : "LB 7/25/2018 11:58", + "resizeFractionsOf:" : "LB 7/25/2018 12:00", "resizeHandleSize" : "MK 5/18/2018 19:13", "resizeHandles" : "MK 5/18/2018 17:43", "resizeHandles:" : "LB 7/6/2018 15:35", diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st index a2b0a1e..e05f471 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/initialize.st @@ -6,5 +6,5 @@ initialize content: StringMorph new; addMorph: self content; color: Color gray; - remaining: self totalVisibleTime; + remainingTime: self totalVisibleTime; startStepping \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining..st deleted file mode 100644 index c14611e..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -remaining: aNumber - - remaining := aNumber diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining.st deleted file mode 100644 index 7efd442..0000000 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -remaining - - ^ remaining diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime..st new file mode 100644 index 0000000..17af27a --- /dev/null +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime..st @@ -0,0 +1,4 @@ +accessing +remainingTime: aNumber + + remainingTime := aNumber diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime.st new file mode 100644 index 0000000..9b19493 --- /dev/null +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remainingTime.st @@ -0,0 +1,4 @@ +accessing +remainingTime + + ^ remainingTime diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st index 1fb2419..7bcab93 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/step.st @@ -1,7 +1,7 @@ stepping and presenter step - self remaining: self remaining - self stepTime. - self remaining <= 0 + self remainingTime: self remainingTime - self stepTime. + self remainingTime <= 0 ifTrue: [self delete] ifFalse: [self updateColor] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st index ab07c66..85d63cb 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st @@ -2,5 +2,5 @@ stepping and presenter updateColor | alpha | - alpha := self remaining / self startFadingTime. + alpha := self remainingTime / self startFadingTime. self color: (self color alpha: alpha) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json index ecf2be3..5a2c25a 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json @@ -5,12 +5,12 @@ "content" : "WoC 6/15/2018 17:21", "content:" : "LM 7/13/2018 14:19", "defaultPadding" : "WoC 6/15/2018 17:31", - "initialize" : "LM 7/13/2018 14:30", - "remaining" : "WoC 6/15/2018 17:41", - "remaining:" : "LB 7/6/2018 18:03", + "initialize" : "LB 7/25/2018 12:12", + "remainingTime" : "LB 7/25/2018 12:12", + "remainingTime:" : "LB 7/25/2018 12:12", "startFadingTime" : "MK 7/24/2018 14:26", - "step" : "MK 7/13/2018 18:01", + "step" : "LB 7/25/2018 12:12", "stepTime" : "LM 7/24/2018 15:44", "totalVisibleTime" : "LM 7/13/2018 14:30", - "updateColor" : "LM 7/13/2018 14:55", + "updateColor" : "LB 7/25/2018 12:12", "withMessage:" : "MK 7/13/2018 18:02" } } diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/properties.json b/packages/Presenter-Core.package/PSFadingMessage.class/properties.json index 8bc0e67..ea1cbbb 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/properties.json +++ b/packages/Presenter-Core.package/PSFadingMessage.class/properties.json @@ -6,8 +6,8 @@ ], "commentStamp" : "MK 7/24/2018 14:31", "instvars" : [ - "remaining", - "content" ], + "content", + "remainingTime" ], "name" : "PSFadingMessage", "pools" : [ ], diff --git a/packages/Presenter-Core.package/PSMiniature.class/instance/slide..st b/packages/Presenter-Core.package/PSMiniature.class/instance/slide..st index 1689715..d583791 100644 --- a/packages/Presenter-Core.package/PSMiniature.class/instance/slide..st +++ b/packages/Presenter-Core.package/PSMiniature.class/instance/slide..st @@ -2,4 +2,4 @@ accessing slide: aPSSlide slide := aPSSlide. - aPSSlide ifNotNil: [ self updateImage ] + self updateImage diff --git a/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json b/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json index 82aab2b..0060fb9 100644 --- a/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSMiniature.class/methodProperties.json @@ -14,6 +14,6 @@ "model:" : "LB 6/29/2018 15:52", "mouseDown:" : "LB 7/3/2018 17:00", "slide" : "WoC 6/29/2018 15:19", - "slide:" : "LM 7/6/2018 14:57", + "slide:" : "LB 7/25/2018 12:03", "unHighlight" : "LM 7/6/2018 15:01", "updateImage" : "LB 7/6/2018 15:25" } } diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st index 77ae956..2acca47 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/expectedFailures.st @@ -1,4 +1,4 @@ -as yet unclassified +testing expectedFailures ^ #(testSlideResizeRegression) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st index 76fd634..6c168a3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st @@ -8,4 +8,4 @@ testDeleteFirstSlide slide := self tool slideAt: 2. self tool deleteSlideAt: 1. - self assert: (self tool slideAt: 1) = slide. \ No newline at end of file + self assert: (self tool slideAt: 1) equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st index a34344a..803a0cb 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st @@ -6,4 +6,4 @@ testDeletionDecreasesSlideCount slideCount := self tool slideCount. self tool deleteSlideAt: 1. - self assert: self tool slideCount = (slideCount - 1) \ No newline at end of file + self assert: self tool slideCount equals: (slideCount - 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st index 3ec4a8a..c3d6bdf 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st @@ -6,4 +6,4 @@ testDeletionRemovesSlide deletedSlide := self slides first. self tool deleteSlideAt: 1. - self assert: (self slides includes: deletedSlide) not \ No newline at end of file + self deny: (self slides includes: deletedSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st index c9a3895..f19143c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st @@ -4,5 +4,5 @@ testDuplicateSlide | slideCount | slideCount := self tool slideCount. self tool duplicateCurrentSlide. - self assert: self tool slideCount = (slideCount + 1) + self assert: self tool slideCount equals: (slideCount + 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st index 9de33f8..cbb6584 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st @@ -5,5 +5,5 @@ testDuplicatedSlidesContent slide := self tool currentSlide. slide addContent: (Morph new center: slide center). self tool duplicateCurrentSlide. - duplicatedSlide := self tool slideAt: self tool currentSlideNumber +1. - slide submorphs withIndexDo: [:each :index | self assert: each center = (duplicatedSlide submorphs at: index) center] \ No newline at end of file + duplicatedSlide := self tool slideAt: self currentSlideNumber +1. + slide submorphs withIndexDo: [:each :index | self assert: each center equals: (duplicatedSlide submorphs at: index) center] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st index 2f390a6..9fc0220 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st @@ -2,4 +2,4 @@ slide creation tests testLayoutedSlidesCreation "Assure that layout creation does not throw an error." self tool slideLayoutNames values do: [:each | each value]. - self assert: self slideCount = (self tool slideLayoutNames size + 1) \ No newline at end of file + self assert: self tool slideCount equals: (self tool slideLayoutNames size + 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLoadingProvidesWarning.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLoadingProvidesWarning.st index 0a61ce0..b402fc4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLoadingProvidesWarning.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLoadingProvidesWarning.st @@ -1,4 +1,4 @@ -loading tests +loading and saving tests testLoadingProvidesWarning self diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st index 7c0d2b9..8836810 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st @@ -8,4 +8,4 @@ testMiniatureChangesIfSlideChanges slide addContent: (Morph new center: slide center). self tool step. "the tool is stepping but we do not want to wait here" - self assert: oldMiniatureForm ~= miniature form \ No newline at end of file + self deny: oldMiniatureForm = miniature form \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSavingShouldProvideWarning.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSavingShouldProvideWarning.st index 874f1b9..7f765e3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSavingShouldProvideWarning.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSavingShouldProvideWarning.st @@ -1,4 +1,4 @@ -saving tests +loading and saving tests testSavingShouldProvideWarning self diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st index 024132f..5c17755 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st @@ -4,6 +4,6 @@ testSlideCreation | slideCount newSlide | slideCount := self slideCount. newSlide := self tool createSlide. - self assert: self slideCount = (slideCount + 1). + self assert: self slideCount equals: (slideCount + 1). self assert: (self slides includes: newSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st index d3bd744..b12dd7e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st @@ -1,6 +1,6 @@ slide creation tests testSlideCreationSelectsNewSlide - self assert: self currentSlide = self slides first. + self assert: self currentSlide equals: self slides first. self tool createSlide. - self assert: self currentSlide = self slides second. \ No newline at end of file + self assert: self currentSlide equals: self slides second. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index 3a29507..763e6f6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -7,5 +7,5 @@ testSlideDeletionMovesSlideSelection slide := self slides first. self tool deleteSlideAt: 2. - self assert: self slides first = slide. - self assert: self currentSlide = slide. \ No newline at end of file + self assert: self slides first equals: slide. + self assert: self currentSlide equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st index c37c468..83154d9 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st @@ -6,6 +6,6 @@ testSlideNavigationInPresentationMode selectSlideNumber: 1; enablePresentationMode. - self assert: self tool slideContainer currentSlide equals: self currentSlide. + self assert: self slideContainer currentSlide equals: self currentSlide. self tool selectSlideNumber: 2. - self assert: self tool slideContainer currentSlide equals: self currentSlide \ No newline at end of file + self assert: self slideContainer currentSlide equals: self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st index 0f27cb6..3dbd300 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st @@ -2,13 +2,13 @@ slide deletion tests testZeroSlidesRegression | deletedSlide | - self assert: self slideCount = 1. + self assert: self slideCount equals: 1. deletedSlide := self currentSlide. self tool deleteSlideAt: 1. self - assert: self slideCount = 1 + assert: self slideCount equals: 1 description: 'There should never be 0 slides'. self - assert: self currentSlide ~= deletedSlide + deny: self currentSlide = deletedSlide description: 'The slide should actually be deleted' \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 97cad9d..c6fbb13 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -15,18 +15,18 @@ "testBuildWith" : "WoC 7/24/2018 17:51", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", "testDefaultSlideCount" : "WoC 7/24/2018 17:51", - "testDeleteFirstSlide" : "LM 7/13/2018 17:40", - "testDeletionDecreasesSlideCount" : "LM 7/13/2018 17:23", - "testDeletionRemovesSlide" : "LM 7/13/2018 17:43", - "testDuplicateSlide" : "MK 7/13/2018 17:03", - "testDuplicatedSlidesContent" : "MK 7/13/2018 17:37", + "testDeleteFirstSlide" : "LB 7/24/2018 18:27", + "testDeletionDecreasesSlideCount" : "LB 7/24/2018 18:26", + "testDeletionRemovesSlide" : "LB 7/24/2018 18:26", + "testDuplicateSlide" : "LB 7/24/2018 18:24", + "testDuplicatedSlidesContent" : "LB 7/24/2018 18:25", "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", - "testLayoutedSlidesCreation" : "WoC 7/24/2018 17:48", + "testLayoutedSlidesCreation" : "LB 7/24/2018 18:25", "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "WoC 7/24/2018 17:47", - "testMiniatureChangesIfSlideChanges" : "WoC 6/29/2018 19:23", + "testMiniatureChangesIfSlideChanges" : "LB 7/24/2018 18:15", "testMiniatureCreated" : "LB 6/29/2018 18:01", "testMiniatureDeleted" : "LB 6/29/2018 18:02", "testMiniatureSelects" : "WoC 7/24/2018 17:44", @@ -44,16 +44,16 @@ "testSelectedMiniatureChanges" : "LB 6/29/2018 19:05", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", "testSlideContainerPosition" : "LB 7/24/2018 16:47", - "testSlideCreation" : "WoC 7/24/2018 17:35", + "testSlideCreation" : "LB 7/24/2018 18:25", "testSlideCreationReturnsSlide" : "WoC 7/24/2018 17:34", - "testSlideCreationSelectsNewSlide" : "WoC 7/24/2018 17:34", - "testSlideDeletionMovesSlideSelection" : "WoC 7/24/2018 17:33", - "testSlideNavigationInPresentationMode" : "WoC 7/24/2018 17:33", + "testSlideCreationSelectsNewSlide" : "LB 7/24/2018 18:26", + "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", + "testSlideNavigationInPresentationMode" : "LB 7/24/2018 18:23", "testSlideNumberLabelSelectsCorrectly" : "WoC 7/24/2018 17:32", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", - "testZeroSlidesRegression" : "WoC 7/24/2018 17:28", + "testZeroSlidesRegression" : "LB 7/24/2018 18:28", "testnextSlideClampsToMax" : "WoC 7/24/2018 17:29", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", From eeb55e6464141cd229f40050300fea98fe9b408f Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 12:15:30 +0200 Subject: [PATCH 083/112] Added documentation --- .../instance/assertContextMenuContent.equals..st | 4 +++- .../PSOnSlideTest.class/methodProperties.json | 2 +- .../PSUITestCase.class/instance/assert.onResizeOf..st | 4 +--- .../PSUITestCase.class/methodProperties.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st index fcc728b..a8686de 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/assertContextMenuContent.equals..st @@ -1,9 +1,11 @@ context menu tests assertContextMenuContent: aMorph equals: aCollection - + "Tests whether the context menu is created correctly. + Tests both the PowerSqueak method to create the correct context menu and describes our assumptions about how Morphic creates context-menus from Collections." | container menu items | container := aMorph owner. menu := container invokeContextMenu. items := self collectMenuContentFrom: menu. + self assert: items equals: aCollection. menu abandon \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index f04b345..884e7fe 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "assertContextMenuContent:equals:" : "MK 7/25/2018 11:35", + "assertContextMenuContent:equals:" : "LM 7/25/2018 12:15", "collectMenuContentFrom:" : "MK 7/25/2018 11:28", "collectMenuItemContentsFrom:" : "LM 6/15/2018 19:18", "setUp" : "WoC 7/24/2018 17:54", diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st index c660ba3..39f9f20 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st +++ b/packages/Presenter-Tests.package/PSUITestCase.class/instance/assert.onResizeOf..st @@ -6,6 +6,4 @@ assert: aBlock onResizeOf: aMorph aMorph extent: width@height. "Setting the extent does not update everything immediately, for the update, we need fullBounds." aMorph fullBounds. - self assert: aBlock. - ] - ] \ No newline at end of file + self assert: aBlock]] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json index 03e2962..e53891e 100644 --- a/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSUITestCase.class/methodProperties.json @@ -3,7 +3,7 @@ "resources" : "LM 6/15/2018 18:41" }, "instance" : { "assert:constantOnResizeOf:" : "LB 7/13/2018 18:59", - "assert:onResizeOf:" : "LM 7/25/2018 11:38", + "assert:onResizeOf:" : "LM 7/25/2018 12:14", "click:at:" : "LB 7/20/2018 14:11", "do:and:answerRatio:" : "LM 7/25/2018 11:28", "does:answerRatio:" : "LM 7/25/2018 11:27", From 3d2aa6a5fd4ecfe05b2693d7fbe96adf10b88a7a Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 25 Jul 2018 12:18:58 +0200 Subject: [PATCH 084/112] Merge after --- .../instance/testDecaysAfterFadingTime.st | 3 +-- .../instance/testNotDecaysBeforeFadingTime.st | 3 +-- .../PSFadingMessageTest.class/methodProperties.json | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st index d73d4df..9f78eda 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testDecaysAfterFadingTime.st @@ -1,7 +1,6 @@ decaying testDecaysAfterFadingTime - self - stepCount + 1 + self stepCount + 1 timesRepeat: [self message step]. self assert: (self isAbandoned: self message) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st index 855e063..415ae9a 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/instance/testNotDecaysBeforeFadingTime.st @@ -1,7 +1,6 @@ decaying testNotDecaysBeforeFadingTime - self - stepCount - 1 + self stepCount - 1 timesRepeat: [self message step]. self deny: (self isAbandoned: self message) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json index 3deb467..9a65864 100644 --- a/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSFadingMessageTest.class/methodProperties.json @@ -7,5 +7,5 @@ "message:" : "LB 7/24/2018 17:12", "setUp" : "LB 7/24/2018 17:13", "stepCount" : "LB 7/24/2018 17:21", - "testDecaysAfterFadingTime" : "LM 7/25/2018 11:50", - "testNotDecaysBeforeFadingTime" : "LM 7/25/2018 11:51" } } + "testDecaysAfterFadingTime" : "LB 7/25/2018 12:18", + "testNotDecaysBeforeFadingTime" : "LB 7/25/2018 12:18" } } From ec6f352797d7c8ef80598fe4e050ad6fad47dbae Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 12:23:00 +0200 Subject: [PATCH 085/112] Small refactoring --- .../instance/morph.survivesOneCycleIn..st | 7 ++----- .../PSPresentationLoader.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st index 35e8493..22c2056 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/morph.survivesOneCycleIn..st @@ -8,9 +8,6 @@ morph: aMorph survivesOneCycleIn: aWorld [aWorld doOneCycle] on: Error do: [^false]. - newDebuggers := Debugger allInstances reject: [:each | - debuggersBefore includes: each]. + newDebuggers := Debugger allInstances difference: debuggersBefore. newDebuggers do: [:each | each abandon]. - newDebuggers size > 0 - ifTrue: [^ false]. - ^ true \ No newline at end of file + ^ newDebuggers isEmpty \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json index 09b1850..e1755ce 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -15,7 +15,7 @@ "loadPresentationFromDirectory:" : "LM 7/24/2018 15:30", "loadPresentationUnchecked:" : "MK 7/20/2018 14:43", "loadSlideFromDirectory:" : "LM 7/24/2018 14:25", - "morph:survivesOneCycleIn:" : "LM 7/24/2018 15:28", + "morph:survivesOneCycleIn:" : "LM 7/25/2018 12:21", "presentation" : "MK 7/20/2018 14:20", "presentation:" : "MK 7/20/2018 14:20", "reset" : "LM 7/24/2018 15:31", From 6ce857a0922a0b619c6c9d9b1011e8273b98a6dd Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 12:40:28 +0200 Subject: [PATCH 086/112] small changes --- .../instance/rasterResolution.st | 2 +- .../PSContentContainer.class/methodProperties.json | 2 +- .../instance/testContainerResizingCorner..st | 3 ++- .../instance/testResizeHandleMagnetic.st | 10 ++++++++-- .../instance/testSubmorphRelativeSizeOnResize.st | 5 ++++- .../PSSlideSubmorphTest.class/methodProperties.json | 10 +++++----- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st index 2a070c3..1989b03 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st @@ -1,4 +1,4 @@ magnetic raster rasterResolution - ^ (0.04 @ 0.03) \ No newline at end of file + ^ 0.04 @ 0.03 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 28fd837..269c759 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -38,7 +38,7 @@ "notifySlideRescale:" : "MK 7/24/2018 14:08", "openMenu:" : "WoC 7/24/2018 16:52", "placeHandles" : "LB 7/6/2018 18:10", - "rasterResolution" : "WoC 7/24/2018 17:00", + "rasterResolution" : "WoC 7/25/2018 12:29", "removeResizeHandles" : "WoC 7/24/2018 17:00", "removedMorph:" : "MK 7/24/2018 14:08", "resizeChild" : "MK 7/24/2018 14:08", diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st index 8f2dbb5..1f2868e 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testContainerResizingCorner..st @@ -3,9 +3,10 @@ testContainerResizingCorner: aSymbol | expectedBounds handlePosition | handlePosition := (self container resizeHandles at: aSymbol) center. - expectedBounds := self morph bounds + expectedBounds := self morph bounds withSideOrCorner: aSymbol setToPoint: handlePosition + self defaultDragOffset. self dragndrop: MouseEvent redButton from: handlePosition to: handlePosition + self defaultDragOffset. self slide fullBounds. + self assert: self morph bounds equals: expectedBounds \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st index 4567dea..562d99f 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testResizeHandleMagnetic.st @@ -3,8 +3,14 @@ testResizeHandleMagnetic | bottomRightFractions | self slide model magneticRasterActive: true. - self dragndrop: MouseEvent redButton from: self morph bottomRight to: self morph bottomRight + (20 @ 20). + self + dragndrop: MouseEvent redButton + from: self morph bottomRight + to: self morph bottomRight + (20 @ 20). + self slide fullBounds. bottomRightFractions := self container layoutFrame rightFraction @ self container layoutFrame bottomFraction. - self assert: (bottomRightFractions roundTo: self container rasterResolution) + + self + assert: (bottomRightFractions roundTo: self container rasterResolution) equals: bottomRightFractions \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st index ca4d510..ff9894e 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphRelativeSizeOnResize.st @@ -3,4 +3,7 @@ testSubmorphRelativeSizeOnResize | oldRatio | oldRatio := self morph extent / self slide extent. - self assert: [self do: self morph extent and: self slide extent answerRatio: oldRatio] \ No newline at end of file + self assert: [self + do: self morph extent + and: self slide extent + answerRatio: oldRatio] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index b083956..ac32ebd 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -6,15 +6,15 @@ "defaultDragOffset" : "MK 7/25/2018 11:50", "setUp" : "LB 7/20/2018 15:05", "testContainerResizingAllCorners" : "MK 7/25/2018 11:52", - "testContainerResizingCorner:" : "MK 7/25/2018 11:51", + "testContainerResizingCorner:" : "WoC 7/25/2018 12:18", "testContextMenu" : "MK 7/25/2018 11:33", "testDuplicateChild" : "LB 7/20/2018 14:52", "testGrabbing" : "LB 7/20/2018 14:52", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", - "testResizeHandleMagnetic" : "WoC 7/24/2018 18:05", + "testResizeHandleMagnetic" : "WoC 7/25/2018 12:29", "testSlideContainerExtent" : "WoC 7/24/2018 18:05", "testSlideContainerPosition" : "WoC 7/24/2018 18:06", - "testSubmorphRelativePositionOnResize" : "WoC 7/24/2018 18:15", - "testSubmorphRelativeSizeOnResize" : "LB 7/20/2018 14:59", - "testSubmorphSideRatioOnResize" : "LB 7/20/2018 14:59" } } + "testSubmorphRelativePositionOnResize" : "WoC 7/25/2018 12:37", + "testSubmorphRelativeSizeOnResize" : "WoC 7/25/2018 12:37", + "testSubmorphSideRatioOnResize" : "WoC 7/25/2018 12:37" } } From bb3fd2343b4ff526a94c86c3b4e4418e23ce1581 Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Wed, 25 Jul 2018 12:42:06 +0200 Subject: [PATCH 087/112] Minor Changes --- .../PSPresentation.class/instance/slides..st | 5 +++-- .../PSPresentation.class/instance/slides.st | 1 + .../PSPresentation.class/methodProperties.json | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st b/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st index 292be51..e232270 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slides..st @@ -1,3 +1,4 @@ accessing -slides: anObject - slides := anObject \ No newline at end of file +slides: anOrderedCollection + + slides := anOrderedCollection \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/instance/slides.st b/packages/Presenter-Core.package/PSPresentation.class/instance/slides.st index fcefa0a..27a8aab 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/instance/slides.st +++ b/packages/Presenter-Core.package/PSPresentation.class/instance/slides.st @@ -1,3 +1,4 @@ accessing slides + ^ slides \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json index 9cb1ee6..f584fb7 100644 --- a/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentation.class/methodProperties.json @@ -23,8 +23,8 @@ "saveConfirmed" : "LM 7/13/2018 18:46", "slideAt:" : "LM 7/13/2018 18:11", "slideCount" : "LM 7/13/2018 17:34", - "slides" : "LM 7/13/2018 17:13", - "slides:" : "LM 7/13/2018 17:13", + "slides" : "JZ 7/25/2018 12:41", + "slides:" : "JZ 7/25/2018 12:41", "slidesCollect:" : "LM 7/13/2018 18:18", "slidesDo:" : "LM 7/13/2018 18:16", "slidesWithIndexDo:" : "LM 7/13/2018 18:58", From 9798fd8fb958e292093df76c85d0fd8a0b08756c Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 12:45:30 +0200 Subject: [PATCH 088/112] Small refactorings --- .../instance/testAcceptDropImageFile.st | 9 +++++---- .../PSOnSlideTest.class/methodProperties.json | 2 +- .../instance/testDroppingCreatesContainer.st | 9 +++------ .../instance/testMorphKeepsSideRatioOnResizeToFit.st | 3 ++- .../PSSlideAndMorphTest.class/methodProperties.json | 6 +++--- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st index 2abbeca..25f76a7 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testAcceptDropImageFile.st @@ -8,7 +8,8 @@ testAcceptDropImageFile handleDroppedItem: PSMockByteStream newPng event: (UserInputEvent new setPosition: self slide center). - createdImages := (self submorphs difference: oldSubMorphs) - select: [:each | each content isKindOf: SketchMorph]. - - self assert: createdImages size equals: 1 \ No newline at end of file + createdImages := (self submorphs difference: oldSubMorphs). + + self assert: createdImages size equals: 1. + createdImages do: [:each | + self assert: (each content isKindOf: SketchMorph)] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 884e7fe..0a2cec0 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -12,5 +12,5 @@ "slideContainer:" : "LB 7/13/2018 18:13", "submorphs" : "WoC 7/24/2018 17:55", "tearDown" : "LB 7/13/2018 18:13", - "testAcceptDropImageFile" : "WoC 7/24/2018 17:56", + "testAcceptDropImageFile" : "LM 7/25/2018 12:27", "testTextFieldCreatedOnDoubleClick" : "WoC 7/25/2018 11:28" } } diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st index 4dc93fc..d20e6db 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testDroppingCreatesContainer.st @@ -1,9 +1,6 @@ dropping tests testDroppingCreatesContainer - self slide - acceptDroppingMorph: self morph - event: nil. - self - assert: self morph owner class - equals: PSContentContainer \ No newline at end of file + self slide acceptDroppingMorph: self morph event: nil. + + self assert: self morph owner class equals: PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st index 39d9b11..1968d78 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testMorphKeepsSideRatioOnResizeToFit.st @@ -1,7 +1,8 @@ resizeToFit tests testMorphKeepsSideRatioOnResizeToFit - self doForDifferentSizes: [:width :height | | sideRatio | + self doForDifferentSizes: [:width :height | + | sideRatio | self morph extent: width @ height. sideRatio := self morph extent y / self morph extent x. self slide resizeMorphToFit: self morph. diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json index 2b7f5e1..3b1a2d2 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json @@ -2,15 +2,15 @@ "class" : { }, "instance" : { - "assert:onResizeToFit:" : "MK 7/13/2018 18:07", + "assert:onResizeToFit:" : "LM 7/25/2018 12:43", "doForDifferentSizes:" : "WoC 7/24/2018 17:57", "morph" : "LB 7/20/2018 15:04", "morph:" : "LB 7/20/2018 15:04", "setUp" : "WoC 7/24/2018 17:59", "tearDown" : "LB 6/1/2018 17:51", - "testDroppingCreatesContainer" : "WoC 7/25/2018 11:30", + "testDroppingCreatesContainer" : "LM 7/25/2018 12:33", "testKeepsBoundsOnDrop" : "WoC 7/25/2018 11:46", "testMorphFitsSlideOnResizeToFit" : "LB 7/20/2018 15:48", "testMorphKeepsPositionOnResizeToFit" : "LB 7/20/2018 15:56", - "testMorphKeepsSideRatioOnResizeToFit" : "WoC 7/24/2018 17:58", + "testMorphKeepsSideRatioOnResizeToFit" : "LM 7/25/2018 12:43", "testTriggerContextMenu" : "WoC 7/25/2018 11:35" } } From 6bfc0fa9eb0ee238cb6a65e0cfe4509397c7ff3c Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 12:50:24 +0200 Subject: [PATCH 089/112] small changes --- .../instance/testErrorReportExistsPerSlide.st | 1 + .../instance/testLoadCompletePresentation.st | 1 + .../instance/testMorphLoadIsValid.st | 1 + .../instance/testSortMorphFiles.st | 3 ++- .../PSPresentationLoaderTest.class/methodProperties.json | 8 ++++---- .../instance/testDefaultSlideCount.st | 4 ++-- .../instance/testNextSlide.st | 1 + .../instance/testSlidesReceiveEnablePresentationMode.st | 1 + .../instance/testnextSlideClampsToMax.st | 4 ++-- .../PSPresentationToolTest.class/methodProperties.json | 8 ++++---- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st index 7cedd4d..ce1dd2b 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testErrorReportExistsPerSlide.st @@ -5,6 +5,7 @@ testErrorReportExistsPerSlide directory := self mockEmptyPresentationDirectory. self loader loadPresentationUnchecked: directory. errorReport := self loader errorReport. + self assert: errorReport keys asSet equals: (directory / self loader slidesDirectoryName) directoryNames asSet diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st index 140ff45..6bfaeca 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st @@ -6,6 +6,7 @@ testLoadCompletePresentation presentation := PSPresentationLoader new world: self world; loadPresentationFromDirectory: directory. + self assert: presentation slideCount equals: 3. self assert: presentation slides first submorphs size equals: 1. self assert: presentation slides second submorphs isEmpty. diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st index 69b0a81..c9e4669 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st @@ -5,5 +5,6 @@ testMorphLoadIsValid morph := self loader loadMorphFromStream: (self morphLoadingStreamFor: self validMorphFileData) testIn: self world. + self assert: morph notNil. self assert: morph class equals: PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st index dfe272b..5590826 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st @@ -1,5 +1,6 @@ presentation loading testSortMorphFiles - self assert: {'2.morph' . '3.morph' . '4.morph'} + self + assert: {'2.morph' . '3.morph' . '4.morph'} equals: (self loader sortedMorphFiles: {'4.morph' . '2.morph' . '3.morph'}) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index f92000e..0128e4e 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -11,14 +11,14 @@ "testCanLoadEmptyPresentation" : "MK 7/20/2018 15:49", "testCanLoadEmptySlide" : "MK 7/20/2018 15:48", "testEmptyPresentationDirectoryIsValid" : "MK 7/20/2018 15:50", - "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", + "testErrorReportExistsPerSlide" : "WoC 7/25/2018 12:43", "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", "testInvalidSlideDirectoryNames" : "LB 7/24/2018 17:35", - "testLoadCompletePresentation" : "LB 7/24/2018 17:41", + "testLoadCompletePresentation" : "WoC 7/25/2018 12:43", "testMissingSlidesDirectory" : "LB 7/24/2018 17:39", - "testMorphLoadIsValid" : "LB 7/24/2018 17:44", + "testMorphLoadIsValid" : "WoC 7/25/2018 12:44", "testMorphNameIsNotNumber" : "LB 7/24/2018 17:39", "testMorphNameIsNumber" : "LB 7/24/2018 17:39", "testSlidesDirectoryIsEmpty" : "LB 7/24/2018 17:39", - "testSortMorphFiles" : "LB 7/24/2018 17:46", + "testSortMorphFiles" : "WoC 7/25/2018 12:41", "validMorphFileData" : "LB 7/24/2018 17:47" } } diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st index 63cfac5..a53e2dd 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st @@ -1,5 +1,5 @@ slide creation tests testDefaultSlideCount - self assert: self slideCount = 1. - self assert: self currentSlide = (self tool slideAt: 1). \ No newline at end of file + self assert: self slideCount equals: 1. + self assert: self currentSlide equals: (self tool slideAt: 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st index d71feab..d6f9bd1 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st @@ -3,6 +3,7 @@ testNextSlide self tool createSlide. self tool selectSlideNumber: 1. + self assert: self tool currentSlide = self slides first. self tool nextSlide. self assert: self tool currentSlide = self slides second. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st index 4130e4f..50acea7 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st @@ -4,5 +4,6 @@ testSlidesReceiveEnablePresentationMode self tool createSlide. self slides: (self slides collect: [:each | PSMockSlide new]). self tool enablePresentationMode. + self slides do: [:each | self assert: each receivedPresentationModeEnable] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st index 1f0a2e4..0fc5b45 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st @@ -1,6 +1,6 @@ slide navigation tests testnextSlideClampsToMax - self assert: self currentSlide = self slides last. + self assert: self currentSlide equals: self slides last. self tool nextSlide. - self assert: self currentSlide = self slides last. \ No newline at end of file + self assert: self currentSlide equals: self slides last. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index c6fbb13..1fc04fe 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -14,7 +14,7 @@ "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", - "testDefaultSlideCount" : "WoC 7/24/2018 17:51", + "testDefaultSlideCount" : "WoC 7/25/2018 12:46", "testDeleteFirstSlide" : "LB 7/24/2018 18:27", "testDeletionDecreasesSlideCount" : "LB 7/24/2018 18:26", "testDeletionRemovesSlide" : "LB 7/24/2018 18:26", @@ -33,7 +33,7 @@ "testMoveSlide" : "LB 6/29/2018 15:45", "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", "testMovedSlideStayCurrentSlide" : "WoC 7/24/2018 17:37", - "testNextSlide" : "LM 7/13/2018 17:52", + "testNextSlide" : "WoC 7/25/2018 12:49", "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", "testOccupiesWorldOnStep" : "LB 7/24/2018 16:48", @@ -52,9 +52,9 @@ "testSlideNumberLabelSelectsCorrectly" : "WoC 7/24/2018 17:32", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", - "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", + "testSlidesReceiveEnablePresentationMode" : "WoC 7/25/2018 12:46", "testZeroSlidesRegression" : "LB 7/24/2018 18:28", - "testnextSlideClampsToMax" : "WoC 7/24/2018 17:29", + "testnextSlideClampsToMax" : "WoC 7/25/2018 12:46", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", "window:" : "LM 5/11/2018 17:59" } } From c2ffdabfb7d6904d124027e64cd5f91400c2666c Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 12:51:55 +0200 Subject: [PATCH 090/112] Refactoring --- .../instance/deleteSlideAt..st | 4 ++++ .../instance/slideAt..st | 4 ++++ .../instance/testDefaultSlideCount.st | 2 +- .../instance/testDeleteFirstSlide.st | 8 ++++---- .../instance/testDeletionDecreasesSlideCount.st | 4 ++-- .../instance/testDeletionRemovesSlide.st | 2 +- .../instance/testDuplicateSlide.st | 4 ++-- .../methodProperties.json | 12 +++++++----- 8 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/deleteSlideAt..st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideAt..st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/deleteSlideAt..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/deleteSlideAt..st new file mode 100644 index 0000000..353bdd3 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/deleteSlideAt..st @@ -0,0 +1,4 @@ +accessing +deleteSlideAt: aNumber + + self tool deleteSlideAt: aNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideAt..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideAt..st new file mode 100644 index 0000000..00fb8de --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideAt..st @@ -0,0 +1,4 @@ +slide deletion tests +slideAt: aNumber + + ^ self tool slideAt: aNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st index 63cfac5..d0ffcb8 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st @@ -2,4 +2,4 @@ slide creation tests testDefaultSlideCount self assert: self slideCount = 1. - self assert: self currentSlide = (self tool slideAt: 1). \ No newline at end of file + self assert: self currentSlide = (self slideAt: 1). \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st index 6c168a3..eeb32e3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st @@ -4,8 +4,8 @@ testDeleteFirstSlide | deletedSlide slide | self setUpSlideDeletion. - deletedSlide := self tool slideAt: 1. - slide := self tool slideAt: 2. + deletedSlide := self slideAt: 1. + slide := self slideAt: 2. - self tool deleteSlideAt: 1. - self assert: (self tool slideAt: 1) equals: slide \ No newline at end of file + self deleteSlideAt: 1. + self assert: (self slideAt: 1) equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st index 803a0cb..a67424f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st @@ -5,5 +5,5 @@ testDeletionDecreasesSlideCount self setUpSlideDeletion. slideCount := self tool slideCount. - self tool deleteSlideAt: 1. - self assert: self tool slideCount equals: (slideCount - 1) \ No newline at end of file + self deleteSlideAt: 1. + self assert: self slideCount equals: (slideCount - 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st index c3d6bdf..e87af57 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st @@ -5,5 +5,5 @@ testDeletionRemovesSlide self setUpSlideDeletion. deletedSlide := self slides first. - self tool deleteSlideAt: 1. + self deleteSlideAt: 1. self deny: (self slides includes: deletedSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st index f19143c..ebcdf56 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicateSlide.st @@ -2,7 +2,7 @@ slide creation tests testDuplicateSlide | slideCount | - slideCount := self tool slideCount. + slideCount := self slideCount. self tool duplicateCurrentSlide. - self assert: self tool slideCount equals: (slideCount + 1) + self assert: self slideCount equals: (slideCount + 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index c6fbb13..d943646 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -4,9 +4,11 @@ "instance" : { "currentSlide" : "WoC 7/24/2018 17:27", "currentSlideNumber" : "WoC 7/24/2018 17:32", + "deleteSlideAt:" : "MK 7/25/2018 12:50", "expectedFailures" : "LB 7/24/2018 15:38", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "LM 7/24/2018 17:31", + "slideAt:" : "MK 7/25/2018 12:48", "slideContainer" : "WoC 6/15/2018 18:21", "slideCount" : "WoC 7/24/2018 17:27", "slides" : "LM 7/13/2018 17:42", @@ -14,11 +16,11 @@ "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", - "testDefaultSlideCount" : "WoC 7/24/2018 17:51", - "testDeleteFirstSlide" : "LB 7/24/2018 18:27", - "testDeletionDecreasesSlideCount" : "LB 7/24/2018 18:26", - "testDeletionRemovesSlide" : "LB 7/24/2018 18:26", - "testDuplicateSlide" : "LB 7/24/2018 18:24", + "testDefaultSlideCount" : "MK 7/25/2018 12:49", + "testDeleteFirstSlide" : "MK 7/25/2018 12:51", + "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:51", + "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", + "testDuplicateSlide" : "MK 7/25/2018 12:51", "testDuplicatedSlidesContent" : "LB 7/24/2018 18:25", "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", "testLayoutedSlidesCreation" : "LB 7/24/2018 18:25", From 9b3af582353ad9109e757341e80315fa6867026d Mon Sep 17 00:00:00 2001 From: Jonas Zimmermann Date: Wed, 25 Jul 2018 12:58:15 +0200 Subject: [PATCH 091/112] Minor changes --- .../PSFadingMessage.class/class/for..st | 2 +- .../PSPresentationLoader.class/instance/world.st | 1 + .../PSPresentationLoader.class/methodProperties.json | 2 +- .../instance/magneticRasterActive..st | 4 ++-- .../PSPresentationTool.class/methodProperties.json | 2 +- .../PSSlide.class/instance/saveInDirectory..st | 2 +- .../PSSlide.class/methodProperties.json | 2 +- .../PSSlideContainer.class/instance/occupyWorld..st | 2 +- .../PSSlideContainer.class/instance/showSlide..st | 2 +- .../PSSlideContainer.class/instance/stepTime.st | 2 +- .../PSSlideContainer.class/methodProperties.json | 6 +++--- .../PSTextMorph.class/instance/hasUnacceptedEdits.st | 1 - .../PSTextMorph.class/methodProperties.json | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st index 9fc99a2..18667e3 100644 --- a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st +++ b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st @@ -1,4 +1,4 @@ -nil +instance creation for: aString ^ self new withMessage: aString \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st index a8f5c4f..ae9071c 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/instance/world.st @@ -1,3 +1,4 @@ accessing world + ^ world \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json index e1755ce..b4020db 100644 --- a/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationLoader.class/methodProperties.json @@ -22,5 +22,5 @@ "slidesDirectoryName" : "LM 7/24/2018 14:54", "sortedMorphFiles:" : "MK 7/20/2018 14:48", "sortedSlideSubdirectories:" : "MK 7/20/2018 14:52", - "world" : "LM 7/24/2018 15:22", + "world" : "JZ 7/25/2018 12:44", "world:" : "LM 7/24/2018 15:26" } } diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st index c113268..e9ec338 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/magneticRasterActive..st @@ -1,4 +1,4 @@ accessing -magneticRasterActive: aBool +magneticRasterActive: aBoolean - magneticRasterActive := aBool \ No newline at end of file + magneticRasterActive := aBoolean \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index d933ad9..28b6e0b 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -61,7 +61,7 @@ "loadPresentationFromDirectory:" : "WoC 7/24/2018 15:44", "loadQuestionMessage" : "WoC 7/24/2018 15:48", "magneticRasterActive" : "LB 7/5/2018 19:48", - "magneticRasterActive:" : "LB 7/5/2018 19:49", + "magneticRasterActive:" : "JZ 7/25/2018 12:46", "magneticRasterButtonColor" : "LB 7/5/2018 21:59", "magneticRasterButtonData" : "JZ 7/6/2018 15:37", "menuBarButtonData" : "WoC 7/24/2018 15:14", diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st b/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st index 28e0352..cd8b83f 100644 --- a/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st +++ b/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st @@ -3,4 +3,4 @@ saveInDirectory: aDirectory self allMorphsDo: [:each | each prepareToBeSaved ]. self submorphs doWithIndex: [:each :index | - each saveOnFileNamed: (aDirectory / (index asString, '.morph')) fullName]. \ No newline at end of file + each saveOnFileNamed: (aDirectory / (index asString, '.morph')) fullName] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json index 488bc08..4ca3e60 100644 --- a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json @@ -24,7 +24,7 @@ "resizeMorphHeightToFit:" : "LB 5/18/2018 17:36", "resizeMorphToFit:" : "LB 5/18/2018 17:36", "resizeMorphWidthToFit:" : "LM 5/18/2018 19:26", - "saveInDirectory:" : "LM 7/6/2018 16:49", + "saveInDirectory:" : "JZ 7/25/2018 12:50", "sideRatio" : "LB 7/6/2018 15:26", "waitForDoubleClick:" : "LM 5/25/2018 17:22", "wantsDropFiles:" : "LB 5/18/2018 17:29" } } diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupyWorld..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupyWorld..st index 78d7665..4768875 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupyWorld..st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupyWorld..st @@ -4,4 +4,4 @@ occupyWorld: aWorld self openInWorld: aWorld; extent: aWorld extent; - position: 0@0. \ No newline at end of file + position: 0 @ 0 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st index e6e2435..42e9dc3 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/showSlide..st @@ -4,4 +4,4 @@ showSlide: aPSSlide self currentSlide ifNotNil: [self removeMorph: self currentSlide]. self currentSlide: aPSSlide; - addMorph: self currentSlide fullFrame: (LayoutFrame fractions: (0@0 corner: 1@1)) \ No newline at end of file + addMorph: self currentSlide fullFrame: (LayoutFrame fractions: (0 @ 0 corner: 1 @ 1)) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/stepTime.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/stepTime.st index 5ee34a6..920796b 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/stepTime.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/stepTime.st @@ -1,4 +1,4 @@ stepping and presenter stepTime - ^500 \ No newline at end of file + ^ 500 \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index ca6eddc..b21c51b 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -29,7 +29,7 @@ "notification" : "WoC 6/15/2018 19:21", "notification:" : "MK 7/24/2018 14:37", "occupiesWorld" : "LB 7/6/2018 17:43", - "occupyWorld:" : "JZ 6/29/2018 19:01", + "occupyWorld:" : "JZ 7/25/2018 12:52", "presentationCommandShortcuts" : "LM 7/13/2018 15:39", "presentationCreationCommandShortcuts" : "LM 7/13/2018 15:40", "presentationCreationModeCommandShortcuts" : "MK 6/28/2018 14:14", @@ -44,7 +44,7 @@ "sharedShortcuts" : "LB 6/29/2018 15:45", "shouldShowCursor:andNotify:" : "WoC 7/24/2018 14:16", "showNotification:" : "LM 6/22/2018 15:40", - "showSlide:" : "WoC 7/24/2018 14:30", + "showSlide:" : "JZ 7/25/2018 12:52", "step" : "WoC 7/24/2018 14:37", - "stepTime" : "JZ 6/29/2018 18:56", + "stepTime" : "JZ 7/25/2018 12:53", "wantsDroppedMorph:event:" : "MK 6/7/2018 09:29" } } diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st index 61ae803..7112e98 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st @@ -1,5 +1,4 @@ dependents access hasUnacceptedEdits - "Disables the small yellow triangle" ^ false \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index a33a66c..e83c65f 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -12,7 +12,7 @@ "defaultTextScale" : "WoC 7/13/2018 16:27", "ensureScalingFontAttribute" : "LB 6/17/2018 18:39", "fontSizeDialogText" : "LB 6/29/2018 19:38", - "hasUnacceptedEdits" : "LM 6/8/2018 20:48", + "hasUnacceptedEdits" : "JZ 7/25/2018 12:54", "initialize" : "WoC 7/13/2018 16:29", "initializeProperties" : "WoC 7/13/2018 16:28", "initializeStyle" : "WoC 7/13/2018 16:29", From ce6b88dd0225771349dc7dac52dfcf065fd45cdf Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:02:46 +0200 Subject: [PATCH 092/112] Added tests for container abandon on content abandon --- .../PSContentContainer.class/methodProperties.json | 2 +- .../PSSlideSubmorphTest.class/instance/container..st | 4 ++++ .../PSSlideSubmorphTest.class/instance/container.st | 2 +- .../PSSlideSubmorphTest.class/instance/setUp.st | 4 ++-- .../instance/testAbandonMorphDeletesContainer.st | 6 ++++++ .../instance/testDuplicateChild.st | 4 ++-- .../instance/testRemoveMorphAbandonsContainer.st | 6 ++++++ .../PSSlideSubmorphTest.class/methodProperties.json | 11 +++++++---- .../PSSlideSubmorphTest.class/properties.json | 2 +- 9 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container..st create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAbandonMorphDeletesContainer.st create mode 100644 packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testRemoveMorphAbandonsContainer.st diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json index 635ce83..24256e9 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -41,7 +41,7 @@ "placeHandles" : "LB 7/6/2018 18:10", "rasterResolution" : "WoC 7/25/2018 12:29", "removeResizeHandles" : "WoC 7/24/2018 17:00", - "removedMorph:" : "MK 7/24/2018 14:08", + "removedMorph:" : "LM 7/25/2018 13:00", "resizeChild" : "LB 7/25/2018 11:58", "resizeFractionsOf:" : "LB 7/25/2018 12:00", "resizeHandleSize" : "MK 5/18/2018 19:13", diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container..st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container..st new file mode 100644 index 0000000..ecb4703 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container..st @@ -0,0 +1,4 @@ +accessing +container: aPSContentContainer + + container := aPSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st index 88195e0..231a1b6 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/container.st @@ -1,4 +1,4 @@ accessing container - ^ self morph owner \ No newline at end of file + ^ container \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st index 84d9e16..9d93e42 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/setUp.st @@ -2,5 +2,5 @@ running setUp super setUp. - self slide addContent: self morph - \ No newline at end of file + self slide addContent: self morph. + self container: self morph owner \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAbandonMorphDeletesContainer.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAbandonMorphDeletesContainer.st new file mode 100644 index 0000000..2beec21 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testAbandonMorphDeletesContainer.st @@ -0,0 +1,6 @@ +container tests +testAbandonMorphDeletesContainer + + self assert: (self submorphs includes: self container). + self morph abandon. + self deny: (self submorphs includes: self container) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st index b33cc8b..95faebd 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testDuplicateChild.st @@ -1,6 +1,6 @@ container tests testDuplicateChild - + "Mostly tests that copying a Morph does not throw an error, as it is difficult to test, whether two morphs are equal" | copy | copy := self container copyChildToHand. - self assert: (self hand submorphs includes: copy) \ No newline at end of file + self assert: (self hand submorphs includes: copy). \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testRemoveMorphAbandonsContainer.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testRemoveMorphAbandonsContainer.st new file mode 100644 index 0000000..c808af9 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testRemoveMorphAbandonsContainer.st @@ -0,0 +1,6 @@ +container tests +testRemoveMorphAbandonsContainer + + self assert: (self submorphs includes: self container). + self morph openInWorld: self world. + self deny: (self submorphs includes: self container) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json index ac32ebd..a8a9a73 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -2,16 +2,19 @@ "class" : { }, "instance" : { - "container" : "LB 7/20/2018 14:51", + "container" : "LM 7/25/2018 13:00", + "container:" : "LM 7/25/2018 12:59", "defaultDragOffset" : "MK 7/25/2018 11:50", - "setUp" : "LB 7/20/2018 15:05", + "setUp" : "LM 7/25/2018 13:00", + "testAbandonMorphDeletesContainer" : "LM 7/25/2018 12:52", "testContainerResizingAllCorners" : "MK 7/25/2018 11:52", "testContainerResizingCorner:" : "WoC 7/25/2018 12:18", "testContextMenu" : "MK 7/25/2018 11:33", - "testDuplicateChild" : "LB 7/20/2018 14:52", - "testGrabbing" : "LB 7/20/2018 14:52", + "testDuplicateChild" : "LM 7/25/2018 12:48", + "testGrabbing" : "LM 7/25/2018 12:51", "testLeavePresentationModeEnablesHandles" : "LB 7/20/2018 14:54", "testPresentationModeRemovesHandle" : "LB 7/20/2018 14:54", + "testRemoveMorphAbandonsContainer" : "LM 7/25/2018 12:52", "testResizeHandleMagnetic" : "WoC 7/25/2018 12:29", "testSlideContainerExtent" : "WoC 7/24/2018 18:05", "testSlideContainerPosition" : "WoC 7/24/2018 18:06", diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json index 4cf7138..ce6eeb1 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/properties.json @@ -6,7 +6,7 @@ ], "commentStamp" : "", "instvars" : [ - ], + "container" ], "name" : "PSSlideSubmorphTest", "pools" : [ ], From e59c744c4ad3b03fc63a2b4c68eb3da503217faf Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 13:04:32 +0200 Subject: [PATCH 093/112] small changes --- .../instance/testDefaultSlideCount.st | 2 +- .../testSlideNumberLabelSelectsCorrectly.st | 14 +++++++------- .../methodProperties.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st index a53e2dd..2b6a357 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st @@ -2,4 +2,4 @@ slide creation tests testDefaultSlideCount self assert: self slideCount equals: 1. - self assert: self currentSlide equals: (self tool slideAt: 1) \ No newline at end of file + self assert: self currentSlide equals: (self slideAt: 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st index 60d91eb..0097583 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st @@ -1,15 +1,15 @@ slide navigation tests testSlideNumberLabelSelectsCorrectly - | numberOfSlides index | - numberOfSlides := 5. - numberOfSlides timesRepeat: [self tool createSlide]. + | numberOfNewSlides index | + numberOfNewSlides := 5. + numberOfNewSlides timesRepeat: [self tool createSlide]. - index := numberOfSlides atRandom. + index := self slideCount atRandom. self tool slideNumberString: index asString asText. self assert: index equals: self currentSlideNumber. - index := numberOfSlides atRandom. - self tool slideNumberString: (index asString , '/' , numberOfSlides) asText. - self assert: index equals: self currentSlideNumber. + index := self slideCount atRandom. + self tool slideNumberString: (index asString , '/' , self slideCount) asText. + self assert: index equals: self currentSlideNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 3f20a96..b67770e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -16,7 +16,7 @@ "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", - "testDefaultSlideCount" : "WoC 7/25/2018 12:46", + "testDefaultSlideCount" : "WoC 7/25/2018 12:53", "testDeleteFirstSlide" : "MK 7/25/2018 12:51", "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:51", "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", @@ -51,7 +51,7 @@ "testSlideCreationSelectsNewSlide" : "LB 7/24/2018 18:26", "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", "testSlideNavigationInPresentationMode" : "LB 7/24/2018 18:23", - "testSlideNumberLabelSelectsCorrectly" : "WoC 7/24/2018 17:32", + "testSlideNumberLabelSelectsCorrectly" : "WoC 7/25/2018 13:02", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "WoC 7/25/2018 12:46", From b00a468aa337b5422c33e639b7cc85ca56782cf3 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 13:06:15 +0200 Subject: [PATCH 094/112] Refactoring --- .../instance/createSlide.st | 4 ++ .../instance/magneticRasterActive.st | 4 ++ .../instance/setUpSlideDeletion.st | 2 +- .../testCurrentMiniatureHighlighted.st | 2 +- .../testDeletionDecreasesSlideCount.st | 2 +- .../instance/testDuplicatedSlidesContent.st | 4 +- .../instance/testLayoutedSlidesCreation.st | 2 +- .../instance/testMagneticRasterButton.st | 8 ++-- .../instance/testMiniatureCreated.st | 2 +- .../instance/testMiniatureDeleted.st | 2 +- .../instance/testMiniatureSelects.st | 2 +- .../instance/testMoveSlide.st | 2 +- .../instance/testMoveSlideOutOfBounds.st | 2 +- .../testMovedSlideStayCurrentSlide.st | 2 +- .../instance/testNextSlide.st | 6 +-- .../instance/testSelectSlide.st | 2 +- .../instance/testSelectSlideClamps.st | 2 +- .../instance/testSelectedMiniatureChanges.st | 2 +- .../instance/testSlideCreation.st | 2 +- .../instance/testSlideCreationReturnsSlide.st | 2 +- .../testSlideCreationSelectsNewSlide.st | 4 +- .../testSlideNumberLabelSelectsCorrectly.st | 2 +- ...testSlidesReceiveEnablePresentationMode.st | 2 +- .../methodProperties.json | 44 ++++++++++--------- 24 files changed, 59 insertions(+), 49 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st new file mode 100644 index 0000000..b4541d5 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st @@ -0,0 +1,4 @@ +as yet unclassified +createSlide + + self tool createSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st new file mode 100644 index 0000000..dbc3299 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st @@ -0,0 +1,4 @@ +as yet unclassified +magneticRasterActive + + ^ self tool magneticRasterActive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st index 933143b..eb2d98f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/setUpSlideDeletion.st @@ -1,4 +1,4 @@ slide deletion tests setUpSlideDeletion - self tool createSlide \ No newline at end of file + self createSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st index bf4184a..1f12749 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st @@ -1,6 +1,6 @@ miniature view tests testCurrentMiniatureHighlighted - 5 timesRepeat: [self tool createSlide]. + 5 timesRepeat: [self createSlide]. self tool selectSlideNumber: 5. self assert: self tool currentMiniature isHighlighted \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st index a67424f..ff30e98 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st @@ -4,6 +4,6 @@ testDeletionDecreasesSlideCount | slideCount | self setUpSlideDeletion. - slideCount := self tool slideCount. + slideCount := self slideCount. self deleteSlideAt: 1. self assert: self slideCount equals: (slideCount - 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st index cbb6584..ca5bbb3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st @@ -2,8 +2,8 @@ slide creation tests testDuplicatedSlidesContent | slide duplicatedSlide | - slide := self tool currentSlide. + slide := self currentSlide. slide addContent: (Morph new center: slide center). self tool duplicateCurrentSlide. - duplicatedSlide := self tool slideAt: self currentSlideNumber +1. + duplicatedSlide := self slideAt: self currentSlideNumber +1. slide submorphs withIndexDo: [:each :index | self assert: each center equals: (duplicatedSlide submorphs at: index) center] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st index 9fc0220..2877d6f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLayoutedSlidesCreation.st @@ -2,4 +2,4 @@ slide creation tests testLayoutedSlidesCreation "Assure that layout creation does not throw an error." self tool slideLayoutNames values do: [:each | each value]. - self assert: self tool slideCount equals: (self tool slideLayoutNames size + 1) \ No newline at end of file + self assert: self slideCount equals: (self tool slideLayoutNames size + 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st index 8533d03..eed172d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st @@ -1,14 +1,14 @@ button tests testMagneticRasterButton - | button modeBefore| + | button modeBefore | button := self window allMorphs detect: [:m | m externalName = (self tool magneticRasterButtonData at: #name)]. - modeBefore := self tool magneticRasterActive. + modeBefore := self magneticRasterActive. self click: MouseEvent redButton at: button boundsInWorld center. - self assert: self tool magneticRasterActive equals: modeBefore not. + self assert: self magneticRasterActive equals: modeBefore not. self click: MouseEvent redButton at: button boundsInWorld center. - self assert: self tool magneticRasterActive equals: modeBefore. + self assert: self magneticRasterActive equals: modeBefore. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st index 87bb844..34fda5a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st @@ -3,5 +3,5 @@ testMiniatureCreated | oldSize | oldSize := self tool slideMiniatures size. - self tool createSlide. + self createSlide. self assert: self tool slideMiniatures size equals: oldSize + 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st index e989cbe..aef040c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st @@ -2,7 +2,7 @@ miniature view tests testMiniatureDeleted | oldSize | - self tool createSlide. + self createSlide. oldSize := self tool slideMiniatures size. self tool deleteSlide. self assert: self tool slideMiniatures size equals: oldSize - 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index e102b97..0b6a377 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -2,7 +2,7 @@ miniature view tests testMiniatureSelects | slideToSelect miniatureToClick | - 5 timesRepeat: [self tool createSlide]. + 5 timesRepeat: [self createSlide]. slideToSelect := self slides third. miniatureToClick := self tool miniatureOf: slideToSelect. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st index a1de3f9..ec9ac8a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st @@ -2,7 +2,7 @@ slide moving tests testMoveSlide | slide | - 4 timesRepeat: [self tool createSlide]. "=> 5 slides" + 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. self tool selectSlideNumber: 1. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st index a1af67d..cb8a9d0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st @@ -2,7 +2,7 @@ slide moving tests testMoveSlideOutOfBounds | slide | - 4 timesRepeat: [self tool createSlide]. "=> 5 slides" + 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. self tool selectSlideNumber: 1. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st index 0bec238..20369bc 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st @@ -2,7 +2,7 @@ slide moving tests testMovedSlideStayCurrentSlide | slide | - 4 timesRepeat: [self tool createSlide]. "=> 5 slides" + 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. self tool selectSlideNumber: 1. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st index d71feab..1c28a40 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st @@ -1,8 +1,8 @@ slide navigation tests testNextSlide - self tool createSlide. + self createSlide. self tool selectSlideNumber: 1. - self assert: self tool currentSlide = self slides first. + self assert: self currentSlide = self slides first. self tool nextSlide. - self assert: self tool currentSlide = self slides second. \ No newline at end of file + self assert: self currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st index ffc25ce..664d1b9 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st @@ -1,7 +1,7 @@ slide navigation tests testSelectSlide - self tool createSlide. + self createSlide. self tool selectSlideNumber: 1. self assert: self currentSlide = self slides first. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index 1b90d44..e5d44d3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -1,7 +1,7 @@ slide navigation tests testSelectSlideClamps - self tool createSlide. + self createSlide. self tool selectSlideNumber: 3. self assert: self tool currentSlide = self slides last. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st index f80e253..7d542d3 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st @@ -2,7 +2,7 @@ miniature view tests testSelectedMiniatureChanges | slide | - 5 timesRepeat: [self tool createSlide]. + 5 timesRepeat: [self createSlide]. slide := self tool slideAt: 2. self tool selectSlide: slide. self assert: (self tool miniatureOf: slide) equals: self tool currentMiniature \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st index 5c17755..c79b1c6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st @@ -3,7 +3,7 @@ testSlideCreation | slideCount newSlide | slideCount := self slideCount. - newSlide := self tool createSlide. + newSlide := self createSlide. self assert: self slideCount equals: (slideCount + 1). self assert: (self slides includes: newSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st index 44dd75c..88851b4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st @@ -2,5 +2,5 @@ slide creation tests testSlideCreationReturnsSlide | slide | - slide := self tool createSlide. + slide := self createSlide. self assert: slide = self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st index b12dd7e..8984139 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st @@ -2,5 +2,5 @@ slide creation tests testSlideCreationSelectsNewSlide self assert: self currentSlide equals: self slides first. - self tool createSlide. - self assert: self currentSlide equals: self slides second. \ No newline at end of file + self createSlide. + self assert: self currentSlide equals: self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st index 60d91eb..ddb7cd6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNumberLabelSelectsCorrectly.st @@ -3,7 +3,7 @@ testSlideNumberLabelSelectsCorrectly | numberOfSlides index | numberOfSlides := 5. - numberOfSlides timesRepeat: [self tool createSlide]. + numberOfSlides timesRepeat: [self createSlide]. index := numberOfSlides atRandom. self tool slideNumberString: index asString asText. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st index 4130e4f..8407aee 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st @@ -1,7 +1,7 @@ presentation mode tests testSlidesReceiveEnablePresentationMode - self tool createSlide. + self createSlide. self slides: (self slides collect: [:each | PSMockSlide new]). self tool enablePresentationMode. self slides do: [:each | diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index d943646..7f9ffac 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -2,12 +2,14 @@ "class" : { }, "instance" : { + "createSlide" : "MK 7/25/2018 13:00", "currentSlide" : "WoC 7/24/2018 17:27", "currentSlideNumber" : "WoC 7/24/2018 17:32", "deleteSlideAt:" : "MK 7/25/2018 12:50", "expectedFailures" : "LB 7/24/2018 15:38", + "magneticRasterActive" : "MK 7/25/2018 12:57", "setUp" : "LB 5/23/2018 16:11", - "setUpSlideDeletion" : "LM 7/24/2018 17:31", + "setUpSlideDeletion" : "MK 7/25/2018 13:00", "slideAt:" : "MK 7/25/2018 12:48", "slideContainer" : "WoC 6/15/2018 18:21", "slideCount" : "WoC 7/24/2018 17:27", @@ -15,46 +17,46 @@ "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", - "testCurrentMiniatureHighlighted" : "LB 6/29/2018 19:05", + "testCurrentMiniatureHighlighted" : "MK 7/25/2018 13:01", "testDefaultSlideCount" : "MK 7/25/2018 12:49", "testDeleteFirstSlide" : "MK 7/25/2018 12:51", - "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:51", + "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:53", "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", "testDuplicateSlide" : "MK 7/25/2018 12:51", - "testDuplicatedSlidesContent" : "LB 7/24/2018 18:25", + "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", - "testLayoutedSlidesCreation" : "LB 7/24/2018 18:25", + "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", - "testMagneticRasterButton" : "WoC 7/24/2018 17:47", + "testMagneticRasterButton" : "MK 7/25/2018 12:58", "testMiniatureChangesIfSlideChanges" : "LB 7/24/2018 18:15", - "testMiniatureCreated" : "LB 6/29/2018 18:01", - "testMiniatureDeleted" : "LB 6/29/2018 18:02", - "testMiniatureSelects" : "WoC 7/24/2018 17:44", - "testMoveSlide" : "LB 6/29/2018 15:45", - "testMoveSlideOutOfBounds" : "LB 6/29/2018 15:45", - "testMovedSlideStayCurrentSlide" : "WoC 7/24/2018 17:37", - "testNextSlide" : "LM 7/13/2018 17:52", + "testMiniatureCreated" : "MK 7/25/2018 13:01", + "testMiniatureDeleted" : "MK 7/25/2018 13:00", + "testMiniatureSelects" : "MK 7/25/2018 13:01", + "testMoveSlide" : "MK 7/25/2018 13:02", + "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:02", + "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:02", + "testNextSlide" : "MK 7/25/2018 13:03", "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", "testOccupiesWorldOnStep" : "LB 7/24/2018 16:48", "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", - "testSelectSlide" : "WoC 7/24/2018 17:36", - "testSelectSlideClamps" : "WoC 7/24/2018 17:35", - "testSelectedMiniatureChanges" : "LB 6/29/2018 19:05", + "testSelectSlide" : "MK 7/25/2018 13:03", + "testSelectSlideClamps" : "MK 7/25/2018 13:03", + "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", "testSlideContainerPosition" : "LB 7/24/2018 16:47", - "testSlideCreation" : "LB 7/24/2018 18:25", - "testSlideCreationReturnsSlide" : "WoC 7/24/2018 17:34", - "testSlideCreationSelectsNewSlide" : "LB 7/24/2018 18:26", + "testSlideCreation" : "MK 7/25/2018 13:04", + "testSlideCreationReturnsSlide" : "MK 7/25/2018 13:04", + "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", "testSlideNavigationInPresentationMode" : "LB 7/24/2018 18:23", - "testSlideNumberLabelSelectsCorrectly" : "WoC 7/24/2018 17:32", + "testSlideNumberLabelSelectsCorrectly" : "MK 7/25/2018 13:05", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", - "testSlidesReceiveEnablePresentationMode" : "LM 7/13/2018 18:21", + "testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:05", "testZeroSlidesRegression" : "LB 7/24/2018 18:28", "testnextSlideClampsToMax" : "WoC 7/24/2018 17:29", "tool" : "LM 5/16/2018 17:13", From 6682edcf38f3786b8cfa002604b90630ab472803 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 13:11:22 +0200 Subject: [PATCH 095/112] Refactoring --- .../PSPresentationToolTest.class/instance/createSlide.st | 2 +- .../instance/enablePresentationMode.st | 4 ++++ .../instance/selectSlideNumber..st | 4 ++++ .../instance/testMagneticRasterButton.st | 2 +- .../instance/testSlideNavigationInPresentationMode.st | 2 +- .../PSPresentationToolTest.class/methodProperties.json | 8 +++++--- 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st index b4541d5..392ce56 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st @@ -1,4 +1,4 @@ as yet unclassified createSlide - self tool createSlide \ No newline at end of file + ^ self tool createSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st new file mode 100644 index 0000000..93ab6ee --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st @@ -0,0 +1,4 @@ +as yet unclassified +enablePresentationMode + + self tool enablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st new file mode 100644 index 0000000..c42eabe --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st @@ -0,0 +1,4 @@ +as yet unclassified +selectSlideNumber: aNumber + + self tool selectSlideNumber: aNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st index eed172d..65e5d1b 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st @@ -10,5 +10,5 @@ testMagneticRasterButton self assert: self magneticRasterActive equals: modeBefore not. self click: MouseEvent redButton at: button boundsInWorld center. - self assert: self magneticRasterActive equals: modeBefore. + self assert: self magneticRasterActive equals: modeBefore \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st index 83154d9..f0abe66 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st @@ -1,7 +1,7 @@ presentation mode tests testSlideNavigationInPresentationMode - self tool + self createSlide; selectSlideNumber: 1; enablePresentationMode. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 7f9ffac..35c0c06 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -2,12 +2,14 @@ "class" : { }, "instance" : { - "createSlide" : "MK 7/25/2018 13:00", + "createSlide" : "MK 7/25/2018 13:10", "currentSlide" : "WoC 7/24/2018 17:27", "currentSlideNumber" : "WoC 7/24/2018 17:32", "deleteSlideAt:" : "MK 7/25/2018 12:50", + "enablePresentationMode" : "MK 7/25/2018 13:07", "expectedFailures" : "LB 7/24/2018 15:38", "magneticRasterActive" : "MK 7/25/2018 12:57", + "selectSlideNumber:" : "MK 7/25/2018 13:09", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "MK 7/25/2018 13:00", "slideAt:" : "MK 7/25/2018 12:48", @@ -29,7 +31,7 @@ "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", - "testMagneticRasterButton" : "MK 7/25/2018 12:58", + "testMagneticRasterButton" : "MK 7/25/2018 13:10", "testMiniatureChangesIfSlideChanges" : "LB 7/24/2018 18:15", "testMiniatureCreated" : "MK 7/25/2018 13:01", "testMiniatureDeleted" : "MK 7/25/2018 13:00", @@ -52,7 +54,7 @@ "testSlideCreationReturnsSlide" : "MK 7/25/2018 13:04", "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", - "testSlideNavigationInPresentationMode" : "LB 7/24/2018 18:23", + "testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:09", "testSlideNumberLabelSelectsCorrectly" : "MK 7/25/2018 13:05", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", From 5fe8472f13d23e9c89a028e4d736ed4b53ab5180 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:16:07 +0200 Subject: [PATCH 096/112] Refactoring --- .../instance/testCanLoadEmptyPresentation.st | 3 +-- .../instance/testCanLoadEmptySlide.st | 3 +-- .../instance/testLoadCompletePresentation.st | 9 +++++---- .../instance/testMorphLoadIsValid.st | 5 +++-- .../instance/testSortMorphFiles.st | 3 ++- .../instance/validMorphFileData.st | 2 +- .../methodProperties.json | 12 ++++++------ .../instance/testContextMenu.st | 5 +++-- .../PSTextMorphTest.class/methodProperties.json | 2 +- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st index 14b17a3..c55962c 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptyPresentation.st @@ -6,6 +6,5 @@ testCanLoadEmptyPresentation self loader loadPresentationUnchecked: directory. errorReport := self loader errorReport. self - assert: (errorReport values select: [:each | each = 0]) size - equals: (directory / self loader slidesDirectoryName) directoryNames size + assert: (errorReport values select: [:each | each ~= 0]) isEmpty description: 'There should be 0 errors per slide for an empty presentation' \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st index fb882f7..0545b8c 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testCanLoadEmptySlide.st @@ -4,5 +4,4 @@ testCanLoadEmptySlide | directory | directory := PSMockFileDirectory named: 'slide'. self - assert: 0 - equals: (self loader loadSlideFromDirectory: directory) submorphs size \ No newline at end of file + assert: (self loader loadSlideFromDirectory: directory) submorphs isEmpty \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st index 140ff45..c5a9693 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testLoadCompletePresentation.st @@ -6,7 +6,8 @@ testLoadCompletePresentation presentation := PSPresentationLoader new world: self world; loadPresentationFromDirectory: directory. - self assert: presentation slideCount equals: 3. - self assert: presentation slides first submorphs size equals: 1. - self assert: presentation slides second submorphs isEmpty. - self assert: presentation slides third submorphs size equals: 2 \ No newline at end of file + self + assert: presentation slideCount equals: 3; + assert: presentation slides first submorphs size equals: 1; + assert: presentation slides second submorphs isEmpty; + assert: presentation slides third submorphs size equals: 2 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st index 69b0a81..5659024 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testMorphLoadIsValid.st @@ -5,5 +5,6 @@ testMorphLoadIsValid morph := self loader loadMorphFromStream: (self morphLoadingStreamFor: self validMorphFileData) testIn: self world. - self assert: morph notNil. - self assert: morph class equals: PSContentContainer \ No newline at end of file + self + assert: morph notNil; + assert: morph class equals: PSContentContainer \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st index dfe272b..5590826 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/testSortMorphFiles.st @@ -1,5 +1,6 @@ presentation loading testSortMorphFiles - self assert: {'2.morph' . '3.morph' . '4.morph'} + self + assert: {'2.morph' . '3.morph' . '4.morph'} equals: (self loader sortedMorphFiles: {'4.morph' . '2.morph' . '3.morph'}) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st index 60fea90..bfd605e 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/instance/validMorphFileData.st @@ -1,4 +1,4 @@ presentation loading validMorphFileData - "This is the binary data for an example morph (a PSTextMorph)" + "This is the binary data for an example morph (a PSTextMorph contained inside a PSContentContainer)" ^ #[239 187 191 39 70 114 111 109 32 83 113 117 101 97 107 54 46 48 97 108 112 104 97 32 111 102 32 49 55 32 65 112 114 105 108 32 50 48 49 56 32 91 108 97 116 101 115 116 32 117 112 100 97 116 101 58 32 35 49 55 57 48 49 93 32 111 110 32 54 32 74 117 110 101 32 50 48 49 56 32 97 116 32 53 58 50 49 58 50 56 32 112 109 39 33 13 13 33 79 98 106 101 99 116 83 99 97 110 110 101 114 32 110 101 119 32 105 110 105 116 105 97 108 105 122 101 33 13 13 13 13 33 115 101 108 102 32 115 109 97 114 116 82 101 102 83 116 114 101 97 109 33 4 0 0 0 4 8 0 0 0 4 17 15 99 108 97 115 115 32 115 116 114 117 99 116 117 114 101 9 0 0 0 3 6 10 68 105 99 116 105 111 110 97 114 121 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 9 0 0 0 3 6 11 65 115 115 111 99 105 97 116 105 111 110 6 10 83 99 114 111 108 108 80 97 110 101 8 0 0 0 23 4 0 0 0 0 17 6 98 111 117 110 100 115 17 5 111 119 110 101 114 17 9 115 117 98 109 111 114 112 104 115 17 10 102 117 108 108 66 111 117 110 100 115 17 5 99 111 108 111 114 17 9 101 120 116 101 110 115 105 111 110 17 11 98 111 114 100 101 114 87 105 100 116 104 17 11 98 111 114 100 101 114 67 111 108 111 114 17 5 109 111 100 101 108 17 8 115 108 111 116 78 97 109 101 17 4 111 112 101 110 17 9 115 99 114 111 108 108 66 97 114 17 8 115 99 114 111 108 108 101 114 17 20 114 101 116 114 97 99 116 97 98 108 101 83 99 114 111 108 108 66 97 114 17 15 115 99 114 111 108 108 66 97 114 79 110 76 101 102 116 17 15 103 101 116 77 101 110 117 83 101 108 101 99 116 111 114 17 20 103 101 116 77 101 110 117 84 105 116 108 101 83 101 108 101 99 116 111 114 17 8 104 97 115 70 111 99 117 115 17 10 104 83 99 114 111 108 108 66 97 114 17 16 104 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 16 118 83 99 114 111 108 108 66 97 114 80 111 108 105 99 121 17 18 115 99 114 111 108 108 66 97 114 84 104 105 99 107 110 101 115 115 16 3 0 66 6 9 84 101 120 116 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 116 101 120 116 83 116 121 108 101 17 4 116 101 120 116 17 8 119 114 97 112 70 108 97 103 17 9 112 97 114 97 103 114 97 112 104 17 6 101 100 105 116 111 114 17 9 99 111 110 116 97 105 110 101 114 17 11 112 114 101 100 101 99 101 115 115 111 114 17 9 115 117 99 99 101 115 115 111 114 17 15 98 97 99 107 103 114 111 117 110 100 67 111 108 111 114 17 7 109 97 114 103 105 110 115 17 11 101 100 105 116 72 105 115 116 111 114 121 17 8 114 101 97 100 79 110 108 121 17 7 97 117 116 111 70 105 116 16 3 0 66 6 18 80 83 67 111 110 116 101 110 116 67 111 110 116 97 105 110 101 114 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 13 114 101 115 105 122 101 72 97 110 100 108 101 115 17 10 104 97 115 72 97 110 100 108 101 115 17 5 99 104 105 108 100 16 3 0 66 6 11 76 97 121 111 117 116 70 114 97 109 101 8 0 0 0 9 4 0 0 0 1 17 12 108 101 102 116 70 114 97 99 116 105 111 110 17 10 108 101 102 116 79 102 102 115 101 116 17 11 116 111 112 70 114 97 99 116 105 111 110 17 9 116 111 112 79 102 102 115 101 116 17 13 114 105 103 104 116 70 114 97 99 116 105 111 110 17 11 114 105 103 104 116 79 102 102 115 101 116 17 14 98 111 116 116 111 109 70 114 97 99 116 105 111 110 17 12 98 111 116 116 111 109 79 102 102 115 101 116 16 3 0 66 6 10 73 109 97 103 101 77 111 114 112 104 8 0 0 0 8 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 5 105 109 97 103 101 16 3 0 66 6 12 77 111 114 112 104 105 99 77 111 100 101 108 8 0 0 0 12 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 16 3 0 66 6 13 84 101 120 116 65 116 116 114 105 98 117 116 101 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 9 76 111 111 107 117 112 75 101 121 8 0 0 0 2 4 0 0 0 0 17 3 107 101 121 16 3 0 66 6 18 80 108 117 103 103 97 98 108 101 84 101 120 116 77 111 114 112 104 8 0 0 0 33 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 0 206 10 0 0 0 217 10 0 0 0 227 10 0 0 0 249 10 0 0 1 10 10 0 0 1 27 10 0 0 1 49 10 0 0 1 59 10 0 0 1 71 10 0 0 1 89 10 0 0 1 107 17 9 116 101 120 116 77 111 114 112 104 17 15 103 101 116 84 101 120 116 83 101 108 101 99 116 111 114 17 15 115 101 116 84 101 120 116 83 101 108 101 99 116 111 114 17 20 103 101 116 83 101 108 101 99 116 105 111 110 83 101 108 101 99 116 111 114 17 18 104 97 115 85 110 97 99 99 101 112 116 101 100 69 100 105 116 115 17 24 97 115 107 66 101 102 111 114 101 68 105 115 99 97 114 100 105 110 103 69 100 105 116 115 17 17 115 101 108 101 99 116 105 111 110 73 110 116 101 114 118 97 108 17 19 104 97 115 69 100 105 116 105 110 103 67 111 110 102 108 105 99 116 115 17 16 101 100 105 116 84 101 120 116 83 101 108 101 99 116 111 114 17 15 119 97 110 116 115 87 114 97 112 66 111 114 100 101 114 16 3 0 66 6 7 84 84 67 70 111 110 116 8 0 0 0 12 4 0 0 0 1 17 14 116 116 99 68 101 115 99 114 105 112 116 105 111 110 17 9 112 111 105 110 116 83 105 122 101 17 15 102 111 114 101 103 114 111 117 110 100 67 111 108 111 114 17 5 99 97 99 104 101 17 11 100 101 114 105 118 97 116 105 118 101 115 17 12 102 97 108 108 98 97 99 107 70 111 110 116 17 6 104 101 105 103 104 116 17 6 97 115 99 101 110 116 17 7 100 101 115 99 101 110 116 17 8 109 97 120 65 115 99 105 105 17 15 99 111 108 111 114 84 111 67 97 99 104 101 77 97 112 16 3 0 66 6 12 83 105 109 112 108 101 66 111 114 100 101 114 8 0 0 0 4 4 0 0 0 0 17 9 98 97 115 101 67 111 108 111 114 17 5 99 111 108 111 114 17 5 119 105 100 116 104 1 1 16 3 0 66 6 9 66 121 116 101 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 18 73 100 101 110 116 105 116 121 68 105 99 116 105 111 110 97 114 121 8 0 0 0 3 4 0 0 0 0 17 5 116 97 108 108 121 17 5 97 114 114 97 121 16 3 0 66 6 20 76 97 114 103 101 80 111 115 105 116 105 118 101 73 110 116 101 103 101 114 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 5 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 10 66 121 116 101 83 121 109 98 111 108 8 0 0 0 1 4 0 0 0 0 1 1 16 3 0 66 6 4 70 111 114 109 8 0 0 0 6 4 0 0 0 0 17 4 98 105 116 115 17 5 119 105 100 116 104 17 6 104 101 105 103 104 116 17 5 100 101 112 116 104 17 6 111 102 102 115 101 116 1 1 1 1 16 3 0 66 6 16 68 105 115 112 108 97 121 84 114 97 110 115 102 111 114 109 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 16 77 111 114 112 104 105 99 84 114 97 110 115 102 111 114 109 8 0 0 0 4 4 0 0 0 0 17 6 111 102 102 115 101 116 17 5 97 110 103 108 101 17 5 115 99 97 108 101 16 3 0 66 6 14 84 114 97 110 115 102 111 114 109 77 111 114 112 104 8 0 0 0 10 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 17 9 116 114 97 110 115 102 111 114 109 17 9 115 109 111 111 116 104 105 110 103 17 11 108 111 99 97 108 66 111 117 110 100 115 1 1 1 1 16 3 0 66 6 11 80 83 84 101 120 116 77 111 114 112 104 8 0 0 0 35 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 0 206 10 0 0 0 217 10 0 0 0 227 10 0 0 0 249 10 0 0 1 10 10 0 0 1 27 10 0 0 1 49 10 0 0 1 59 10 0 0 1 71 10 0 0 1 89 10 0 0 1 107 10 0 0 4 148 10 0 0 4 159 10 0 0 4 176 10 0 0 4 193 10 0 0 4 215 10 0 0 4 235 10 0 0 5 5 10 0 0 5 24 10 0 0 5 45 10 0 0 5 63 17 13 98 97 115 105 99 84 101 120 116 83 105 122 101 17 9 116 101 120 116 83 99 97 108 101 1 1 16 3 0 66 6 5 80 111 105 110 116 8 0 0 0 3 4 0 0 0 0 17 1 120 17 1 121 16 3 0 66 6 12 83 109 97 108 108 70 108 111 97 116 54 52 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 9 77 97 103 110 105 116 117 100 101 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 9 87 101 97 107 65 114 114 97 121 8 0 0 0 1 4 0 0 0 0 1 1 1 1 1 16 3 0 66 6 17 65 114 114 97 121 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 5 70 108 111 97 116 8 0 0 0 1 4 0 0 0 0 1 1 1 1 16 3 0 66 6 9 82 101 99 116 97 110 103 108 101 8 0 0 0 3 4 0 0 0 0 17 6 111 114 105 103 105 110 17 6 99 111 114 110 101 114 16 3 0 66 6 14 82 101 99 116 97 110 103 108 101 77 111 114 112 104 8 0 0 0 9 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 1 1 1 1 1 1 16 3 0 66 6 6 83 116 114 105 110 103 8 0 0 0 1 4 0 0 0 0 1 1 1 16 3 0 66 6 22 83 101 113 117 101 110 99 101 97 98 108 101 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 10 67 111 108 108 101 99 116 105 111 110 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 12 69 118 101 110 116 72 97 110 100 108 101 114 8 0 0 0 37 4 0 0 0 0 17 18 109 111 117 115 101 68 111 119 110 82 101 99 105 112 105 101 110 116 17 17 109 111 117 115 101 68 111 119 110 83 101 108 101 99 116 111 114 17 18 109 111 117 115 101 77 111 118 101 82 101 99 105 112 105 101 110 116 17 17 109 111 117 115 101 77 111 118 101 83 101 108 101 99 116 111 114 17 23 109 111 117 115 101 83 116 105 108 108 68 111 119 110 82 101 99 105 112 105 101 110 116 17 22 109 111 117 115 101 83 116 105 108 108 68 111 119 110 83 101 108 101 99 116 111 114 17 16 109 111 117 115 101 85 112 82 101 99 105 112 105 101 110 116 17 15 109 111 117 115 101 85 112 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 69 110 116 101 114 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 69 110 116 101 114 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 76 101 97 118 101 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 76 101 97 118 101 83 101 108 101 99 116 111 114 17 27 109 111 117 115 101 69 110 116 101 114 68 114 97 103 103 105 110 103 82 101 99 105 112 105 101 110 116 17 26 109 111 117 115 101 69 110 116 101 114 68 114 97 103 103 105 110 103 83 101 108 101 99 116 111 114 17 27 109 111 117 115 101 76 101 97 118 101 68 114 97 103 103 105 110 103 82 101 99 105 112 105 101 110 116 17 26 109 111 117 115 101 76 101 97 118 101 68 114 97 103 103 105 110 103 83 101 108 101 99 116 111 114 17 19 109 111 117 115 101 87 104 101 101 108 82 101 99 105 112 105 101 110 116 17 18 109 111 117 115 101 87 104 101 101 108 83 101 108 101 99 116 111 114 17 18 107 101 121 83 116 114 111 107 101 82 101 99 105 112 105 101 110 116 17 17 107 101 121 83 116 114 111 107 101 83 101 108 101 99 116 111 114 17 14 107 101 121 85 112 82 101 99 105 112 105 101 110 116 17 13 107 101 121 85 112 83 101 108 101 99 116 111 114 17 16 107 101 121 68 111 119 110 82 101 99 105 112 105 101 110 116 17 15 107 101 121 68 111 119 110 83 101 108 101 99 116 111 114 17 14 118 97 108 117 101 80 97 114 97 109 101 116 101 114 17 18 115 116 97 114 116 68 114 97 103 82 101 99 105 112 105 101 110 116 17 17 115 116 97 114 116 68 114 97 103 83 101 108 101 99 116 111 114 17 19 100 111 117 98 108 101 67 108 105 99 107 83 101 108 101 99 116 111 114 17 20 100 111 117 98 108 101 67 108 105 99 107 82 101 99 105 112 105 101 110 116 17 26 100 111 117 98 108 101 67 108 105 99 107 84 105 109 101 111 117 116 83 101 108 101 99 116 111 114 17 27 100 111 117 98 108 101 67 108 105 99 107 84 105 109 101 111 117 116 82 101 99 105 112 105 101 110 116 17 13 99 108 105 99 107 83 101 108 101 99 116 111 114 17 14 99 108 105 99 107 82 101 99 105 112 105 101 110 116 17 28 107 101 121 98 111 97 114 100 70 111 99 117 115 67 104 97 110 103 101 82 101 99 105 112 105 101 110 116 17 27 107 101 121 98 111 97 114 100 70 111 99 117 115 67 104 97 110 103 101 83 101 108 101 99 116 111 114 17 19 119 97 110 116 115 69 118 101 114 121 77 111 117 115 101 77 111 118 101 16 3 0 66 6 9 83 99 114 111 108 108 66 97 114 8 0 0 0 37 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 17 6 115 108 105 100 101 114 17 5 118 97 108 117 101 17 16 115 101 116 86 97 108 117 101 83 101 108 101 99 116 111 114 17 16 103 101 116 86 97 108 117 101 83 101 108 101 99 116 111 114 17 12 115 108 105 100 101 114 83 104 97 100 111 119 17 11 115 108 105 100 101 114 67 111 108 111 114 17 10 100 101 115 99 101 110 100 105 110 103 17 12 109 105 110 105 109 117 109 86 97 108 117 101 17 12 109 97 120 105 109 117 109 86 97 108 117 101 17 7 113 117 97 110 116 117 109 17 23 103 101 116 77 105 110 105 109 117 109 86 97 108 117 101 83 101 108 101 99 116 111 114 17 23 103 101 116 77 97 120 105 109 117 109 86 97 108 117 101 83 101 108 101 99 116 111 114 17 11 111 114 105 101 110 116 97 116 105 111 110 17 10 109 101 110 117 66 117 116 116 111 110 17 8 117 112 66 117 116 116 111 110 17 10 100 111 119 110 66 117 116 116 111 110 17 10 112 97 103 105 110 103 65 114 101 97 17 11 115 99 114 111 108 108 68 101 108 116 97 17 9 112 97 103 101 68 101 108 116 97 17 8 105 110 116 101 114 118 97 108 17 12 109 101 110 117 83 101 108 101 99 116 111 114 17 15 116 105 109 101 79 102 77 111 117 115 101 68 111 119 110 17 16 116 105 109 101 79 102 76 97 115 116 83 99 114 111 108 108 17 17 110 101 120 116 80 97 103 101 68 105 114 101 99 116 105 111 110 17 18 99 117 114 114 101 110 116 83 99 114 111 108 108 68 101 108 97 121 16 3 0 66 6 8 82 117 110 65 114 114 97 121 8 0 0 0 6 4 0 0 0 0 17 4 114 117 110 115 17 6 118 97 108 117 101 115 17 9 108 97 115 116 73 110 100 101 120 17 7 108 97 115 116 82 117 110 17 10 108 97 115 116 79 102 102 115 101 116 16 3 0 66 6 9 84 101 120 116 83 116 121 108 101 8 0 0 0 13 4 0 0 0 0 17 9 102 111 110 116 65 114 114 97 121 17 14 102 111 110 116 70 97 109 105 108 121 83 105 122 101 17 8 108 105 110 101 71 114 105 100 17 8 98 97 115 101 108 105 110 101 17 9 97 108 105 103 110 109 101 110 116 17 11 102 105 114 115 116 73 110 100 101 110 116 17 10 114 101 115 116 73 110 100 101 110 116 17 11 114 105 103 104 116 73 110 100 101 110 116 17 9 116 97 98 115 65 114 114 97 121 17 15 109 97 114 103 105 110 84 97 98 115 65 114 114 97 121 17 7 108 101 97 100 105 110 103 17 16 100 101 102 97 117 108 116 70 111 110 116 73 110 100 101 120 16 3 0 66 6 12 65 98 115 116 114 97 99 116 70 111 110 116 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 66 105 116 109 97 112 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 12 66 111 120 101 100 70 108 111 97 116 54 52 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 8 70 114 97 99 116 105 111 110 8 0 0 0 3 4 0 0 0 0 17 9 110 117 109 101 114 97 116 111 114 17 11 100 101 110 111 109 105 110 97 116 111 114 1 1 1 16 3 0 66 6 16 72 97 115 104 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 3 4 0 0 0 0 10 0 0 6 91 10 0 0 6 98 16 3 0 66 6 12 78 101 119 80 97 114 97 103 114 97 112 104 8 0 0 0 18 4 0 0 0 0 17 4 116 101 120 116 17 9 116 101 120 116 83 116 121 108 101 17 19 102 105 114 115 116 67 104 97 114 97 99 116 101 114 73 110 100 101 120 17 9 99 111 110 116 97 105 110 101 114 17 5 108 105 110 101 115 17 20 112 111 115 105 116 105 111 110 87 104 101 110 67 111 109 112 111 115 101 100 17 11 111 102 102 115 101 116 84 111 69 110 100 17 9 109 97 120 82 105 103 104 116 88 17 14 115 101 108 101 99 116 105 111 110 83 116 97 114 116 17 13 115 101 108 101 99 116 105 111 110 83 116 111 112 17 17 119 97 110 116 115 67 111 108 117 109 110 66 114 101 97 107 115 17 7 102 111 99 117 115 101 100 17 9 99 97 114 101 116 82 101 99 116 17 9 115 104 111 119 67 97 114 101 116 17 10 99 97 114 101 116 67 111 108 111 114 17 14 115 101 108 101 99 116 105 111 110 67 111 108 111 114 17 23 117 110 102 111 99 117 115 101 100 83 101 108 101 99 116 105 111 110 67 111 108 111 114 16 3 0 66 6 14 84 101 120 116 70 111 110 116 67 104 97 110 103 101 8 0 0 0 2 4 0 0 0 0 17 10 102 111 110 116 78 117 109 98 101 114 1 1 16 3 0 66 6 14 77 111 114 112 104 69 120 116 101 110 115 105 111 110 8 0 0 0 12 4 0 0 0 0 17 6 108 111 99 107 101 100 17 7 118 105 115 105 98 108 101 17 6 115 116 105 99 107 121 17 11 98 97 108 108 111 111 110 84 101 120 116 17 19 98 97 108 108 111 111 110 84 101 120 116 83 101 108 101 99 116 111 114 17 12 101 120 116 101 114 110 97 108 78 97 109 101 17 12 105 115 80 97 114 116 115 68 111 110 111 114 17 10 97 99 116 111 114 83 116 97 116 101 17 6 112 108 97 121 101 114 17 12 101 118 101 110 116 72 97 110 100 108 101 114 17 15 111 116 104 101 114 80 114 111 112 101 114 116 105 101 115 1 1 1 1 1 16 3 0 66 6 16 84 114 97 110 115 108 117 99 101 110 116 67 111 108 111 114 8 0 0 0 5 4 0 0 0 0 17 3 114 103 98 17 11 99 97 99 104 101 100 68 101 112 116 104 17 16 99 97 99 104 101 100 66 105 116 80 97 116 116 101 114 110 17 5 97 108 112 104 97 16 3 0 66 6 7 80 83 83 108 105 100 101 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 17 9 112 114 101 115 101 110 116 101 114 17 5 109 111 100 101 108 17 6 99 117 114 115 111 114 17 7 112 97 100 100 105 110 103 17 15 98 97 99 107 103 114 111 117 110 100 77 111 114 112 104 17 16 116 117 114 116 108 101 84 114 97 105 108 115 70 111 114 109 17 9 116 117 114 116 108 101 80 101 110 17 19 108 97 115 116 84 117 114 116 108 101 80 111 115 105 116 105 111 110 115 17 10 105 115 80 97 114 116 115 66 105 110 17 14 105 110 100 105 99 97 116 101 67 117 114 115 111 114 17 19 119 97 110 116 115 77 111 117 115 101 79 118 101 114 72 97 108 111 115 17 10 119 111 114 108 100 83 116 97 116 101 17 10 103 114 105 100 100 105 110 103 79 110 16 3 0 66 6 5 67 111 108 111 114 8 0 0 0 4 4 0 0 0 0 10 0 0 18 147 10 0 0 18 152 10 0 0 18 165 16 3 0 66 6 13 68 105 115 112 108 97 121 77 101 100 105 117 109 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 12 80 97 115 116 101 85 112 77 111 114 112 104 8 0 0 0 22 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 18 253 10 0 0 19 8 10 0 0 19 15 10 0 0 19 23 10 0 0 19 32 10 0 0 19 49 10 0 0 19 67 10 0 0 19 78 10 0 0 19 99 10 0 0 19 111 10 0 0 19 127 10 0 0 19 148 10 0 0 19 160 16 3 0 66 6 8 73 110 116 101 114 118 97 108 8 0 0 0 4 4 0 0 0 0 17 5 115 116 97 114 116 17 4 115 116 111 112 17 4 115 116 101 112 16 3 0 66 10 0 0 0 66 8 0 0 0 3 4 0 0 0 0 10 0 0 3 255 17 5 118 97 108 117 101 16 3 0 66 6 13 66 111 114 100 101 114 101 100 77 111 114 112 104 8 0 0 0 9 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 16 3 0 66 6 16 76 97 121 111 117 116 80 114 111 112 101 114 116 105 101 115 8 0 0 0 4 4 0 0 0 0 17 9 104 82 101 115 105 122 105 110 103 17 9 118 82 101 115 105 122 105 110 103 17 13 100 105 115 97 98 108 101 76 97 121 111 117 116 16 3 0 66 6 11 80 114 111 116 111 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 8 84 101 120 116 76 105 110 101 8 0 0 0 11 4 0 0 0 0 17 4 108 101 102 116 17 5 114 105 103 104 116 17 3 116 111 112 17 6 98 111 116 116 111 109 17 10 102 105 114 115 116 73 110 100 101 120 17 9 108 97 115 116 73 110 100 101 120 17 14 105 110 116 101 114 110 97 108 83 112 97 99 101 115 17 12 112 97 100 100 105 110 103 87 105 100 116 104 17 8 98 97 115 101 108 105 110 101 17 10 108 101 102 116 77 97 114 103 105 110 16 3 0 66 6 11 66 111 114 100 101 114 83 116 121 108 101 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 6 83 121 109 98 111 108 8 0 0 0 1 4 0 0 0 0 16 3 0 66 6 17 79 114 100 101 114 101 100 67 111 108 108 101 99 116 105 111 110 8 0 0 0 4 4 0 0 0 0 17 5 97 114 114 97 121 17 10 102 105 114 115 116 73 110 100 101 120 17 9 108 97 115 116 73 110 100 101 120 16 3 0 66 6 13 68 105 115 112 108 97 121 79 98 106 101 99 116 8 0 0 0 1 4 0 0 0 0 1 1 16 3 0 66 6 6 78 117 109 98 101 114 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 9 68 105 115 107 80 114 111 120 121 8 0 0 0 5 4 0 0 0 0 17 16 103 108 111 98 97 108 79 98 106 101 99 116 78 97 109 101 17 11 112 114 101 83 101 108 101 99 116 111 114 17 19 99 111 110 115 116 114 117 99 116 111 114 83 101 108 101 99 116 111 114 17 15 99 111 110 115 116 114 117 99 116 111 114 65 114 103 115 16 3 0 66 6 20 84 101 120 116 77 111 114 112 104 70 111 114 69 100 105 116 86 105 101 119 8 0 0 0 24 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 1 192 10 0 0 1 203 10 0 0 1 209 10 0 0 1 219 10 0 0 1 230 10 0 0 1 238 10 0 0 1 249 10 0 0 2 6 10 0 0 2 17 10 0 0 2 34 10 0 0 2 43 10 0 0 2 56 10 0 0 2 66 17 8 101 100 105 116 86 105 101 119 17 10 97 99 99 101 112 116 79 110 67 82 1 1 16 3 0 66 10 0 0 0 32 8 0 0 0 3 4 0 0 0 0 10 0 0 6 91 10 0 0 6 98 1 1 1 1 1 16 3 0 66 6 6 83 108 105 100 101 114 8 0 0 0 25 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 10 0 0 0 157 10 0 0 0 170 10 0 0 0 183 10 0 0 0 190 10 0 0 0 200 10 0 0 13 138 10 0 0 13 146 10 0 0 13 153 10 0 0 13 171 10 0 0 13 189 10 0 0 13 203 10 0 0 13 216 10 0 0 13 228 10 0 0 13 242 10 0 0 14 0 10 0 0 14 9 10 0 0 14 34 10 0 0 14 59 1 1 16 3 0 66 6 5 77 111 114 112 104 8 0 0 0 7 4 0 0 0 0 10 0 0 0 101 10 0 0 0 109 10 0 0 0 116 10 0 0 0 127 10 0 0 0 139 10 0 0 0 146 1 1 16 3 0 66 6 17 84 101 120 116 70 111 110 116 82 101 102 101 114 101 110 99 101 8 0 0 0 3 4 0 0 0 0 10 0 0 17 184 17 4 102 111 110 116 1 16 3 0 66 6 4 84 101 120 116 8 0 0 0 3 4 0 0 0 0 17 6 115 116 114 105 110 103 17 4 114 117 110 115 1 1 1 1 16 3 0 66 6 7 73 110 116 101 103 101 114 8 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 10 66 121 116 101 83 116 114 105 110 103 8 0 0 0 1 4 0 0 0 0 17 12 115 117 112 101 114 99 108 97 115 115 101 115 16 3 0 32 4 0 0 0 70 8 0 0 0 149 1 1 1 1 1 1 1 16 3 0 66 10 0 0 0 79 10 0 0 3 119 16 3 0 66 10 0 0 1 131 10 0 0 9 122 16 3 0 66 10 0 0 2 79 10 0 0 24 61 16 3 0 66 10 0 0 2 177 10 0 0 6 145 16 3 0 66 10 0 0 3 56 10 0 0 24 61 16 3 0 66 10 0 0 3 202 10 0 0 6 145 16 3 0 66 10 0 0 3 119 10 0 0 20 192 1 1 1 16 3 0 66 10 0 0 3 234 10 0 0 8 223 16 3 0 66 10 0 0 4 8 10 0 0 0 79 16 3 0 66 10 0 0 5 84 10 0 0 15 234 16 3 0 66 10 0 0 5 237 10 0 0 21 226 1 1 16 3 0 66 10 0 0 6 61 10 0 0 0 32 16 3 0 66 10 0 0 6 36 10 0 0 9 22 16 3 0 66 10 0 0 6 109 10 0 0 24 197 16 3 0 66 10 0 0 6 145 10 0 0 21 74 1 1 1 16 3 0 66 10 0 0 6 170 10 0 0 9 22 16 3 0 66 10 0 0 6 191 10 0 0 21 253 1 1 16 3 0 66 10 0 0 6 219 10 0 0 19 212 1 1 1 1 16 3 0 66 10 0 0 7 23 10 0 0 6 145 1 16 3 0 66 10 0 0 7 56 10 0 0 7 23 16 3 0 66 10 0 0 7 110 10 0 0 24 61 1 1 1 1 16 3 0 66 10 0 0 7 209 10 0 0 4 8 1 1 16 3 0 66 10 0 0 8 223 10 0 0 6 145 16 3 0 66 10 0 0 8 195 10 0 0 9 56 16 3 0 66 10 0 0 8 248 10 0 0 6 170 16 3 0 66 10 0 0 8 168 10 0 0 6 145 1 1 1 1 1 16 3 0 66 10 0 0 9 22 10 0 0 9 223 1 16 3 0 66 10 0 0 9 56 10 0 0 22 113 1 1 1 1 16 3 0 66 10 0 0 9 81 10 0 0 6 145 16 3 0 66 10 0 0 9 122 10 0 0 20 192 1 1 1 1 1 1 16 3 0 66 10 0 0 9 198 10 0 0 9 22 1 1 1 16 3 0 66 10 0 0 9 223 10 0 0 10 5 16 3 0 66 10 0 0 10 5 10 0 0 6 145 1 16 3 0 66 10 0 0 10 32 10 0 0 6 145 16 3 0 66 10 0 0 13 62 10 0 0 23 173 16 3 0 66 10 0 0 14 244 10 0 0 9 22 16 3 0 66 10 0 0 15 234 10 0 0 6 145 16 3 0 66 10 0 0 15 58 10 0 0 6 145 16 3 0 66 10 0 0 16 6 10 0 0 9 22 16 3 0 66 10 0 0 16 28 10 0 0 9 56 1 16 3 0 66 10 0 0 16 57 10 0 0 22 113 1 1 1 16 3 0 66 10 0 0 16 108 10 0 0 10 5 16 3 0 66 10 0 0 16 150 10 0 0 6 145 16 3 0 66 10 0 0 17 158 10 0 0 3 202 1 1 16 3 0 66 10 0 0 17 202 10 0 0 6 145 1 1 1 1 1 16 3 0 66 10 0 0 18 119 10 0 0 19 176 16 3 0 66 10 0 0 18 194 10 0 0 19 241 16 3 0 66 10 0 0 21 253 10 0 0 9 198 16 3 0 66 10 0 0 19 212 10 0 0 22 82 16 3 0 66 10 0 0 19 241 10 0 0 20 192 16 3 0 66 10 0 0 19 176 10 0 0 6 145 16 3 0 66 10 0 0 0 66 10 0 0 3 234 16 3 0 66 10 0 0 21 101 10 0 0 6 145 16 3 0 66 10 0 0 21 5 10 0 0 6 145 16 3 0 66 10 0 0 20 192 10 0 0 24 61 16 3 0 66 10 0 0 21 74 17 3 110 105 108 16 3 0 66 10 0 0 21 226 10 0 0 6 145 16 3 0 66 10 0 0 20 118 10 0 0 9 223 16 3 0 66 10 0 0 22 19 10 0 0 9 223 16 3 0 66 10 0 0 22 82 10 0 0 6 145 1 1 16 3 0 66 10 0 0 22 113 10 0 0 8 223 1 16 3 0 66 10 0 0 22 136 10 0 0 6 145 16 3 0 66 10 0 0 22 230 10 0 0 1 131 1 1 16 3 0 66 10 0 0 0 32 10 0 0 16 108 1 1 1 1 1 16 3 0 66 10 0 0 23 173 10 0 0 3 119 1 1 16 3 0 66 10 0 0 24 61 10 0 0 6 145 1 1 16 3 0 66 10 0 0 24 114 10 0 0 17 158 1 16 3 0 66 10 0 0 24 159 10 0 0 9 22 1 1 1 1 16 3 0 66 10 0 0 24 197 10 0 0 22 113 1 16 3 0 66 10 0 0 24 221 10 0 0 9 198 16 10 2 79 15 15 144 242 24 241 106 10 63 255 255 255 8 0 0 0 5 16 35 7 209 15 15 144 242 24 241 106 10 0 0 29 50 8 0 0 0 1 16 10 7 110 15 15 160 243 24 225 105 10 0 0 29 71 8 0 0 0 1 16 24 22 230 15 0 0 0 9 64 86 10 0 0 29 92 8 0 0 0 0 1 16 4 19 176 4 57 158 103 153 4 0 0 0 32 11 128 6 1 7 255 230 230 230 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 9 8 0 0 0 17 1 16 3 0 66 6 23 117 110 102 111 99 117 115 101 100 83 101 108 101 99 116 105 111 110 67 111 108 111 114 16 4 19 176 4 7 52 129 32 1 1 16 3 0 66 6 11 100 114 111 112 69 110 97 98 108 101 100 2 1 1 1 16 3 0 66 6 10 98 108 105 110 107 83 116 97 114 116 16 7 6 109 4 0 0 0 142 4 0 0 0 72 4 0 0 0 252 4 0 0 0 207 4 0 0 0 94 4 0 0 0 3 16 3 0 66 6 10 99 97 114 101 116 67 111 108 111 114 16 4 19 176 4 58 216 212 0 4 0 0 0 32 11 128 6 1 7 255 235 141 0 1 16 3 0 66 6 21 105 110 100 105 99 97 116 101 75 101 121 98 111 97 114 100 70 111 99 117 115 6 5 110 101 118 101 114 1 16 3 0 66 6 10 97 110 105 109 97 116 105 111 110 115 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 6 14 115 101 108 101 99 116 105 111 110 67 111 108 111 114 16 4 19 176 4 7 86 25 134 4 0 0 0 32 11 128 6 1 7 255 29 97 97 16 3 0 66 6 11 100 114 97 103 69 110 97 98 108 101 100 2 1 16 3 0 66 6 17 115 105 103 110 97 108 67 111 110 110 101 99 116 105 111 110 115 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 1 4 0 0 0 0 16 4 19 176 4 0 0 0 0 4 0 0 0 32 11 128 6 1 7 255 0 0 1 16 13 15 58 8 0 0 0 1 16 5 22 136 10 0 0 5 84 1 6 30 102 97 109 105 108 121 78 97 109 101 58 112 111 105 110 116 83 105 122 101 58 101 109 112 104 97 115 105 115 58 8 0 0 0 3 17 17 66 105 116 115 116 114 101 97 109 86 101 114 97 83 97 110 115 4 0 0 0 20 4 0 0 0 0 1 4 0 0 0 28 4 0 0 0 22 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 16 5 22 136 6 13 84 101 120 116 67 111 110 115 116 97 110 116 115 1 6 3 97 116 58 8 0 0 0 1 6 16 68 101 102 97 117 108 116 84 97 98 115 65 114 114 97 121 16 5 22 136 10 0 0 31 159 1 10 0 0 31 175 8 0 0 0 1 6 22 68 101 102 97 117 108 116 77 97 114 103 105 110 84 97 98 115 65 114 114 97 121 4 0 0 0 2 1 16 3 24 159 17 33 68 105 101 115 32 105 115 116 32 101 105 110 32 84 101 120 116 109 111 114 112 104 32 109 105 116 32 73 110 104 97 108 116 16 6 14 244 8 0 0 0 1 4 0 0 0 33 8 0 0 0 1 8 0 0 0 1 16 3 24 114 1 10 0 0 31 48 4 0 0 0 24 4 0 0 0 1 4 0 0 0 23 2 16 18 16 150 10 0 0 31 253 16 13 15 58 10 0 0 31 43 1 4 0 0 0 28 4 0 0 0 22 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 4 0 0 0 0 10 0 0 31 155 10 0 0 31 203 4 0 0 0 2 1 4 0 0 0 1 16 3 9 81 16 3 8 168 4 0 0 0 3 4 0 0 0 0 16 3 8 168 4 0 0 0 148 4 0 152 150 127 8 0 0 0 3 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 0 4 0 0 0 28 4 0 0 0 1 4 0 0 0 13 4 0 0 0 2 4 0 0 0 21 4 0 0 0 22 1 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 28 4 0 0 0 56 4 0 0 0 14 4 0 0 0 23 4 0 0 0 0 4 0 0 0 22 4 0 0 0 22 1 16 11 21 101 4 0 0 0 3 4 0 0 0 148 4 0 0 0 56 4 0 0 0 84 4 0 0 0 24 4 0 0 0 33 4 0 0 0 0 4 0 0 0 37 4 0 0 0 22 1 16 3 8 168 4 0 0 0 0 4 0 0 0 0 4 0 0 0 32 4 0 0 0 127 1 1 3 3 1 1 10 0 0 30 58 10 0 0 30 182 10 0 0 29 216 1 1 1 1 1 15 0 48 0 0 0 0 1 1 1 10 0 0 29 71 3 1 16 5 18 119 4 0 0 0 0 1 1 4 0 0 0 0 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 3 8 0 0 0 5 1 1 16 3 0 66 6 13 99 108 105 112 83 117 98 109 111 114 112 104 115 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 4 7 56 16 3 8 168 4 255 255 255 6 4 255 255 255 13 14 0 0 0 0 0 0 0 0 14 63 240 0 0 0 0 0 0 4 0 0 0 1 10 0 0 29 117 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 15 8 0 0 0 23 1 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 82 101 97 100 79 110 108 121 16 4 19 176 4 44 169 74 238 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 1 1 16 3 0 66 6 9 109 105 110 72 101 105 103 104 116 4 0 0 0 20 16 3 0 66 6 19 97 100 111 114 110 109 101 110 116 78 111 114 109 97 108 69 100 105 116 16 4 19 176 4 55 185 57 125 1 1 1 16 3 0 66 6 11 98 111 114 100 101 114 83 116 121 108 101 16 4 5 237 1 16 4 19 176 4 0 80 20 5 4 0 0 0 32 11 128 6 1 7 255 1 1 1 4 0 0 0 1 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 1 16 3 0 66 6 15 119 114 97 112 66 111 114 100 101 114 67 111 108 111 114 16 5 18 119 4 49 44 75 18 1 1 4 0 0 0 76 16 3 0 66 6 13 97 100 111 114 110 109 101 110 116 68 105 102 102 16 4 19 176 4 21 40 169 38 1 1 1 16 3 0 66 6 15 97 100 111 114 110 109 101 110 116 82 101 102 117 115 101 16 4 19 176 4 25 248 142 148 1 1 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 67 111 110 102 108 105 99 116 16 4 19 176 4 47 244 1 0 1 1 16 3 0 66 6 8 109 105 110 87 105 100 116 104 4 0 0 0 10 16 3 0 66 6 19 102 114 97 109 101 65 100 111 114 110 109 101 110 116 87 105 100 116 104 4 0 0 0 2 16 3 0 66 6 22 107 101 121 98 111 97 114 100 67 97 112 116 117 114 101 70 105 108 116 101 114 115 16 2 8 248 10 0 0 29 71 16 3 0 66 6 17 97 100 111 114 110 109 101 110 116 68 105 102 102 69 100 105 116 16 4 19 176 4 43 58 28 164 1 1 16 3 0 66 6 13 97 99 99 101 112 116 82 101 115 99 97 108 101 2 4 0 0 0 1 10 0 0 35 0 1 1 3 16 37 13 62 15 24 80 242 24 241 106 1 8 0 0 0 6 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 4 19 176 4 18 228 185 46 4 0 0 0 32 11 128 6 1 7 255 75 75 75 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 18 109 111 117 115 101 68 111 119 110 73 110 83 108 105 100 101 114 58 10 0 0 36 98 6 15 115 99 114 111 108 108 65 98 115 111 108 117 116 101 58 1 1 10 0 0 36 98 6 16 109 111 117 115 101 85 112 73 110 83 108 105 100 101 114 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 0 80 20 5 1 1 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 5 18 119 4 18 228 185 46 1 1 4 0 0 0 178 16 12 17 202 3 3 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 33 154 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 33 154 16 9 9 122 15 24 81 96 24 241 106 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 81 96 24 241 106 10 0 0 37 237 8 0 0 0 0 1 16 4 19 176 4 0 0 3 255 4 0 0 0 32 11 128 6 1 7 255 0 0 255 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 38 100 133 0 22 255 1 1 1 25 0 18 255 1 1 1 25 0 14 255 1 1 1 33 0 10 255 1 1 1 33 0 7 255 1 1 1 97 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 14 115 99 114 111 108 108 68 111 119 110 73 110 105 116 1 1 1 1 10 0 0 36 98 6 17 102 105 110 105 115 104 101 100 83 99 114 111 108 108 105 110 103 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 240 252 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 80 242 24 240 252 10 0 0 39 93 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 38 100 141 0 7 255 1 1 1 33 0 10 255 1 1 1 33 0 14 255 1 1 1 25 0 18 255 1 1 1 25 0 22 255 1 1 1 89 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 12 115 99 114 111 108 108 85 112 73 110 105 116 1 1 1 1 10 0 0 36 98 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 240 252 10 0 0 36 98 8 0 0 0 1 16 8 3 56 15 24 80 242 24 240 252 10 0 0 40 171 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 31 100 133 0 18 255 1 1 1 25 0 18 255 1 1 1 25 0 18 255 1 1 1 25 0 18 255 1 1 1 133 0 4 0 0 0 10 4 0 0 0 10 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 20 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 68 111 119 110 58 1 1 1 1 1 1 10 0 0 36 98 6 21 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 69 110 116 101 114 58 10 0 0 36 98 6 21 109 101 110 117 66 117 116 116 111 110 77 111 117 115 101 76 101 97 118 101 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 37 51 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 37 51 16 9 9 122 15 24 80 242 24 241 106 10 0 0 36 98 10 0 0 29 129 1 16 5 18 119 4 13 195 112 220 1 1 4 0 0 0 89 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 36 98 6 15 115 99 114 111 108 108 80 97 103 101 73 110 105 116 58 1 1 1 1 10 0 0 36 98 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 63 255 252 0 4 0 0 0 32 11 128 6 1 7 255 255 255 0 4 0 0 0 2 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 43 7 10 0 0 29 71 1 3 10 0 0 36 115 10 0 0 34 48 6 16 118 83 99 114 111 108 108 66 97 114 86 97 108 117 101 58 1 10 0 0 37 106 10 0 0 36 137 3 1 4 0 0 0 0 4 0 0 0 1 1 1 6 8 118 101 114 116 105 99 97 108 10 0 0 40 171 10 0 0 39 93 10 0 0 37 237 10 0 0 42 38 4 0 0 0 28 4 0 0 1 24 14 63 240 0 0 0 0 0 0 6 28 118 83 99 114 111 108 108 66 97 114 77 101 110 117 66 117 116 116 111 110 80 114 101 115 115 101 100 58 1 1 1 1 10 0 0 29 92 3 3 1 1 3 16 37 13 62 15 0 0 0 0 64 8 1 8 0 0 0 6 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 10 0 0 36 137 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 36 182 10 0 0 43 227 10 0 0 36 207 1 1 10 0 0 43 227 10 0 0 36 231 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 16 4 19 176 4 0 80 20 5 1 1 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 16 5 18 119 4 18 228 185 46 1 1 4 0 0 0 178 16 12 17 202 3 3 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 33 154 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 33 154 16 9 9 122 15 255 192 0 0 64 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 255 192 0 0 64 8 10 0 0 45 52 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 24 64 109 0 10 255 1 1 1 25 0 14 255 1 1 1 21 0 7 255 1 1 1 81 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 38 198 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 128 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 0 0 0 0 128 8 10 0 0 46 107 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 24 64 117 0 7 255 1 1 1 21 0 14 255 1 1 1 25 0 10 255 1 1 1 73 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 40 36 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 128 8 10 0 0 43 227 8 0 0 0 1 16 8 3 56 15 0 0 0 0 128 8 10 0 0 47 162 10 0 0 38 18 1 10 0 0 38 24 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 6 6 219 7 0 0 0 17 64 109 0 10 255 1 1 1 25 0 10 255 1 1 1 109 0 4 0 0 0 8 4 0 0 0 8 4 0 0 0 32 1 1 10 0 0 36 137 16 12 17 202 3 3 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 41 107 1 1 1 1 1 1 10 0 0 43 227 10 0 0 41 140 10 0 0 43 227 10 0 0 41 168 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 44 122 4 0 0 0 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 1 10 0 0 44 122 16 9 9 122 15 0 0 0 0 64 8 10 0 0 43 227 10 0 0 29 129 1 16 5 18 119 4 13 195 112 220 1 1 4 0 0 0 89 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 10 0 0 43 227 10 0 0 42 98 1 1 1 1 10 0 0 43 227 10 0 0 38 223 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 1 8 0 0 0 5 1 1 1 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 2 8 0 0 0 5 1 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 43 7 4 0 0 0 2 1 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 0 10 0 0 43 7 10 0 0 29 71 1 3 10 0 0 43 244 10 0 0 34 48 6 16 104 83 99 114 111 108 108 66 97 114 86 97 108 117 101 58 1 10 0 0 44 177 10 0 0 36 137 3 1 4 0 0 0 0 4 0 0 0 1 1 1 6 10 104 111 114 105 122 111 110 116 97 108 10 0 0 47 162 10 0 0 46 107 10 0 0 45 52 10 0 0 48 218 4 0 0 0 10 4 0 0 0 100 10 0 0 43 174 6 28 104 83 99 114 111 108 108 66 97 114 77 101 110 117 66 117 116 116 111 110 80 114 101 115 115 101 100 58 1 1 1 1 10 0 0 30 109 6 10 119 104 101 110 78 101 101 100 101 100 4 0 0 0 10 10 0 0 29 113 1 1 1 2 2 16 4 20 118 4 0 0 0 34 4 0 0 0 33 4 0 0 0 1 3 1 1 4 0 0 0 11 16 3 16 57 4 0 0 0 237 4 0 0 0 100 16 9 9 122 15 15 64 237 15 224 247 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 6 28 100 114 97 103 67 111 114 110 101 114 58 101 118 101 110 116 58 102 114 111 109 72 97 110 100 108 101 58 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 6 18 109 111 114 112 104 105 99 76 97 121 101 114 78 117 109 98 101 114 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 24 160 237 25 64 247 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 2 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 24 161 101 25 65 111 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 3 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 16 9 9 122 15 15 65 101 15 225 111 10 0 0 29 50 10 0 0 29 129 1 10 0 0 31 16 16 12 17 202 3 2 3 1 1 1 3 1 1 16 37 10 32 1 1 10 0 0 29 50 10 0 0 50 233 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 0 0 0 4 1 1 1 1 1 1 1 1 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 10 0 0 51 61 4 0 0 0 200 1 16 3 0 66 10 0 0 34 238 16 4 5 237 1 10 0 0 31 16 4 0 0 0 2 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 4 0 0 0 2 10 0 0 31 16 1 10 0 0 33 154 16 12 17 202 3 2 3 1 1 1 3 1 1 1 16 3 6 61 4 0 0 0 4 8 0 0 0 5 16 3 0 66 6 11 108 97 121 111 117 116 70 114 97 109 101 16 9 2 177 16 3 16 57 4 0 0 0 47 4 0 0 1 60 4 0 0 0 0 16 3 16 57 4 0 0 0 1 4 0 0 0 79 4 0 0 0 0 16 3 16 57 4 0 0 0 197 4 0 0 1 60 4 0 0 0 0 16 3 16 57 4 0 0 0 41 4 0 0 0 79 4 0 0 0 0 16 3 0 66 6 16 108 97 121 111 117 116 80 114 111 112 101 114 116 105 101 115 16 4 21 5 6 9 115 112 97 99 101 70 105 108 108 10 0 0 54 239 3 1 16 3 0 66 10 0 0 30 121 16 4 22 19 8 0 0 0 10 1 1 1 1 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 0 16 3 0 66 10 0 0 30 228 16 3 0 32 4 0 0 0 0 8 0 0 0 5 1 1 1 1 1 16 4 22 19 8 0 0 0 10 10 0 0 50 182 10 0 0 51 187 10 0 0 52 152 10 0 0 53 117 1 1 1 1 1 1 4 0 0 0 1 4 0 0 0 4 2 10 0 0 29 71 33 13 13] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json index f92000e..56828cd 100644 --- a/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationLoaderTest.class/methodProperties.json @@ -8,17 +8,17 @@ "mockEmptyPresentationDirectory" : "LB 7/24/2018 17:33", "morphLoadingStreamFor:" : "MK 7/20/2018 15:48", "setUp" : "MK 7/20/2018 15:46", - "testCanLoadEmptyPresentation" : "MK 7/20/2018 15:49", - "testCanLoadEmptySlide" : "MK 7/20/2018 15:48", + "testCanLoadEmptyPresentation" : "LM 7/25/2018 13:09", + "testCanLoadEmptySlide" : "LM 7/25/2018 13:10", "testEmptyPresentationDirectoryIsValid" : "MK 7/20/2018 15:50", "testErrorReportExistsPerSlide" : "MK 7/20/2018 15:51", "testInvalidLoadReturnsNil" : "MK 7/20/2018 15:51", "testInvalidSlideDirectoryNames" : "LB 7/24/2018 17:35", - "testLoadCompletePresentation" : "LB 7/24/2018 17:41", + "testLoadCompletePresentation" : "LM 7/25/2018 13:12", "testMissingSlidesDirectory" : "LB 7/24/2018 17:39", - "testMorphLoadIsValid" : "LB 7/24/2018 17:44", + "testMorphLoadIsValid" : "LM 7/25/2018 13:14", "testMorphNameIsNotNumber" : "LB 7/24/2018 17:39", "testMorphNameIsNumber" : "LB 7/24/2018 17:39", "testSlidesDirectoryIsEmpty" : "LB 7/24/2018 17:39", - "testSortMorphFiles" : "LB 7/24/2018 17:46", - "validMorphFileData" : "LB 7/24/2018 17:47" } } + "testSortMorphFiles" : "LM 7/25/2018 13:14", + "validMorphFileData" : "LM 7/25/2018 13:14" } } diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st index 17ee286..0c2b95e 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testContextMenu.st @@ -1,5 +1,6 @@ context menu tests testContextMenu - self assertContextMenuContent: self textField equals: - (self textField owner defaultContextMenuContent, self textField customContextMenuContent) \ No newline at end of file + self + assertContextMenuContent: self textField + equals: (self textField owner defaultContextMenuContent, self textField customContextMenuContent) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json index 7d82ce9..f4456c0 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -6,7 +6,7 @@ "setUp" : "LB 6/1/2018 18:12", "tearDown" : "LB 6/1/2018 18:21", "testBackgroundColorDialog" : "LM 7/25/2018 11:35", - "testContextMenu" : "MK 7/25/2018 11:33", + "testContextMenu" : "LM 7/25/2018 13:07", "testFontColorDialog" : "LM 7/25/2018 11:34", "testFontSizeDialog" : "MK 7/13/2018 18:10", "testLocalFontColor" : "JZ 7/25/2018 11:41", From 94ade93461ff64f2de8f5d7de47fad06830df317 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 13:17:45 +0200 Subject: [PATCH 097/112] Refactoring --- .../testCurrentMiniatureHighlighted.st | 2 +- .../instance/testEnterNonInteractiveMode.st | 2 +- .../instance/testLeaveNonInteractiveMode.st | 2 +- .../instance/testMoveSlide.st | 2 +- .../instance/testMoveSlideOutOfBounds.st | 2 +- .../testMovedSlideStayCurrentSlide.st | 2 +- .../instance/testNextSlide.st | 2 +- ...estNonInteractivetyInNonInteractiveMode.st | 2 +- .../instance/testOccupiesWorldOnStep.st | 2 +- .../instance/testSelectSlide.st | 4 +-- .../instance/testSelectSlideClamps.st | 6 ++-- .../instance/testSlideContainerExtent.st | 2 +- .../instance/testSlideContainerPosition.st | 4 +-- .../testSlideNavigationInPresentationMode.st | 2 +- ...testSlidesReceiveEnablePresentationMode.st | 2 +- .../methodProperties.json | 30 +++++++++---------- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st index 1f12749..6fcb9b8 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st @@ -2,5 +2,5 @@ miniature view tests testCurrentMiniatureHighlighted 5 timesRepeat: [self createSlide]. - self tool selectSlideNumber: 5. + self selectSlideNumber: 5. self assert: self tool currentMiniature isHighlighted \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index 118a7c8..bd1b609 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -1,7 +1,7 @@ presentation mode tests testEnterNonInteractiveMode - self tool enablePresentationMode. + self enablePresentationMode. self pressKey: $i at: self slideContainer center. self assert: self tool isInteractive equals: false. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st index 425f015..ee51969 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st @@ -1,7 +1,7 @@ presentation mode tests testLeaveNonInteractiveMode - self tool enablePresentationMode. + self enablePresentationMode. self pressKey: $i at: self slideContainer center. self pressKey: $i at: self slideContainer center. self assert: self tool isInteractive equals: true diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st index ec9ac8a..2ac7193 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st @@ -5,7 +5,7 @@ testMoveSlide 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. - self tool selectSlideNumber: 1. + self selectSlideNumber: 1. self tool moveCurrentSlideTo: 3. self assert: (self slides indexOf: slide startingAt: 0) equals: 3. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st index cb8a9d0..c0de061 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st @@ -5,7 +5,7 @@ testMoveSlideOutOfBounds 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. - self tool selectSlideNumber: 1. + self selectSlideNumber: 1. self tool moveCurrentSlideTo: 100. "no slide with number 100 exists" self assert: (self slides indexOf: slide startingAt: 0) equals: 5. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st index 20369bc..d7e6500 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st @@ -5,6 +5,6 @@ testMovedSlideStayCurrentSlide 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. - self tool selectSlideNumber: 1. + self selectSlideNumber: 1. self tool moveCurrentSlideTo: 5. self assert: slide = self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st index 1c28a40..99520dc 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st @@ -2,7 +2,7 @@ slide navigation tests testNextSlide self createSlide. - self tool selectSlideNumber: 1. + self selectSlideNumber: 1. self assert: self currentSlide = self slides first. self tool nextSlide. self assert: self currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st index b630d55..00d9a54 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st @@ -3,7 +3,7 @@ testNonInteractivetyInNonInteractiveMode | testMorph | testMorph := PSMockMorph new. - self tool enablePresentationMode. + self enablePresentationMode. self slideContainer currentSlide addContent: testMorph. self pressKey: $i at: self slideContainer center. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st index 4bf8db9..38441d5 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testOccupiesWorldOnStep.st @@ -1,7 +1,7 @@ presentation mode tests testOccupiesWorldOnStep - self tool enablePresentationMode. + self enablePresentationMode. self slideContainer extent: self slideContainer extent / 2. self deny: self slideContainer occupiesWorld. self slideContainer step. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st index 664d1b9..01564ee 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st @@ -2,8 +2,8 @@ slide navigation tests testSelectSlide self createSlide. - self tool selectSlideNumber: 1. + self selectSlideNumber: 1. self assert: self currentSlide = self slides first. - self tool selectSlideNumber: 2. + self selectSlideNumber: 2. self assert: self currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index e5d44d3..8aafd77 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -2,11 +2,11 @@ slide navigation tests testSelectSlideClamps self createSlide. - self tool selectSlideNumber: 3. + self selectSlideNumber: 3. self assert: self tool currentSlide = self slides last. - self tool selectSlideNumber: 0. + self selectSlideNumber: 0. self assert: self currentSlide = self slides first. - self tool selectSlideNumber: -1. + self selectSlideNumber: -1. self assert: self currentSlide = self slides first. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st index 05ce038..9c7697d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st @@ -2,5 +2,5 @@ presentation mode tests testSlideContainerExtent self assert: self slideContainer extent ~= self slideContainer world extent. - self tool enablePresentationMode. + self enablePresentationMode. self assert: self slideContainer extent equals: self slideContainer world extent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st index 3b86c1f..36980ee 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st @@ -1,5 +1,5 @@ presentation mode tests testSlideContainerPosition - self tool enablePresentationMode. - self assert: self tool slideContainer position equals: 0@0 \ No newline at end of file + self enablePresentationMode. + self assert: self slideContainer position equals: 0@0 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st index f0abe66..19ed3e0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st @@ -7,5 +7,5 @@ testSlideNavigationInPresentationMode enablePresentationMode. self assert: self slideContainer currentSlide equals: self currentSlide. - self tool selectSlideNumber: 2. + self selectSlideNumber: 2. self assert: self slideContainer currentSlide equals: self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st index 8407aee..1f1c774 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st @@ -3,6 +3,6 @@ testSlidesReceiveEnablePresentationMode self createSlide. self slides: (self slides collect: [:each | PSMockSlide new]). - self tool enablePresentationMode. + self enablePresentationMode. self slides do: [:each | self assert: each receivedPresentationModeEnable] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 35c0c06..308b66c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -19,16 +19,16 @@ "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", - "testCurrentMiniatureHighlighted" : "MK 7/25/2018 13:01", + "testCurrentMiniatureHighlighted" : "MK 7/25/2018 13:15", "testDefaultSlideCount" : "MK 7/25/2018 12:49", "testDeleteFirstSlide" : "MK 7/25/2018 12:51", "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:53", "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", "testDuplicateSlide" : "MK 7/25/2018 12:51", "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", - "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", + "testEnterNonInteractiveMode" : "MK 7/25/2018 13:12", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", - "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", + "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:12", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "MK 7/25/2018 13:10", @@ -36,29 +36,29 @@ "testMiniatureCreated" : "MK 7/25/2018 13:01", "testMiniatureDeleted" : "MK 7/25/2018 13:00", "testMiniatureSelects" : "MK 7/25/2018 13:01", - "testMoveSlide" : "MK 7/25/2018 13:02", - "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:02", - "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:02", - "testNextSlide" : "MK 7/25/2018 13:03", - "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", + "testMoveSlide" : "MK 7/25/2018 13:16", + "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:16", + "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:16", + "testNextSlide" : "MK 7/25/2018 13:16", + "testNonInteractivetyInNonInteractiveMode" : "MK 7/25/2018 13:13", "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", - "testOccupiesWorldOnStep" : "LB 7/24/2018 16:48", + "testOccupiesWorldOnStep" : "MK 7/25/2018 13:13", "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", - "testSelectSlide" : "MK 7/25/2018 13:03", - "testSelectSlideClamps" : "MK 7/25/2018 13:03", + "testSelectSlide" : "MK 7/25/2018 13:16", + "testSelectSlideClamps" : "MK 7/25/2018 13:17", "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", - "testSlideContainerExtent" : "WoC 6/15/2018 18:51", - "testSlideContainerPosition" : "LB 7/24/2018 16:47", + "testSlideContainerExtent" : "MK 7/25/2018 13:13", + "testSlideContainerPosition" : "MK 7/25/2018 13:14", "testSlideCreation" : "MK 7/25/2018 13:04", "testSlideCreationReturnsSlide" : "MK 7/25/2018 13:04", "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", - "testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:09", + "testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:17", "testSlideNumberLabelSelectsCorrectly" : "MK 7/25/2018 13:05", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", - "testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:05", + "testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:14", "testZeroSlidesRegression" : "LB 7/24/2018 18:28", "testnextSlideClampsToMax" : "WoC 7/24/2018 17:29", "tool" : "LM 5/16/2018 17:13", From 7cc4ed08d95f2ffd1f151d5d04b26285ba28afc8 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:20:34 +0200 Subject: [PATCH 098/112] Refactoring --- .../instance/testEnterNonInteractiveMode.st | 5 +++-- .../PSPresentationToolTest.class/methodProperties.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index 118a7c8..0ef8a82 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -2,7 +2,8 @@ presentation mode tests testEnterNonInteractiveMode self tool enablePresentationMode. - self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: false. + self + pressKey: $i at: self slideContainer center; + deny: self tool isInteractive. self tool disablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 35c0c06..489211d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -26,7 +26,7 @@ "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", "testDuplicateSlide" : "MK 7/25/2018 12:51", "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", - "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", + "testEnterNonInteractiveMode" : "LM 7/25/2018 13:19", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", From 3435239709f29917d9374bf0eb93dc4a5a8b4088 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:21:59 +0200 Subject: [PATCH 099/112] Refactoring --- .../instance/testEnterNonInteractiveMode.st | 2 +- .../PSPresentationToolTest.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index 0ef8a82..9c455a4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -1,7 +1,7 @@ presentation mode tests testEnterNonInteractiveMode - self tool enablePresentationMode. + self enablePresentationMode. self pressKey: $i at: self slideContainer center; deny: self tool isInteractive. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 77ea206..142a7a0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -26,7 +26,7 @@ "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", "testDuplicateSlide" : "MK 7/25/2018 12:51", "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", - "testEnterNonInteractiveMode" : "LM 7/25/2018 13:19", + "testEnterNonInteractiveMode" : "LM 7/25/2018 13:21", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:12", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", From 2b367903500aaa62a4093a198f88e3f62eef3a40 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 13:24:11 +0200 Subject: [PATCH 100/112] refactoring --- .../instance/testDuplicatedSlidesContent.st | 5 ++++- .../instance/testNextSlide.st | 5 +++-- ...eClampsToMax.st => testNextSlideClampsToMax.st} | 4 ++-- .../instance/testPreviousSlideClampsToMin.st | 2 +- .../instance/testSelectSlideClamps.st | 6 +++--- .../instance/testSlideCreation.st | 1 + .../instance/testSlideCreationReturnsSlide.st | 2 +- .../methodProperties.json | 14 +++++++------- 8 files changed, 22 insertions(+), 17 deletions(-) rename packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/{testnextSlideClampsToMax.st => testNextSlideClampsToMax.st} (55%) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st index ca5bbb3..5a7a602 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st @@ -6,4 +6,7 @@ testDuplicatedSlidesContent slide addContent: (Morph new center: slide center). self tool duplicateCurrentSlide. duplicatedSlide := self slideAt: self currentSlideNumber +1. - slide submorphs withIndexDo: [:each :index | self assert: each center equals: (duplicatedSlide submorphs at: index) center] \ No newline at end of file + slide submorphs withIndexDo: [:each :index | + self + assert: each center + equals: (duplicatedSlide submorphs at: index) center] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st index 1c28a40..a9a50e5 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st @@ -3,6 +3,7 @@ testNextSlide self createSlide. self tool selectSlideNumber: 1. - self assert: self currentSlide = self slides first. + + self assert: self currentSlide equals: self slides first. self tool nextSlide. - self assert: self currentSlide = self slides second \ No newline at end of file + self assert: self currentSlide equals: self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlideClampsToMax.st similarity index 55% rename from packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st rename to packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlideClampsToMax.st index 0fc5b45..4778c88 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testnextSlideClampsToMax.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlideClampsToMax.st @@ -1,6 +1,6 @@ slide navigation tests -testnextSlideClampsToMax +testNextSlideClampsToMax self assert: self currentSlide equals: self slides last. self tool nextSlide. - self assert: self currentSlide equals: self slides last. \ No newline at end of file + self assert: self currentSlide equals: self slides last \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st index 9c50cfa..15462b9 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testPreviousSlideClampsToMin.st @@ -3,4 +3,4 @@ testPreviousSlideClampsToMin self assert: self currentSlide = self slides first. self tool previousSlide. - self assert: self currentSlide = self slides first. \ No newline at end of file + self assert: self currentSlide = self slides first \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index e5d44d3..e39d5dc 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -3,10 +3,10 @@ testSelectSlideClamps self createSlide. self tool selectSlideNumber: 3. - self assert: self tool currentSlide = self slides last. + self assert: self tool currentSlide equals: self slides last. self tool selectSlideNumber: 0. - self assert: self currentSlide = self slides first. + self assert: self currentSlide equals: self slides first. self tool selectSlideNumber: -1. - self assert: self currentSlide = self slides first. \ No newline at end of file + self assert: self currentSlide equals: self slides first \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st index c79b1c6..d468007 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st @@ -4,6 +4,7 @@ testSlideCreation | slideCount newSlide | slideCount := self slideCount. newSlide := self createSlide. + self assert: self slideCount equals: (slideCount + 1). self assert: (self slides includes: newSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st index 88851b4..ac56b12 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationReturnsSlide.st @@ -3,4 +3,4 @@ testSlideCreationReturnsSlide | slide | slide := self createSlide. - self assert: slide = self currentSlide \ No newline at end of file + self assert: slide equals: self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index a28153d..5245b3a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -25,7 +25,7 @@ "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:53", "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", "testDuplicateSlide" : "MK 7/25/2018 12:51", - "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", + "testDuplicatedSlidesContent" : "WoC 7/25/2018 13:19", "testEnterNonInteractiveMode" : "WoC 7/24/2018 17:40", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", "testLeaveNonInteractiveMode" : "WoC 7/24/2018 17:41", @@ -39,19 +39,20 @@ "testMoveSlide" : "MK 7/25/2018 13:02", "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:02", "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:02", - "testNextSlide" : "MK 7/25/2018 13:03", + "testNextSlide" : "WoC 7/25/2018 13:15", + "testNextSlideClampsToMax" : "WoC 7/25/2018 13:14", "testNonInteractivetyInNonInteractiveMode" : "LM 7/24/2018 15:12", "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", "testOccupiesWorldOnStep" : "LB 7/24/2018 16:48", - "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", + "testPreviousSlideClampsToMin" : "WoC 7/25/2018 13:14", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", "testSelectSlide" : "MK 7/25/2018 13:03", - "testSelectSlideClamps" : "MK 7/25/2018 13:03", + "testSelectSlideClamps" : "WoC 7/25/2018 13:14", "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", "testSlideContainerExtent" : "WoC 6/15/2018 18:51", "testSlideContainerPosition" : "LB 7/24/2018 16:47", - "testSlideCreation" : "MK 7/25/2018 13:04", - "testSlideCreationReturnsSlide" : "MK 7/25/2018 13:04", + "testSlideCreation" : "WoC 7/25/2018 13:19", + "testSlideCreationReturnsSlide" : "WoC 7/25/2018 13:18", "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", "testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:09", @@ -60,7 +61,6 @@ "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:05", "testZeroSlidesRegression" : "LB 7/24/2018 18:28", - "testnextSlideClampsToMax" : "WoC 7/25/2018 12:46", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", "window:" : "LM 5/11/2018 17:59" } } From ddba7fd437a2efde0bb2a98e892032956ea8ebfe Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:25:09 +0200 Subject: [PATCH 101/112] Refactoring --- .../instance/testLeaveNonInteractiveMode.st | 10 +++++----- ...aveNonInteractiveModeWhenLeavingPresentation.st | 7 ++++--- .../testNonInteractivetyInNonInteractiveMode.st | 14 ++++++-------- .../methodProperties.json | 6 +++--- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st index ee51969..66d03c5 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st @@ -1,8 +1,8 @@ presentation mode tests testLeaveNonInteractiveMode - self enablePresentationMode. - self pressKey: $i at: self slideContainer center. - self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: true - \ No newline at end of file + self + enablePresentationMode; + pressKey: $i at: self slideContainer center; + pressKey: $i at: self slideContainer center; + assert: self tool isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st index 2094c20..b411192 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st @@ -1,7 +1,8 @@ presentation mode tests testLeaveNonInteractiveModeWhenLeavingPresentation - self pressKey: $i at: self slideContainer center. - self pressKey: Character escape at: self slideContainer center. - self assert: self tool isInteractive equals: true + self + pressKey: $i at: self slideContainer center; + pressKey: Character escape at: self slideContainer center; + assert: self tool isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st index 00d9a54..c898a52 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNonInteractivetyInNonInteractiveMode.st @@ -7,12 +7,10 @@ testNonInteractivetyInNonInteractiveMode self slideContainer currentSlide addContent: testMorph. self pressKey: $i at: self slideContainer center. - self pressKey: $a at: self slideContainer center. - self click: MouseEvent redButton at: self slideContainer center. + self + pressKey: $a at: self slideContainer center; + click: MouseEvent redButton at: self slideContainer center. - self assert: testMorph receivedMouseEvents equals: 0. - self assert: testMorph receivedKeyboardEvents equals: 0. - - self slideContainer disableNonInteractiveMode. - self tool disablePresentationMode. - testMorph abandon \ No newline at end of file + self + assert: testMorph receivedMouseEvents equals: 0; + assert: testMorph receivedKeyboardEvents equals: 0. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 142a7a0..f8715d4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -28,8 +28,8 @@ "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", "testEnterNonInteractiveMode" : "LM 7/25/2018 13:21", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", - "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:12", - "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", + "testLeaveNonInteractiveMode" : "LM 7/25/2018 13:23", + "testLeaveNonInteractiveModeWhenLeavingPresentation" : "LM 7/25/2018 13:23", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "MK 7/25/2018 13:10", "testMiniatureChangesIfSlideChanges" : "LB 7/24/2018 18:15", @@ -40,7 +40,7 @@ "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:16", "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:16", "testNextSlide" : "MK 7/25/2018 13:16", - "testNonInteractivetyInNonInteractiveMode" : "MK 7/25/2018 13:13", + "testNonInteractivetyInNonInteractiveMode" : "LM 7/25/2018 13:24", "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", "testOccupiesWorldOnStep" : "MK 7/25/2018 13:13", "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", From 099337eab2c09b046a370b3a96ffbc43d61c59e3 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:26:21 +0200 Subject: [PATCH 102/112] Refactoring --- .../instance/testNotEnterNonInteractiveModeInEditMode.st | 5 +++-- .../PSPresentationToolTest.class/methodProperties.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st index 05d0f30..c54360b 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st @@ -1,5 +1,6 @@ presentation mode tests testNotEnterNonInteractiveModeInEditMode - self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: true \ No newline at end of file + self + pressKey: $i at: self slideContainer center; + assert: self tool isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index f8715d4..0874cf4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -41,7 +41,7 @@ "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:16", "testNextSlide" : "MK 7/25/2018 13:16", "testNonInteractivetyInNonInteractiveMode" : "LM 7/25/2018 13:24", - "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", + "testNotEnterNonInteractiveModeInEditMode" : "LM 7/25/2018 13:25", "testOccupiesWorldOnStep" : "MK 7/25/2018 13:13", "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", From af9f5f0cdafe6a51d28b6aa4dced7deb3ba60e9b Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:29:39 +0200 Subject: [PATCH 103/112] Enter commit log message here --- .../instance/testSlideContainerExtent.st | 7 ++++--- .../instance/testSlideContainerPosition.st | 6 ++++-- .../instance/testSlideNavigationInPresentationMode.st | 7 ++++--- .../instance/testSlidesReceiveEnablePresentationMode.st | 7 ++++--- .../PSPresentationToolTest.class/methodProperties.json | 8 ++++---- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st index 9c7697d..b075c0d 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st @@ -1,6 +1,7 @@ presentation mode tests testSlideContainerExtent - self assert: self slideContainer extent ~= self slideContainer world extent. - self enablePresentationMode. - self assert: self slideContainer extent equals: self slideContainer world extent \ No newline at end of file + self + assert: self slideContainer extent ~= self slideContainer world extent; + enablePresentationMode; + assert: self slideContainer extent equals: self slideContainer world extent \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st index 36980ee..a575819 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st @@ -1,5 +1,7 @@ presentation mode tests testSlideContainerPosition - self enablePresentationMode. - self assert: self slideContainer position equals: 0@0 \ No newline at end of file + self + deny: self slideContainer position = (0 @ 0); + enablePresentationMode; + assert: self slideContainer position equals: 0 @ 0 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st index 19ed3e0..84419d1 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st @@ -6,6 +6,7 @@ testSlideNavigationInPresentationMode selectSlideNumber: 1; enablePresentationMode. - self assert: self slideContainer currentSlide equals: self currentSlide. - self selectSlideNumber: 2. - self assert: self slideContainer currentSlide equals: self currentSlide \ No newline at end of file + self + assert: self slideContainer currentSlide equals: self currentSlide; + selectSlideNumber: 2; + assert: self slideContainer currentSlide equals: self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st index 1f1c774..6fd4041 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st @@ -1,8 +1,9 @@ presentation mode tests testSlidesReceiveEnablePresentationMode - self createSlide. - self slides: (self slides collect: [:each | PSMockSlide new]). - self enablePresentationMode. + self + createSlide; + slides: (self slides collect: [:each | PSMockSlide new]); + enablePresentationMode. self slides do: [:each | self assert: each receivedPresentationModeEnable] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index fa79e7f..1c25e10 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -49,17 +49,17 @@ "testSelectSlide" : "MK 7/25/2018 13:16", "testSelectSlideClamps" : "MK 7/25/2018 13:17", "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", - "testSlideContainerExtent" : "MK 7/25/2018 13:13", - "testSlideContainerPosition" : "MK 7/25/2018 13:14", + "testSlideContainerExtent" : "LM 7/25/2018 13:27", + "testSlideContainerPosition" : "LM 7/25/2018 13:28", "testSlideCreation" : "WoC 7/25/2018 13:19", "testSlideCreationReturnsSlide" : "WoC 7/25/2018 13:18", "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", - "testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:17", + "testSlideNavigationInPresentationMode" : "LM 7/25/2018 13:28", "testSlideNumberLabelSelectsCorrectly" : "WoC 7/25/2018 13:08", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", - "testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:14", + "testSlidesReceiveEnablePresentationMode" : "LM 7/25/2018 13:29", "testZeroSlidesRegression" : "LB 7/24/2018 18:28", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", From 8dee5801c23e4d759dc772436a1cbe7e4f40fd6b Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 13:30:50 +0200 Subject: [PATCH 104/112] small change --- .../class/styled.sized.scaledBy..st | 2 +- .../PSScalingFontAttribute.class/methodProperties.json | 2 +- .../class/{DefaultTextStyle.st => defaultTextStyle.st} | 2 +- .../PSTextMorph.class/instance/createFontSizeAttribute.st | 2 +- .../PSTextMorph.class/instance/selectionFontSize..st | 2 +- .../PSTextMorph.class/methodProperties.json | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) rename packages/Presenter-Core.package/PSTextMorph.class/class/{DefaultTextStyle.st => defaultTextStyle.st} (91%) diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/class/styled.sized.scaledBy..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/class/styled.sized.scaledBy..st index 76131bf..a14eb94 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/class/styled.sized.scaledBy..st +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/class/styled.sized.scaledBy..st @@ -2,6 +2,6 @@ instance creation styled: aTextStyle sized: aNumber scaledBy: anObject ^ self new - style: aTextStyle; + style: aTextStyle; basicTextSize: aNumber; scalingSource: anObject \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json index ab33cae..508682d 100644 --- a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "styled:sized:scaledBy:" : "LB 6/8/2018 12:42" }, + "styled:sized:scaledBy:" : "WoC 7/25/2018 13:29" }, "instance" : { "=" : "MK 7/24/2018 15:33", "actualTextSize" : "LB 6/8/2018 12:32", diff --git a/packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st b/packages/Presenter-Core.package/PSTextMorph.class/class/defaultTextStyle.st similarity index 91% rename from packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st rename to packages/Presenter-Core.package/PSTextMorph.class/class/defaultTextStyle.st index 82ece7c..3096cc1 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/class/DefaultTextStyle.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/class/defaultTextStyle.st @@ -1,5 +1,5 @@ constants -DefaultTextStyle +defaultTextStyle ^ DefaultTextStyle ifNil: [TextStyle fontArray: diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st index cf50b9b..184f666 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st @@ -2,6 +2,6 @@ initialize-release createFontSizeAttribute ^ PSScalingFontAttribute - styled: PSTextMorph DefaultTextStyle + styled: self class defaultTextStyle sized: self defaultBasicTextSize scaledBy: self \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st index 94f1512..a3bdc74 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st @@ -3,7 +3,7 @@ selectionFontSize: aNumber self selectionAddAttribute: (PSScalingFontAttribute - styled: PSTextMorph DefaultTextStyle + styled: self class defaultTextStyle sized: aNumber scaledBy: self). self textMorph releaseParagraph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json index e83c65f..e38c143 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -1,10 +1,10 @@ { "class" : { - "DefaultTextStyle" : "LB 5/25/2018 17:35" }, + "defaultTextStyle" : "WoC 7/25/2018 13:28" }, "instance" : { "accept" : "LM 6/8/2018 20:47", "centerText" : "MK 7/6/2018 15:30", - "createFontSizeAttribute" : "LB 6/8/2018 15:42", + "createFontSizeAttribute" : "WoC 7/25/2018 13:28", "customContextMenuContent" : "LM 6/15/2018 19:22", "defaultBasicTextSize" : "LB 5/25/2018 16:44", "defaultFontColor" : "LM 6/6/2018 19:22", @@ -25,7 +25,7 @@ "selectionColor" : "LB 6/8/2018 15:05", "selectionColor:" : "LB 6/15/2018 19:28", "selectionFontSize" : "LB 6/8/2018 15:04", - "selectionFontSize:" : "LB 6/15/2018 19:27", + "selectionFontSize:" : "WoC 7/25/2018 13:29", "setText:" : "MK 7/6/2018 16:58", "showBackgroundColorDialog" : "LM 7/25/2018 11:30", "showFontColorDialog" : "LM 7/25/2018 11:32", From bc216c5b4c3770a78abde6f34a8b7031cc1c00ea Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:35:14 +0200 Subject: [PATCH 105/112] Refactoring --- .../instance/testDefaultSlideCount.st | 5 +++-- .../instance/testDeleteFirstSlide.st | 5 +++-- .../testDeletionDecreasesSlideCount.st | 5 +++-- .../instance/testDeletionRemovesSlide.st | 5 +++-- .../instance/testDuplicatedSlidesContent.st | 4 ++-- .../instance/testSlideCreation.st | 5 +++-- .../testSlideCreationSelectsNewSlide.st | 7 ++++--- .../testSlideDeletionMovesSlideSelection.st | 5 +++-- .../instance/testZeroSlidesRegression.st | 6 +++--- .../methodProperties.json | 18 +++++++++--------- 10 files changed, 36 insertions(+), 29 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st index 2b6a357..5ebdc85 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDefaultSlideCount.st @@ -1,5 +1,6 @@ slide creation tests testDefaultSlideCount - self assert: self slideCount equals: 1. - self assert: self currentSlide equals: (self slideAt: 1) \ No newline at end of file + self + assert: self slideCount equals: 1; + assert: self currentSlide equals: (self slideAt: 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st index eeb32e3..65704dd 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeleteFirstSlide.st @@ -7,5 +7,6 @@ testDeleteFirstSlide deletedSlide := self slideAt: 1. slide := self slideAt: 2. - self deleteSlideAt: 1. - self assert: (self slideAt: 1) equals: slide \ No newline at end of file + self + deleteSlideAt: 1; + assert: (self slideAt: 1) equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st index ff30e98..d124f96 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionDecreasesSlideCount.st @@ -5,5 +5,6 @@ testDeletionDecreasesSlideCount self setUpSlideDeletion. slideCount := self slideCount. - self deleteSlideAt: 1. - self assert: self slideCount equals: (slideCount - 1) \ No newline at end of file + self + deleteSlideAt: 1; + assert: self slideCount equals: (slideCount - 1) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st index e87af57..e73fc5c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDeletionRemovesSlide.st @@ -5,5 +5,6 @@ testDeletionRemovesSlide self setUpSlideDeletion. deletedSlide := self slides first. - self deleteSlideAt: 1. - self deny: (self slides includes: deletedSlide) \ No newline at end of file + self + deleteSlideAt: 1; + deny: (self slides includes: deletedSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st index 5a7a602..44877e8 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testDuplicatedSlidesContent.st @@ -8,5 +8,5 @@ testDuplicatedSlidesContent duplicatedSlide := self slideAt: self currentSlideNumber +1. slide submorphs withIndexDo: [:each :index | self - assert: each center - equals: (duplicatedSlide submorphs at: index) center] \ No newline at end of file + assert: each bounds + equals: (duplicatedSlide submorphs at: index) bounds] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st index d468007..c32d4c0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreation.st @@ -5,6 +5,7 @@ testSlideCreation slideCount := self slideCount. newSlide := self createSlide. - self assert: self slideCount equals: (slideCount + 1). - self assert: (self slides includes: newSlide) + self + assert: self slideCount equals: (slideCount + 1); + assert: (self slides includes: newSlide) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st index 8984139..2cf7b17 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideCreationSelectsNewSlide.st @@ -1,6 +1,7 @@ slide creation tests testSlideCreationSelectsNewSlide - self assert: self currentSlide equals: self slides first. - self createSlide. - self assert: self currentSlide equals: self slides second \ No newline at end of file + self + assert: self currentSlide equals: self slides first; + createSlide; + assert: self currentSlide equals: self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index 763e6f6..ea2c8d1 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -7,5 +7,6 @@ testSlideDeletionMovesSlideSelection slide := self slides first. self tool deleteSlideAt: 2. - self assert: self slides first equals: slide. - self assert: self currentSlide equals: slide \ No newline at end of file + self + assert: self slides first equals: slide; + assert: self currentSlide equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st index 3dbd300..30ba662 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st @@ -2,13 +2,13 @@ slide deletion tests testZeroSlidesRegression | deletedSlide | - self assert: self slideCount equals: 1. + self assert: self slideCount equals: self tool minimumSlideCount. deletedSlide := self currentSlide. self tool deleteSlideAt: 1. self - assert: self slideCount equals: 1 + assert: self slideCount equals: self tool minimumSlideCount description: 'There should never be 0 slides'. self - deny: self currentSlide = deletedSlide + deny: self currentSlide = deletedSlide description: 'The slide should actually be deleted' \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 1c25e10..76e43e6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -20,12 +20,12 @@ "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", "testCurrentMiniatureHighlighted" : "MK 7/25/2018 13:15", - "testDefaultSlideCount" : "WoC 7/25/2018 12:53", - "testDeleteFirstSlide" : "MK 7/25/2018 12:51", - "testDeletionDecreasesSlideCount" : "MK 7/25/2018 12:53", - "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", + "testDefaultSlideCount" : "LM 7/25/2018 13:31", + "testDeleteFirstSlide" : "LM 7/25/2018 13:33", + "testDeletionDecreasesSlideCount" : "LM 7/25/2018 13:33", + "testDeletionRemovesSlide" : "LM 7/25/2018 13:34", "testDuplicateSlide" : "MK 7/25/2018 12:51", - "testDuplicatedSlidesContent" : "WoC 7/25/2018 13:19", + "testDuplicatedSlidesContent" : "LM 7/25/2018 13:32", "testEnterNonInteractiveMode" : "LM 7/25/2018 13:21", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", "testLeaveNonInteractiveMode" : "LM 7/25/2018 13:23", @@ -51,16 +51,16 @@ "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", "testSlideContainerExtent" : "LM 7/25/2018 13:27", "testSlideContainerPosition" : "LM 7/25/2018 13:28", - "testSlideCreation" : "WoC 7/25/2018 13:19", + "testSlideCreation" : "LM 7/25/2018 13:32", "testSlideCreationReturnsSlide" : "WoC 7/25/2018 13:18", - "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", - "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", + "testSlideCreationSelectsNewSlide" : "LM 7/25/2018 13:33", + "testSlideDeletionMovesSlideSelection" : "LM 7/25/2018 13:34", "testSlideNavigationInPresentationMode" : "LM 7/25/2018 13:28", "testSlideNumberLabelSelectsCorrectly" : "WoC 7/25/2018 13:08", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "LM 7/25/2018 13:29", - "testZeroSlidesRegression" : "LB 7/24/2018 18:28", + "testZeroSlidesRegression" : "LM 7/25/2018 13:35", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", "window:" : "LM 5/11/2018 17:59" } } From 238724a3c032916d7554a66e9eed5d8a47681567 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 13:38:08 +0200 Subject: [PATCH 106/112] Refactoring --- .../instance/testNextSlide.st | 7 ++++--- .../instance/testSelectSlide.st | 12 +++++++----- .../instance/testSelectSlideClamps.st | 17 ++++++++++------- .../methodProperties.json | 6 +++--- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st index 99520dc..3298bde 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNextSlide.st @@ -1,8 +1,9 @@ slide navigation tests testNextSlide - self createSlide. - self selectSlideNumber: 1. - self assert: self currentSlide = self slides first. + self + createSlide; + selectSlideNumber: 1; + assert: self currentSlide = self slides first. self tool nextSlide. self assert: self currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st index 01564ee..60c8091 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlide.st @@ -1,9 +1,11 @@ slide navigation tests testSelectSlide - self createSlide. - self selectSlideNumber: 1. - self assert: self currentSlide = self slides first. + self + createSlide; + selectSlideNumber: 1; + assert: self currentSlide = self slides first. - self selectSlideNumber: 2. - self assert: self currentSlide = self slides second \ No newline at end of file + self + selectSlideNumber: 2; + assert: self currentSlide = self slides second \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index 8aafd77..edce992 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -1,12 +1,15 @@ slide navigation tests testSelectSlideClamps - self createSlide. - self selectSlideNumber: 3. - self assert: self tool currentSlide = self slides last. + self + createSlide; + selectSlideNumber: 3; + assert: self tool currentSlide = self slides last. - self selectSlideNumber: 0. - self assert: self currentSlide = self slides first. + self + selectSlideNumber: 0; + assert: self currentSlide = self slides first. - self selectSlideNumber: -1. - self assert: self currentSlide = self slides first. \ No newline at end of file + self + selectSlideNumber: -1; + assert: self currentSlide = self slides first. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 76e43e6..1464577 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -39,15 +39,15 @@ "testMoveSlide" : "MK 7/25/2018 13:16", "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:16", "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:16", - "testNextSlide" : "MK 7/25/2018 13:16", + "testNextSlide" : "LM 7/25/2018 13:36", "testNextSlideClampsToMax" : "WoC 7/25/2018 13:14", "testNonInteractivetyInNonInteractiveMode" : "LM 7/25/2018 13:24", "testNotEnterNonInteractiveModeInEditMode" : "LM 7/25/2018 13:25", "testOccupiesWorldOnStep" : "MK 7/25/2018 13:13", "testPreviousSlideClampsToMin" : "WoC 7/25/2018 13:14", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", - "testSelectSlide" : "MK 7/25/2018 13:16", - "testSelectSlideClamps" : "MK 7/25/2018 13:17", + "testSelectSlide" : "LM 7/25/2018 13:37", + "testSelectSlideClamps" : "LM 7/25/2018 13:37", "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", "testSlideContainerExtent" : "LM 7/25/2018 13:27", "testSlideContainerPosition" : "LM 7/25/2018 13:28", From c14a48ce9661e7e002b8b9c5b0f2cd623ab47a47 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 13:40:01 +0200 Subject: [PATCH 107/112] Refactoring --- .../instance/isInteractive.st | 4 +++ .../instance/miniatureOf..st | 4 +++ .../instance/moveCurrentSlideTo..st | 4 +++ .../instance/slideMiniatures.st | 4 +++ .../instance/testEnterNonInteractiveMode.st | 2 +- .../instance/testLeaveNonInteractiveMode.st | 2 +- ...nInteractiveModeWhenLeavingPresentation.st | 2 +- .../testMiniatureChangesIfSlideChanges.st | 2 +- .../instance/testMiniatureCreated.st | 4 +-- .../instance/testMiniatureDeleted.st | 4 +-- .../instance/testMiniatureSelects.st | 4 +-- .../instance/testMoveSlide.st | 6 ++-- .../instance/testMoveSlideOutOfBounds.st | 4 +-- .../testMovedSlideStayCurrentSlide.st | 2 +- ...estNotEnterNonInteractiveModeInEditMode.st | 2 +- .../instance/testSelectSlideClamps.st | 2 +- .../instance/testSelectedMiniatureChanges.st | 4 +-- .../testSlideDeletionMovesSlideSelection.st | 2 +- .../instance/testZeroSlidesRegression.st | 2 +- .../methodProperties.json | 34 +++++++++++-------- 20 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/isInteractive.st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/miniatureOf..st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/moveCurrentSlideTo..st create mode 100644 packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideMiniatures.st diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/isInteractive.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/isInteractive.st new file mode 100644 index 0000000..d9ec478 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/isInteractive.st @@ -0,0 +1,4 @@ +accessing +isInteractive + + ^ self tool isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/miniatureOf..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/miniatureOf..st new file mode 100644 index 0000000..fef8a0b --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/miniatureOf..st @@ -0,0 +1,4 @@ +accessing +miniatureOf: aPSSlide + + ^ self tool miniatureOf: aPSSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/moveCurrentSlideTo..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/moveCurrentSlideTo..st new file mode 100644 index 0000000..ce1ca3d --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/moveCurrentSlideTo..st @@ -0,0 +1,4 @@ +slide deletion tests +moveCurrentSlideTo: aNumber + + self tool moveCurrentSlideTo: aNumber \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideMiniatures.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideMiniatures.st new file mode 100644 index 0000000..613bd38 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/slideMiniatures.st @@ -0,0 +1,4 @@ +slide deletion tests +slideMiniatures + + ^ self tool slideMiniatures \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index bd1b609..4d5626f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -3,6 +3,6 @@ testEnterNonInteractiveMode self enablePresentationMode. self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: false. + self assert: self isInteractive equals: false. self tool disablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st index ee51969..4af75b6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st @@ -4,5 +4,5 @@ testLeaveNonInteractiveMode self enablePresentationMode. self pressKey: $i at: self slideContainer center. self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: true + self assert: self isInteractive equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st index 2094c20..b9cc035 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st @@ -3,5 +3,5 @@ testLeaveNonInteractiveModeWhenLeavingPresentation self pressKey: $i at: self slideContainer center. self pressKey: Character escape at: self slideContainer center. - self assert: self tool isInteractive equals: true + self assert: self isInteractive equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st index 8836810..f3d9925 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureChangesIfSlideChanges.st @@ -3,7 +3,7 @@ testMiniatureChangesIfSlideChanges | slide miniature oldMiniatureForm | slide := self slides first. - miniature := (self tool miniatureOf: slide). + miniature := (self miniatureOf: slide). oldMiniatureForm := miniature form. slide addContent: (Morph new center: slide center). diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st index 34fda5a..70fe42e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st @@ -2,6 +2,6 @@ miniature view tests testMiniatureCreated | oldSize | - oldSize := self tool slideMiniatures size. + oldSize := self slideMiniatures size. self createSlide. - self assert: self tool slideMiniatures size equals: oldSize + 1 \ No newline at end of file + self assert: self slideMiniatures size equals: oldSize + 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st index aef040c..0cacc0e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureDeleted.st @@ -3,6 +3,6 @@ testMiniatureDeleted | oldSize | self createSlide. - oldSize := self tool slideMiniatures size. + oldSize := self slideMiniatures size. self tool deleteSlide. - self assert: self tool slideMiniatures size equals: oldSize - 1 \ No newline at end of file + self assert: self slideMiniatures size equals: oldSize - 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index 0b6a377..927f161 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -5,7 +5,7 @@ testMiniatureSelects 5 timesRepeat: [self createSlide]. slideToSelect := self slides third. - miniatureToClick := self tool miniatureOf: slideToSelect. + miniatureToClick := self miniatureOf: slideToSelect. self click: MouseEvent redButton at: miniatureToClick boundsInWorld center. - self assert: self tool currentSlide equals: slideToSelect \ No newline at end of file + self assert: self currentSlide equals: slideToSelect \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st index 2ac7193..d0ab0c7 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st @@ -6,12 +6,12 @@ testMoveSlide slide := self slides first. self selectSlideNumber: 1. - self tool moveCurrentSlideTo: 3. + self moveCurrentSlideTo: 3. self assert: (self slides indexOf: slide startingAt: 0) equals: 3. - self tool moveCurrentSlideTo: 1. + self moveCurrentSlideTo: 1. self assert: (self slides indexOf: slide startingAt: 0) equals: 1. - self tool moveCurrentSlideTo: 5. + self moveCurrentSlideTo: 5. self assert: (self slides indexOf: slide startingAt: 0) equals: 5 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st index c0de061..e0865fe 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st @@ -6,8 +6,8 @@ testMoveSlideOutOfBounds slide := self slides first. self selectSlideNumber: 1. - self tool moveCurrentSlideTo: 100. "no slide with number 100 exists" + self moveCurrentSlideTo: 100. "no slide with number 100 exists" self assert: (self slides indexOf: slide startingAt: 0) equals: 5. - self tool moveCurrentSlideTo: -100. "no slide with number -100 exists" + self moveCurrentSlideTo: -100. "no slide with number -100 exists" self assert: (self slides indexOf: slide startingAt: 0) equals: 1. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st index d7e6500..1d85b64 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st @@ -6,5 +6,5 @@ testMovedSlideStayCurrentSlide slide := self slides first. self selectSlideNumber: 1. - self tool moveCurrentSlideTo: 5. + self moveCurrentSlideTo: 5. self assert: slide = self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st index 05d0f30..9e81e87 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st @@ -2,4 +2,4 @@ presentation mode tests testNotEnterNonInteractiveModeInEditMode self pressKey: $i at: self slideContainer center. - self assert: self tool isInteractive equals: true \ No newline at end of file + self assert: self isInteractive equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index 8aafd77..8491668 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -3,7 +3,7 @@ testSelectSlideClamps self createSlide. self selectSlideNumber: 3. - self assert: self tool currentSlide = self slides last. + self assert: self currentSlide = self slides last. self selectSlideNumber: 0. self assert: self currentSlide = self slides first. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st index 7d542d3..60fea89 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectedMiniatureChanges.st @@ -3,6 +3,6 @@ testSelectedMiniatureChanges | slide | 5 timesRepeat: [self createSlide]. - slide := self tool slideAt: 2. + slide := self slideAt: 2. self tool selectSlide: slide. - self assert: (self tool miniatureOf: slide) equals: self tool currentMiniature \ No newline at end of file + self assert: (self miniatureOf: slide) equals: self tool currentMiniature \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index 763e6f6..3325cd6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -6,6 +6,6 @@ testSlideDeletionMovesSlideSelection slide := self slides first. - self tool deleteSlideAt: 2. + self deleteSlideAt: 2. self assert: self slides first equals: slide. self assert: self currentSlide equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st index 3dbd300..51b6380 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st @@ -4,7 +4,7 @@ testZeroSlidesRegression | deletedSlide | self assert: self slideCount equals: 1. deletedSlide := self currentSlide. - self tool deleteSlideAt: 1. + self deleteSlideAt: 1. self assert: self slideCount equals: 1 description: 'There should never be 0 slides'. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 308b66c..02855c7 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -8,13 +8,17 @@ "deleteSlideAt:" : "MK 7/25/2018 12:50", "enablePresentationMode" : "MK 7/25/2018 13:07", "expectedFailures" : "LB 7/24/2018 15:38", + "isInteractive" : "MK 7/25/2018 13:23", "magneticRasterActive" : "MK 7/25/2018 12:57", + "miniatureOf:" : "MK 7/25/2018 13:28", + "moveCurrentSlideTo:" : "MK 7/25/2018 13:33", "selectSlideNumber:" : "MK 7/25/2018 13:09", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "MK 7/25/2018 13:00", "slideAt:" : "MK 7/25/2018 12:48", "slideContainer" : "WoC 6/15/2018 18:21", "slideCount" : "WoC 7/24/2018 17:27", + "slideMiniatures" : "MK 7/25/2018 13:31", "slides" : "LM 7/13/2018 17:42", "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", @@ -26,40 +30,40 @@ "testDeletionRemovesSlide" : "MK 7/25/2018 12:51", "testDuplicateSlide" : "MK 7/25/2018 12:51", "testDuplicatedSlidesContent" : "MK 7/25/2018 12:54", - "testEnterNonInteractiveMode" : "MK 7/25/2018 13:12", + "testEnterNonInteractiveMode" : "MK 7/25/2018 13:23", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", - "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:12", - "testLeaveNonInteractiveModeWhenLeavingPresentation" : "WoC 7/24/2018 17:41", + "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:23", + "testLeaveNonInteractiveModeWhenLeavingPresentation" : "MK 7/25/2018 13:24", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "MK 7/25/2018 13:10", - "testMiniatureChangesIfSlideChanges" : "LB 7/24/2018 18:15", - "testMiniatureCreated" : "MK 7/25/2018 13:01", - "testMiniatureDeleted" : "MK 7/25/2018 13:00", - "testMiniatureSelects" : "MK 7/25/2018 13:01", - "testMoveSlide" : "MK 7/25/2018 13:16", - "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:16", - "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:16", + "testMiniatureChangesIfSlideChanges" : "MK 7/25/2018 13:28", + "testMiniatureCreated" : "MK 7/25/2018 13:31", + "testMiniatureDeleted" : "MK 7/25/2018 13:31", + "testMiniatureSelects" : "MK 7/25/2018 13:32", + "testMoveSlide" : "MK 7/25/2018 13:34", + "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:34", + "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:34", "testNextSlide" : "MK 7/25/2018 13:16", "testNonInteractivetyInNonInteractiveMode" : "MK 7/25/2018 13:13", - "testNotEnterNonInteractiveModeInEditMode" : "WoC 7/24/2018 17:42", + "testNotEnterNonInteractiveModeInEditMode" : "MK 7/25/2018 13:24", "testOccupiesWorldOnStep" : "MK 7/25/2018 13:13", "testPreviousSlideClampsToMin" : "WoC 7/24/2018 17:36", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", "testSelectSlide" : "MK 7/25/2018 13:16", - "testSelectSlideClamps" : "MK 7/25/2018 13:17", - "testSelectedMiniatureChanges" : "MK 7/25/2018 13:03", + "testSelectSlideClamps" : "MK 7/25/2018 13:36", + "testSelectedMiniatureChanges" : "MK 7/25/2018 13:29", "testSlideContainerExtent" : "MK 7/25/2018 13:13", "testSlideContainerPosition" : "MK 7/25/2018 13:14", "testSlideCreation" : "MK 7/25/2018 13:04", "testSlideCreationReturnsSlide" : "MK 7/25/2018 13:04", "testSlideCreationSelectsNewSlide" : "MK 7/25/2018 13:04", - "testSlideDeletionMovesSlideSelection" : "LB 7/24/2018 18:27", + "testSlideDeletionMovesSlideSelection" : "MK 7/25/2018 13:37", "testSlideNavigationInPresentationMode" : "MK 7/25/2018 13:17", "testSlideNumberLabelSelectsCorrectly" : "MK 7/25/2018 13:05", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "MK 7/25/2018 13:14", - "testZeroSlidesRegression" : "LB 7/24/2018 18:28", + "testZeroSlidesRegression" : "MK 7/25/2018 13:38", "testnextSlideClampsToMax" : "WoC 7/24/2018 17:29", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", From 11c78fc906baa1405c1e0954a7d2a4b3f217ddce Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 13:47:16 +0200 Subject: [PATCH 108/112] Merging --- .../instance/testEnterNonInteractiveMode.st | 2 +- .../instance/testLeaveNonInteractiveMode.st | 2 +- ...aveNonInteractiveModeWhenLeavingPresentation.st | 2 +- .../testNotEnterNonInteractiveModeInEditMode.st | 2 +- .../instance/testSelectSlideClamps.st | 2 +- .../testSlideDeletionMovesSlideSelection.st | 2 +- .../instance/testZeroSlidesRegression.st | 2 +- .../methodProperties.json | 14 +++++++------- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st index 9c455a4..b9a986c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testEnterNonInteractiveMode.st @@ -4,6 +4,6 @@ testEnterNonInteractiveMode self enablePresentationMode. self pressKey: $i at: self slideContainer center; - deny: self tool isInteractive. + deny: self isInteractive. self tool disablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st index 66d03c5..a234d0a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveMode.st @@ -5,4 +5,4 @@ testLeaveNonInteractiveMode enablePresentationMode; pressKey: $i at: self slideContainer center; pressKey: $i at: self slideContainer center; - assert: self tool isInteractive \ No newline at end of file + assert: self isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st index b411192..e5f9d42 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testLeaveNonInteractiveModeWhenLeavingPresentation.st @@ -4,5 +4,5 @@ testLeaveNonInteractiveModeWhenLeavingPresentation self pressKey: $i at: self slideContainer center; pressKey: Character escape at: self slideContainer center; - assert: self tool isInteractive + assert: self isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st index c54360b..99ec59c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testNotEnterNonInteractiveModeInEditMode.st @@ -3,4 +3,4 @@ testNotEnterNonInteractiveModeInEditMode self pressKey: $i at: self slideContainer center; - assert: self tool isInteractive \ No newline at end of file + assert: self isInteractive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st index edce992..9938341 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSelectSlideClamps.st @@ -4,7 +4,7 @@ testSelectSlideClamps self createSlide; selectSlideNumber: 3; - assert: self tool currentSlide = self slides last. + assert: self currentSlide = self slides last. self selectSlideNumber: 0; diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st index ea2c8d1..45e95b6 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideDeletionMovesSlideSelection.st @@ -6,7 +6,7 @@ testSlideDeletionMovesSlideSelection slide := self slides first. - self tool deleteSlideAt: 2. + self deleteSlideAt: 2. self assert: self slides first equals: slide; assert: self currentSlide equals: slide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st index 30ba662..a94fb4a 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testZeroSlidesRegression.st @@ -4,7 +4,7 @@ testZeroSlidesRegression | deletedSlide | self assert: self slideCount equals: self tool minimumSlideCount. deletedSlide := self currentSlide. - self tool deleteSlideAt: 1. + self deleteSlideAt: 1. self assert: self slideCount equals: self tool minimumSlideCount description: 'There should never be 0 slides'. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 5b192b7..937c233 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -30,10 +30,10 @@ "testDeletionRemovesSlide" : "LM 7/25/2018 13:34", "testDuplicateSlide" : "MK 7/25/2018 12:51", "testDuplicatedSlidesContent" : "LM 7/25/2018 13:32", - "testEnterNonInteractiveMode" : "LM 7/25/2018 13:21", + "testEnterNonInteractiveMode" : "MK 7/25/2018 13:45", "testLayoutedSlidesCreation" : "MK 7/25/2018 12:55", - "testLeaveNonInteractiveMode" : "LM 7/25/2018 13:23", - "testLeaveNonInteractiveModeWhenLeavingPresentation" : "LM 7/25/2018 13:23", + "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:45", + "testLeaveNonInteractiveModeWhenLeavingPresentation" : "MK 7/25/2018 13:46", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", "testMagneticRasterButton" : "MK 7/25/2018 13:10", "testMiniatureChangesIfSlideChanges" : "MK 7/25/2018 13:28", @@ -46,25 +46,25 @@ "testNextSlide" : "LM 7/25/2018 13:36", "testNextSlideClampsToMax" : "WoC 7/25/2018 13:14", "testNonInteractivetyInNonInteractiveMode" : "LM 7/25/2018 13:24", - "testNotEnterNonInteractiveModeInEditMode" : "LM 7/25/2018 13:25", + "testNotEnterNonInteractiveModeInEditMode" : "MK 7/25/2018 13:45", "testOccupiesWorldOnStep" : "MK 7/25/2018 13:13", "testPreviousSlideClampsToMin" : "WoC 7/25/2018 13:14", "testSavingShouldProvideWarning" : "LM 7/13/2018 18:40", "testSelectSlide" : "LM 7/25/2018 13:37", - "testSelectSlideClamps" : "LM 7/25/2018 13:37", + "testSelectSlideClamps" : "MK 7/25/2018 13:46", "testSelectedMiniatureChanges" : "MK 7/25/2018 13:29", "testSlideContainerExtent" : "LM 7/25/2018 13:27", "testSlideContainerPosition" : "LM 7/25/2018 13:28", "testSlideCreation" : "LM 7/25/2018 13:32", "testSlideCreationReturnsSlide" : "WoC 7/25/2018 13:18", "testSlideCreationSelectsNewSlide" : "LM 7/25/2018 13:33", - "testSlideDeletionMovesSlideSelection" : "LM 7/25/2018 13:34", + "testSlideDeletionMovesSlideSelection" : "MK 7/25/2018 13:45", "testSlideNavigationInPresentationMode" : "LM 7/25/2018 13:28", "testSlideNumberLabelSelectsCorrectly" : "WoC 7/25/2018 13:08", "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "LM 7/25/2018 13:29", - "testZeroSlidesRegression" : "LM 7/25/2018 13:35", + "testZeroSlidesRegression" : "MK 7/25/2018 13:46", "tool" : "LM 5/16/2018 17:13", "window" : "LM 5/11/2018 17:57", "window:" : "LM 5/11/2018 17:59" } } From d006d9af756cfccfe13bdff5cc676518766aca25 Mon Sep 17 00:00:00 2001 From: Tom Braun Date: Wed, 25 Jul 2018 13:57:35 +0200 Subject: [PATCH 109/112] cascades --- .../testTextFieldCreatedOnDoubleClick.st | 5 +++-- .../PSOnSlideTest.class/methodProperties.json | 2 +- .../instance/testCurrentMiniatureHighlighted.st | 5 +++-- .../instance/testMagneticRasterButton.st | 10 ++++++---- .../instance/testMiniatureCreated.st | 5 +++-- .../instance/testMiniatureSelects.st | 5 +++-- .../instance/testMoveSlide.st | 17 ++++++++++------- .../instance/testMoveSlideOutOfBounds.st | 12 +++++++----- .../instance/testMovedSlideStayCurrentSlide.st | 7 ++++--- .../instance/testSlideRatioIsFixed.st | 5 +++-- .../methodProperties.json | 16 ++++++++-------- .../instance/testTriggerContextMenu.st | 5 +++-- .../methodProperties.json | 2 +- 13 files changed, 55 insertions(+), 41 deletions(-) diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st index 7e9ea47..4b6b8e5 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/instance/testTextFieldCreatedOnDoubleClick.st @@ -6,5 +6,6 @@ testTextFieldCreatedOnDoubleClick self doubleClick: MouseEvent redButton at: self slide center. addedMorphs := self submorphs difference: oldSubmorphs. - self assert: addedMorphs size equals: 1. - self assert: (addedMorphs first content isKindOf: PSTextMorph) \ No newline at end of file + self + assert: addedMorphs size equals: 1; + assert: (addedMorphs first content isKindOf: PSTextMorph) \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json index 0a2cec0..fc79554 100644 --- a/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSOnSlideTest.class/methodProperties.json @@ -13,4 +13,4 @@ "submorphs" : "WoC 7/24/2018 17:55", "tearDown" : "LB 7/13/2018 18:13", "testAcceptDropImageFile" : "LM 7/25/2018 12:27", - "testTextFieldCreatedOnDoubleClick" : "WoC 7/25/2018 11:28" } } + "testTextFieldCreatedOnDoubleClick" : "WoC 7/25/2018 13:49" } } diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st index 6fcb9b8..c8288c4 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testCurrentMiniatureHighlighted.st @@ -2,5 +2,6 @@ miniature view tests testCurrentMiniatureHighlighted 5 timesRepeat: [self createSlide]. - self selectSlideNumber: 5. - self assert: self tool currentMiniature isHighlighted \ No newline at end of file + self + selectSlideNumber: 5; + assert: self tool currentMiniature isHighlighted \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st index 65e5d1b..72cdc1c 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMagneticRasterButton.st @@ -6,9 +6,11 @@ testMagneticRasterButton [:m | m externalName = (self tool magneticRasterButtonData at: #name)]. modeBefore := self magneticRasterActive. - self click: MouseEvent redButton at: button boundsInWorld center. - self assert: self magneticRasterActive equals: modeBefore not. + self + click: MouseEvent redButton at: button boundsInWorld center; + assert: self magneticRasterActive equals: modeBefore not. - self click: MouseEvent redButton at: button boundsInWorld center. - self assert: self magneticRasterActive equals: modeBefore + self + click: MouseEvent redButton at: button boundsInWorld center; + assert: self magneticRasterActive equals: modeBefore \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st index 70fe42e..17b1007 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureCreated.st @@ -3,5 +3,6 @@ testMiniatureCreated | oldSize | oldSize := self slideMiniatures size. - self createSlide. - self assert: self slideMiniatures size equals: oldSize + 1 \ No newline at end of file + self + createSlide; + assert: self slideMiniatures size equals: oldSize + 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st index 927f161..4723932 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMiniatureSelects.st @@ -6,6 +6,7 @@ testMiniatureSelects slideToSelect := self slides third. miniatureToClick := self miniatureOf: slideToSelect. - self click: MouseEvent redButton at: miniatureToClick boundsInWorld center. - self assert: self currentSlide equals: slideToSelect \ No newline at end of file + self + click: MouseEvent redButton at: miniatureToClick boundsInWorld center; + assert: self currentSlide equals: slideToSelect \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st index d0ab0c7..e9acc7e 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlide.st @@ -5,13 +5,16 @@ testMoveSlide 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. - self selectSlideNumber: 1. - self moveCurrentSlideTo: 3. - self assert: (self slides indexOf: slide startingAt: 0) equals: 3. + self + selectSlideNumber: 1; + moveCurrentSlideTo: 3; + assert: (self slides indexOf: slide startingAt: 0) equals: 3. - self moveCurrentSlideTo: 1. - self assert: (self slides indexOf: slide startingAt: 0) equals: 1. + self + moveCurrentSlideTo: 1; + assert: (self slides indexOf: slide startingAt: 0) equals: 1. - self moveCurrentSlideTo: 5. - self assert: (self slides indexOf: slide startingAt: 0) equals: 5 + self + moveCurrentSlideTo: 5; + assert: (self slides indexOf: slide startingAt: 0) equals: 5 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st index e0865fe..b2808c9 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMoveSlideOutOfBounds.st @@ -5,9 +5,11 @@ testMoveSlideOutOfBounds 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. - self selectSlideNumber: 1. - self moveCurrentSlideTo: 100. "no slide with number 100 exists" - self assert: (self slides indexOf: slide startingAt: 0) equals: 5. + self + selectSlideNumber: 1; + moveCurrentSlideTo: 100; "no slide with number 100 exists" + assert: (self slides indexOf: slide startingAt: 0) equals: 5. - self moveCurrentSlideTo: -100. "no slide with number -100 exists" - self assert: (self slides indexOf: slide startingAt: 0) equals: 1. \ No newline at end of file + self + moveCurrentSlideTo: -100; "no slide with number -100 exists" + assert: (self slides indexOf: slide startingAt: 0) equals: 1 \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st index 1d85b64..1021234 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMovedSlideStayCurrentSlide.st @@ -5,6 +5,7 @@ testMovedSlideStayCurrentSlide 4 timesRepeat: [self createSlide]. "=> 5 slides" slide := self slides first. - self selectSlideNumber: 1. - self moveCurrentSlideTo: 5. - self assert: slide = self currentSlide \ No newline at end of file + self + selectSlideNumber: 1; + moveCurrentSlideTo: 5; + assert: slide = self currentSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st index 182f87b..7a80f98 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideRatioIsFixed.st @@ -3,5 +3,6 @@ testSlideRatioIsFixed | slide | slide := self currentSlide. - self assert: (self does: slide answerSideRatio: slide sideRatio). - self assert: [self does: slide answerSideRatio: slide sideRatio] onResizeOf: self window \ No newline at end of file + self + assert: (self does: slide answerSideRatio: slide sideRatio); + assert: [self does: slide answerSideRatio: slide sideRatio] onResizeOf: self window \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index 937c233..40df86f 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -23,7 +23,7 @@ "slides:" : "LM 7/13/2018 18:22", "tearDown" : "LB 5/22/2018 17:37", "testBuildWith" : "WoC 7/24/2018 17:51", - "testCurrentMiniatureHighlighted" : "MK 7/25/2018 13:15", + "testCurrentMiniatureHighlighted" : "WoC 7/25/2018 13:52", "testDefaultSlideCount" : "LM 7/25/2018 13:31", "testDeleteFirstSlide" : "LM 7/25/2018 13:33", "testDeletionDecreasesSlideCount" : "LM 7/25/2018 13:33", @@ -35,14 +35,14 @@ "testLeaveNonInteractiveMode" : "MK 7/25/2018 13:45", "testLeaveNonInteractiveModeWhenLeavingPresentation" : "MK 7/25/2018 13:46", "testLoadingProvidesWarning" : "LB 6/29/2018 19:38", - "testMagneticRasterButton" : "MK 7/25/2018 13:10", + "testMagneticRasterButton" : "WoC 7/25/2018 13:52", "testMiniatureChangesIfSlideChanges" : "MK 7/25/2018 13:28", - "testMiniatureCreated" : "MK 7/25/2018 13:31", + "testMiniatureCreated" : "WoC 7/25/2018 13:53", "testMiniatureDeleted" : "MK 7/25/2018 13:31", - "testMiniatureSelects" : "MK 7/25/2018 13:32", - "testMoveSlide" : "MK 7/25/2018 13:34", - "testMoveSlideOutOfBounds" : "MK 7/25/2018 13:34", - "testMovedSlideStayCurrentSlide" : "MK 7/25/2018 13:34", + "testMiniatureSelects" : "WoC 7/25/2018 13:53", + "testMoveSlide" : "WoC 7/25/2018 13:54", + "testMoveSlideOutOfBounds" : "WoC 7/25/2018 13:54", + "testMovedSlideStayCurrentSlide" : "WoC 7/25/2018 13:55", "testNextSlide" : "LM 7/25/2018 13:36", "testNextSlideClampsToMax" : "WoC 7/25/2018 13:14", "testNonInteractivetyInNonInteractiveMode" : "LM 7/25/2018 13:24", @@ -61,7 +61,7 @@ "testSlideDeletionMovesSlideSelection" : "MK 7/25/2018 13:45", "testSlideNavigationInPresentationMode" : "LM 7/25/2018 13:28", "testSlideNumberLabelSelectsCorrectly" : "WoC 7/25/2018 13:08", - "testSlideRatioIsFixed" : "WoC 7/24/2018 17:29", + "testSlideRatioIsFixed" : "WoC 7/25/2018 13:56", "testSlideResizeRegression" : "WoC 7/24/2018 17:29", "testSlidesReceiveEnablePresentationMode" : "LM 7/25/2018 13:29", "testZeroSlidesRegression" : "MK 7/25/2018 13:46", diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st index 5636d14..b78b6d8 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/instance/testTriggerContextMenu.st @@ -5,5 +5,6 @@ testTriggerContextMenu container := (PSMockContentContainer for: self morph). self slide addMorph: container fullFrame: (self slide layoutFrameFor: container). - self click: MouseEvent yellowButton at: container center. - self assert: container menuCreated equals: true \ No newline at end of file + self + click: MouseEvent yellowButton at: container center; + assert: container menuCreated equals: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json index 3b1a2d2..935da86 100644 --- a/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideAndMorphTest.class/methodProperties.json @@ -13,4 +13,4 @@ "testMorphFitsSlideOnResizeToFit" : "LB 7/20/2018 15:48", "testMorphKeepsPositionOnResizeToFit" : "LB 7/20/2018 15:56", "testMorphKeepsSideRatioOnResizeToFit" : "LM 7/25/2018 12:43", - "testTriggerContextMenu" : "WoC 7/25/2018 11:35" } } + "testTriggerContextMenu" : "WoC 7/25/2018 13:50" } } From a1c0dfe4ea0a2f62a5d34895b123a3b893ec3cf9 Mon Sep 17 00:00:00 2001 From: Maximilian Koenig Date: Wed, 25 Jul 2018 14:07:17 +0200 Subject: [PATCH 110/112] Refactoring --- .../instance/presentationCommandShortcuts.st | 2 +- .../instance/presentationCreationCommandShortcuts.st | 2 +- .../instance/presentationCreationModeCommandShortcuts.st | 2 +- .../instance/presentationCreationModeShortcuts.st | 2 +- .../instance/presentationCreationShortcuts.st | 2 +- .../instance/presentationModeCommandShortcuts.st | 2 +- .../instance/presentationModeShortcuts.st | 3 ++- .../instance/presentationShortcuts.st | 2 +- .../instance/sharedCommandShortcuts.st | 2 +- .../PSSlideContainer.class/instance/sharedShortcuts.st | 6 +++--- .../PSSlideContainer.class/methodProperties.json | 4 ++-- .../PSPresentationToolTest.class/instance/createSlide.st | 2 +- .../instance/enablePresentationMode.st | 2 +- .../instance/magneticRasterActive.st | 2 +- .../instance/selectSlideNumber..st | 2 +- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st index 0f919f9..097b858 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCommandShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationCommandShortcuts ^ self createShortcutsFrom: self presentationModeCommandShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st index 8ef7ed6..6ed36c5 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationCommandShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationCreationCommandShortcuts ^ self createShortcutsFrom: self presentationCreationModeCommandShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeCommandShortcuts.st index 3b0aa1c..3374e5c 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeCommandShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationCreationModeCommandShortcuts "{character that triggers event . action block . description}" ^ { diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeShortcuts.st index 540c3a0..50821c9 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationModeShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationCreationModeShortcuts "{character that triggers event . action block . description}" ^ {}, self sharedShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st index 968f137..7d44d3e 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationCreationShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationCreationShortcuts ^ self createShortcutsFrom: self presentationCreationModeShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st index 861645d..6b18ba2 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeCommandShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationModeCommandShortcuts "{character that triggers event . action block . discription}" ^ {}, self sharedCommandShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st index bc66e3c..b28439e 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationModeShortcuts.st @@ -1,6 +1,7 @@ -accessing +shortcuts presentationModeShortcuts "{character that triggers event . action block . discription}" ^ { + {Character escape . [self model disablePresentationMode] . 'Disable Presentation Mode'}. {$i . [self model toggleInteractivity] . 'Toggle iteractive/non interactive mode'} }, self sharedShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st index adefa7d..558edbc 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/presentationShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts presentationShortcuts ^ self createShortcutsFrom: self presentationModeShortcuts \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedCommandShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedCommandShortcuts.st index fdf7be3..465b280 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedCommandShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedCommandShortcuts.st @@ -1,4 +1,4 @@ -accessing +shortcuts sharedCommandShortcuts ^ { diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedShortcuts.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedShortcuts.st index 50f4f4b..f093498 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedShortcuts.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/sharedShortcuts.st @@ -1,8 +1,7 @@ -accessing +shortcuts sharedShortcuts ^ { - {Character escape . [self model disablePresentationMode] . 'Disable Presentation Mode'}. {Character arrowRight . [self model nextSlide] . 'Go to the next slide'}. {Character pageDown . [self model nextSlide] . 'Go to the next slide'}. {Character arrowDown . [self model nextSlide] . 'Go to the next slide'}. @@ -18,5 +17,6 @@ sharedShortcuts {$6 . [self model selectSlideNumber: 6] . 'Go to slide number 6'}. {$7 . [self model selectSlideNumber: 7] . 'Go to slide number 7'}. {$8 . [self model selectSlideNumber: 8] . 'Go to slide number 8'}. - {$9 . [self model selectSlideNumber: 9] . 'Go to slide number 9'} + {$9 . [self model selectSlideNumber: 9] . 'Go to slide number 9'}. + {$0 . [self model selectSlideNumber: self model slideCount] . 'Go to last slide'} } \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json index b21c51b..11d9eac 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -36,12 +36,12 @@ "presentationCreationModeShortcuts" : "MK 6/28/2018 14:14", "presentationCreationShortcuts" : "LM 7/13/2018 15:40", "presentationModeCommandShortcuts" : "JZ 7/13/2018 15:16", - "presentationModeShortcuts" : "JZ 7/13/2018 15:16", + "presentationModeShortcuts" : "MK 7/25/2018 13:57", "presentationShortcuts" : "LM 7/13/2018 15:41", "previousOwner" : "MK 5/25/2018 15:31", "previousOwner:" : "MK 5/25/2018 15:32", "sharedCommandShortcuts" : "MK 6/28/2018 14:00", - "sharedShortcuts" : "LB 6/29/2018 15:45", + "sharedShortcuts" : "MK 7/25/2018 14:02", "shouldShowCursor:andNotify:" : "WoC 7/24/2018 14:16", "showNotification:" : "LM 6/22/2018 15:40", "showSlide:" : "JZ 7/25/2018 12:52", diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st index 392ce56..fa3b2cc 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/createSlide.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing createSlide ^ self tool createSlide \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st index 93ab6ee..bf6b811 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/enablePresentationMode.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing enablePresentationMode self tool enablePresentationMode \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st index dbc3299..31db043 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/magneticRasterActive.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing magneticRasterActive ^ self tool magneticRasterActive \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st index c42eabe..b2c10d0 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/selectSlideNumber..st @@ -1,4 +1,4 @@ -as yet unclassified +accessing selectSlideNumber: aNumber self tool selectSlideNumber: aNumber \ No newline at end of file From 2e0162fb66af25211ec9152284654e923105189e Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 25 Jul 2018 14:15:30 +0200 Subject: [PATCH 111/112] Update README.md for Release 1.0 --- README.md | 90 ++++++++++++++++++++-------- pictures/magnetic-raster-active.png | Bin 0 -> 7253 bytes pictures/magnetic-raster.png | Bin 0 -> 13014 bytes pictures/right-click.png | Bin 59218 -> 84585 bytes 4 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 pictures/magnetic-raster-active.png create mode 100644 pictures/magnetic-raster.png diff --git a/README.md b/README.md index 232d49e..3c50454 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# PowerSqueak [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09)[![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=release)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=release) +# **PowerSqueak** [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09)[![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=release)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=release) A presentation tool for the Squeak development platform @@ -10,17 +10,19 @@ Please check [Travis-ci](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09 Squeak 5.0 is officially unsupported (see [Travis-ci](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09)). -## Overview +## **Overview** * [Overview](https://github.com/hpi-swa-teaching/SWT18-Project-09#overview) * [Installation Instructions](https://github.com/hpi-swa-teaching/SWT18-Project-09#installation-instructions) * [Build status](https://github.com/hpi-swa-teaching/SWT18-Project-09#build-status) * [Using PowerSqueak](https://github.com/hpi-swa-teaching/SWT18-Project-09#using-powersqueak) * [Edit mode](https://github.com/hpi-swa-teaching/SWT18-Project-09#edit-mode) + * [Magnetic Raster](https://github.com/hpi-swa-teaching/SWT18-Project-09#magnetic-raster) * [Presentation mode](https://github.com/hpi-swa-teaching/SWT18-Project-09#presentation-mode) * [Interactive/Non-Interactive mode](https://github.com/hpi-swa-teaching/SWT18-Project-09#interactivenon-interactive-mode) * [saving and loading](https://github.com/hpi-swa-teaching/SWT18-Project-09#saving-and-loading) + * [list of shortcuts](https://github.com/hpi-swa-teaching/SWT18-Project-09#list-of-shortcuts) -## Installation Instructions +## **Installation Instructions** For easy installation, please first install [Metacello](https://github.com/Metacello/metacello). Then run the following code in your Squeak 5.1/6.0(trunk) image: @@ -31,25 +33,38 @@ Metacello new load. ``` -## Build status +Alternatively, download the .sar file from the [latest release](https://github.com/hpi-swa-teaching/SWT18-Project-09/releases/latest) and install it into your Squeak image via drag and drop. + +## **Build status** | [Release](https://github.com/hpi-swa-teaching/SWT18-Project-09/releases/latest) | master | ------------------------- | ------------------- | | [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09) | [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=master)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09) | | [![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=release)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=release) | [![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=master)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=master) | -## Using PowerSqueak +## **Using PowerSqueak** To open PowerSqueak either -* run: ``` PSPresentationTool open. ``` -* click PowerSqueak in the "Apps" drop-down-menu
Open PowerSqueak in the Apps menu - -### Edit mode -During edit mode, you can use the buttons at the top to create, delete and navigate slides and to create different slide elements (like text boxes, and images) and drop them onto the slide. -You may also drop in other Morphs, but be aware, that some features of those Morphs might not work as expected. - -For advanced features like deleting morphs or resizing text, right-click the morph. -
Right-click example - -### Presentation mode +* run: ``` PSPresentationTool open. ``` +* click PowerSqueak in the "Apps" drop-down-menu\ + Open PowerSqueak in the Apps menu + +### **Edit mode** +During edit mode, you can use the buttons at the top to create and navigate slides. +To create slides from templates or delete slides, use the "Slide" menu in the menu bar. +To add slide elements like text or images, use the "Insert" menu to create a textfield/image in hand. +You may also drop other Morphs onto slides, but be aware, that some features of those Morphs might not work as expected (scaling most of the time does not work correctly). + +For advanced features like deleting morphs or resizing text, right-click the Morph.\ +Right-click example + +#### **Magnetic Raster** +PowerSqueak supports a magnetic raster for easy layouting. +If the magnetic raster is active, resizing a Morph will automatically smap the corners of the Morph to an imaginary raster.\ +To enable the magnetic raster click:\ +How to enable magnetic raster\ +The button will change color, to indicate, that the raster is active\ +Magnetic raster is enabled + +### **Presentation mode** To enter presentation mode, click the "Present" button. To control your presentation during presentation mode, use: @@ -57,25 +72,50 @@ To control your presentation during presentation mode, use: | Key | Action | | ------- | ------- | | Esc | Leave presentation mode | -| right arrow/page down | next slide | -| left arrow/page up | previous slide | -| Number keys | Jump to a slide number | +| right arrow/arrow down/page down | next slide | +| left arrow/arrow up/page up | previous slide | +| Number keys | Jump to a slide number (0 = last slide) | | i | (de-)activate interactivity and (un-)hide cursor | -#### Interactive/Non-Interactive mode + +Because PowerSqueak supports slide selection with both arrow and page keys, most wireless presenters will work correctly with PowerSqueak, but pressing the present button on your presenter will not work, as the Squeak VM does not support function keys. + +#### **Interactive/Non-Interactive mode** By pressing "i" during presentation mode, you can disable/enable interactivity and hide/unhide the cursor. This mode is added to avoid the visual clutter of the cursor and to keep text on slides from grabbing the keyboard input, which prevents you from changing slides. -Leaving presentation mode also enables interactivity and unhides the cursor. +Leaving the presentation mode also enables interactivity and unhides the cursor. -### Saving and loading +### **Saving and loading** PowerSqueak can save and load presentations to/from the file system. -Use the corresponding save/load buttons to save/load the presentation. -If you want to view the saved files, go to the PSPresentation folder in your Squeak VMs folder. -You can share presentations by copying any presentation in the PSPresentation folder into the PSPresentations folder of another image. +Use the corresponding save/load buttons in the "File" menu to save/load the presentation. +If you want to view the saved files, go to the ```PSPresentation``` directory in your Squeak VMs directory. +You can share presentations by copying any presentation in the ```PSPresentation``` directory into the ```PSPresentation``` directory of another image. In the other image you can then load the presentation as usual in PowerSqueak. ``` diff - Warning: some morphs may crash your image if they are saved/loaded! - It is recommended, that you save your image before every save/load operation in PowerSqueak ``` + +You may also export your presentation to a list of .png files, which will get exported into the ```PSPresentationsExports``` folder in your Squeak VMS directory + +### **List of shortcuts** +#### **Global schortcuts** +| Key | Action| +| ---- | ---- | +| right arrow/arrow down/page down | next slide | +| left arrow/arrow up/page up | previous slide | +| Number keys | Jump to a slide number (0 = last slide) | +| Cmd + t | Create a text field in hand | + +### **Edit mode shortcuts** +| Key | Action | +| --- | --- | +| Cmd + i | Create an image | + +### **Presentation mode shortcuts ** +| Key | Action | +| --- | --- | +| i | (de-)activate interactivity and (un-)hide cursor | +| Esc | Leave presentation mode | \ No newline at end of file diff --git a/pictures/magnetic-raster-active.png b/pictures/magnetic-raster-active.png new file mode 100644 index 0000000000000000000000000000000000000000..735333f77a3aa1e9d20347cefca2adaa623a20e6 GIT binary patch literal 7253 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 aXO`14sw1qwsl9j#1c2mK<%*sg`~3%R&Po^n literal 0 HcmV?d00001 diff --git a/pictures/magnetic-raster.png b/pictures/magnetic-raster.png new file mode 100644 index 0000000000000000000000000000000000000000..9aea8f0a18902abdcaaf824ae16d355d84f20f0a GIT binary patch literal 13014 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 literal 0 HcmV?d00001 diff --git a/pictures/right-click.png b/pictures/right-click.png index 910369665766e551d36e631612ea6f04fe55a94e..f91c30dcc3bef0abeeff8ebd57cb16947d2ba08f 100644 GIT binary patch literal 84585 zcmbrlXH-*L*Z!@d(g`Rf2m}EUMJWNPp(r4zG-(FuMMUY5PN>oZ0s*N~MU>u=PUs{^ z3B7khZ=r|In{%J@{O>cy^L}{C2L@yB?5w@l+H)%an&J+{l`B`MU%pV# zymEyEcjd~p46>WVGcI}4WW;}09W|BYt`uTfSBVGLEuX1AyK%lXLvsc-w+ceKm_Pj9`t%kk;fGv9D(wVq2<+F z`GYig#B|ZI7m9(oa1!P+e=|GGpqyyBxgOLM%DN67SY zr$B>Bx94Ikbj9mpQNSmidOi^M zZVcl=FUkjaRtb4+=ZD(wiF-1t%bq()doD%E>`{63TIweQysyfK*T;NEnh(W?D&Fz= z)7LL@VTKtNxx5zi#{Dv0kWc?OUxB5Ww4wb6!MkLjROIAZQ2qXk@cQrRNL(j!vs0jx z38VD*VKcsQ}xGf`J296FLV#+=fwm1;|gJsni;fN&LiTj>-a}SXNw^2c4M#df;WdT zNuMX_7iFVmAMXY`mn__~ne;tB1d0`o}*wS^0kO{&JdERG;fV z>9lgvv!HJu0z3XScnrs*l!(`8{^!D*y9Xo2Bi($#`AJyr%WteT4};O|0x~BnT%N~^ z@qb@LywdirMPo%S3iqkqV@P5_HrmlC&8J?(Jo!J3{Pp>DZgd`vVFSwo0`^zCf1UqL zhmu8G{B&l(^~l|XnInjg`S%CZ_$gpf&Gp0xSoJ~z)jS%Q^*{GvG15YG4(Tr#Grv8z zB)+8I^%wmAx``VeeWdKlANcQYXoSE*9714Pk(V1eS*gvAJ<^zewf9U5(Xibd_F*7X z_1t{2+6x{qI%fLapXhoSe;cvzu1|mhhI<2Y>fv*uM6V=BT-kGOgOVmB*;$Xw>qG z%r3K&(($FbR4q<;>T8!mhDX`d<3UQoSAjmzbr6ubq z1u*J!uQA6n;X6#*^I=2ai-l-)IYsRvWrVVJZFW_J=A5|34Z?jUG5T8f+2mRtejWHT z_gB>uLu_R!2E9|$SErrHKZz7X2lLdCkkB$SANtOjHj&Y6`{hM*jk8QmH#>iF@l$_F zD`)nj?-vw61?&Y#!(HUF)cVMvNCEM7CZp7~msSq?*1cGxK(}|U_gd94*%v9aw-@Zh z+5R4$!9?34`7=izS+)uGn{9KbcBeCu_cx|je`k&lxrup5Oasya8*U)bmRlN!?SnMrKn78QI>W{AkK%e4%UW4$5u}g}0}DwHg|lITp;>w#vyr z)gEp-eF?7h`qJlDWNuiQr7?Ng0Q)#90JCjvz}1v~I`WyFFE*ZgJtJ!Z>)Hd(o>tJf zk~-^WxZimQ=J&5Gx8nm}{E*Q;xAZv~NW06GJHm~Y)_&ls0YgoWG2Gy7R_E=>+b+ze zfoWWv{@6wAemOZeVpx=CW1F+Jv=r|-E!RqC7xkq2Dl{^?@TUc!8`Hq{*7`k{C@;O* z=GtLF05`C&8lnlcY4vN75O>Zbv+QBS?XSuuOX~RIFnh(0od&Jp;UaYfZF#BeM&2a} zQeIbi`9W<>eB=pW$qqNYzo$*k&^Q)Lo(3VE<+_Y=6ENeyxKpkWc=U>G*44a@x1GCp zCR{Ioz}3I~GI;u^xkG4cDPd7 zN*={*+{pE-;G%kczrrEqNRk!e_2tmcSi7yR$y2pv+$Z7z0Z@FmMkG`_AdPL;+F+RD zf?cvz^-b<&(Q8>*i6gOgJOQpk?#^(5O7h1bBz6?r!5>3+5BLj#>7OSxy0bD-V=go_D|g}p7D+$t45&k2!*b{`9eb}0 zJjvpDd*;wkOW0}`M}9{_z=gCt)v{?wg}ps#T6-ZdO^T^4OKmofg~?%6j`?tNDwFSl zM1Z5QVPoHqf`n-CaR(4%kp}|QgaUKfN_d~_2t{nA1uu{rBC`Gt&KSL49>}8)6el;!ifzsPo}aYTXjroxzBIdJuLdb#pLZbh%%2%m1c%b zoHX)m7Ua%wKN@o4&zKG{Uk2pTy!Ckz*$LWtfCLE2uH9f8g$B*A%qn(F?{>EMgcz2n zuiPa#o#nrI=53FVE$U$_(n2UdC7l@KX!`ROQ?77mVeDfN@@3G7hN}MdY`oVw=%|_% zU9Whfx=a4Y^ooqixP&;TOTSJ2AO2Q=tbrodPgS?(9gU`zR#dqxX%>H~R+Kk6le%r= zXNeZ=1#fa!0sHIMNt4*Hpa`;GX=zLbhHOJmHs`iBGqOU+C_g8K32)T@_D7}MK070! zWn>I3j=XZ<$Wt!2X^LN=Xz+b{{RU|xW`a5*;?TjtB`7#eK(2WUmDbz)^ysLjrSH$P zDI`kIo5^b;vRLqX-YF#jFf`zT2vsPm8q+NmCOulEs7HBFk-Fq#zR+=jKedvz_M`?n zla`g(uJd*wSYVc3qY%laU;cp4a$D0y$w)R3o!@r*i-3Tm4FC9~)CyDz*Q7LRsE2D7 zKXBC!8!@!^5x@j>y&f3Eb?=4reSzcqxmFi6ShW+_jbNF1*q`G~JJ2>Igmpql(YqE%Q7JJ`tNyG zfDvGoJ~*DkI~(YB(l%J@MDol##@}UFzy|GAI-asd^szTP>rKGr3^uBpZ;$a*{@6ad zn*Z=c@Z}_7>lj6|3$|~b#%uj{6^gL%iAREEs`w%RCwzs&oUPrlcV{Nn)mPSzL6dAU z!pRNQ2N5vR#Sf%BHZHJQ#}^(JMbk&`S3hlrli$X-x>;=a%f?TzYJwAfm>J#l7OnwA zFM%)4T^V#^W#~w1as~Hyo-2%KB-Fb3hwgM9omkPl;r~VfCxuWYu_8q#Toc)_MqhS! zC8(b*n+A zj*cac%QP`Dtl9$%-_P7Q`b9UII#BLMJHg5irlTVkLZtVv*!`$P0J^f$fDROLDL9K^?`2>Zw!s>X_`pXvlV?miVMNVaAVGR56~t!Wg&U6y73H2$?T z(q%Kb57pyfBdLqq`I?yxPjeq{! z-&{Mu*4eVteEtH#5)i>*^^N@&?vu8!anHqg0%BBKO0{?JE(X5HGo{tLVu=m%D@rGU-uTafsK1%i7r!YDpv94G1Hf$=S!%aYaK+q-dUPR1;PWR;~A zxY{3PljCuL>*g41dwx9xz7vT%tUo{Em6^ltFRoQUbRu0#eD?pG5F=n}lj5-&YiQv! zHIJe)*P|=<1a!5^Ess59TsGfE$l&gqou^8Rd(F|?&4`CZ^LnVK@nH(s?bCmI$};jL zeC9WmNvL=t$uBLb3Iw(I~o@M}U3CTi-7Us!S)FDIn>x@nt*e;b;bE zq@*9E8!dC)pN9%lRqa@OIcjQ9<9TgajWMTpIw0CoZSIVlAzn$;eCg-2FA<@B&_ThC zE{TA3F#%jhtZyORTgLv}gPFK^;@iCx?6>W|4dOqhQ^tn4k zTwJ?|lA)q-i(^IBOsHakt@YRXGVEaO@7(z3#A2J)btK;k`azs z3ou)4Du|I#MQ?u z^#}sa+y1!WQAIr#8UcgTN-xgcL{5abc!|#Y+kNAmk6(Q@b#EK(eVD;Fm*@J{~k3%5hP5QLYjthN?bcmMFY{Lv1EV)Ekf z9u4bcP+(X;7^cbUf%xXvYGDmKPue@W2!6$|&J!73c7u`$+xGKi3)ti-nWW;$O5fmO zXRvQJT|&7-bo~s=h#Ic(VlzR~_RjEzxbIg-rk!*3*rUT{Z-$X*9mK>csy{kU{%92I z)OAP4`AgLXGrOb<1^@XzS3SxI(f#O_NmfOR@7vW;x8G|p!#GTAHLH9ORa>rVEo>v- z!$8(ZF~Y;(V~&=fxConmshIglJ#~VJHRJnVnPvkOwpAAc>PMiFVxNgu3X-EOkl&aT zY1|^5(R?rW?Te{8YD`c3+|mI~+}TFbm$%g4?;{iGJRp1ipe$#HrSI%dE)^iUdlmsw5M$%Nv0?VOEimHHb1UgCnv)u?T zvDUlz4G?QVJ0>opv(M|>sdNKC#pe?HV4X&T{SManrfuz$vym#9lgcVO!jt;ML(Kvd zc;}^d#0fP&&8Y~Qv|NOkp8z2{JZtng79B(qGLe57VH_UXB&Hm%bK_`4tX#5-u+erf z$Ay=OH?V{2wYjC~Vch&eTOU<;O#JNHn1B0Q2#I+Xk0~}+^`wG3>Ah)pKYc6yQR7bD zvNpoF4LM`noL*j5V%EgkH3etQDl%%CJ5K`F=-(Y?8}+|kS&s(HK+VoWoe-c&QnrjA zz3?vj#}lQhJ`xTGlQQ`R!t6#q5ZJ#XNuRV^ zssTHvs)rKX_m-FqP#&yI0-&aE1MZ_qu@Qf8X3mdYQw3R+2@E+F^`C8dt&|9Osv;V; zS*B42EiJ~mUG*89hXsdFd`}$@+9w9p4_W4@Kk>BHLO`>D4e4f{QytgE#U;(AD;~4P zV-8wGY;?f@^PovD17$J$q4mqP<8$5eC!j4EZ?g5N+y3_>p1*n(>Jsj;!DDw-%;)UR z^HWh%8{I2%8K*12cxR9Gb*(Dc=5_uYj0bL)?w!3J;;QL0GAGx-jHwI^&G*0e)q0se zd+Y`NdS++Qsq1vY&H^q>My)xaMHE+ee1(7?P|~ht>7H?6V~yH7KYBYyORJW^~h8IJ|U=cF%9_j0y9*xg2~M zUi7{`)Lv}A+4XqOYE$fyoP+sVSe5ARNCN#??%Y|o2x5mPHCrEHuL-uJu#S$09L=te zIc|Hs3<)jb^{#TbI%7AE=twOg#_F3kw;4(F(NLZxY)zZ_l` zq8`(Oru}TQ1aNZCCG4if!yoa!QfIWm%+*beI$zu@%%-k`uipwdt}%C16D^#DFjU7r z=$P^AW{ERd%njsK6uXOmA@kkrY(kl|*z~*^0ycUJBddNp(3eqm>`uEmdmHF`VXnv_ z<1Wegz6;$E%RGuQe!ep%L`+&N2Gu{!+}(xb>ZSzkjP93q@XrS011Nda4mE{8_+F`$+}yq~`8lmhJVJ|b-A`G>4&S2KeMaay0V z9SRydqli_1_{^B1>j?S(Y}3#58xz*P8~GDz3j;^CZ4>HCfo(iRFKm5|N3eEP8Gft#CY_0P9b!-4d3{t|g* z4%;>sItU(w65cnLuARG(G(73^r-M-e*(d1bTp-@l(jx=dqYd_^uFPYH<}~3tlve$8 zMysW7e}o`s2N%n#jt?FtziD{%h);2BRao3>PqhAc&YJ$6ed9Jz?7C|x>NZaH%;ARY zneG8Taq!y;(;X_F@?@8_<9GF-|0!oPj#FV8G|~iM1@$ABlvd{1 zyo3@UTMRY8ie0wmWzC(j*z~yl-Z5RHF0nkbVk00rjdq3$@`{9wMu0_l37loD(3NC^ zyh-AQbQ+FzyYVJV1^qpn_UPoq3gWaK5Ee$Vu`v#96ZdYmW!Rh$ef(L!)}o8%mWuT9qkCZY8z(t^>!T z3ruI#uWP$zt8X5^0+Ew4;2!B9ptJhrQkGFNwo+z!0?_w%3LmaqYtHC0^AxCf47_Lu z#w!;}h>JH)wUD&j?`~{TZY-ae`R+Eu*xDArY4PXPhNO!D=ICoH-3p_&$bLhFH3M#0 z#{eqx1g)imaIJ%&o*{}}gA3V52$o>`lYn5E!au^9=^J_WI|qd2s4{zz8l?bEUQX6? zjC$MTHd~su@p!}A4iYrrh#et<}Ox7tp%4h zcrmMwn1;0E55TLWO`;P0+V3NGNVo!hr?E!v3F6^q!uP7*T@v))nhu9T$E z9h}l#(Tco!M)xc`RFt5-L`TDCifQ}T#jdv%6;I4Z2k$+eaD2+XWLRa-_Fk3UKeG4r zKD!J}r>ITSi0oABNIbxF>gz{d^hArqcj5azdfy37&=`DcE@IW{f@4K&qiJ>VlYK~@ zX!>jELiQnChh78iZN=%!Dzxd-vN!M*dB-t-=$LnRXO5ea`KS zh~zY6siT-f&HVj}#T2D?lOPmy(zB*Pk*|rALwNg}{?ECybx2~(dKYv~XqS)3f^Ebv zPa-nC-?#gi!Fzc6dX{bfF7EBWtRwKw&MnuKc#cNaByl;qjwgD-Mp_SaLE=bt(b@!sLA6oPxkQqn zMaR9?p5&m|&iEfycL8~fYK>p|P_skkUBr@BpNUFoc}*H8lxByEF80KmdJ2%FGT_@f zV)tmp+&TN1idv`Z%slJjW0>${MJx(a-mp5D9l_#?h*xXD!AaM9TQfuAaxZcAc zejnF?9rIj<73kJqZwp+5@g;uwm8VsVJ99RuKZvbYnV59nd0|`ztQ|ZlloUG~_Xl6# zxasY`1y&0ya$0HMs#toLp($O#?p+n3qx}8{bfl5Ag6DrKaj!vVG)n2c>1sr@ZuKes zd>rFEE|rkV!yla8!1OHw>3MUO2)A2~M@}Vi(Z>E-1cK?voEGtzAc^B9@eXd?j;C9- z^90uYg?c0a5Z&iapQDAb*~RtQF^=dW1qG|_9_ogTbwXp$;`X5qe<9iHJqOLc4^Hg& zH(6O}S;Vy3+#*7El#vLS5|jE-pi@gO8w7SZ?ml_4Bvoki5L3RMwKIi`71yg``xt_o zU0u6Q3WtcF2HgEHtIf)bgKnQPlSDsK+mat{ zj&e1tL#0T|1tXq~#~Di2G`zWL@YY?fXSriY>qxKdkRWS>N%v9~w3Sn@5+BXMEC&_J zE1J36fw4NNEtP9KhWQWLsGWT(8yY^@BRYv7@Q33ihpu<=Q&pb|D-V&&b;SXwY~eF= z9@F?aoMcFnn800YdCsrPYOSM-EDrky5_VJdUmigt<~quwk6v|O`T_BeNvinz;zb`# zivV8Y%;z>%!$7w)P1@|L9~*KP8uDqB$gZc_zWiH*DyM01*dOFdZy14bTzJe(!$R!I zKc#6*%n7-5N(X0!efn}jnofQ+$$e#W0|Dv5ZaRu9`jCx$w4IA{vX2}A;;cO4`-q@# znF#u9EX95POZse62oc7h3+0W~10JW{qbqiYX)M^8Ne@ibO8$I7Es8`a+3@x3QhE`~ zUnu-xAOB9hQQ#4ol9E?dZ2+q8O!W;LcIt*dI=m%WB4lNPkF_2k{c}uB75`aAKA6K> zjhC^YtFe@Uve;?N;N4@D)&+9;UhexF*nJo5mIKYo7g+TDyVBBE9sB2LneSXtI=JWH ze1KVjMGNwHRh%5FI8ji4c7zO|tw}FuUsI)sQ5F*L;fugs{mVTKxHCOBENvGwycWdpvM6b+A z_k#1SzKfQ~n+SSDq<&c~`x;sD)9M6)s2;6(L<#k&39;vAYeu&XY^kx+{>)7Cy?!7b zm*3vFyGU7l&zw=HKYGYqO-}C&NVRHSQ{@dgx)H1`UHF@n9a^K8s$u0`bBK_8VI$kh zjcsg(4E%(uW-KRteu)d>oW#(9>it#*^U~^zs`|Wo3o;sLdc|`Jx;D8fZ$oI z&_C*90mfyMZM)i$DAKWn5?U;0ZZBl+VcH0_?-K)$*4Ai|7#=o{j1*MZ*7c0z%1V1u z2vI$uKLr`wuY;*aD)FDm0oLMDrQZUEm!c2f4B;0dUC4Jd?3+vWNQvrQVB)3!9%ITz z{Zl0ZKrjmz*1ma4YLN4ss0qNxcZmGo=PD~oK#8#%G=B)Be#T%MGiCc?Er-|4uoZH?%vBJ+^8}Ys3c6yvHPwHA#<#iPT z$9-HkhgkB6!`+)_X4pX>kb{%cljOqt7WbU158ZtA-uDd*3^+(eZzdt`}l_~%`H%YMo>Nyt*WJ0j;reVyBO7%H}{G^dq7 z0amF&DXXgHuh*+F%MNP?AOjv$VGoI`@>v+jLi&A)bj@Q}jj&aX{#l-fKusQnYp@#o z50q6?aA4I-ONNCee)iS70vm)Gamd0*mDEN&Zw)@E`g+xdM1$Zy^a1<6{z8sJTE5)m z%yG0{VAZGzm_ME-x}{5ATNkOpQSqlum9+Bs!Mc!D4b^Z3wv9n+@QDWRwDgeeyBNm| zchQ(qB|{omyx*UV%^{zOoV1bRt03hA-SIrky^QY@Ij1qw(?J76-zTy49x^}9D*K#V zpVZC>G&ofYC!Q3%V!(A;$_S!V9<9su=-a_(@a)B+$o15Z8|u_up+FMGg3;$Z&$o)LYQMbnWiFvU5Nry-9nEfOX z?cKC?T-yO{oXb9gLmB4RT!QwVXq~ic+;ETV!~oYW?+ew+_|IQlhAT_9=b4>#Y#YxH z&d#hfjeq4bl5;I0%&zZ~vsy9FoB6j@y=3m?dwpZ#DXEf*W)oYHO1?{`klL8>4gG|~ zOwr)XftsA|D)u_h~{o?I+^$^4Qr$+U6k}(@mvtj9``#M ztt|>Y0D9@dArK{$e~*IQQ>`I%=lSLc+ z=;(m4F#+USO5dSHx$7bS4DiEpR%V=Nwtw_(sXEl$SQANMp_FUVKfVOMZl%_vvVU6= zJYOJW|NP4!@DeTlj~J*q-a5^WvmO6!`d_C)_$mr~aqV9Y1RFfs&H7(op%+5`V`_-$ zzaIxy`=0~Rl7HPa#Nxj#s&1HL+)fWSb8fWT_Md%X(G6Of@ca8|mE*y7i=UF7G)&%% zOFwq`8{Q1|TOjnSC+~L)RQg$bsAv0oKUeO=jC;dh`Esw*)`U6Hp7ifI$!CbJitYSg z%@WeV7aPPuu#TMgdAulEOx0aU@^_!(3QZBR$3Jb+RsR0c8=IT>vxbxuHdZ#agNCJn zx6#A(sy5H8$8PRU7On5iBpPx3_fabYTaV&-@7D*!$MZ-@N%s|=Sn~5@xA*q^Goo+T zd(Mgurytnep6J`H^m{xKzpdTlHL!Q7d~k^+s&&Wsg^jbwWgpwj64rk`iaXJ%@wxR# zd6)rr7*Xi3LxnEx!$rj;2E@dy4q=~u>UY}Tx)pkNhGu1Uh8(7K-@M~z)CzEc+?co! zY)F$)E@hdSR06M8RRggz{k9#poNy&ni)8vpFP+u7+VgiGXjv2Ys=vo!xWuV6P-b8& zZQ1Lm@Rq(0HHsAvE1S;8CnTE2`bhnQ5YIe+jP1#~^J>oX+!eY<%dfVzy&vB6v+8An zD2)CGN_uYjcIZ|KNmLY=#s9=f(U;)g;{!#0hYV0{^)dTx6#`VuU;gWzXdx=?Y=8Zw zIQr9=o|m|*i(++>(SLB&52QV=aC4Ks)-7fq!0gM#e|ddfDZDXPBrmF3h}ysQ=6CZf zzl78}GN?eT>CQsm7ab1E#H`g`10^Mi{E<>X53!GCmiEYO4%myCVru9kq*-gDk%MT1 zu|&*URov{XL(g3AQbVOy1ANf5=aasYQr`t#uwvfvXwJvvWLilR`gz93PhAdq_t!zx z@$cR2L>EP?jGwSvE0#oVe%IkN|@Z;YZS zgDZ;K0wS7L==(@Bc)dK

J^(il$tg#lxc6Fiw?lRcxw6dX;tZ=k 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 From ba243061a6edebc0fff0e25576e0a46bcef68dd8 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Wed, 25 Jul 2018 14:17:44 +0200 Subject: [PATCH 112/112] [skip ci] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3c50454..6eee2a7 100644 --- a/README.md +++ b/README.md @@ -114,8 +114,8 @@ You may also export your presentation to a list of .png files, which will get ex | --- | --- | | Cmd + i | Create an image | -### **Presentation mode shortcuts ** +### **Presentation mode shortcuts** | Key | Action | | --- | --- | | i | (de-)activate interactivity and (un-)hide cursor | -| Esc | Leave presentation mode | \ No newline at end of file +| Esc | Leave presentation mode |