Skip to content

Commit b8c853b

Browse files
authored
Merge pull request #143 from hpi-swa-teaching/SoSe19
SoSe19
2 parents 314cec9 + daa7a57 commit b8c853b

File tree

759 files changed

+3995
-1166
lines changed

Some content is hidden

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

759 files changed

+3995
-1166
lines changed

.squot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
OrderedDictionary {
22
'packages\/BaselineOfPresenter.package' : #SquotCypressCodeSerializer,
33
'packages\/Presenter-Core.package' : #SquotCypressCodeSerializer,
4-
'packages\/Presenter-Tests.package' : #SquotCypressCodeSerializer
4+
'packages\/Presenter-Tests.package' : #SquotCypressCodeSerializer,
5+
'packages\/Presenter-Compatibility-Tests.package' : #SquotCypressCodeSerializer
56
}

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ os:
88
smalltalk:
99
- Squeak-5.0
1010
- Squeak-5.1
11+
- Squeak-5.2
1112
- Squeak-trunk
1213

1314
matrix:

README.md

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
# **PowerSqueak** [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09)[![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=release)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=release)
1+
# **PowerSqueak** [![Build Status](https://travis-ci.org/hpi-swa-teaching/PowerSqueak.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/PowerSqueak)[![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=release)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=release)
22

33
A presentation tool for the Squeak development platform
44

55
Supported platforms:
66
* Squeak 5.1
7+
* Squeak 5.2
78

