Skip to content

Commit e973290

Browse files
Nyan11Nyan11
committed
Fix a trigger bug + english for the toplo panel
1 parent 166b1ec commit e973290

4 files changed

Lines changed: 82 additions & 133 deletions

File tree

‎src/ExecutableRequirements-Toplo-Example/ExReqToploLoginRequirements.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ ExReqToploLoginRequirements >> transformCapellaFileIntoSimpleModel [
10551055
simple filterFunctionsOnIds:
10561056
{ #'300a7f2b-c0d2-48cd-854b-d9a8fcbadc24' }.
10571057

1058-
"(CapellaSimpleProject roassalGraph: simple) inspect."
1058+
(CapellaSimpleProject roassalGraph: simple) inspect.
10591059
^ simple
10601060
]
10611061

‎src/ExecutableRequirements-Toplo-Example/ExReqToploLoginSimulation.class.st‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,54 @@ Class {
88
#package : 'ExecutableRequirements-Toplo-Example'
99
}
1010

11+
{ #category : 'as yet unclassified' }
12+
ExReqToploLoginSimulation class >> authentificationPage [
13+
14+
| widget background space |
15+
widget := self defaultWidget.
16+
background := BlElement new
17+
background: (Color fromHexString: 'a1b8cc');
18+
layout: BlFrameLayout new;
19+
constraintsDo: [ :c |
20+
c horizontal matchParent.
21+
c vertical matchParent ];
22+
yourself.
23+
space := BlSpace new.
24+
space root layout: BlFrameLayout new.
25+
space root addChild: background.
26+
background addChild: widget.
27+
widget constraintsDo: [ :c |
28+
c frame vertical alignCenter.
29+
c frame horizontal alignCenter ].
30+
^ space
31+
]
32+
1133
{ #category : 'instance creation' }
12-
ExReqToploLoginSimulation class >> open [
34+
ExReqToploLoginSimulation class >> defaultWidget [
1335

14-
<script>
36+
<script: 'self defaultWidget inspect'>
1537
| widget database |
1638
database := self new.
1739
widget := ExReqToploLoginWidget new.
1840
widget authentificationBlock: [ :user :pass |
1941
database authentificateUsername: user password: pass ].
2042
widget loginBlock: [ self inform: 'Login success !' ].
21-
widget openInNewSpace
43+
^ widget
44+
]
45+
46+
{ #category : 'instance creation' }
47+
ExReqToploLoginSimulation class >> open [
48+
49+
<script>
50+
| space |
51+
space := self authentificationPage show.
52+
space show.
53+
space
54+
addEventHandlerOn: BlSpaceShownEvent
55+
do: [ :evt |
56+
evt source pulse.
57+
evt source root background: (Color fromHexString: 'a1b8cc') ].
58+
^ space
2259
]
2360

2461
{ #category : 'as yet unclassified' }

‎src/ExecutableRequirements-Toplo-Example/ExReqToploLoginWidget.class.st‎

Lines changed: 27 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ ExReqToploLoginWidget class >> loginPanel [
1414
"This class has been generated using Pyramid.
1515
1616
By: YannLEGOFF
17-
2025-04-16 12:07:30"
17+
2025-04-18 13:31:54"
1818

1919
<pyStash>
20-
^ [ | tobutton1 blinsets2 blinsets3 |
21-
tobutton1 := ToButton new.
20+
^ [ | blinsets1 blinsets2 tobutton3 |
21+
blinsets1 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 3.0.
2222
blinsets2 := BlInsets top: 15.0 right: 0.0 bottom: 0.0 left: 0.0.
23-
blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
23+
tobutton3 := ToButton new.
2424
{(ToPane new
2525
background: (BlPaintBackground new
2626
paint: (BlColorPaint new
@@ -45,9 +45,9 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
4545
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
4646
yourself) .
4747
(BlFontSizeAttribute new
48-
size: 45;
48+
size: 40;
4949
yourself)} rope: (BlCollectionRope new
50-
collection: 'Bienvenue !';
50+
collection: 'Welcome !';
5151
yourself));
5252
yourself);
5353
constraintsDo: [:constraints | constraints horizontal fitContent.
@@ -67,6 +67,7 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
6767
color: (Color r: 0.7996089931573802 g: 0.20039100684261973 b: 0.20039100684261973 alpha: 1.0);
6868
yourself);
6969
build);
70+
visibility: BlVisibility gone;
7071
addChildren: {(ToLabel new
7172
text: (BlRopedText new
7273
rope: (BlAttributeRope attributes: {(BlFontWeightAttribute new
@@ -82,13 +83,12 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
8283
(BlTextForegroundAttribute new
8384
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
8485
yourself)} rope: (BlCollectionRope new
85-
collection: 'Mauvais';
86+
collection: 'Wrong';
8687
yourself));
8788
yourself);
8889
constraintsDo: [:constraints | constraints horizontal fitContent.
8990
constraints vertical fitContent.
90-
constraints margin: blinsets3 ];
91-
id: #Mauvais;
91+
constraints margin: blinsets1 ];
9292
yourself) .
9393
(ToLabel new
9494
text: (BlRopedText new
@@ -105,13 +105,12 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
105105
(BlTextForegroundAttribute new
106106
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
107107
yourself)} rope: (BlCollectionRope new
108-
collection: 'identifiant';
108+
collection: 'login';
109109
yourself));
110110
yourself);
111111
constraintsDo: [:constraints | constraints horizontal fitContent.
112112
constraints vertical fitContent.
113-
constraints margin: blinsets3 ];
114-
id: #identifiant;
113+
constraints margin: blinsets1 ];
115114
yourself) .
116115
(ToLabel new
117116
text: (BlRopedText new
@@ -128,13 +127,12 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
128127
(BlTextForegroundAttribute new
129128
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
130129
yourself)} rope: (BlCollectionRope new
131-
collection: 'ou';
130+
collection: 'informations';
132131
yourself));
133132
yourself);
134133
constraintsDo: [:constraints | constraints horizontal fitContent.
135134
constraints vertical fitContent.
136-
constraints margin: blinsets3 ];
137-
id: #ou;
135+
constraints margin: blinsets1 ];
138136
yourself) .
139137
(ToLabel new
140138
text: (BlRopedText new
@@ -151,13 +149,12 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
151149
(BlTextForegroundAttribute new
152150
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
153151
yourself)} rope: (BlCollectionRope new
154-
collection: 'mauvais';
152+
collection: 'or';
155153
yourself));
156154
yourself);
157155
constraintsDo: [:constraints | constraints horizontal fitContent.
158156
constraints vertical fitContent.
159-
constraints margin: blinsets3 ];
160-
id: #mauvais;
157+
constraints margin: blinsets1 ];
161158
yourself) .
162159
(ToLabel new
163160
text: (BlRopedText new
@@ -174,13 +171,12 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
174171
(BlTextForegroundAttribute new
175172
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
176173
yourself)} rope: (BlCollectionRope new
177-
collection: 'mot';
174+
collection: 'expired';
178175
yourself));
179176
yourself);
180177
constraintsDo: [:constraints | constraints horizontal fitContent.
181178
constraints vertical fitContent.
182-
constraints margin: blinsets3 ];
183-
id: #mot;
179+
constraints margin: blinsets1 ];
184180
yourself) .
185181
(ToLabel new
186182
text: (BlRopedText new
@@ -197,107 +193,14 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
197193
(BlTextForegroundAttribute new
198194
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
199195
yourself)} rope: (BlCollectionRope new
200-
collection: 'de';
196+
collection: 'account.';
201197
yourself));
202198
yourself);
203199
constraintsDo: [:constraints | constraints horizontal fitContent.
204200
constraints vertical fitContent.
205-
constraints margin: blinsets3 ];
206-
id: #de;
207-
yourself) .
208-
(ToLabel new
209-
text: (BlRopedText new
210-
rope: (BlAttributeRope attributes: {(BlFontWeightAttribute new
211-
weight: 600;
212-
yourself) .
213-
(BlFontFamilyDefaultAttribute new
214-
name: 'Courier';
215-
yourself) .
216-
(BlFontSizeDefaultAttribute new
217-
size: 14;
218-
yourself) .
219-
AlbTextParagraphLineSpacingAttribute new .
220-
(BlTextForegroundAttribute new
221-
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
222-
yourself)} rope: (BlCollectionRope new
223-
collection: 'passe';
224-
yourself));
225-
yourself);
226-
constraintsDo: [:constraints | constraints horizontal fitContent.
227-
constraints vertical fitContent.
228-
constraints margin: blinsets3 ];
229-
id: #passe;
230-
yourself) .
231-
(ToLabel new
232-
text: (BlRopedText new
233-
rope: (BlAttributeRope attributes: {(BlFontWeightAttribute new
234-
weight: 600;
235-
yourself) .
236-
(BlFontFamilyDefaultAttribute new
237-
name: 'Courier';
238-
yourself) .
239-
(BlFontSizeDefaultAttribute new
240-
size: 14;
241-
yourself) .
242-
AlbTextParagraphLineSpacingAttribute new .
243-
(BlTextForegroundAttribute new
244-
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
245-
yourself)} rope: (BlCollectionRope new
246-
collection: 'ou';
247-
yourself));
248-
yourself);
249-
constraintsDo: [:constraints | constraints horizontal fitContent.
250-
constraints vertical fitContent.
251-
constraints margin: blinsets3 ];
252-
id: #ou;
253-
yourself) .
254-
(ToLabel new
255-
text: (BlRopedText new
256-
rope: (BlAttributeRope attributes: {(BlFontWeightAttribute new
257-
weight: 600;
258-
yourself) .
259-
(BlFontFamilyDefaultAttribute new
260-
name: 'Courier';
261-
yourself) .
262-
(BlFontSizeDefaultAttribute new
263-
size: 14;
264-
yourself) .
265-
AlbTextParagraphLineSpacingAttribute new .
266-
(BlTextForegroundAttribute new
267-
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
268-
yourself)} rope: (BlCollectionRope new
269-
collection: 'compte';
270-
yourself));
271-
yourself);
272-
constraintsDo: [:constraints | constraints horizontal fitContent.
273-
constraints vertical fitContent.
274-
constraints margin: blinsets3 ];
275-
id: #compte;
276-
yourself) .
277-
(ToLabel new
278-
text: (BlRopedText new
279-
rope: (BlAttributeRope attributes: {(BlFontWeightAttribute new
280-
weight: 600;
281-
yourself) .
282-
(BlFontFamilyDefaultAttribute new
283-
name: 'Courier';
284-
yourself) .
285-
(BlFontSizeDefaultAttribute new
286-
size: 14;
287-
yourself) .
288-
AlbTextParagraphLineSpacingAttribute new .
289-
(BlTextForegroundAttribute new
290-
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
291-
yourself)} rope: (BlCollectionRope new
292-
collection: 'expiré.';
293-
yourself));
294-
yourself);
295-
constraintsDo: [:constraints | constraints horizontal fitContent.
296-
constraints vertical fitContent.
297-
constraints margin: blinsets3 ];
298-
id: #'expiré.';
201+
constraints margin: blinsets1 ];
299202
yourself)};
300-
constraintsDo: [:constraints | constraints horizontal fitContent.
203+
constraintsDo: [:constraints | constraints horizontal matchParent.
301204
constraints vertical fitContent.
302205
constraints padding: (BlInsets all: 15.0).
303206
constraints margin: (BlInsets top: 15.0 right: 0.0 bottom: 0.0 left: 0.0) ];
@@ -322,7 +225,7 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
322225
(BlFontSizeAttribute new
323226
size: 16;
324227
yourself)} rope: (BlCollectionRope new
325-
collection: 'Identifiant';
228+
collection: 'Username';
326229
yourself));
327230
yourself);
328231
constraintsDo: [:constraints | constraints horizontal fitContent.
@@ -360,7 +263,7 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
360263
(BlFontSizeAttribute new
361264
size: 16;
362265
yourself)} rope: (BlCollectionRope new
363-
collection: 'Mot de passe';
266+
collection: 'Password';
364267
yourself));
365268
yourself);
366269
constraintsDo: [:constraints | constraints horizontal fitContent.
@@ -380,7 +283,7 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
380283
constraints padding: (BlInsets top: 4.0 right: 8.0 bottom: 4.0 left: 8.0) ];
381284
id: #passwordInput;
382285
yourself) .
383-
(tobutton1
286+
(tobutton3
384287
endFlexible: true;
385288
flexible: true;
386289
middleElement: (ToLabel new
@@ -398,10 +301,10 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
398301
(BlTextForegroundAttribute new
399302
paint: (Color r: 0.0 g: 0.0 b: 0.0 alpha: 1.0);
400303
yourself)} rope: (BlCollectionRope new
401-
collection: 'Connexion';
304+
collection: 'Login';
402305
yourself));
403306
yourself);
404-
addStamp: #'parent-button' withValue: tobutton1;
307+
addStamp: #'parent-button' withValue: tobutton3;
405308
constraintsDo: [:constraints | constraints horizontal fitContent.
406309
constraints vertical fitContent ];
407310
yourself);
@@ -425,7 +328,7 @@ blinsets3 := BlInsets top: 0.0 right: 0.0 bottom: 0.0 left: 2.0.
425328
constraints margin: blinsets2 ];
426329
id: #loginButton;
427330
yourself)};
428-
constraintsDo: [:constraints | constraints horizontal fitContent.
331+
constraintsDo: [:constraints | constraints horizontal exact: 260.0.
429332
constraints vertical fitContent.
430333
constraints padding: (BlInsets all: 30.0) ];
431334
layout: BlLinearLayout vertical;
@@ -458,7 +361,7 @@ ExReqToploLoginWidget >> initialize [
458361
authentificationBlock := [ :username :password | false ].
459362
loginBlock := [ ].
460363
self loginButton whenClickedDo: [ self loginAction ].
461-
self loginStatusContainer visibility: BlVisibility hidden
364+
self loginStatusContainer visibility: BlVisibility gone
462365
]
463366

464367
{ #category : 'as yet unclassified' }

0 commit comments

Comments
 (0)