diff --git a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/baseline..st b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/baseline..st index 0acd483..3ffd645 100644 --- a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/baseline..st +++ b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/baseline..st @@ -5,7 +5,6 @@ baseline: spec for: #'common' do: [ spec - package: 'Presenter-Core'; package: 'Presenter-Tests' with: [spec requires: #('Presenter-Core')]; yourself. @@ -14,4 +13,5 @@ baseline: spec group: 'tests' with: #('Presenter-Tests')]; yourself. spec - preLoadDoIt: #preLoad + preLoadDoIt: #preLoad; + postLoadDoIt: #postLoad. diff --git a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/postLoad.st b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/postLoad.st new file mode 100644 index 0000000..9c9fdde --- /dev/null +++ b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/postLoad.st @@ -0,0 +1,4 @@ +baseline +postLoad + + PSPresentationTool initialize. \ No newline at end of file diff --git a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/preLoad.st b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/preLoad.st index 0276a62..3cc1c71 100644 --- a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/preLoad.st +++ b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/preLoad.st @@ -1,4 +1,4 @@ -as yet unclassified +baseline preLoad (TextStyle named: 'BitstreamVeraSans') fontArray do: [:font | diff --git a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/methodProperties.json b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/methodProperties.json index c5b7e8e..b4472a6 100644 --- a/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/methodProperties.json +++ b/packages/BaselineOfPresenter.package/BaselineOfPresenter.class/methodProperties.json @@ -2,5 +2,6 @@ "class" : { }, "instance" : { - "baseline:" : "fn 4/17/2018 11:58", + "baseline:" : "LM 6/13/2018 13:41", + "postLoad" : "LM 6/13/2018 13:51", "preLoad" : "WoC 5/28/2018 17:40" } } diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/enablePresentationMode.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/enablePresentationMode.st index 1a67f8e..62e1ac8 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/instance/enablePresentationMode.st +++ b/packages/Presenter-Core.package/PSContentContainer.class/instance/enablePresentationMode.st @@ -1,4 +1,4 @@ presentation mode enablePresentationMode - self removeResizeHandles \ No newline at end of file + self removeResizeHandles \ 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 441288d..f7fed0a 100644 --- a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json @@ -13,7 +13,7 @@ "defaultContextMenuContent" : "MK 6/1/2018 18:06", "disablePresentationMode" : "MK 5/25/2018 16:12", "dragCorner:event:fromHandle:" : "MK 5/25/2018 17:10", - "enablePresentationMode" : "MK 5/25/2018 15:19", + "enablePresentationMode" : "LM 6/8/2018 20:10", "extent:" : "MK 5/25/2018 17:11", "extentBottomLeft:" : "MK 5/25/2018 17:12", "extentBottomRight:" : "MK 5/25/2018 17:12", diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/class/initialize.st b/packages/Presenter-Core.package/PSPresentationTool.class/class/initialize.st new file mode 100644 index 0000000..804cd15 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/class/initialize.st @@ -0,0 +1,5 @@ +instance creation +initialize + + super initialize. + self registerInWorldMenu \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/class/registerInWorldMenu.st b/packages/Presenter-Core.package/PSPresentationTool.class/class/registerInWorldMenu.st new file mode 100644 index 0000000..00488f0 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/class/registerInWorldMenu.st @@ -0,0 +1,4 @@ +instance creation +registerInWorldMenu + + TheWorldMenu registerOpenCommand: {'PowerSqueak'. {self. #open}} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/abandonMorph..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/abandonMorph..st new file mode 100644 index 0000000..cec0f9c --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/abandonMorph..st @@ -0,0 +1,5 @@ +presentation loading +abandonMorph: aMorph + + aMorph ifNotNil: [aMorph abandon]. + ^ nil \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st new file mode 100644 index 0000000..02185a2 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/askForPresentationName.st @@ -0,0 +1,4 @@ +presentation saving +askForPresentationName + + ^ UIManager default request: 'Please enter a presentation name: ' initialAnswer: 'Presentation' centerAt: World center \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildErrorReportString..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildErrorReportString..st new file mode 100644 index 0000000..2d0063a --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buildErrorReportString..st @@ -0,0 +1,8 @@ +notifications +buildErrorReportString: aDictionary + + | errorString | + errorString := 'I could not load all slides completely.'. + aDictionary keysAndValuesDo: [:key :value | + errorString := errorString, Character cr, key, ' is missing ', value, ' morph(s).']. + ^ errorString \ 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 b115191..b91cd26 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st @@ -8,4 +8,6 @@ buttonBarTopData self selectSlideButtonData. self textFieldButtonData. self imageFieldButtonData. - self presentationModeButtonData } \ No newline at end of file + self presentationModeButtonData. + self loadingButtonData. + self saveButtonData } \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/createDirectory.in..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createDirectory.in..st new file mode 100644 index 0000000..03c2278 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/createDirectory.in..st @@ -0,0 +1,7 @@ +presentation saving +createDirectory: aString in: aFileDirectory + + aFileDirectory createDirectory: aString. + ^ aFileDirectory / aString + + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/defaultDirectory.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/defaultDirectory.st new file mode 100644 index 0000000..d0c6a5d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.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/PSPresentationTool.class/instance/defaultDirectoryName.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/defaultDirectoryName.st new file mode 100644 index 0000000..485b9d2 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/defaultDirectoryName.st @@ -0,0 +1,4 @@ +accessing +defaultDirectoryName + + ^ 'PSPresentations' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideButtonData.st index 6e14659..e5f63fa 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideButtonData.st +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideButtonData.st @@ -2,7 +2,7 @@ toolbuilder deleteSlideButtonData ^ Dictionary withAll: { - #frame -> (0.4@0.0 corner: 0.55@1.0). + #frame -> (0.35@0.0 corner: 0.50@1.0). #name -> #DeleteSlideButton. #label -> 'Delete Slide'. #action -> #deleteSlide} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/getValidPresentationName..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/getValidPresentationName..st new file mode 100644 index 0000000..9ffe5e2 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/getValidPresentationName..st @@ -0,0 +1,12 @@ +presentation saving +getValidPresentationName: aFileDirectory + + | presentationName directory | + presentationName := self askForPresentationName. + presentationName = '' + ifTrue: [^ nil]. + directory := (aFileDirectory / presentationName). + ^ directory exists + ifTrue: [self validateUsageOf: presentationName inDirectory: aFileDirectory] + ifFalse: [directory assureExistence] + \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/isValidPresentationDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/isValidPresentationDirectory..st new file mode 100644 index 0000000..74de564 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/isValidPresentationDirectory..st @@ -0,0 +1,6 @@ +presentation loading +isValidPresentationDirectory: aDirectory + + | slidesDirectory | + slidesDirectory := aDirectory / self slidesDirectoryName. + ^ slidesDirectory exists and: [slidesDirectory directoryNames isEmpty not] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromFile..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromFile..st new file mode 100644 index 0000000..284d686 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromFile..st @@ -0,0 +1,4 @@ +presentation 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/PSPresentationTool.class/instance/loadMorphFromStream..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st new file mode 100644 index 0000000..7670cce --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream..st @@ -0,0 +1,4 @@ +presentation loading +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/PSPresentationTool.class/instance/loadMorphFromStream.testIn..st new file mode 100644 index 0000000..2e13acb --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadMorphFromStream.testIn..st @@ -0,0 +1,11 @@ +presentation loading +loadMorphFromStream: aStream testIn: aWorld + + | morph | + [morph := aStream fileInObjectAndCode] + on: Error + do: [:error | + morph := self abandonMorph: morph]. + (morph isNil not 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/PSPresentationTool.class/instance/loadPresentation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st new file mode 100644 index 0000000..1094841 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st @@ -0,0 +1,15 @@ +presentation loading +loadPresentation + + | presentations presentationName | + 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] + \ 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 new file mode 100644 index 0000000..4b98e2c --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationFromDirectory..st @@ -0,0 +1,7 @@ +presentation loading +loadPresentationFromDirectory: aDirectory + + (self isValidPresentationDirectory: aDirectory) + ifTrue: [self loadPresentationUnchecked: aDirectory] + ifFalse: [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 new file mode 100644 index 0000000..ad609e9 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentationUnchecked..st @@ -0,0 +1,12 @@ +presentation loading +loadPresentationUnchecked: aDirectory + + | slidesDirectory errorReport | + errorReport := Dictionary new. + self slides removeAll. + slidesDirectory := aDirectory / self slidesDirectoryName. + slidesDirectory directoryNames do: [:each | + errorReport at: each put: (self loadSlideFromDirectory: slidesDirectory / each)]. + self + selectSlide: 1; + showErrorReport: errorReport \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st new file mode 100644 index 0000000..9cdc788 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st @@ -0,0 +1,14 @@ +presentation loading +loadSlideFromDirectory: aDirectory + + | slide corruptedMorphs | + corruptedMorphs := 0. + slide := PSSlide new. + aDirectory fileNames do: [:each | + | morph | + morph := self loadMorphFromFile: aDirectory / each. + morph + ifNil: [corruptedMorphs := corruptedMorphs + 1] + ifNotNil: [slide addMorph: morph]]. + self slides addLast: slide. + ^ corruptedMorphs \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadingButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadingButtonData.st new file mode 100644 index 0000000..c403d3d --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/loadingButtonData.st @@ -0,0 +1,8 @@ +toolbuilder +loadingButtonData + + ^ Dictionary withAll: { + #frame -> (0.6@0.0 corner: 0.7@1.0). + #name -> #loadingButton. + #label -> 'Load'. + #action -> #loadPresentation} \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/morph.survivesOneCycleIn..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/morph.survivesOneCycleIn..st new file mode 100644 index 0000000..52bb7c6 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/morph.survivesOneCycleIn..st @@ -0,0 +1,14 @@ +presentation 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." + | debuggersBefore newDebuggers | + debuggersBefore := Debugger allInstances. + aMorph openInWorld: aWorld. + World doOneCycle. + newDebuggers := Debugger allInstances reject: [:each | + debuggersBefore includes: each]. + newDebuggers do: [:each | each abandon]. + newDebuggers size > 0 + ifTrue: [^ false]. + ^ true \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/overwriteQuestion.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/overwriteQuestion.st new file mode 100644 index 0000000..93ee1c6 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/overwriteQuestion.st @@ -0,0 +1,4 @@ +accessing +overwriteQuestion + + ^ 'The name you chose is already used. Do you want to overwrite the Presentation?' \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/riskyOperationMessage.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/riskyOperationMessage.st new file mode 100644 index 0000000..5500152 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/riskyOperationMessage.st @@ -0,0 +1,4 @@ +as yet unclassified +riskyOperationMessage + + ^ '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/PSPresentationTool.class/instance/saveButtonData.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/saveButtonData.st new file mode 100644 index 0000000..7965758 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/saveButtonData.st @@ -0,0 +1,8 @@ +toolbuilder +saveButtonData + + ^ Dictionary withAll: { + #frame -> (0.5@0.0 corner: 0.6@1.0). + #name -> #savingButton. + #label -> 'Save'. + #action -> #savingConfirmation} \ 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 new file mode 100644 index 0000000..2989757 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st @@ -0,0 +1,15 @@ +presentation saving +savePresentation + + | directory | + directory := self defaultDirectory. + + directory := self getValidPresentationName: directory. + directory ifNil: [^ self]. + directory := self createDirectory: 'slides' in: directory. + + self slides doWithIndex: [:each :index | + | directoryName | + directoryName := 'slide', index asString. + directory createDirectory: directoryName. + each saveInDirectory: directory / directoryName ] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/savingConfirmation.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savingConfirmation.st new file mode 100644 index 0000000..65fd009 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/savingConfirmation.st @@ -0,0 +1,4 @@ +presentation saving +savingConfirmation + + self warn: self riskyOperationMessage trueChoice: [self savePresentation] \ 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 new file mode 100644 index 0000000..3fd9f27 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/showErrorReport..st @@ -0,0 +1,8 @@ +notifications +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 diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/slidesDirectoryName.st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slidesDirectoryName.st new file mode 100644 index 0000000..6ddf5ef --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/slidesDirectoryName.st @@ -0,0 +1,4 @@ +accessing +slidesDirectoryName + + ^ 'slides' \ 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 new file mode 100644 index 0000000..4a3da83 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/validateUsageOf.inDirectory..st @@ -0,0 +1,9 @@ +presentation saving +validateUsageOf: aString inDirectory: aFileDirectory + + | directory | + directory := aFileDirectory / aString. + self warn: self overwriteQuestion + trueChoice: [directory recursiveDelete. + ^ self createDirectory: aString in: aFileDirectory] + falseChoice: [^ self getValidPresentationName: aFileDirectory] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice..st b/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice..st new file mode 100644 index 0000000..89cca2f --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice..st @@ -0,0 +1,4 @@ +notifications +warn: aString trueChoice: aBlock + + self warn: aString trueChoice: aBlock falseChoice: [] \ No newline at end of file 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 new file mode 100644 index 0000000..bb45a07 --- /dev/null +++ b/packages/Presenter-Core.package/PSPresentationTool.class/instance/warn.trueChoice.falseChoice..st @@ -0,0 +1,6 @@ +notifications +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/PSPresentationTool.class/methodProperties.json b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json index 09a0364..3867edb 100644 --- a/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSPresentationTool.class/methodProperties.json @@ -1,13 +1,19 @@ { "class" : { + "initialize" : "LM 6/13/2018 13:54", "open" : "WoC 5/6/2018 13:36", - "openIn:" : "LB 5/23/2018 16:11" }, + "openIn:" : "LB 5/23/2018 16:11", + "registerInWorldMenu" : "LM 6/13/2018 12:19" }, "instance" : { + "abandonMorph:" : "MK 6/8/2018 17:37", "addSlideButtonData" : "LM 5/16/2018 17:08", + "askForPresentationName" : "JZ 6/8/2018 20:41", + "buildErrorReportString:" : "MK 6/8/2018 18:38", "buildWith:" : "LM 6/1/2018 20:15", - "buttonBarTopData" : "MK 5/25/2018 15:02", + "buttonBarTopData" : "JZ 6/8/2018 19:53", "createButtonBarTopSpec:" : "JZ 5/11/2018 19:51", "createButtonSpec:with:" : "LM 5/18/2018 16:16", + "createDirectory:in:" : "JZ 6/8/2018 19:12", "createSlide" : "LM 5/18/2018 18:37", "createSlideContainerIn:" : "MK 5/25/2018 15:55", "createSlideViewportSpec:" : "LB 5/6/2018 17:00", @@ -15,33 +21,56 @@ "currentSlide" : "LM 5/11/2018 18:09", "currentSlideNumber" : "LM 5/6/2018 15:15", "currentSlideNumber:" : "MK 5/6/2018 15:56", + "defaultDirectory" : "JZ 6/8/2018 17:01", + "defaultDirectoryName" : "JZ 6/8/2018 16:52", "deleteSlide" : "LB 5/6/2018 18:03", "deleteSlide:" : "JZ 5/11/2018 19:50", - "deleteSlideButtonData" : "LM 5/15/2018 15:27", + "deleteSlideButtonData" : "JZ 6/8/2018 19:54", "disablePresentationMode" : "LM 5/25/2018 16:58", - "enablePresentationMode" : "LM 5/25/2018 16:59", + "enablePresentationMode" : "LM 6/8/2018 20:01", + "getValidPresentationName:" : "JZ 6/8/2018 20:45", "imageFieldButtonData" : "LM 5/18/2018 16:16", "initialize" : "LM 5/25/2018 16:58", + "isValidPresentationDirectory:" : "MK 6/8/2018 18:15", + "loadMorphFromFile:" : "MK 6/8/2018 17:32", + "loadMorphFromStream:" : "LM 6/13/2018 16:46", + "loadMorphFromStream:testIn:" : "LM 6/13/2018 16:45", + "loadPresentation" : "MK 6/8/2018 20:35", + "loadPresentationFromDirectory:" : "MK 6/8/2018 17:14", + "loadPresentationUnchecked:" : "MK 6/8/2018 18:23", + "loadSlideFromDirectory:" : "MK 6/8/2018 17:25", + "loadingButtonData" : "MK 6/8/2018 19:16", "minimumSlideCount" : "LM 5/6/2018 15:35", + "morph:survivesOneCycleIn:" : "LM 6/13/2018 16:57", "newImageField" : "LM 5/18/2018 17:13", "newTextField" : "LB 5/25/2018 16:43", "nextSlide" : "LM 5/6/2018 15:33", "nextSlideButtonData" : "LM 5/15/2018 15:27", "openImageField:" : "LB 5/18/2018 17:35", "openSlideSelectionDialog" : "WoC 5/6/2018 17:58", + "overwriteQuestion" : "JZ 6/8/2018 20:06", "presentationMode" : "LM 5/25/2018 16:57", "presentationMode:" : "LM 5/25/2018 16:57", "presentationModeButtonData" : "MK 5/25/2018 15:05", "previousSlide" : "LM 5/6/2018 15:33", "previousSlideButtonData" : "LM 5/15/2018 15:28", + "riskyOperationMessage" : "MK 6/8/2018 20:34", + "saveButtonData" : "JZ 6/8/2018 20:11", + "savePresentation" : "JZ 6/8/2018 20:22", + "savingConfirmation" : "JZ 6/8/2018 20:11", "selectSlide:" : "LM 5/11/2018 19:07", "selectSlideButtonData" : "LM 5/15/2018 15:28", + "showErrorReport:" : "MK 6/8/2018 18:30", "slideAt:" : "LM 5/6/2018 15:37", "slideContainer" : "MK 5/6/2018 15:32", "slideContainer:" : "MK 5/6/2018 15:32", "slideCount" : "LB 5/6/2018 17:25", "slides" : "LM 5/6/2018 15:05", "slides:" : "MK 5/6/2018 15:56", + "slidesDirectoryName" : "MK 6/8/2018 18:14", "textFieldButtonData" : "LM 5/18/2018 16:17", + "validateUsageOf:inDirectory:" : "JZ 6/8/2018 20:05", + "warn:trueChoice:" : "JZ 6/8/2018 17:54", + "warn:trueChoice:falseChoice:" : "MK 6/8/2018 18:44", "window" : "LM 6/1/2018 20:15", "window:" : "LM 6/1/2018 20:15" } } diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md b/packages/Presenter-Core.package/PSScalingFontAttribute.class/README.md new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..76131bf --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/class/styled.sized.scaledBy..st @@ -0,0 +1,7 @@ +instance creation +styled: aTextStyle sized: aNumber scaledBy: anObject + + ^ self new + style: aTextStyle; + basicTextSize: aNumber; + scalingSource: anObject \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st new file mode 100644 index 0000000..fd232d8 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/^equals.st @@ -0,0 +1,6 @@ +comparing += other + + ^ (other class == self class) + and: [other style == self style] + and: [other scalingSource == self scalingSource] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/actualTextSize.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/actualTextSize.st new file mode 100644 index 0000000..436f57d --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/actualTextSize.st @@ -0,0 +1,4 @@ +accessing +actualTextSize + + ^ self basicTextSize * self scalingSource textScale \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/basicTextSize..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/basicTextSize..st new file mode 100644 index 0000000..b1b5ecd --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/basicTextSize..st @@ -0,0 +1,4 @@ +accessing +basicTextSize: aNumber + + basicTextSize := aNumber diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/basicTextSize.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/basicTextSize.st similarity index 100% rename from packages/Presenter-Core.package/PSTextMorph.class/instance/basicTextSize.st rename to packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/basicTextSize.st diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/couldDeriveFromPrettyPrinting.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/couldDeriveFromPrettyPrinting.st new file mode 100644 index 0000000..400a1cc --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/couldDeriveFromPrettyPrinting.st @@ -0,0 +1,4 @@ +testing +couldDeriveFromPrettyPrinting + + ^ false \ 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 new file mode 100644 index 0000000..5edda34 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/dominates..st @@ -0,0 +1,4 @@ +testing +dominates: other + + ^ (other isKindOf: TextFontChange) or: [other class == self class] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/emphasizeScanner..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/emphasizeScanner..st new file mode 100644 index 0000000..bdd8b8e --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/emphasizeScanner..st @@ -0,0 +1,4 @@ +accessing +emphasizeScanner: scanner + + scanner setActualFont: self font \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/font.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/font.st new file mode 100644 index 0000000..3739164 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/font.st @@ -0,0 +1,4 @@ +accessing +font + + ^ self style fontOfSize: self actualTextSize \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/forFontInStyle.do..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/forFontInStyle.do..st new file mode 100644 index 0000000..44665c7 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/forFontInStyle.do..st @@ -0,0 +1,4 @@ +private +forFontInStyle: aTextStyle do: aBlock + + aBlock value: (aTextStyle fontOfSize: self actualTextSize) \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st new file mode 100644 index 0000000..af99ee0 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource..st @@ -0,0 +1,4 @@ +accessing +scalingSource: anObject + + scalingSource := anObject diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource.st new file mode 100644 index 0000000..10eff81 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/scalingSource.st @@ -0,0 +1,4 @@ +accessing +scalingSource + + ^ scalingSource diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/style..st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/style..st new file mode 100644 index 0000000..9b089ab --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/style..st @@ -0,0 +1,4 @@ +accessing +style: aTextStyle + + style := aTextStyle diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/style.st b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/style.st new file mode 100644 index 0000000..9801742 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/instance/style.st @@ -0,0 +1,4 @@ +accessing +style + + ^ style diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json new file mode 100644 index 0000000..40fc27f --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/methodProperties.json @@ -0,0 +1,17 @@ +{ + "class" : { + "styled:sized:scaledBy:" : "LB 6/8/2018 12:42" }, + "instance" : { + "=" : "LB 6/8/2018 12:29", + "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", + "emphasizeScanner:" : "LB 6/8/2018 12:33", + "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", + "style" : "LB 6/8/2018 12:27", + "style:" : "LB 6/8/2018 12:27" } } diff --git a/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json b/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json new file mode 100644 index 0000000..19a6fa8 --- /dev/null +++ b/packages/Presenter-Core.package/PSScalingFontAttribute.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "Presenter-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "style", + "basicTextSize", + "scalingSource" ], + "name" : "PSScalingFontAttribute", + "pools" : [ + ], + "super" : "TextAttribute", + "type" : "normal" } diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st b/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st new file mode 100644 index 0000000..f78015b --- /dev/null +++ b/packages/Presenter-Core.package/PSSlide.class/instance/saveInDirectory..st @@ -0,0 +1,6 @@ +as yet unclassified +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 diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json index b15d545..a6e4a0c 100644 --- a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json @@ -17,6 +17,7 @@ "resizeMorphHeightToFit:" : "LB 5/18/2018 17:36", "resizeMorphToFit:" : "LB 5/18/2018 17:36", "resizeMorphWidthToFit:" : "LM 5/18/2018 19:26", + "saveInDirectory:" : "JZ 6/8/2018 17:25", "sideRatio" : "LB 5/11/2018 16:10", "waitForDoubleClick:" : "LM 5/25/2018 17:22", "wantsDropFiles:" : "LB 5/18/2018 17:29" } } diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/beKeyWindow.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/beKeyWindow.st index 2991943..7c0cc8e 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/beKeyWindow.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/beKeyWindow.st @@ -1,3 +1,3 @@ -presentation mode +systemwindow-compatibility beKeyWindow "see comment in #isSystemWindow" \ 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 452e5d9..4a70852 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/disablePresentationMode.st @@ -1,8 +1,8 @@ presentation mode disablePresentationMode - DisplayScreen fullScreenOff. - "self ensurePreviousOwnerIsNotSubmorph." + +" self ensurePreviousOwnerIsNotSubmorph." self previousOwner addMorph: self. self color: self defaultColor diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st index 9d4722a..af347bb 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/enablePresentationMode.st @@ -2,7 +2,6 @@ presentation mode enablePresentationMode self previousOwner: self owner. - DisplayScreen fullScreenOn. self owner removeMorph: self. self openInWorld: self previousOwner world; diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/isCollapsed.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isCollapsed.st new file mode 100644 index 0000000..f008c44 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isCollapsed.st @@ -0,0 +1,4 @@ +systemwindow-compatibility +isCollapsed + + ^ false \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/isSystemWindow.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isSystemWindow.st index d796fe4..ac72d65 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/isSystemWindow.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/isSystemWindow.st @@ -1,4 +1,4 @@ -presentation mode +systemwindow-compatibility isSystemWindow "this method is needed in order to keep the presentation on top if a system window is closed" ^ true \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/lookUnfocused.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/lookUnfocused.st index e816cd9..f9f7fab 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/lookUnfocused.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/lookUnfocused.st @@ -1,3 +1,3 @@ -presentation mode +systemwindow-compatibility lookUnfocused "see comment in #isSystemWindow" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/makeMeVisible.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/makeMeVisible.st index b75634f..6cb517d 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/instance/makeMeVisible.st +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/makeMeVisible.st @@ -1,3 +1,3 @@ -presentation mode +systemwindow-compatibility makeMeVisible "see comment in #isSystemWindow" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/wantsDroppedMorph.event..st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/wantsDroppedMorph.event..st new file mode 100644 index 0000000..6fa1bc1 --- /dev/null +++ b/packages/Presenter-Core.package/PSSlideContainer.class/instance/wantsDroppedMorph.event..st @@ -0,0 +1,6 @@ +events-processing +wantsDroppedMorph: aMorph event: evt + + (self currentSlide containsPoint: evt position) + ifTrue: [^ true]. + ^ false \ 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 0f48638..c93c40f 100644 --- a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json @@ -7,15 +7,17 @@ "currentSlide" : "MK 5/6/2018 13:56", "currentSlide:" : "MK 5/6/2018 15:51", "defaultColor" : "MK 5/25/2018 15:41", - "disablePresentationMode" : "WoC 6/4/2018 17:13", - "enablePresentationMode" : "WoC 6/4/2018 16:09", + "disablePresentationMode" : "LM 6/6/2018 17:32", + "enablePresentationMode" : "LM 6/8/2018 20:04", "ensurePreviousOwnerIsNotSubmorph" : "LM 6/1/2018 20:13", "handlesKeyboard:" : "MK 5/25/2018 16:08", "initialize" : "WoC 6/4/2018 16:50", + "isCollapsed" : "LM 6/6/2018 18:13", "isSystemWindow" : "WoC 6/4/2018 17:35", "keyStroke:" : "MK 5/31/2018 10:10", "lookUnfocused" : "WoC 6/4/2018 17:13", "makeMeVisible" : "WoC 6/3/2018 00:10", "previousOwner" : "MK 5/25/2018 15:31", "previousOwner:" : "MK 5/25/2018 15:32", - "showSlide:" : "LB 5/6/2018 16:49" } } + "showSlide:" : "LB 5/6/2018 16:49", + "wantsDroppedMorph:event:" : "MK 6/7/2018 09:29" } } diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/accept.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/accept.st new file mode 100644 index 0000000..0f2f064 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/accept.st @@ -0,0 +1,4 @@ +as yet unclassified +accept + + "overwritten in order to disable the unwanted behavior of the text getting cleared, whenever the TextMorph is saved" \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/actualTextSize.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/actualTextSize.st deleted file mode 100644 index 06dca10..0000000 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/actualTextSize.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -actualTextSize - - ^ self basicTextSize * self textScale \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/basicTextSize..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/basicTextSize..st deleted file mode 100644 index 865c090..0000000 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/basicTextSize..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -basicTextSize: anInteger - - basicTextSize := anInteger. - self updateTextSize \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st new file mode 100644 index 0000000..cf50b9b --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/createFontSizeAttribute.st @@ -0,0 +1,7 @@ +initialize-release +createFontSizeAttribute + + ^ PSScalingFontAttribute + styled: PSTextMorph DefaultTextStyle + sized: self defaultBasicTextSize + scaledBy: self \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st new file mode 100644 index 0000000..2c654f5 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultFontColor.st @@ -0,0 +1,4 @@ +styling +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 new file mode 100644 index 0000000..04c840a --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/defaultTextBackgroundColor.st @@ -0,0 +1,4 @@ +styling +defaultTextBackgroundColor + + ^ Color white. \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/getLocalFontColor.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/getLocalFontColor.st deleted file mode 100644 index efdfa6b..0000000 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/getLocalFontColor.st +++ /dev/null @@ -1,4 +0,0 @@ -styling -getLocalFontColor - - ^ self selectionColor \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st new file mode 100644 index 0000000..6cf2e34 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/hasUnacceptedEdits.st @@ -0,0 +1,5 @@ +as yet unclassified +hasUnacceptedEdits + + "Disables the small yellow triangle" + ^ false \ 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 57971d1..64df129 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/initialize.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/initialize.st @@ -2,7 +2,10 @@ initialize-release initialize super initialize. - self basicTextSize: self defaultBasicTextSize. - self extension + self + initializeTextAttribute; setProperty: #acceptRescale toValue: true; - setProperty: #wantsCustomContextMenu toValue: true \ No newline at end of file + setProperty: #wantsCustomContextMenu toValue: true; + borderWidth: 0; + color: self defaultTextBackgroundColor; + selectionColor: self defaultFontColor \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeTextAttribute.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeTextAttribute.st new file mode 100644 index 0000000..60f363b --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/initializeTextAttribute.st @@ -0,0 +1,5 @@ +initialize-release +initializeTextAttribute + + self textMorph text addAttribute: self createFontSizeAttribute. + self textMorph releaseParagraph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAddAttribute..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAddAttribute..st new file mode 100644 index 0000000..956312a --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAddAttribute..st @@ -0,0 +1,4 @@ +styling +selectionAddAttribute: anAttribute + + self selectionAddAttribute: anAttribute onNoSelection: [] \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAddAttribute.onNoSelection..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAddAttribute.onNoSelection..st new file mode 100644 index 0000000..541f621 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAddAttribute.onNoSelection..st @@ -0,0 +1,12 @@ +styling +selectionAddAttribute: anAttribute onNoSelection: aBlock + "This is an adapted copy of TextMorph#selectionColor:, as it is not supported on all Versions of Squeak and we needed similar methods for other attributes." + + | interval | + interval := self textMorph editor selectionInterval. + interval size <= 0 + ifTrue: [interval := 1 to: self textMorph text size]. + self textMorph text addAttribute: anAttribute from: interval first to: interval last. + interval size = self textMorph text string size + ifTrue: aBlock. + self textMorph releaseParagraph \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAttribute..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAttribute..st new file mode 100644 index 0000000..2a16a9c --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionAttribute..st @@ -0,0 +1,10 @@ +styling +selectionAttribute: anAttributeClass + "This is an adapted copy of TextMorph#selectionColor, as it is not supported on all Versions of Squeak, and we needed similar methods for different attributes" + + | index attributes fontAttribute | + index := self textMorph editor startBlock stringIndex ifNil: [1]. + (index between: 1 and: self textMorph text size) ifFalse: [index := 1]. + attributes := self textMorph text attributesAt: index. + fontAttribute := attributes detect: [:attr | attr class = anAttributeClass] ifNone: []. + ^ fontAttribute \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor..st index 7b8c63b..a92b4b9 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor..st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor..st @@ -1,12 +1,6 @@ -compatability +styling selectionColor: aColor - "This is an adapted copy of TextMorph#selectionColor:, as it is not supported on all Versions of Squeak." - - | attribute int | - attribute := TextColor color: aColor. - int := self textMorph editor selectionInterval. - int size <= 0 ifTrue: [int := 1 to: self textMorph text size]. - self textMorph text addAttribute: attribute from: int first to: int last. - int size = self textMorph text string size ifTrue: - [self textMorph textColor: aColor]. - self changed. + + self + selectionAddAttribute: (TextColor color: aColor) + onNoSelection: [self textMorph textColor: aColor] diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor.st index df99652..00dff7f 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionColor.st @@ -1,10 +1,7 @@ -compatability +styling selectionColor - "This is an adapted copy of TextMorph#selectionColor, as it is not supported on all Versions of Squeak." - | ind attrs c | - ind := self textMorph editor startBlock stringIndex. - (ind isNil or: [ind < 1 or: [ind > self textMorph text size]]) ifTrue: [ind := 1]. - attrs := self textMorph text attributesAt: ind. - c := attrs detect: [:attr | attr class = TextColor] ifNone: []. - ^ c ifNil: [Color black] ifNotNil: [c color]. + + ^ (self selectionAttribute: TextColor) + ifNil: [Color black] + ifNotNil: [:colorAttribute | colorAttribute color] diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st new file mode 100644 index 0000000..c96f9c3 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize..st @@ -0,0 +1,8 @@ +styling +selectionFontSize: aNumber + + self selectionAddAttribute: + (PSScalingFontAttribute + styled: PSTextMorph DefaultTextStyle + sized: aNumber + 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 new file mode 100644 index 0000000..f6d1ec9 --- /dev/null +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/selectionFontSize.st @@ -0,0 +1,6 @@ +styling +selectionFontSize + + ^ (self selectionAttribute: PSScalingFontAttribute) + ifNil: [self defaultBasicTextSize] + ifNotNil: [:fontAttribute | fontAttribute basicTextSize] \ 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 d8abced..18738a2 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontColorDialog.st @@ -1,10 +1,8 @@ styling showFontColorDialog - | color | - color := self selectionColor. (NewColorPickerMorph on: self - originalColor: color + originalColor: self selectionColor setColorSelector: #selectionColor:) openNear: self fullBoundsInWorld \ No newline at end of file diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st index 78ce1a8..87b2faa 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/showFontSizeDialog.st @@ -4,7 +4,7 @@ showFontSizeDialog | newSize | newSize := UIManager default request: 'Please enter new text size' - initialAnswer: self basicTextSize printString. - [self basicTextSize: newSize asNumber] + initialAnswer: self selectionFontSize printString. + [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/instance/textScale..st b/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale..st index eff61af..4d2a62a 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale..st +++ b/packages/Presenter-Core.package/PSTextMorph.class/instance/textScale..st @@ -1,5 +1,4 @@ accessing textScale: aNumber - textScale := aNumber. - self updateTextSize + textScale := aNumber diff --git a/packages/Presenter-Core.package/PSTextMorph.class/instance/updateTextSize.st b/packages/Presenter-Core.package/PSTextMorph.class/instance/updateTextSize.st deleted file mode 100644 index 231bdee..0000000 --- a/packages/Presenter-Core.package/PSTextMorph.class/instance/updateTextSize.st +++ /dev/null @@ -1,4 +0,0 @@ -scaling -updateTextSize - - self textMorph beAllFont: (PSTextMorph DefaultTextStyle fontOfSize: self actualTextSize) \ 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 bbdd7b6..e1d5844 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/methodProperties.json @@ -2,18 +2,24 @@ "class" : { "DefaultTextStyle" : "LB 5/25/2018 17:35" }, "instance" : { - "actualTextSize" : "LB 5/25/2018 17:03", - "basicTextSize" : "LB 5/25/2018 15:59", - "basicTextSize:" : "LB 5/25/2018 16:09", + "accept" : "LM 6/8/2018 20:47", + "createFontSizeAttribute" : "LB 6/8/2018 15:42", "customContextMenuContent" : "WoC 6/2/2018 23:38", "defaultBasicTextSize" : "LB 5/25/2018 16:44", - "getLocalFontColor" : "LB 6/1/2018 18:35", - "initialize" : "MK 6/1/2018 16:59", + "defaultFontColor" : "LM 6/6/2018 19:22", + "defaultTextBackgroundColor" : "LM 6/6/2018 19:24", + "hasUnacceptedEdits" : "LM 6/8/2018 20:48", + "initialize" : "LB 6/12/2018 16:47", + "initializeTextAttribute" : "LB 6/12/2018 16:48", "rescale:" : "LB 5/25/2018 16:42", - "selectionColor" : "LB 6/1/2018 18:34", - "selectionColor:" : "LB 6/1/2018 18:33", - "showFontColorDialog" : "LB 6/1/2018 18:35", - "showFontSizeDialog" : "LB 6/1/2018 19:06", + "selectionAddAttribute:" : "LB 6/8/2018 15:11", + "selectionAddAttribute:onNoSelection:" : "LB 6/12/2018 17:14", + "selectionAttribute:" : "LB 6/8/2018 15:06", + "selectionColor" : "LB 6/8/2018 15:05", + "selectionColor:" : "LB 6/8/2018 15:22", + "selectionFontSize" : "LB 6/8/2018 15:04", + "selectionFontSize:" : "LB 6/8/2018 15:13", + "showFontColorDialog" : "LB 6/8/2018 14:56", + "showFontSizeDialog" : "LB 6/8/2018 14:54", "textScale" : "LB 5/25/2018 16:08", - "textScale:" : "LB 5/25/2018 16:09", - "updateTextSize" : "LB 5/25/2018 17:03" } } + "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 f477ec8..9d079bf 100644 --- a/packages/Presenter-Core.package/PSTextMorph.class/properties.json +++ b/packages/Presenter-Core.package/PSTextMorph.class/properties.json @@ -6,7 +6,6 @@ "DefaultTextStyle" ], "commentStamp" : "", "instvars" : [ - "basicTextSize", "textScale" ], "name" : "PSTextMorph", "pools" : [ diff --git a/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/createContextMenu.st b/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/createContextMenu.st index 05bcac8..af11ce9 100644 --- a/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/createContextMenu.st +++ b/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/createContextMenu.st @@ -1,4 +1,4 @@ -as yet unclassified +context menu createContextMenu self menuCreated: true \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/initialize.st b/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/initialize.st index 860e2d6..4c66473 100644 --- a/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/initialize.st +++ b/packages/Presenter-Tests.package/PSContentContainerForTests.class/instance/initialize.st @@ -1,4 +1,4 @@ -as yet unclassified +initialize-release initialize super initialize. diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/morphLoadingStreamFor..st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/morphLoadingStreamFor..st new file mode 100644 index 0000000..37cfa67 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/morphLoadingStreamFor..st @@ -0,0 +1,7 @@ +loading tests +morphLoadingStreamFor: aByteArray + + ^ (MultiByteBinaryOrTextStream with: aByteArray) + binary; + reset; + yourself \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st new file mode 100644 index 0000000..ae9ef88 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testInvalidLoadReturnsNil.st @@ -0,0 +1,4 @@ +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/testMorphLoadIsValid.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphLoadIsValid.st new file mode 100644 index 0000000..078d9be --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testMorphLoadIsValid.st @@ -0,0 +1,10 @@ +loading tests +testMorphLoadIsValid + + | morph | + morph := self tool + 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 diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st new file mode 100644 index 0000000..9416c18 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerExtent.st @@ -0,0 +1,6 @@ +presentation mode tests +testSlideContainerExtent + + self assert: self tool slideContainer extent ~= self tool slideContainer world extent. + self tool slideContainer enablePresentationMode. + self assert: self tool slideContainer extent equals: self tool 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 new file mode 100644 index 0000000..1838435 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideContainerPosition.st @@ -0,0 +1,5 @@ +presentation mode tests +testSlideContainerPosition + + self tool slideContainer 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/instance/testSlideNavigationInPresentationMode.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st new file mode 100644 index 0000000..475342f --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlideNavigationInPresentationMode.st @@ -0,0 +1,10 @@ +presentation mode tests +testSlideNavigationInPresentationMode + + self tool + createSlide; + selectSlide: 1; + enablePresentationMode. + self assert: self tool slideContainer currentSlide equals: self tool currentSlide. + self tool selectSlide: 2. + self assert: self tool slideContainer currentSlide equals: self tool 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 new file mode 100644 index 0000000..55d012d --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/testSlidesReceiveEnablePresentationMode.st @@ -0,0 +1,8 @@ +presentation mode tests +testSlidesReceiveEnablePresentationMode + + self tool createSlide. + self tool slides: (self tool slides collect: [:each | PSSlideForTests new]). + self tool enablePresentationMode. + self tool slides do: [:each | + self assert: each receivedPresentationModeEnable] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/validMorphFileData.st b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/validMorphFileData.st new file mode 100644 index 0000000..92e7316 --- /dev/null +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/instance/validMorphFileData.st @@ -0,0 +1,5 @@ +loading tests +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 diff --git a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json index ac864f6..f46ef1b 100644 --- a/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSPresentationToolTest.class/methodProperties.json @@ -5,6 +5,7 @@ "assertDeviatesLessThan:onWindowResize:" : "LB 5/29/2018 17:54", "assertIsConstantOnWindowResize:" : "LB 5/18/2018 18:19", "assertIsNearlyConstantOnWindowResize:" : "LB 5/22/2018 17:49", + "morphLoadingStreamFor:" : "LM 6/13/2018 16:50", "setUp" : "LB 5/23/2018 16:11", "setUpSlideDeletion" : "LM 5/18/2018 18:21", "tearDown" : "LB 5/22/2018 17:37", @@ -13,18 +14,25 @@ "testDeleteFirstSlide" : "LM 5/18/2018 18:25", "testDeletionDecreasesSlideCount" : "LM 5/18/2018 18:31", "testDeletionRemovesSlide" : "LM 5/18/2018 18:28", + "testInvalidLoadReturnsNil" : "LM 6/13/2018 17:34", + "testMorphLoadIsValid" : "LM 6/13/2018 16:50", "testNextSlide" : "LM 5/18/2018 18:43", "testPreviousSlideClampsToMin" : "LM 5/18/2018 18:45", "testSelectSlide" : "LM 5/18/2018 18:46", "testSelectSlideClamps" : "LM 5/18/2018 18:47", + "testSlideContainerExtent" : "LM 6/8/2018 19:54", + "testSlideContainerPosition" : "LM 6/8/2018 19:55", "testSlideCreation" : "LM 5/18/2018 18:38", "testSlideCreationReturnsSlide" : "LM 5/18/2018 18:37", "testSlideCreationSelectsNewSlide" : "LM 5/18/2018 18:35", "testSlideDeletionMovesSlideSelection" : "LM 5/18/2018 18:32", + "testSlideNavigationInPresentationMode" : "LM 6/8/2018 20:20", "testSlideRatioIsFixed" : "LB 6/1/2018 18:49", "testSlideResizeRegression" : "LB 5/18/2018 20:27", + "testSlidesReceiveEnablePresentationMode" : "LM 6/8/2018 20:01", "testZeroSlidesRegression" : "LM 5/11/2018 18:09", "testnextSlideClampsToMax" : "LM 5/18/2018 18:42", "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" } } diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/README.md b/packages/Presenter-Tests.package/PSSlideForTests.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/instance/enablePresentationMode.st b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/enablePresentationMode.st new file mode 100644 index 0000000..f229f71 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/enablePresentationMode.st @@ -0,0 +1,4 @@ +presentation mode +enablePresentationMode + + self receivedPresentationModeEnable: true. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/instance/initialize.st b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/initialize.st new file mode 100644 index 0000000..ae97699 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/initialize.st @@ -0,0 +1,5 @@ +initialize-release +initialize + + super initialize. + self receivedPresentationModeEnable: false. \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/instance/receivedPresentationModeEnable..st b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/receivedPresentationModeEnable..st new file mode 100644 index 0000000..8321fa1 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/receivedPresentationModeEnable..st @@ -0,0 +1,4 @@ +accessing +receivedPresentationModeEnable: anObject + + receivedPresentationModeEnable := anObject diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/instance/receivedPresentationModeEnable.st b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/receivedPresentationModeEnable.st new file mode 100644 index 0000000..b59ad14 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideForTests.class/instance/receivedPresentationModeEnable.st @@ -0,0 +1,4 @@ +accessing +receivedPresentationModeEnable + + ^ receivedPresentationModeEnable diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/methodProperties.json b/packages/Presenter-Tests.package/PSSlideForTests.class/methodProperties.json new file mode 100644 index 0000000..c66bc05 --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideForTests.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + }, + "instance" : { + "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" } } diff --git a/packages/Presenter-Tests.package/PSSlideForTests.class/properties.json b/packages/Presenter-Tests.package/PSSlideForTests.class/properties.json new file mode 100644 index 0000000..dbc377c --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideForTests.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Presenter-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "receivedPresentationModeEnable" ], + "name" : "PSSlideForTests", + "pools" : [ + ], + "super" : "PSSlide", + "type" : "normal" } diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st new file mode 100644 index 0000000..995ca9b --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testLeavePresentationModeEnablesHandles.st @@ -0,0 +1,9 @@ +presentation mode tests +testLeavePresentationModeEnablesHandles + + self slide + addContent: self morph; + enablePresentationMode; + disablePresentationMode; + submorphsDo: [:each | + self assert: each hasHandles] \ No newline at end of file diff --git a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st new file mode 100644 index 0000000..1d7718c --- /dev/null +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testPresentationModeRemovesHandle.st @@ -0,0 +1,8 @@ +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/testSubmorphsOnResize.st b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st index c4b7393..b3894bc 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/instance/testSubmorphsOnResize.st @@ -4,5 +4,5 @@ testSubmorphsOnResize self slide addContent: self morph. self assertDeviatesLessThan: 0.05 onSlideResize: [self morph extent x / self morph extent y]. - self assertDeviatesLessThan: 0.05@0.05 onSlideResize: [self morph extent / self slide extent]. + 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 2b325b2..a0506a2 100644 --- a/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSSlideSubmorphTest.class/methodProperties.json @@ -11,10 +11,12 @@ "testContainerResizing" : "LB 5/23/2018 16:44", "testContextMenu" : "MK 6/1/2018 19:49", "testDroppingCreatesContainer" : "LM 5/18/2018 18:59", + "testLeavePresentationModeEnablesHandles" : "LM 6/8/2018 20:11", + "testPresentationModeRemovesHandle" : "LM 6/8/2018 20:14", "testSlideContainerPosition" : "LB 5/23/2018 15:47", "testSlideDropping" : "LB 5/18/2018 18:17", "testSlideResizeToFit" : "LM 5/18/2018 19:20", "testSlideResizeToFitKeepsAspectRatio" : "LB 6/6/2018 15:16", "testSlideResizeToFitKeepsPosition" : "LM 5/18/2018 19:25", - "testSubmorphsOnResize" : "LB 5/29/2018 17:52", + "testSubmorphsOnResize" : "LM 6/6/2018 18:09", "testTriggerContextMenu" : "MK 6/1/2018 20:19" } } diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st index 3e90e9d..3689994 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontColor.st @@ -8,6 +8,7 @@ testLocalFontColor color := Color random. 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 diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st new file mode 100644 index 0000000..94e28aa --- /dev/null +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testLocalFontSize.st @@ -0,0 +1,14 @@ +style tests +testLocalFontSize + + | textLength size | + textLength := self textField textMorph contents size. + 1 to: textLength do: [:begin | + begin to: textLength do: [:end | + size := 200 atRandom. + 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 diff --git a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st index 15e54e3..914a78e 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/instance/testTextFieldRescale.st @@ -2,6 +2,7 @@ rescaling tests testTextFieldRescale | oldSize | - oldSize := self textField actualTextSize. + self flag: #TODO. + oldSize := self textField textScale * self textField selectionFontSize. self slide extent: self slide extent * 2. - self assert: oldSize * 2 = self textField actualTextSize \ No newline at end of file + self assert: oldSize * 2 = (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 357ddf9..945b491 100644 --- a/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json +++ b/packages/Presenter-Tests.package/PSTextMorphTest.class/methodProperties.json @@ -6,7 +6,8 @@ "setUp" : "LB 6/1/2018 18:12", "tearDown" : "LB 6/1/2018 18:21", "testContextMenu" : "MK 6/1/2018 19:45", - "testLocalFontColor" : "LB 6/1/2018 18:35", - "testTextFieldRescale" : "WoC 6/4/2018 17:22", + "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" } }