Skip to content

Commit 6ed28db

Browse files
authored
Merge pull request #251 from OpenSmock/dev-246
Dev
2 parents 8133ba3 + 42bd42e commit 6ed28db

4 files changed

Lines changed: 47 additions & 21 deletions

File tree

README.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You can add plugins into Pyramid to extend the editor capacities or create [your
3232
You can load a release version of Pyramid or the latest development version.
3333
Beware that Pyramid is currently in alpha development. The API is subject to significant changes, and stability is not guaranteed. Projects created during the alpha version are not designed to be compatible with newer versions of Pyramid.
3434

35-
Pyramid is available with Bloc and Toplo as defaults. If you want to build UI without Toplo, you can choose to load Pyramid with only Bloc using the baseline option `load: 'BlocUI'`. Here's an example script below.
35+
Pyramid is available with Bloc and Toplo as defaults.
3636

3737
To install a version of Pyramid, use one of the following scripts inside a playground.
3838

@@ -41,38 +41,27 @@ To install a version of Pyramid, use one of the following scripts inside a playg
4141
```st
4242
Metacello new
4343
baseline: 'Pyramid';
44-
repository: 'github://OpenSmock/Pyramid:main/src';
44+
repository: 'github://OpenSmock/Pyramid:main';
4545
onConflictUseLoaded;
4646
load
4747
```
4848

49-
Only with Bloc (without Toplo features):
50-
51-
```st
52-
Metacello new
53-
baseline: 'Pyramid';
54-
repository: 'github://OpenSmock/Pyramid:main/src';
55-
onConflictUseLoaded;
56-
load: 'BlocUI';
57-
load
58-
```
59-
6049
### Release version
6150

6251
We advise you to use dependencies committed at the date of the Pyramid release (Bloc, Bloc-Serialization, etc.) to ensure compatibility with a release of Pyramid.
6352

6453
```st
6554
Metacello new
6655
baseline: 'Pyramid';
67-
repository: 'github://OpenSmock/Pyramid:alpha4';
56+
repository: 'github://OpenSmock/Pyramid:alpha8';
6857
onConflictUseLoaded;
6958
load
7059
```
7160

7261
### Add in your baseline
7362

7463
```st
75-
spec baseline: 'Pyramid' with: [ spec repository: 'github://OpenSmock/Pyramid:main/src' ].
64+
spec baseline: 'Pyramid' with: [ spec repository: 'github://OpenSmock/Pyramid:main' ].
7665
```
7766

7867
## <img src="/assets/PyramidPinPtah.svg" width="75" height="75" align="bottom"> How to use Pyramid
@@ -147,8 +136,7 @@ https://github.com/OpenSmock/Pyramid/assets/49183340/0c66a3ac-7bea-48c1-b1e8-0b0
147136
- [Toplo](https://github.com/pharo-graphics/Toplo) - a widget framework on top of Bloc.
148137
- [STON](https://github.com/svenvc/ston) - serializer for Pharo objects to Smalltalk Object Notation format.
149138
- [Stash](https://github.com/Nyan11/Stash) - serializer for Pharo objects to source code format.
150-
151-
**Pharo 12 compatibility:** On Pharo 12, [PharoBackwardCompatibility](https://github.com/jecisc/PharoBackwardCompatibility) is automatically loaded via the baseline to ensure compatibility.
139+
- [PharoBackwardCompatibility](https://github.com/jecisc/PharoBackwardCompatibility) - Automatically ensure compatibility with old versions of Pharo.
152140

153141
## <img src="/assets/PyramidPinPtah.svg" width="75" height="75" align="bottom"> License
154142

src/BaselineOfPyramid/BaselineOfPyramid.class.st

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BaselineOfPyramid >> baselineForCommon: spec [
2222
"Pharo backward compatibility: to preserve running from previous versions of Pharo"
2323
spec
2424
baseline: 'PharoBackwardCompatibility'
25-
with: [ spec repository: 'github://jecisc/PharoBackwardCompatibility:master/src' ].
25+
with: [ spec repository: 'github://jecisc/PharoBackwardCompatibility:master' ].
2626

2727
"Dependencies"
2828
self blocDependencies: spec.
@@ -45,7 +45,7 @@ BaselineOfPyramid >> blocDependencies: spec [
4545
spec
4646
baseline: 'BlocSerialization'
4747
with: [
48-
spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ]
48+
spec repository: 'github://OpenSmock/Bloc-Serialization:main' ]
4949
]
5050

5151
{ #category : #packages }
@@ -101,7 +101,7 @@ BaselineOfPyramid >> toploDependencies: spec [
101101
spec
102102
baseline: 'ToploSerialization'
103103
with: [
104-
spec repository: 'github://OpenSmock/Toplo-Serialization:main/src' ]
104+
spec repository: 'github://OpenSmock/Toplo-Serialization:main' ]
105105
]
106106

107107
{ #category : #packages }

src/Pyramid-IDE-Tests/PyramidWorldTest.class.st

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,45 @@ A PyramidWorldTest is a test class for testing the behavior of PyramidWorld
44
Class {
55
#name : #PyramidWorldTest,
66
#superclass : #TestCase,
7+
#classInstVars : [
8+
'worldMenuItemCheck'
9+
],
710
#category : #'Pyramid-IDE-Tests-menus'
811
}
912

13+
{ #category : #accessing }
14+
PyramidWorldTest class >> worldMenuItemCheck [
15+
16+
^ worldMenuItemCheck
17+
]
18+
19+
{ #category : #accessing }
20+
PyramidWorldTest class >> worldMenuItemCheck: anObject [
21+
22+
worldMenuItemCheck := anObject
23+
]
24+
25+
{ #category : #'tests - menu' }
26+
PyramidWorldTest class >> worldMenuItemTestMethod: anItem [
27+
"This method check if the pragma mecanism to setup a menu item is working"
28+
"Be aware to not inject behavior here because this is just a test method ant it is called when the menu is build!"
29+
30+
<worldMenuItem: #Pyramid>
31+
worldMenuItemCheck := true.
32+
33+
anItem ifNil:[ Exception signal: 'Menu item should be not nil' ].
34+
anItem item = (PyramidWorld menuKey) ifFalse:[ Exception signal: 'Menu item should be equals to ', PyramidWorld menuKey printString ].
35+
]
36+
37+
{ #category : #running }
38+
PyramidWorldTest >> setUp [
39+
40+
super setUp.
41+
42+
self class worldMenuItemCheck: false.
43+
self deny: self class worldMenuItemCheck.
44+
]
45+
1046
{ #category : #tests }
1147
PyramidWorldTest >> testCleanUp [
1248

@@ -59,4 +95,6 @@ PyramidWorldTest >> testWorldMenuBuilding [
5995
menuMethods do:[ :p |
6096
PyramidWorld perform: p with: menuBuilder.
6197
].
98+
99+
self assert: self class worldMenuItemCheck.
62100
]

src/Pyramid-IDE/PyramidWorld.class.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ PyramidWorld class >> openAbout [
10571057

10581058
SpInformDialog new
10591059
title: ('About ', PyramidWindow aboutTitle);
1060-
icon: (self themeIcons iconNamed: #logotype512);
1060+
icon: ((self themeIcons iconNamed: #cartouche512) scaledToSize: 200 asPoint);
10611061
label: PyramidWindow aboutText;
10621062
acceptLabel: 'Close';
10631063
openDialog

0 commit comments

Comments
 (0)