89
Squeak 6.0/Trunk is also a target plattform, but due to the fast changing nature of Trunk, certain versions of Squeak Trunk may not work.
9-
Please check [Travis-ci](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09) for the current build status.
10+
Please check [Travis-ci](https://travis-ci.org/hpi-swa-teaching/PowerSqueak) for the current build status.
1011

11-
Squeak 5.0 is officially unsupported (see [Travis-ci](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09)).
12+
Squeak 5.0 is officially unsupported (see [Travis-ci](https://travis-ci.org/hpi-swa-teaching/PowerSqueak)).
1213

1314
## **Overview**
14-
* [Overview](https://github.com/hpi-swa-teaching/SWT18-Project-09#overview)
15-
* [Installation Instructions](https://github.com/hpi-swa-teaching/SWT18-Project-09#installation-instructions)
16-
* [Build status](https://github.com/hpi-swa-teaching/SWT18-Project-09#build-status)
17-
* [Using PowerSqueak](https://github.com/hpi-swa-teaching/SWT18-Project-09#using-powersqueak)
18-
* [Edit mode](https://github.com/hpi-swa-teaching/SWT18-Project-09#edit-mode)
19-
* [Magnetic Raster](https://github.com/hpi-swa-teaching/SWT18-Project-09#magnetic-raster)
20-
* [Presentation mode](https://github.com/hpi-swa-teaching/SWT18-Project-09#presentation-mode)
21-
* [Interactive/Non-Interactive mode](https://github.com/hpi-swa-teaching/SWT18-Project-09#interactivenon-interactive-mode)
22-
* [saving and loading](https://github.com/hpi-swa-teaching/SWT18-Project-09#saving-and-loading)
23-
* [list of shortcuts](https://github.com/hpi-swa-teaching/SWT18-Project-09#list-of-shortcuts)
15+
* [Overview](https://github.com/hpi-swa-teaching/PowerSqueak#overview)
16+
* [Installation Instructions](https://github.com/hpi-swa-teaching/PowerSqueak#installation-instructions)
17+
* [Build status](https://github.com/hpi-swa-teaching/PowerSqueak#build-status)
18+
* [Using PowerSqueak](https://github.com/hpi-swa-teaching/PowerSqueak#using-powersqueak)
19+
* [Edit mode](https://github.com/hpi-swa-teaching/PowerSqueak#edit-mode)
20+
* [Snapping Raster](https://github.com/hpi-swa-teaching/PowerSqueak#snapping-raster)
21+
* [Drag & Drop](https://github.com/hpi-swa-teaching/PowerSqueak#drag-&-drop)
22+
* [Presentation mode](https://github.com/hpi-swa-teaching/PowerSqueak#presentation-mode)
23+
* [Interactive/Non-Interactive mode](https://github.com/hpi-swa-teaching/PowerSqueak#interactivenon-interactive-mode)
24+
* [saving and loading](https://github.com/hpi-swa-teaching/PowerSqueak#saving-and-loading)
25+
* [list of shortcuts](https://github.com/hpi-swa-teaching/PowerSqueak#list-of-shortcuts)
2426

2527
## **Installation Instructions**
2628
For easy installation, please first install [Metacello](https://github.com/Metacello/metacello).
@@ -29,16 +31,16 @@ Then run the following code in your Squeak 5.1/6.0(trunk) image:
2931
``` smalltalk
3032
Metacello new
3133
baseline: 'Presenter';
32-
repository: 'github://hpi-swa-teaching/SWT18-Project-09:release/packages';
34+
repository: 'github://hpi-swa-teaching/PowerSqueak:release/packages';
3335
load.
3436
```
3537

36-
Alternatively, download the .sar file from the [latest release](https://github.com/hpi-swa-teaching/SWT18-Project-09/releases/latest) and install it into your Squeak image via drag and drop.
38+
Alternatively, download the .sar file from the [latest release](https://github.com/hpi-swa-teaching/PowerSqueak/releases/latest) and install it into your Squeak image via drag and drop.
3739

3840
## **Build status**
39-
| [Release](https://github.com/hpi-swa-teaching/SWT18-Project-09/releases/latest) | master
41+
| [Release](https://github.com/hpi-swa-teaching/PowerSqueak/releases/latest) | master
4042
| ------------------------- | ------------------- |
41-
| [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09) | [![Build Status](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09.svg?branch=master)](https://travis-ci.org/hpi-swa-teaching/SWT18-Project-09) |
43+
| [![Build Status](https://travis-ci.org/hpi-swa-teaching/PowerSqueak.svg?branch=release)](https://travis-ci.org/hpi-swa-teaching/PowerSqueak) | [![Build Status](https://travis-ci.org/hpi-swa-teaching/PowerSqueak.svg?branch=master)](https://travis-ci.org/hpi-swa-teaching/PowerSqueak) |
4244
| [![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=release)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=release) | [![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/SWT18-Project-09/badge.svg?branch=master)](https://coveralls.io/github/hpi-swa-teaching/SWT18-Project-09?branch=master) |
4345

4446
## **Using PowerSqueak**
@@ -48,21 +50,24 @@ To open PowerSqueak either
4850
<img src="pictures/apps-drawer.png" alt="Open PowerSqueak in the Apps menu" width="250">
4951

5052
### **Edit mode**
51-
During edit mode, you can use the buttons at the top to create and navigate slides.
52-
To create slides from templates or delete slides, use the "Slide" menu in the menu bar.
53-
To add slide elements like text or images, use the "Insert" menu to create a textfield/image in hand.
53+
During edit mode, you can use the menu to save, load or export a presentation. You can insert a text field, an image, a shape or slide numbers with the "insert" button. You can hide, delete, duplicate, move or save a slide as a layout with the "slide" button in the menu bar (see shortcuts).
5454
You may also drop other Morphs onto slides, but be aware, that some features of those Morphs might not work as expected (scaling most of the time does not work correctly).
5555

5656
For advanced features like deleting morphs or resizing text, right-click the Morph.\
57-
<img src="pictures/right-click.png" alt="Right-click example" width="400">
57+
<img src="pictures/right_click.PNG" alt="Right-click example" width="400">
5858

59-
#### **Magnetic Raster**
60-
PowerSqueak supports a magnetic raster for easy layouting.
61-
If the magnetic raster is active, resizing a Morph will automatically smap the corners of the Morph to an imaginary raster.\
62-
To enable the magnetic raster click:\
63-
<img src="pictures/magnetic-raster.png" alt="How to enable magnetic raster" width=250>\
64-
The button will change color, to indicate, that the raster is active\
65-
<img src="pictures/magnetic-raster-active.png" alt="Magnetic raster is enabled" width=250>
59+
You can now use the features in the Menu bar to edit your text. \
60+
<img src="pictures/menu-bar.png" alt="Advanced Menu Bar" width = 400>
61+
62+
#### **Snapping Raster**
63+
PowerSqueak supports a snapping raster for easy layouting.
64+
If the snapping raster is active, resizing a Morph will automatically snap the corners of the Morph to an imaginary raster.\
65+
To enable the snapping raster click the button. It will change its color to show that it's activated.
66+
You can select your snap size by clicking on the small arrow right next to the snap button.\
67+
<img src="pictures/snap.png" alt="How to enable raster" width=250>
68+
69+
#### **Drag & Drop**
70+
You can drag a miniature slide with the left mouseclick and drop it anywhere. If you want to change the position of a miniature, drag the miniature and drop it on the lower half of the above slide.
6671

6772
### **Presentation mode**
6873
To enter presentation mode, click the "Present" button.
@@ -100,14 +105,16 @@ In the other image you can then load the presentation as usual in PowerSqueak.
100105

101106
You may also export your presentation to a list of .png files, which will get exported into the ```PSPresentationsExports``` folder in your Squeak VMS directory
102107

103-
### **List of shortcuts**
104-
#### **Global schortcuts**
108+
#### **List of shortcuts**
109+
### **Global schortcuts**
105110
| Key | Action|
106111
| ---- | ---- |
107112
| right arrow/arrow down/page down | next slide |
108113
| left arrow/arrow up/page up | previous slide |
109114
| Number keys | Jump to a slide number (0 = last slide) |
110115
| Cmd + t | Create a text field in hand |
116+
| delete | Delete slide (miniature needs to be selected) |
117+
| delete | Delete morph (morph needs to be selected and for deleting a text field, mouse needs to be outside of morph)
111118

112119
### **Edit mode shortcuts**
113120
| Key | Action |
@@ -119,3 +126,7 @@ You may also export your presentation to a list of .png files, which will get ex
119126
| --- | --- |
120127
| i | (de-)activate interactivity and (un-)hide cursor |
121128
| Esc | Leave presentation mode |
129+
130+
Credits:
131+
* Team 2018: Leon Bein, Tom Braun, Maximilian König, Jonas Zimmermann, Leon Matthes
132+
* Team 2019: Mark Bader, Vincent Opitz, Julian Berger, Katharina Wille, Mona Sobhani

packages/BaselineOfPresenter.package/BaselineOfPresenter.class/instance/baseline..st

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ baseline: spec
66
do: [
77
spec
88
package: 'Presenter-Core';
9-
package: 'Presenter-Tests' with: [spec requires: #('Presenter-Core')];
10-
yourself.
9+
package: 'Presenter-Tests' with: [spec requires: #('Presenter-Core')].
1110
spec
1211
group: 'default' with: #('Presenter-Core');
13-
group: 'tests' with: #('Presenter-Tests')];
14-
yourself.
12+
group: 'tests' with: #('Presenter-Tests').
1513
spec
1614
preLoadDoIt: #preLoad;
17-
postLoadDoIt: #postLoad.
15+
postLoadDoIt: #postLoad].
16+
spec
17+
for: #(#'squeak5.1.x' #'squeak5.2.x')
18+
do: [
19+
spec
20+
package: 'Presenter-Compatibility-Tests';
21+
package: 'Presenter-Tests' with: [spec requires: #('Presenter-Compatibility-Tests')]]
22+

packages/BaselineOfPresenter.package/BaselineOfPresenter.class/methodProperties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"class" : {
33
},
44
"instance" : {
5-
"baseline:" : "LM 6/13/2018 13:41",
5+
"baseline:" : "VO 6/4/2019 17:07",
66
"postLoad" : "LM 6/13/2018 13:51",
77
"preLoad" : "LM 6/20/2018 18:45" } }
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"noMethodMetaData" : true,
3+
"separateMethodMetaAndSource" : false,
4+
"useCypressPropertiesFile" : true }
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
SquotTrackedObjectMetadata {
2+
#objectClassName : #PackageInfo,
3+
#objectsReplacedByNames : true,
4+
#serializer : #SquotCypressCodeSerializer
5+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*Presenter-Compatibility-Tests
2+
deny: unexpected equals: actual
3+
4+
^self
5+
deny: unexpected = actual
6+
description: 'Actual equals unexpected'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"class" : {
3+
},
4+
"instance" : {
5+
"deny:equals:" : "eem 11/19/2018 09:45" } }
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
"name" : "TestCase" }

0 commit comments

Comments
 (0)