Merge pull request #67 from hpi-swa-teaching/master

PowerSqueak Version 0.4

packages/Presenter-Core.package/PSPresentationTool.class/instance/barFrameFrom.height..st

@@ -0,0 +1,8 @@
+toolbuilder
+barFrameFrom: fromNumber height: heightNumber
+
+	^ LayoutFrame new
+			leftFraction: 0 offset: 0;
+			topFraction: 0 offset: fromNumber;
+			rightFraction: 1 offset: 0;
+			bottomFraction: 0 offset: fromNumber + heightNumber

packages/Presenter-Core.package/PSPresentationTool.class/instance/buildWith..st

@@ -1,7 +1,7 @@
 toolbuilder
 buildWith: builder
 
-	| windowSpec slideViewportSpec buttonBarTopSpec window |
+	| windowSpec slideViewportSpec buttonBarTopSpec menuBarSpec window |
 	windowSpec := self createWindowSpec: builder.
 
 	slideViewportSpec := self createSlideViewportSpec: builder. 
@@ -10,6 +10,9 @@ buildWith: builder
 	buttonBarTopSpec := self createButtonBarTopSpec: builder.
 	windowSpec children add: buttonBarTopSpec.
 
+	menuBarSpec := self createMenuBarSpec: builder.
+	windowSpec children add: menuBarSpec.
+
 	window := builder build: windowSpec.
 	self createSlideContainerIn: (builder widgetAt: #SlideViewport).
 

packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonBarTopData.st

@@ -4,8 +4,8 @@ buttonBarTopData
 	^ {	self addSlideButtonData.
 		self previousSlideButtonData.
 		self nextSlideButtonData.
+		self switchButtonData.
 		self deleteSlideButtonData.
-		self selectSlideButtonData.
 		self textFieldButtonData.
 		self imageFieldButtonData.
 		self presentationModeButtonData.

packages/Presenter-Core.package/PSPresentationTool.class/instance/buttonHeight.st

@@ -0,0 +1,4 @@
+toolbuilder
+buttonHeight
+
+	^ Preferences standardButtonFont height * 3

packages/Presenter-Core.package/PSPresentationTool.class/instance/clampSlideNumber..st

@@ -0,0 +1,6 @@
+as yet unclassified
+clampSlideNumber: aNumber
+
+	^ aNumber 
+			clampLow: self minimumSlideCount
+			high: self slideCount

packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonBarTopSpec..st

@@ -4,13 +4,14 @@ createButtonBarTopSpec: aBuilder
 	panelSpec := aBuilder pluggablePanelSpec new.
 	panelSpec
 		model: self;
-		frame: (0@0 corner: 1@0.1);
+		frame: (self barFrameFrom: self buttonHeight  height: self buttonHeight);
 		name: #ButtonBarTop;
 		children: OrderedCollection new.
 
 	self buttonBarTopData do: [:each | 
 		| button |
 		button := self createButtonSpec: each with: aBuilder.
 		panelSpec children add: button].
+	panelSpec children add: (self createSlideNumberLabelSpec: aBuilder).
 
 	^ panelSpec

packages/Presenter-Core.package/PSPresentationTool.class/instance/createButtonSpec.with..st

@@ -3,6 +3,7 @@ createButtonSpec: aDictionary with: aBuilder
 
 	| buttonSpec |
 	buttonSpec := aBuilder pluggableButtonSpec new.
+	buttonSpec style: #none.
 	^ buttonSpec
 		model: (aDictionary at: #model ifAbsent: self);
 		frame: (aDictionary at: #frame);

packages/Presenter-Core.package/PSPresentationTool.class/instance/createMenuBarSpec..st

@@ -0,0 +1,16 @@
+toolbuilder
+createMenuBarSpec: aBuilder 
+	| panelSpec |
+	panelSpec := aBuilder pluggablePanelSpec new.
+	panelSpec
+		model: self;
+		frame: (self barFrameFrom: 0  height: self buttonHeight);
+		name: #MenuBar;
+		children: OrderedCollection new.
+
+	self menuBarButtonData do: [:each | 
+		| button |
+		button := self createButtonSpec: each with: aBuilder.
+		panelSpec children add: button].
+
+	^ panelSpec

packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlide.st

@@ -3,6 +3,7 @@ createSlide
 
 	| newSlide |
 	newSlide := PSSlide new.
+	newSlide setModel: self.
 	self slides add: newSlide afterIndex: self currentSlideNumber.
 	self selectSlide: self currentSlideNumber + 1.
 	"self updateSlideNumbers."

packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideNumberLabelSpec..st

@@ -0,0 +1,12 @@
+toolbuilder
+createSlideNumberLabelSpec: aBuilder
+
+	| labelSpec |
+	labelSpec := aBuilder pluggableInputFieldSpec new.
+	labelSpec
+		model: self;
+		name: #SlideNumberLabel;
+		frame: (0.2@0.0 corner: 0.3@1.0);
+		getText: #slideNumberString;
+		setText: #slideNumberString:.
+	^ labelSpec

packages/Presenter-Core.package/PSPresentationTool.class/instance/createSlideViewportSpec..st

@@ -4,7 +4,7 @@ createSlideViewportSpec: aBuilder
 	panelSpec := aBuilder pluggablePanelSpec new.
 	panelSpec
 		model: self;
-		frame: (0@0.1 corner: 1@1);
+		frame: self viewPortLayoutFrame;
 		name: #SlideViewport;
 		children: OrderedCollection new.
 	^ panelSpec

packages/Presenter-Core.package/PSPresentationTool.class/instance/currentSlideNumberString.st

@@ -0,0 +1,4 @@
+accessing
+currentSlideNumberString
+
+	^ currentSlideNumber asString

packages/Presenter-Core.package/PSPresentationTool.class/instance/deleteSlideButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 deleteSlideButtonData
 
 	^ Dictionary withAll: {	
-		#frame -> (0.35@0.0 corner: 0.50@1.0).
+		#frame -> (0.55@0.0 corner: 0.70@1.0).
 		#name -> #DeleteSlideButton.
 		#label -> 'Delete Slide'.
 		#action -> #deleteSlide}

packages/Presenter-Core.package/PSPresentationTool.class/instance/duplicateCurrentSlide.st

@@ -0,0 +1,6 @@
+as yet unclassified
+duplicateCurrentSlide
+
+	self slides 
+			add: self currentSlide copy 
+			afterIndex: self currentSlideNumber

packages/Presenter-Core.package/PSPresentationTool.class/instance/fileButtonData.st

@@ -0,0 +1,8 @@
+toolbuilder
+fileButtonData
+
+	^ Dictionary withAll: {	
+		#frame -> (0.0@0.0 corner: 0.1@1.0).
+		#name -> #FileButton.
+		#label -> 'File'.
+		#action -> #openFileMenu}

packages/Presenter-Core.package/PSPresentationTool.class/instance/imageFieldButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 imageFieldButtonData
 
 	^ Dictionary withAll: {
-		#frame -> (0.3@0.0 corner: 0.35@1.0).
+		#frame -> (0.5@0.0 corner: 0.55@1.0).
 		#name -> #imageFieldButton.
 		#label -> 'I'.
 		#action -> #newImageField.

packages/Presenter-Core.package/PSPresentationTool.class/instance/insertButtonData.st

@@ -0,0 +1,8 @@
+toolbuilder
+insertButtonData
+
+	^ Dictionary withAll: {	
+		#frame -> (0.1@0.0 corner: 0.2@1.0).
+		#name -> #InsertButton.
+		#label -> 'Insert'.
+		#action -> #openInsertMenu}

packages/Presenter-Core.package/PSPresentationTool.class/instance/loadPresentation.st

@@ -11,5 +11,6 @@ loadPresentation
 		chooseFrom: presentations
 		values: presentations
 		title: 'Which presentation do you want me to load?'.
-	presentationName ifNotNil: [self loadPresentationFromDirectory: self defaultDirectory  / presentationName]
+	presentationName ifNotNil: [self loadPresentationFromDirectory: self defaultDirectory  / presentationName].
+	"self updateSlideNumbers"
 

packages/Presenter-Core.package/PSPresentationTool.class/instance/loadSlideFromDirectory..st

@@ -4,6 +4,7 @@ loadSlideFromDirectory: aDirectory
 	| slide corruptedMorphs |
 	corruptedMorphs := 0.
 	slide := PSSlide new.
+	slide setModel: self.
 	aDirectory fileNames do: [:each |
 		| morph |
 		morph := self loadMorphFromFile: aDirectory / each.

packages/Presenter-Core.package/PSPresentationTool.class/instance/loadingButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 loadingButtonData
 
 	^ Dictionary withAll: {
-		#frame -> (0.6@0.0 corner: 0.7@1.0).
+		#frame -> (0.8@0.0 corner: 0.9@1.0).
 		#name -> #loadingButton.
 		#label -> 'Load'.
 		#action -> #loadPresentation}

packages/Presenter-Core.package/PSPresentationTool.class/instance/menuBarButtonData.st

@@ -0,0 +1,7 @@
+toolbuilder
+menuBarButtonData
+
+	^ {
+		self fileButtonData.
+		self insertButtonData
+	}

packages/Presenter-Core.package/PSPresentationTool.class/instance/moveCurrentSlideTo..st

@@ -0,0 +1,10 @@
+slide management
+moveCurrentSlideTo: aNumber
+
+	| position |
+	position :=  (self clampSlideNumber: aNumber) .  
+	self slides 
+		add: (self slides removeAt: self currentSlideNumber)  
+		afterIndex: position - 1.   "position needs to be 0 indexed for add:afterIndex"
+    	"self updateSlideNumbers."
+    	self selectSlide: position

packages/Presenter-Core.package/PSPresentationTool.class/instance/nextSlideButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 nextSlideButtonData
 
 	^ Dictionary withAll: {	
-		#frame -> (0.2@0.0 corner: 0.25@1.0).
+		#frame -> (0.3@0.0 corner: 0.35@1.0).
 		#name -> #NextSlideButton.
 		#label -> '>'.
 		#action -> #nextSlide}

packages/Presenter-Core.package/PSPresentationTool.class/instance/openFileMenu.st

@@ -0,0 +1,9 @@
+menu bar
+openFileMenu
+
+	| menu |
+	menu := MenuMorph new.
+	menu defaultTarget: self.
+	menu add: 'Save' action: #savePresentation.
+	menu add: 'Load' action: #loadPresentation.
+	menu popUpInWorld

packages/Presenter-Core.package/PSPresentationTool.class/instance/openInsertMenu.st

@@ -0,0 +1,9 @@
+menu bar
+openInsertMenu
+
+	| menu |
+	menu := MenuMorph new.
+	menu defaultTarget: self.
+	menu add: 'Text field' action: #newTextField.
+	menu add: 'Image' action: #newImageField.
+	menu popUpInWorld

packages/Presenter-Core.package/PSPresentationTool.class/instance/openSlideMoveDialog.st

@@ -0,0 +1,8 @@
+slide management
+openSlideMoveDialog
+
+	| userInput |
+	userInput := UIManager default request: 'Where should I move the current slide???'.
+	[self moveCurrentSlideTo: userInput asNumber] 
+		on: Error 
+		do: [UIManager inform: 'Not a valid number']

packages/Presenter-Core.package/PSPresentationTool.class/instance/presentationModeButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 presentationModeButtonData 
 
 	^ Dictionary withAll: {
-		#frame -> (0.7@0.0 corner: 0.8@1.0).
+		#frame -> (0.9@0.0 corner: 1.0@1.0).
 		#name -> #PresentationModeButton.
 		#label -> 'Present'.
 		#action -> #enablePresentationMode}

packages/Presenter-Core.package/PSPresentationTool.class/instance/riskyOperationMessage.st

@@ -1,4 +1,4 @@
 notifications
 riskyOperationMessage 
 
-	^ 'This operation is risky as it might crash your image.', Character cr, 'Do you want me to proceed?'
+	^ 'Warning!', Character cr, 'This operation is risky as it might crash your image.', Character cr, 'Do you want me to proceed?'

packages/Presenter-Core.package/PSPresentationTool.class/instance/saveButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 saveButtonData
 
 	^ Dictionary withAll: {
-		#frame -> (0.5@0.0 corner: 0.6@1.0).
+		#frame -> (0.7@0.0 corner: 0.8@1.0).
 		#name -> #savingButton.
 		#label -> 'Save'.
-		#action -> #savingConfirmation}
+		#action -> #savePresentation}

packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentation.st

@@ -1,15 +1,4 @@
 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 ]
+	self warn: self riskyOperationMessage trueChoice: [self savePresentationConfirmed]

packages/Presenter-Core.package/PSPresentationTool.class/instance/savePresentationConfirmed.st

@@ -0,0 +1,15 @@
+presentation saving
+savePresentationConfirmed
+
+	| 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 ]

packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlide..st

@@ -1,8 +1,6 @@
 slide management
 selectSlide: aNumber
 
-	self currentSlideNumber: 
-		(aNumber 
-			clampLow: self minimumSlideCount 
-			high: self slideCount).
-	self slideContainer showSlide: self currentSlide 
+	self currentSlideNumber: (self clampSlideNumber: aNumber).
+	self slideContainer showSlide: self currentSlide.
+	self changed: #slideNumberString

packages/Presenter-Core.package/PSPresentationTool.class/instance/selectSlideButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 selectSlideButtonData
 
 	^ Dictionary withAll: {	
-		#frame -> (0.8@0.0 corner: 1.0@1.0).
+		#frame -> (0.8@0.0 corner: 0.9@1.0).
 		#name -> #AddSlideButton.
 		#label -> 'Select Slide'.
 		#action -> #openSlideSelectionDialog}

packages/Presenter-Core.package/PSPresentationTool.class/instance/slideNumberString..st

@@ -0,0 +1,8 @@
+accessing
+slideNumberString: aText
+
+	| number prefix |
+	prefix := (aText asString subStrings: '/') at: 1 ifAbsent:[''].
+	number := prefix asInteger.
+	number ifNotNil: [self selectSlide: number].
+	self changed: #slideNumberString

packages/Presenter-Core.package/PSPresentationTool.class/instance/slideNumberString.st

@@ -0,0 +1,4 @@
+accessing
+slideNumberString
+
+	^ self currentSlideNumber asString, '/' , self slideCount asString

packages/Presenter-Core.package/PSPresentationTool.class/instance/switchButtonData.st

@@ -0,0 +1,8 @@
+toolbuilder
+switchButtonData
+
+	^ Dictionary withAll: {
+		#frame -> (0.35@0.0 corner: 0.45@1.0).
+		#name -> #moveButton.
+		#label -> 'Move'.
+		#action -> #openSlideMoveDialog}

packages/Presenter-Core.package/PSPresentationTool.class/instance/textFieldButtonData.st

@@ -2,7 +2,7 @@ toolbuilder
 textFieldButtonData
 
 	^ Dictionary withAll: {	
-		#frame -> (0.25@0.0 corner: 0.3@1.0).
+		#frame -> (0.45@0.0 corner: 0.5@1.0).
 		#name -> #textFieldButton.
 		#label -> 'T'.
 		#action -> #newTextField.