Skip to content

Commit 39c576c

Browse files
LeonMatthesLeonMatthes
authored
Merge pull request #67 from hpi-swa-teaching/master
PowerSqueak Version 0.4
2 parents 5aac655 + f807eda commit 39c576c

File tree

56 files changed

+338
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+338
-69
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
toolbuilder
2+
barFrameFrom: fromNumber height: heightNumber
3+
4+
^ LayoutFrame new
5+
leftFraction: 0 offset: 0;
6+
topFraction: 0 offset: fromNumber;
7+
rightFraction: 1 offset: 0;
8+
bottomFraction: 0 offset: fromNumber + heightNumber

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
toolbuilder
22
buildWith: builder
33

4-
| windowSpec slideViewportSpec buttonBarTopSpec window |
4+
| windowSpec slideViewportSpec buttonBarTopSpec menuBarSpec window |
55
windowSpec := self createWindowSpec: builder.
66

77
slideViewportSpec := self createSlideViewportSpec: builder.
@@ -10,6 +10,9 @@ buildWith: builder
1010
buttonBarTopSpec := self createButtonBarTopSpec: builder.
1111
windowSpec children add: buttonBarTopSpec.
1212

13+
menuBarSpec := self createMenuBarSpec: builder.
14+
windowSpec children add: menuBarSpec.
15+
1316
window := builder build: windowSpec.
1417
self createSlideContainerIn: (builder widgetAt: #SlideViewport).
1518

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buttonBarTopData
44
^ { self addSlideButtonData.
55
self previousSlideButtonData.
66
self nextSlideButtonData.
7+
self switchButtonData.
78
self deleteSlideButtonData.
8-
self selectSlideButtonData.
99
self textFieldButtonData.
1010
self imageFieldButtonData.
1111
self presentationModeButtonData.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
toolbuilder
2+
buttonHeight
3+
4+
^ Preferences standardButtonFont height * 3

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
as yet unclassified
2+
clampSlideNumber: aNumber
3+
4+
^ aNumber
5+
clampLow: self minimumSlideCount
6+
high: self slideCount

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ createButtonBarTopSpec: aBuilder
44
panelSpec := aBuilder pluggablePanelSpec new.
55
panelSpec
66
model: self;
7-
frame: (0@0 corner: 1@0.1);
7+
frame: (self barFrameFrom: self buttonHeight height: self buttonHeight);
88
name: #ButtonBarTop;
99
children: OrderedCollection new.
1010

1111
self buttonBarTopData do: [:each |
1212
| button |
1313
button := self createButtonSpec: each with: aBuilder.
1414
panelSpec children add: button].
15+
panelSpec children add: (self createSlideNumberLabelSpec: aBuilder).
1516

1617
^ panelSpec

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ createButtonSpec: aDictionary with: aBuilder
33

44
| buttonSpec |
55
buttonSpec := aBuilder pluggableButtonSpec new.
6+
buttonSpec style: #none.
67
^ buttonSpec
78
model: (aDictionary at: #model ifAbsent: self);
89
frame: (aDictionary at: #frame);

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
toolbuilder
2+
createMenuBarSpec: aBuilder
3+
| panelSpec |
4+
panelSpec := aBuilder pluggablePanelSpec new.
5+
panelSpec
6+
model: self;
7+
frame: (self barFrameFrom: 0 height: self buttonHeight);
8+
name: #MenuBar;
9+
children: OrderedCollection new.
10+
11+
self menuBarButtonData do: [:each |
12+
| button |
13+
button := self createButtonSpec: each with: aBuilder.
14+
panelSpec children add: button].
15+
16+
^ panelSpec

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ createSlide
33

44
| newSlide |
55
newSlide := PSSlide new.
6+
newSlide setModel: self.
67
self slides add: newSlide afterIndex: self currentSlideNumber.
78
self selectSlide: self currentSlideNumber + 1.
89
"self updateSlideNumbers."

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
toolbuilder
2+
createSlideNumberLabelSpec: aBuilder
3+
4+
| labelSpec |
5+
labelSpec := aBuilder pluggableInputFieldSpec new.
6+
labelSpec
7+
model: self;
8+
name: #SlideNumberLabel;
9+
frame: (0.2@0.0 corner: 0.3@1.0);
10+
getText: #slideNumberString;
11+
setText: #slideNumberString:.
12+
^ labelSpec

0 commit comments

Comments
 (0)