diff --git a/.classpath b/.classpath
index 033eb86..869a31d 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java
index 8ee3321..f1fc761 100644
--- a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java
+++ b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java
@@ -104,10 +104,8 @@ public class MnGroupeMethodeEvaluer {
// Pour la méthode evalPlacement, evalLastChild, evalFirstChild
if(listeDesNodesEvalPlacement.isPlacement(nod)) {
- if(!nod.getNomElt().equals("page")) {
- mnGroupeMethodeEvaluer.addSeparator();
- mnGroupeMethodeEvaluer.add(mnEvalPlacementParagraphe.menu());
- }
+ mnGroupeMethodeEvaluer.addSeparator();
+ mnGroupeMethodeEvaluer.add(mnEvalPlacementParagraphe.menu());
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvaluerPremierEnfant.menu());
mnGroupeMethodeEvaluer.addSeparator();
diff --git a/Menu/sousmenuEvaluation/mnEvalNumeroPage.java b/Menu/sousmenuEvaluation/mnEvalNumeroPage.java
index 9607772..3fc41b6 100644
--- a/Menu/sousmenuEvaluation/mnEvalNumeroPage.java
+++ b/Menu/sousmenuEvaluation/mnEvalNumeroPage.java
@@ -15,7 +15,7 @@ import fenetres.create;
public class mnEvalNumeroPage{
public static JMenu menu(){
- JMenu mnEvalNumeroPage = new JMenu("Evaluer le numéro de la page");
+ JMenu mnEvalNumeroPage = new JMenu("Evaluer la pagination (num. de la page)");
mnEvalNumeroPage.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagemini.png")));
mnEvalNumeroPage.add(new actEvalNumeroPageOui());
mnEvalNumeroPage.add(new actEvalNumeroPageNon());
diff --git a/bin/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.class b/bin/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.class
index 9bc75bb..0228dd6 100644
Binary files a/bin/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.class and b/bin/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.class differ
diff --git a/bin/action/actEvalAncrageNumeroAbsoluePageNon.class b/bin/action/actEvalAncrageNumeroAbsoluePageNon.class
index ed4e72d..48133aa 100644
Binary files a/bin/action/actEvalAncrageNumeroAbsoluePageNon.class and b/bin/action/actEvalAncrageNumeroAbsoluePageNon.class differ
diff --git a/bin/action/actEvalAncrageNumeroAbsoluePageOui.class b/bin/action/actEvalAncrageNumeroAbsoluePageOui.class
index bd08db9..0ba34d5 100644
Binary files a/bin/action/actEvalAncrageNumeroAbsoluePageOui.class and b/bin/action/actEvalAncrageNumeroAbsoluePageOui.class differ
diff --git a/bin/action/actEvalFirstChildFalse.class b/bin/action/actEvalFirstChildFalse.class
index bedab97..eca6753 100644
Binary files a/bin/action/actEvalFirstChildFalse.class and b/bin/action/actEvalFirstChildFalse.class differ
diff --git a/bin/action/actEvalFirstChildTrue.class b/bin/action/actEvalFirstChildTrue.class
index a269351..17b543d 100644
Binary files a/bin/action/actEvalFirstChildTrue.class and b/bin/action/actEvalFirstChildTrue.class differ
diff --git a/bin/action/actEvalFormatageDirectOui.class b/bin/action/actEvalFormatageDirectOui.class
index 73ab9d9..ab9cd63 100644
Binary files a/bin/action/actEvalFormatageDirectOui.class and b/bin/action/actEvalFormatageDirectOui.class differ
diff --git a/bin/action/actEvalLastChildFalse.class b/bin/action/actEvalLastChildFalse.class
index ea86610..ffa12ce 100644
Binary files a/bin/action/actEvalLastChildFalse.class and b/bin/action/actEvalLastChildFalse.class differ
diff --git a/bin/action/actEvalLastChildTrue.class b/bin/action/actEvalLastChildTrue.class
index 619e8ff..8fe043d 100644
Binary files a/bin/action/actEvalLastChildTrue.class and b/bin/action/actEvalLastChildTrue.class differ
diff --git a/bin/action/actEvalNamePageNon.class b/bin/action/actEvalNamePageNon.class
index fbdf418..a8e1683 100644
Binary files a/bin/action/actEvalNamePageNon.class and b/bin/action/actEvalNamePageNon.class differ
diff --git a/bin/action/actEvalNamePageOui.class b/bin/action/actEvalNamePageOui.class
index bde79a9..68d2809 100644
Binary files a/bin/action/actEvalNamePageOui.class and b/bin/action/actEvalNamePageOui.class differ
diff --git a/bin/action/actEvalNumeroPageNon.class b/bin/action/actEvalNumeroPageNon.class
index e43816a..e43edb3 100644
Binary files a/bin/action/actEvalNumeroPageNon.class and b/bin/action/actEvalNumeroPageNon.class differ
diff --git a/bin/action/actEvalNumeroPageOui.class b/bin/action/actEvalNumeroPageOui.class
index 7b8a1ae..6fc4e90 100644
Binary files a/bin/action/actEvalNumeroPageOui.class and b/bin/action/actEvalNumeroPageOui.class differ
diff --git a/bin/action/actEvalPasParagrapheVideNon.class b/bin/action/actEvalPasParagrapheVideNon.class
index c87fc52..b6b38c2 100644
Binary files a/bin/action/actEvalPasParagrapheVideNon.class and b/bin/action/actEvalPasParagrapheVideNon.class differ
diff --git a/bin/action/actEvalPasParagrapheVideOui.class b/bin/action/actEvalPasParagrapheVideOui.class
index 6d44d27..8d6bf6e 100644
Binary files a/bin/action/actEvalPasParagrapheVideOui.class and b/bin/action/actEvalPasParagrapheVideOui.class differ
diff --git a/bin/action/actEvalPasParagrapheVideToutesLesPagesOui.class b/bin/action/actEvalPasParagrapheVideToutesLesPagesOui.class
index 006a434..a91d179 100644
Binary files a/bin/action/actEvalPasParagrapheVideToutesLesPagesOui.class and b/bin/action/actEvalPasParagrapheVideToutesLesPagesOui.class differ
diff --git a/bin/action/actEvalPiedPagePasActive.class b/bin/action/actEvalPiedPagePasActive.class
index f4d4d12..ac890ab 100644
Binary files a/bin/action/actEvalPiedPagePasActive.class and b/bin/action/actEvalPiedPagePasActive.class differ
diff --git a/bin/action/actEvalPlacementEnfantOui.class b/bin/action/actEvalPlacementEnfantOui.class
index 8e06ad7..554c61f 100644
Binary files a/bin/action/actEvalPlacementEnfantOui.class and b/bin/action/actEvalPlacementEnfantOui.class differ
diff --git a/bin/action/actEvalPlacementParagrapheOui.class b/bin/action/actEvalPlacementParagrapheOui.class
index 1592bcb..119e20c 100644
Binary files a/bin/action/actEvalPlacementParagrapheOui.class and b/bin/action/actEvalPlacementParagrapheOui.class differ
diff --git a/bin/action/actEvalSautPageColonneOui.class b/bin/action/actEvalSautPageColonneOui.class
index ac8534a..67ce17e 100644
Binary files a/bin/action/actEvalSautPageColonneOui.class and b/bin/action/actEvalSautPageColonneOui.class differ
diff --git a/bin/action/actEvalTextUserDefinedOui.class b/bin/action/actEvalTextUserDefinedOui.class
index 02f3f3c..acf83d2 100644
Binary files a/bin/action/actEvalTextUserDefinedOui.class and b/bin/action/actEvalTextUserDefinedOui.class differ
diff --git a/bin/action/actEvaluerNomDuStyleHeriteTrue.class b/bin/action/actEvaluerNomDuStyleHeriteTrue.class
index 6be71a6..f524104 100644
Binary files a/bin/action/actEvaluerNomDuStyleHeriteTrue.class and b/bin/action/actEvaluerNomDuStyleHeriteTrue.class differ
diff --git a/bin/dernierenfant.png b/bin/dernierenfant.png
index 9194d93..ce03155 100644
Binary files a/bin/dernierenfant.png and b/bin/dernierenfant.png differ
diff --git a/bin/dernierenfant.svg b/bin/dernierenfant.svg
index 51943c2..af14322 100644
--- a/bin/dernierenfant.svg
+++ b/bin/dernierenfant.svg
@@ -7,11 +7,11 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
- inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="dernierenfant.svg"
- inkscape:export-filename="dernierenfantmini.png"
- inkscape:export-xdpi="51.200001"
- inkscape:export-ydpi="51.200001"
+ inkscape:export-filename="evalLastChildfalse.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@@ -27,15 +27,27 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
- inkscape:zoom="16.511111"
- inkscape:cx="22.5"
- inkscape:cy="22.802826"
+ inkscape:zoom="15.822222"
+ inkscape:cx="22.531601"
+ inkscape:cy="62.001404"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="layer1" />
+ inkscape:current-layer="layer1"
+ showguides="true">
+
+
+
+ transform="matrix(0.99755826,0,0,1.0915788,-16.001129,1.7446806)"
+ style="stroke-width:0.25">
+ height="10.907367"
+ x="8.776269"
+ y="0.47164559" />
-
+
+
+ Z
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/dernierenfantmini.png b/bin/dernierenfantmini.png
index 8ec0970..6580c0e 100644
Binary files a/bin/dernierenfantmini.png and b/bin/dernierenfantmini.png differ
diff --git a/bin/evalnamepage.png b/bin/evalnamepage.png
index c8ae590..ce77f32 100644
Binary files a/bin/evalnamepage.png and b/bin/evalnamepage.png differ
diff --git a/bin/evalnamepage.svg b/bin/evalnamepage.svg
index f8613cf..bb0dabe 100644
--- a/bin/evalnamepage.svg
+++ b/bin/evalnamepage.svg
@@ -1,10 +1,10 @@
diff --git a/bin/evalnumeropageancrage.png b/bin/evalnumeropageancrage.png
index 6731405..0ffd252 100644
Binary files a/bin/evalnumeropageancrage.png and b/bin/evalnumeropageancrage.png differ
diff --git a/bin/evalnumeropageancrage.svg b/bin/evalnumeropageancrage.svg
index 7cc8657..4ef9026 100644
--- a/bin/evalnumeropageancrage.svg
+++ b/bin/evalnumeropageancrage.svg
@@ -1,10 +1,10 @@
+
@@ -270,46 +275,51 @@
id="g5418"
transform="translate(-0.00235905,280.45744)"
style="fill:#008080" />
-
-
+
+
+
+
+ style="stroke:#000080;stroke-width:10.64487845">
#
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke-width:10.6449"
+ x="-83.48098"
+ y="12.134085">#
+
+
+
+
+
+
+
+
+
diff --git a/bin/evalnumeropageancragemini.png b/bin/evalnumeropageancragemini.png
index 2761d81..9474128 100644
Binary files a/bin/evalnumeropageancragemini.png and b/bin/evalnumeropageancragemini.png differ
diff --git a/bin/evalnumeropagemini.png b/bin/evalnumeropagemini.png
index d1086a7..9f72058 100644
Binary files a/bin/evalnumeropagemini.png and b/bin/evalnumeropagemini.png differ
diff --git a/bin/evalpasparagraphevide.svg b/bin/evalpasparagraphevide.svg
index 3cd0a5c..de9b5c1 100644
--- a/bin/evalpasparagraphevide.svg
+++ b/bin/evalpasparagraphevide.svg
@@ -7,7 +7,7 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
- inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="evalpasparagraphevide.svg"
inkscape:export-filename="evalpasparagraphevidemini.png"
inkscape:export-xdpi="51.200001"
@@ -27,9 +27,9 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
- inkscape:zoom="14.50748"
- inkscape:cx="17.542674"
- inkscape:cy="20.368803"
+ inkscape:zoom="15.822222"
+ inkscape:cx="22.5"
+ inkscape:cy="38.742978"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
@@ -64,5 +64,46 @@
d="M 10.924393,0.83893503 1.0395499,11.252672"
id="path1131"
sodipodi:nodetypes="cc" />
+
+
+
+
+
+
+
+
+
diff --git a/bin/evaluer/evaluation.class b/bin/evaluer/evaluation.class
index 0e90210..df2bbdc 100644
Binary files a/bin/evaluer/evaluation.class and b/bin/evaluer/evaluation.class differ
diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class
index 2f4e13f..94edb44 100644
Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ
diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class
index 7f35e0b..c00a5a1 100644
Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ
diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class
index cecf081..57b3fda 100644
Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ
diff --git a/bin/fenetres/create$3.class b/bin/fenetres/create$3.class
index ed813f0..47d632f 100644
Binary files a/bin/fenetres/create$3.class and b/bin/fenetres/create$3.class differ
diff --git a/bin/fenetres/create$4.class b/bin/fenetres/create$4.class
index 4849b8b..7325089 100644
Binary files a/bin/fenetres/create$4.class and b/bin/fenetres/create$4.class differ
diff --git a/bin/fenetres/create$5.class b/bin/fenetres/create$5.class
index cb622e0..ad09183 100644
Binary files a/bin/fenetres/create$5.class and b/bin/fenetres/create$5.class differ
diff --git a/bin/fenetres/create$6.class b/bin/fenetres/create$6.class
index 4b940d6..0ff276c 100644
Binary files a/bin/fenetres/create$6.class and b/bin/fenetres/create$6.class differ
diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class
index 085f589..b535731 100644
Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ
diff --git a/bin/menucontextuel/MnGroupeMethodeEvaluer.class b/bin/menucontextuel/MnGroupeMethodeEvaluer.class
index f38e8ac..1526409 100644
Binary files a/bin/menucontextuel/MnGroupeMethodeEvaluer.class and b/bin/menucontextuel/MnGroupeMethodeEvaluer.class differ
diff --git a/bin/premierenfant.png b/bin/premierenfant.png
index f5cfc58..641b2ad 100644
Binary files a/bin/premierenfant.png and b/bin/premierenfant.png differ
diff --git a/bin/premierenfant.svg b/bin/premierenfant.svg
index 2df4fd4..857e3a3 100644
--- a/bin/premierenfant.svg
+++ b/bin/premierenfant.svg
@@ -7,7 +7,7 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
- inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="premierenfant.svg"
inkscape:export-filename="premierenfant.png"
inkscape:export-xdpi="96"
@@ -27,9 +27,9 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
- inkscape:zoom="16.511111"
- inkscape:cx="14.565949"
- inkscape:cy="22.802827"
+ inkscape:zoom="14.345196"
+ inkscape:cx="14.534483"
+ inkscape:cy="53.04912"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
@@ -44,16 +44,17 @@
id="layer1">
+ transform="matrix(0.99755826,0,0,1.0915788,-15.834682,-0.33039794)"
+ style="stroke-width:0.25">
+ height="10.907367"
+ x="8.776269"
+ y="0.47164559" />
-
+
+
+ A
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/premierenfantmini.png b/bin/premierenfantmini.png
index 4e6241c..df96977 100644
Binary files a/bin/premierenfantmini.png and b/bin/premierenfantmini.png differ
diff --git a/bin/resources/dernierenfant.png b/bin/resources/dernierenfant.png
index 9194d93..ce03155 100644
Binary files a/bin/resources/dernierenfant.png and b/bin/resources/dernierenfant.png differ
diff --git a/bin/resources/dernierenfantmini.png b/bin/resources/dernierenfantmini.png
index 8ec0970..6580c0e 100644
Binary files a/bin/resources/dernierenfantmini.png and b/bin/resources/dernierenfantmini.png differ
diff --git a/bin/resources/evalnamepage.png b/bin/resources/evalnamepage.png
index c8ae590..ce77f32 100644
Binary files a/bin/resources/evalnamepage.png and b/bin/resources/evalnamepage.png differ
diff --git a/bin/resources/evalnamepagemini.png b/bin/resources/evalnamepagemini.png
index 116aeb5..11ed0aa 100644
Binary files a/bin/resources/evalnamepagemini.png and b/bin/resources/evalnamepagemini.png differ
diff --git a/bin/resources/evalnumeropage.png b/bin/resources/evalnumeropage.png
index 0eab974..307ea84 100644
Binary files a/bin/resources/evalnumeropage.png and b/bin/resources/evalnumeropage.png differ
diff --git a/bin/resources/evalnumeropageancrage.png b/bin/resources/evalnumeropageancrage.png
index 6731405..0ffd252 100644
Binary files a/bin/resources/evalnumeropageancrage.png and b/bin/resources/evalnumeropageancrage.png differ
diff --git a/bin/resources/evalnumeropagemini.png b/bin/resources/evalnumeropagemini.png
index d1086a7..9f72058 100644
Binary files a/bin/resources/evalnumeropagemini.png and b/bin/resources/evalnumeropagemini.png differ
diff --git a/bin/resources/premierenfant.png b/bin/resources/premierenfant.png
index f5cfc58..641b2ad 100644
Binary files a/bin/resources/premierenfant.png and b/bin/resources/premierenfant.png differ
diff --git a/bin/resources/premierenfantmini.png b/bin/resources/premierenfantmini.png
index 4e6241c..df96977 100644
Binary files a/bin/resources/premierenfantmini.png and b/bin/resources/premierenfantmini.png differ
diff --git a/bin/sousmenuEvaluation/mnEvalNumeroPage.class b/bin/sousmenuEvaluation/mnEvalNumeroPage.class
index 0b2d1ff..019de1d 100644
Binary files a/bin/sousmenuEvaluation/mnEvalNumeroPage.class and b/bin/sousmenuEvaluation/mnEvalNumeroPage.class differ
diff --git a/icons/dernierenfant.png b/icons/dernierenfant.png
index 9194d93..ce03155 100644
Binary files a/icons/dernierenfant.png and b/icons/dernierenfant.png differ
diff --git a/icons/dernierenfant.svg b/icons/dernierenfant.svg
index 51943c2..af14322 100644
--- a/icons/dernierenfant.svg
+++ b/icons/dernierenfant.svg
@@ -7,11 +7,11 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
- inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="dernierenfant.svg"
- inkscape:export-filename="dernierenfantmini.png"
- inkscape:export-xdpi="51.200001"
- inkscape:export-ydpi="51.200001"
+ inkscape:export-filename="evalLastChildfalse.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@@ -27,15 +27,27 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
- inkscape:zoom="16.511111"
- inkscape:cx="22.5"
- inkscape:cy="22.802826"
+ inkscape:zoom="15.822222"
+ inkscape:cx="22.531601"
+ inkscape:cy="62.001404"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="layer1" />
+ inkscape:current-layer="layer1"
+ showguides="true">
+
+
+
+ transform="matrix(0.99755826,0,0,1.0915788,-16.001129,1.7446806)"
+ style="stroke-width:0.25">
+ height="10.907367"
+ x="8.776269"
+ y="0.47164559" />
-
+
+
+ Z
+
+
+
+
+
+
+
+
+
+
diff --git a/icons/dernierenfantmini.png b/icons/dernierenfantmini.png
index 8ec0970..6580c0e 100644
Binary files a/icons/dernierenfantmini.png and b/icons/dernierenfantmini.png differ
diff --git a/icons/evalnamepage.png b/icons/evalnamepage.png
index c8ae590..ce77f32 100644
Binary files a/icons/evalnamepage.png and b/icons/evalnamepage.png differ
diff --git a/icons/evalnamepage.svg b/icons/evalnamepage.svg
index f8613cf..bb0dabe 100644
--- a/icons/evalnamepage.svg
+++ b/icons/evalnamepage.svg
@@ -1,10 +1,10 @@
diff --git a/icons/evalnumeropageancrage.png b/icons/evalnumeropageancrage.png
index 6731405..0ffd252 100644
Binary files a/icons/evalnumeropageancrage.png and b/icons/evalnumeropageancrage.png differ
diff --git a/icons/evalnumeropageancrage.svg b/icons/evalnumeropageancrage.svg
index 7cc8657..4ef9026 100644
--- a/icons/evalnumeropageancrage.svg
+++ b/icons/evalnumeropageancrage.svg
@@ -1,10 +1,10 @@
+
@@ -270,46 +275,51 @@
id="g5418"
transform="translate(-0.00235905,280.45744)"
style="fill:#008080" />
-
-
+
+
+
+
+ style="stroke:#000080;stroke-width:10.64487845">
#
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke-width:10.6449"
+ x="-83.48098"
+ y="12.134085">#
+
+
+
+
+
+
+
+
+
diff --git a/icons/evalnumeropageancragemini.png b/icons/evalnumeropageancragemini.png
index 2761d81..9474128 100644
Binary files a/icons/evalnumeropageancragemini.png and b/icons/evalnumeropageancragemini.png differ
diff --git a/icons/evalnumeropagemini.png b/icons/evalnumeropagemini.png
index d1086a7..9f72058 100644
Binary files a/icons/evalnumeropagemini.png and b/icons/evalnumeropagemini.png differ
diff --git a/icons/evalpasparagraphevide.svg b/icons/evalpasparagraphevide.svg
index 3cd0a5c..de9b5c1 100644
--- a/icons/evalpasparagraphevide.svg
+++ b/icons/evalpasparagraphevide.svg
@@ -7,7 +7,7 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
- inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="evalpasparagraphevide.svg"
inkscape:export-filename="evalpasparagraphevidemini.png"
inkscape:export-xdpi="51.200001"
@@ -27,9 +27,9 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
- inkscape:zoom="14.50748"
- inkscape:cx="17.542674"
- inkscape:cy="20.368803"
+ inkscape:zoom="15.822222"
+ inkscape:cx="22.5"
+ inkscape:cy="38.742978"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
@@ -64,5 +64,46 @@
d="M 10.924393,0.83893503 1.0395499,11.252672"
id="path1131"
sodipodi:nodetypes="cc" />
+
+
+
+
+
+
+
+
+
diff --git a/icons/premierenfant.png b/icons/premierenfant.png
index f5cfc58..641b2ad 100644
Binary files a/icons/premierenfant.png and b/icons/premierenfant.png differ
diff --git a/icons/premierenfant.svg b/icons/premierenfant.svg
index 2df4fd4..857e3a3 100644
--- a/icons/premierenfant.svg
+++ b/icons/premierenfant.svg
@@ -7,7 +7,7 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
- inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="premierenfant.svg"
inkscape:export-filename="premierenfant.png"
inkscape:export-xdpi="96"
@@ -27,9 +27,9 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
- inkscape:zoom="16.511111"
- inkscape:cx="14.565949"
- inkscape:cy="22.802827"
+ inkscape:zoom="14.345196"
+ inkscape:cx="14.534483"
+ inkscape:cy="53.04912"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
@@ -44,16 +44,17 @@
id="layer1">
+ transform="matrix(0.99755826,0,0,1.0915788,-15.834682,-0.33039794)"
+ style="stroke-width:0.25">
+ height="10.907367"
+ x="8.776269"
+ y="0.47164559" />
-
+
+
+ A
+
+
+
+
+
+
+
+
+
+
diff --git a/icons/premierenfantmini.png b/icons/premierenfantmini.png
index 4e6241c..df96977 100644
Binary files a/icons/premierenfantmini.png and b/icons/premierenfantmini.png differ
diff --git a/src/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.java b/src/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.java
index 92db401..0159d00 100644
--- a/src/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.java
+++ b/src/action/actEvalAncrageNumeroAbsoluePageEnfantsOui.java
@@ -29,10 +29,9 @@ public class actEvalAncrageNumeroAbsoluePageEnfantsOui extends AbstractAction{
if(nod.getAttributs().get("evalAncrageNumeroAbsoluePage")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalAncrageNumeroAbsoluePage"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a = "";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalAncrageNumeroAbsoluePageNon.java b/src/action/actEvalAncrageNumeroAbsoluePageNon.java
index 020d61d..6d2f0b1 100644
--- a/src/action/actEvalAncrageNumeroAbsoluePageNon.java
+++ b/src/action/actEvalAncrageNumeroAbsoluePageNon.java
@@ -13,7 +13,7 @@ public class actEvalAncrageNumeroAbsoluePageNon extends AbstractAction{
{
putValue( Action.NAME, "Supprime évaluer l'ancrage au numéro absolue de la page" );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'ancrage au numéro absolue de la page." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropageancragefalsemini.png")) );
}
/**
*
diff --git a/src/action/actEvalAncrageNumeroAbsoluePageOui.java b/src/action/actEvalAncrageNumeroAbsoluePageOui.java
index 22670fb..9e75310 100644
--- a/src/action/actEvalAncrageNumeroAbsoluePageOui.java
+++ b/src/action/actEvalAncrageNumeroAbsoluePageOui.java
@@ -15,7 +15,7 @@ public class actEvalAncrageNumeroAbsoluePageOui extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer l'ancrage au numéro absolue de la page" );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropageancragetruemini.png")) );
}
/**
*
@@ -30,9 +30,10 @@ public class actEvalAncrageNumeroAbsoluePageOui extends AbstractAction{
point = Integer.valueOf(nod.getAttributs().get("evalAncrageNumeroAbsoluePage"));
}
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ String a = "";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
- if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
@@ -48,7 +49,6 @@ public class actEvalAncrageNumeroAbsoluePageOui extends AbstractAction{
}
}
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
-
}
}
diff --git a/src/action/actEvalFirstChildFalse.java b/src/action/actEvalFirstChildFalse.java
index a4a7e92..fdade6b 100644
--- a/src/action/actEvalFirstChildFalse.java
+++ b/src/action/actEvalFirstChildFalse.java
@@ -14,7 +14,7 @@ public class actEvalFirstChildFalse extends AbstractAction{
{
putValue( Action.NAME, "Supprimer évaluer le node est le premier enfant." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du premier enfant." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")));
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalFirstChildfalsemini.png")));
}
/**
*
diff --git a/src/action/actEvalFirstChildTrue.java b/src/action/actEvalFirstChildTrue.java
index ab6261f..36ffcef 100644
--- a/src/action/actEvalFirstChildTrue.java
+++ b/src/action/actEvalFirstChildTrue.java
@@ -16,7 +16,7 @@ public class actEvalFirstChildTrue extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer si le node est le premier enfant.");
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")));
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalFirstChildtruemini.png")));
}
/**
*
@@ -30,10 +30,9 @@ public class actEvalFirstChildTrue extends AbstractAction{
if(nod.getAttributs().get("evalFirstChild")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalFirstChild"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a="";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalFormatageDirectOui.java b/src/action/actEvalFormatageDirectOui.java
index 518dff4..68e7fed 100644
--- a/src/action/actEvalFormatageDirectOui.java
+++ b/src/action/actEvalFormatageDirectOui.java
@@ -29,10 +29,9 @@ public class actEvalFormatageDirectOui extends AbstractAction{
if(nod.getAttributs().get("evalFormatageDirect")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalFormatageDirect"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a = "";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalLastChildFalse.java b/src/action/actEvalLastChildFalse.java
index bd5f1da..e8410f3 100644
--- a/src/action/actEvalLastChildFalse.java
+++ b/src/action/actEvalLastChildFalse.java
@@ -14,7 +14,7 @@ public class actEvalLastChildFalse extends AbstractAction{
{
putValue( Action.NAME, "Supprimer évaluer le node est le dernier enfant." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du dernier enfant." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")));
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalLastChildfalsemini.png")));
}
/**
*
diff --git a/src/action/actEvalLastChildTrue.java b/src/action/actEvalLastChildTrue.java
index 89c686a..5caf81e 100644
--- a/src/action/actEvalLastChildTrue.java
+++ b/src/action/actEvalLastChildTrue.java
@@ -16,7 +16,7 @@ public class actEvalLastChildTrue extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer si le node est le dernier enfant.");
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")));
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalLastChildtruemini.png")));
}
/**
*
@@ -30,10 +30,10 @@ public class actEvalLastChildTrue extends AbstractAction{
if(nod.getAttributs().get("evalLastChild")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalLastChild"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ String a="";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
- if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalNamePageNon.java b/src/action/actEvalNamePageNon.java
index 68f15e8..827347d 100644
--- a/src/action/actEvalNamePageNon.java
+++ b/src/action/actEvalNamePageNon.java
@@ -18,7 +18,7 @@ public class actEvalNamePageNon extends AbstractAction{
{
putValue( Action.NAME, "Supprime évaluer le nom du style de la page" );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom du style de la page." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnamepagefalsemini.png")) );
}
@Override
public void actionPerformed(ActionEvent e) {
diff --git a/src/action/actEvalNamePageOui.java b/src/action/actEvalNamePageOui.java
index f94c551..1e48c29 100644
--- a/src/action/actEvalNamePageOui.java
+++ b/src/action/actEvalNamePageOui.java
@@ -20,7 +20,7 @@ public class actEvalNamePageOui extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom du style de la page" );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnamepagetruemini.png")) );
}
@Override
public void actionPerformed(ActionEvent e) {
@@ -29,10 +29,9 @@ public class actEvalNamePageOui extends AbstractAction{
if(nod.getAttributs().get("evalNamePage")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalNamePage"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a="";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
diff --git a/src/action/actEvalNumeroPageNon.java b/src/action/actEvalNumeroPageNon.java
index f762b2b..b1433c0 100644
--- a/src/action/actEvalNumeroPageNon.java
+++ b/src/action/actEvalNumeroPageNon.java
@@ -17,8 +17,8 @@ public class actEvalNumeroPageNon extends AbstractAction{
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Supprime évaluer le numéro de la page" );
- putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du numéro de la page." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
+ putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la pagination (num. page)." );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropagefalsemini.png")) );
}
@Override
public void actionPerformed(ActionEvent e) {
diff --git a/src/action/actEvalNumeroPageOui.java b/src/action/actEvalNumeroPageOui.java
index 9d64704..e2fd421 100644
--- a/src/action/actEvalNumeroPageOui.java
+++ b/src/action/actEvalNumeroPageOui.java
@@ -19,8 +19,8 @@ public class actEvalNumeroPageOui extends AbstractAction{
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Oui, combien de point?" );
- putValue( Action.SHORT_DESCRIPTION, "Evaluer le numéro de la page" );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) );
+ putValue( Action.SHORT_DESCRIPTION, "Evaluer la pagination (num. page)" );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalnumeropagetruemini.png")) );
}
@Override
public void actionPerformed(ActionEvent e) {
@@ -29,10 +29,9 @@ public class actEvalNumeroPageOui extends AbstractAction{
if(nod.getAttributs().get("evalNumeroPage")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalNumeroPage"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a = "";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalPasParagrapheVideNon.java b/src/action/actEvalPasParagrapheVideNon.java
index f632d48..0fac037 100644
--- a/src/action/actEvalPasParagrapheVideNon.java
+++ b/src/action/actEvalPasParagrapheVideNon.java
@@ -13,7 +13,7 @@ public class actEvalPasParagrapheVideNon extends AbstractAction{
{
putValue( Action.NAME, "Supprime évaluer l'absence de paragraphe vide" );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'absence de paragraphe vide." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidefalsemini.png")) );
}
/**
*
diff --git a/src/action/actEvalPasParagrapheVideOui.java b/src/action/actEvalPasParagrapheVideOui.java
index 5917a4a..0ee4bd6 100644
--- a/src/action/actEvalPasParagrapheVideOui.java
+++ b/src/action/actEvalPasParagrapheVideOui.java
@@ -15,7 +15,7 @@ public class actEvalPasParagrapheVideOui extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer l'absence de paragraphe vide" );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidetruemini.png")) );
}
/**
*
@@ -29,10 +29,9 @@ public class actEvalPasParagrapheVideOui extends AbstractAction{
if(nod.getAttributs().get("evalPasParagrapheVide")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalPasParagrapheVide"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a ="";
+ if(a!=null)a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalPasParagrapheVideToutesLesPagesOui.java b/src/action/actEvalPasParagrapheVideToutesLesPagesOui.java
index 0cd0782..1839806 100644
--- a/src/action/actEvalPasParagrapheVideToutesLesPagesOui.java
+++ b/src/action/actEvalPasParagrapheVideToutesLesPagesOui.java
@@ -26,10 +26,9 @@ public class actEvalPasParagrapheVideToutesLesPagesOui extends AbstractAction{
if(nod.getAttributs().get("evalPasParagrapheVide")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalPasParagrapheVide"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ String a = "";
+ a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalPiedPagePasActive.java b/src/action/actEvalPiedPagePasActive.java
index 31dc4f2..e159168 100644
--- a/src/action/actEvalPiedPagePasActive.java
+++ b/src/action/actEvalPiedPagePasActive.java
@@ -29,10 +29,8 @@ public class actEvalPiedPagePasActive extends AbstractAction{
if(nod.getAttributs().get("evalPiedPagePasActive")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalPiedPagePasActive"));
}
-
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()){
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalPlacementEnfantOui.java b/src/action/actEvalPlacementEnfantOui.java
index 54fa57a..d429242 100644
--- a/src/action/actEvalPlacementEnfantOui.java
+++ b/src/action/actEvalPlacementEnfantOui.java
@@ -30,10 +30,8 @@ public class actEvalPlacementEnfantOui extends AbstractAction{
if(nod.getAttributs().get("evalPlacement")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalPlacement"));
}
-
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(a!=null) if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalPlacementParagrapheOui.java b/src/action/actEvalPlacementParagrapheOui.java
index b4f7766..6449cef 100644
--- a/src/action/actEvalPlacementParagrapheOui.java
+++ b/src/action/actEvalPlacementParagrapheOui.java
@@ -31,10 +31,8 @@ public class actEvalPlacementParagrapheOui extends AbstractAction{
if(nod.getAttributs().get("evalPlacement")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalPlacement"));
}
-
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(a!=null) if(!a.isEmpty()) {
+ String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()){
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalSautPageColonneOui.java b/src/action/actEvalSautPageColonneOui.java
index f551a0d..0491770 100644
--- a/src/action/actEvalSautPageColonneOui.java
+++ b/src/action/actEvalSautPageColonneOui.java
@@ -29,10 +29,8 @@ public class actEvalSautPageColonneOui extends AbstractAction{
if(nod.getAttributs().get("evalSautPageColonne")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalSautPageColonne"));
}
-
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvalTextUserDefinedOui.java b/src/action/actEvalTextUserDefinedOui.java
index 77d4daf..c7d5bf2 100644
--- a/src/action/actEvalTextUserDefinedOui.java
+++ b/src/action/actEvalTextUserDefinedOui.java
@@ -29,10 +29,8 @@ public class actEvalTextUserDefinedOui extends AbstractAction{
if(nod.getAttributs().get("evalTextUserDefined")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalTextUserDefined"));
}
-
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()){
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/action/actEvaluerNomDuStyleHeriteTrue.java b/src/action/actEvaluerNomDuStyleHeriteTrue.java
index f6b4bc9..7116241 100644
--- a/src/action/actEvaluerNomDuStyleHeriteTrue.java
+++ b/src/action/actEvaluerNomDuStyleHeriteTrue.java
@@ -29,10 +29,8 @@ public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{
if(nod.getAttributs().get("evalNameLegacyStyle")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalNameLegacyStyle"));
}
-
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
-
- if(a!=null) if(!a.isEmpty()) {
+ if(a!=null)if(!a.isEmpty()||!a.isBlank()){
try {
point = Integer.valueOf(a);
if(point<=0) {
diff --git a/src/evaluer/evaluation.java b/src/evaluer/evaluation.java
index 40fcf47..532c689 100644
--- a/src/evaluer/evaluation.java
+++ b/src/evaluer/evaluation.java
@@ -891,6 +891,7 @@ public class evaluation {
if(!B.isEmpty()) if(B.contains("¢")) B=B.replace("¢", "");
if(!B.isEmpty()) if(B.contains("╬")) B=B.replace("╬", "");
if(!B.isEmpty()) B=B.replaceAll("‽[0-9]{1,}", "");
+ if(!B.isEmpty()) B=B.replaceAll("‼[0-9]{1,}", "");
}
return B;
}
diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java
index b73eef4..4f0e280 100644
--- a/src/evaluer/evaluationAttribut.java
+++ b/src/evaluer/evaluationAttribut.java
@@ -658,7 +658,7 @@ public class evaluationAttribut {
/**
- * Méthode Placement;
+ * Méthode Placement.
* Evaluer si le node placé juste avant est le même que dans le sujet.
* @param sujet : le node sujet.
* @param nodeStudent : le node du student.
@@ -691,14 +691,67 @@ public class evaluationAttribut {
nodeStudent = nodeStudent.getParent();
}
}
+
+ String A = "";
+ String B = "";
if(nodeSujetfrereAvant==null) nodeSujetfrereAvant = new node();
if(nodeStudentfereAvant==null) nodeStudentfereAvant = new node();
- String A = nodeSujetfrereAvant.retourneLesContenusEnfants("");
- String B = nodeStudentfereAvant.retourneLesContenusEnfants("");
- if(A.isEmpty()) A = "Paragraphe vide";
- if(B.isEmpty()) B = "Paragraphe vide";
-
+ if(nodeSujetfrereAvant.getNomElt().contains("text:")) {
+ A = nodeSujetfrereAvant.retourneLesContenusEnfants("");
+ B = nodeStudentfereAvant.retourneLesContenusEnfants("");
+ if(A.isEmpty()) A = "Pas de texte";
+ if(B.isEmpty()) B = "Pas de texte";
+ if(A.isBlank()) A = "Pas de texte";
+ if(B.isBlank()) B = "Pas de texte";
+ }
+
+ if(nodeSujetfrereAvant.getNomElt().equals("page")) {
+ A = "Page : " + nodeSujetfrereAvant.getAttributs().get("style:master-page-name");
+ if(nodeStudentfereAvant.getAttributs().get("style:master-page-name")!=null) {
+ B = "Page : " + nodeStudentfereAvant.getAttributs().get("style:master-page-name");
+ }else {
+ B = "Pas de page avant.";
+ }
+
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("draw:frame")) {
+ A = "draw : " + evaluation.withoutCodeAndPointPourRechercheContenuExact(nodeSujetfrereAvant.getAttributs().get("draw:name"));
+ B = "draw : " + nodeStudentfereAvant.getAttributs().get("draw:name");
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:conditional-text")) {
+ A = "text:conditional-text";
+ B = nodeStudentfereAvant.getNomElt();
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:database-display")) {
+ A = "Champ : " + evaluation.withoutCodeAndPointPourRechercheContenuExact(nodeSujetfrereAvant.getAttributs().get("text:database-name"));
+ if(nodeStudentfereAvant.getAttributs().get("text:database-name")!=null) {
+ B = "Champ : " + nodeStudentfereAvant.getAttributs().get("text:database-name");
+ }else {
+ B = "Pas de champ avant.";
+ }
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:editing-duration")) {
+ A = "text:editing-duration";
+ B = nodeStudentfereAvant.getNomElt();
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:date")) {
+ A = "text:date";
+ B = nodeStudentfereAvant.getNomElt();
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:time")) {
+ A = "text:date";
+ B = nodeStudentfereAvant.getNomElt();
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:title")) {
+ A = "text:title";
+ B = nodeStudentfereAvant.getNomElt();
+ }
+ if(nodeSujetfrereAvant.getNomElt().equals("text:chapter")) {
+ A = "text:chapter";
+ B = nodeStudentfereAvant.getNomElt();
+ }
+
if(!A.isEmpty() && !B.isEmpty()) if(cXML.StringSimilarity.similarity(A, B)>0.92) calcul++;
if(calcul==1) {
diff --git a/src/fenetres/create.java b/src/fenetres/create.java
index 21a6ae6..e7df223 100644
--- a/src/fenetres/create.java
+++ b/src/fenetres/create.java
@@ -48,10 +48,22 @@ import action.actCollapseNode;
import action.actDeleteNode;
import action.actDocumentation;
import action.actDownNode;
+import action.actEvalAncrageNumeroAbsoluePageNon;
+import action.actEvalAncrageNumeroAbsoluePageOui;
+import action.actEvalFirstChildFalse;
+import action.actEvalFirstChildTrue;
import action.actEvalFormatageDirectNon;
import action.actEvalFormatageDirectOui;
+import action.actEvalLastChildFalse;
+import action.actEvalLastChildTrue;
import action.actEvalNameNodeNon;
import action.actEvalNameNodeOui;
+import action.actEvalNamePageNon;
+import action.actEvalNamePageOui;
+import action.actEvalNumeroPageNon;
+import action.actEvalNumeroPageOui;
+import action.actEvalPasParagrapheVideNon;
+import action.actEvalPasParagrapheVideOui;
import action.actEvalPlacementParagrapheOui;
import action.actEvalSautPageColonneNon;
import action.actEvalSautPageColonneOui;
@@ -85,8 +97,10 @@ import cXML.Run;
import cXML.node;
import list.listeDesNodesAllContent;
import list.listeDesNodesAnalyseStyle;
+import list.listeDesNodesAncrable;
import list.listeDesNodesEvalPlacement;
import list.listeDesNodesFormatageDirect;
+import list.listeDesNodesPourEvaluerPage;
import list.listeEvalNameNode;
import menucontextuel.CreatePopupMenu;
import net.miginfocom.swing.MigLayout;
@@ -131,6 +145,19 @@ public final class create extends JFrame {
private final JButton btnevalFormatageDirectfalse = new JButton(new actEvalFormatageDirectNon());
private final JButton btnevalPlacementtrue = new JButton(new actEvalPlacementParagrapheOui());
private final JButton btnevalPlacementfalse = new JButton(new actEvalPlacementParagrapheOui());
+ private final JButton btnevalFirstChildtrue = new JButton(new actEvalFirstChildTrue());
+ private final JButton btnevalFirstChildfalse = new JButton(new actEvalFirstChildFalse());
+ private final JButton btnevalLastChildtrue = new JButton(new actEvalLastChildTrue());
+ private final JButton btnevalLastChildfalse = new JButton(new actEvalLastChildFalse());
+ private final JButton btnevalAncrageNumeroAbsoluePagetrue = new JButton(new actEvalAncrageNumeroAbsoluePageOui());
+ private final JButton btnevalAncrageNumeroAbsoluePagefalse = new JButton(new actEvalAncrageNumeroAbsoluePageNon());
+ private final JButton btnevalPasParagrapheVidetrue = new JButton(new actEvalPasParagrapheVideOui());
+ private final JButton btnevalPasParagrapheVidefalse = new JButton(new actEvalPasParagrapheVideNon());
+ private final JButton btnevalNamePagetrue = new JButton(new actEvalNamePageOui());
+ private final JButton btnevalNamePagefalse = new JButton(new actEvalNamePageNon());
+ private final JButton btnevalNumeroPagetrue = new JButton(new actEvalNumeroPageOui());
+ private final JButton btnevalNumeroPagefalse = new JButton(new actEvalNumeroPageNon());
+
// private AbstractAction allContent = new actAllContent();
@@ -164,8 +191,30 @@ public final class create extends JFrame {
btnevalPlacementtrue.setEnabled(false);
btnevalPlacementfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalplacementparagraphefalse.png")));
btnevalPlacementfalse.setEnabled(false);
-
-
+ btnevalFirstChildtrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalFirstChildtrue.png")));
+ btnevalFirstChildtrue.setEnabled(false);
+ btnevalFirstChildfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalFirstChildfalse.png")));
+ btnevalFirstChildfalse.setEnabled(false);
+ btnevalLastChildtrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalLastChildtrue.png")));
+ btnevalLastChildtrue.setEnabled(false);
+ btnevalLastChildfalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalLastChildfalse.png")));
+ btnevalLastChildfalse.setEnabled(false);
+ btnevalAncrageNumeroAbsoluePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancragetrue.png")));
+ btnevalAncrageNumeroAbsoluePagetrue.setEnabled(false);
+ btnevalAncrageNumeroAbsoluePagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropageancragefalse.png")));
+ btnevalAncrageNumeroAbsoluePagefalse.setEnabled(false);
+ btnevalPasParagrapheVidetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidetrue.png")));
+ btnevalPasParagrapheVidetrue.setEnabled(false);
+ btnevalPasParagrapheVidefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalpasparagraphevidefalse.png")));
+ btnevalPasParagrapheVidefalse.setEnabled(false);
+ btnevalNamePagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagetrue.png")));
+ btnevalNamePagetrue.setEnabled(false);
+ btnevalNamePagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnamepagefalse.png")));
+ btnevalNamePagefalse.setEnabled(false);
+ btnevalNumeroPagetrue.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagetrue.png")));
+ btnevalNumeroPagetrue.setEnabled(false);
+ btnevalNumeroPagefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evalnumeropagefalse.png")));
+ btnevalNumeroPagefalse.setEnabled(false);
setBackground(new Color(255, 255, 255));
try {
initialize();
@@ -322,6 +371,42 @@ public final class create extends JFrame {
btnevalPlacementfalse.setText("");
panelDroiteBoutons.add(btnevalPlacementfalse, "cell 1 4");
+
+ btnevalFirstChildtrue.setText("");
+ panelDroiteBoutons.add(btnevalFirstChildtrue, "cell 2 4");
+
+ btnevalFirstChildfalse.setText("");
+ panelDroiteBoutons.add(btnevalFirstChildfalse, "cell 3 4");
+
+ btnevalLastChildtrue.setText("");
+ panelDroiteBoutons.add(btnevalLastChildtrue, "cell 0 5");
+
+ btnevalLastChildfalse.setText("");
+ panelDroiteBoutons.add(btnevalLastChildfalse, "cell 1 5");
+
+ btnevalAncrageNumeroAbsoluePagetrue.setText("");
+ panelDroiteBoutons.add(btnevalAncrageNumeroAbsoluePagetrue, "cell 2 5");
+
+ btnevalAncrageNumeroAbsoluePagefalse.setText("");
+ panelDroiteBoutons.add(btnevalAncrageNumeroAbsoluePagefalse, "cell 3 5");
+
+ btnevalPasParagrapheVidetrue.setText("");
+ panelDroiteBoutons.add(btnevalPasParagrapheVidetrue, "cell 0 6");
+
+ btnevalPasParagrapheVidefalse.setText("");
+ panelDroiteBoutons.add(btnevalPasParagrapheVidefalse, "cell 1 6");
+
+ btnevalNamePagetrue.setText("");
+ panelDroiteBoutons.add(btnevalNamePagetrue, "cell 2 6");
+
+ btnevalNamePagefalse.setText("");
+ panelDroiteBoutons.add(btnevalNamePagefalse, "cell 3 6");
+
+ btnevalNumeroPagetrue.setText("");
+ panelDroiteBoutons.add(btnevalNumeroPagetrue, "cell 0 7");
+
+ btnevalNumeroPagefalse.setText("");
+ panelDroiteBoutons.add(btnevalNumeroPagefalse, "cell 1 7");
JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton );
@@ -411,6 +496,18 @@ public final class create extends JFrame {
btnevalFormatageDirectfalse.setEnabled(false);
btnevalPlacementtrue.setEnabled(false);
btnevalPlacementfalse.setEnabled(false);
+ btnevalFirstChildtrue.setEnabled(false);
+ btnevalFirstChildfalse.setEnabled(false);
+ btnevalLastChildtrue.setEnabled(false);
+ btnevalLastChildfalse.setEnabled(false);
+ btnevalAncrageNumeroAbsoluePagetrue.setEnabled(false);
+ btnevalAncrageNumeroAbsoluePagefalse.setEnabled(false);
+ btnevalPasParagrapheVidetrue.setEnabled(false);
+ btnevalPasParagrapheVidefalse.setEnabled(false);
+ btnevalNamePagetrue.setEnabled(false);
+ btnevalNamePagefalse.setEnabled(false);
+ btnevalNumeroPagetrue.setEnabled(false);
+ btnevalNumeroPagefalse.setEnabled(false);
if(listeDesNodesAllContent.isAllContent(nod)) {
btnAllContent.setEnabled(true);
@@ -434,8 +531,23 @@ public final class create extends JFrame {
if(listeDesNodesEvalPlacement.isPlacement(nod)) {
btnevalPlacementtrue.setEnabled(true);
btnevalPlacementfalse.setEnabled(true);
+ btnevalFirstChildtrue.setEnabled(true);
+ btnevalFirstChildfalse.setEnabled(true);
+ btnevalLastChildtrue.setEnabled(true);
+ btnevalLastChildfalse.setEnabled(true);
+ }
+ if(listeDesNodesAncrable.isAncrable(nod)) {
+ btnevalAncrageNumeroAbsoluePagetrue.setEnabled(true);
+ btnevalAncrageNumeroAbsoluePagefalse.setEnabled(true);
+ }
+ if(listeDesNodesPourEvaluerPage.isPage(nod)) {
+ btnevalPasParagrapheVidetrue.setEnabled(true);
+ btnevalPasParagrapheVidefalse.setEnabled(true);
+ btnevalNamePagetrue.setEnabled(true);
+ btnevalNamePagefalse.setEnabled(true);
+ btnevalNumeroPagetrue.setEnabled(true);
+ btnevalNumeroPagefalse.setEnabled(true);
}
-
}
}
});
diff --git a/src/list/listeDesNodesAncrable.java b/src/list/listeDesNodesAncrable.java
index c9ac963..5ed80d9 100644
--- a/src/list/listeDesNodesAncrable.java
+++ b/src/list/listeDesNodesAncrable.java
@@ -34,7 +34,7 @@ public class listeDesNodesAncrable {
case "draw:frame": return true;
case "text:date":return true;
case "text:time":return true;
-
+
default:
return false;
}
diff --git a/src/resources/dernierenfant.png b/src/resources/dernierenfant.png
index 9194d93..ce03155 100644
Binary files a/src/resources/dernierenfant.png and b/src/resources/dernierenfant.png differ
diff --git a/src/resources/dernierenfantmini.png b/src/resources/dernierenfantmini.png
index 8ec0970..6580c0e 100644
Binary files a/src/resources/dernierenfantmini.png and b/src/resources/dernierenfantmini.png differ
diff --git a/src/resources/evalFirstChildfalse.png b/src/resources/evalFirstChildfalse.png
new file mode 100644
index 0000000..98a0c8b
Binary files /dev/null and b/src/resources/evalFirstChildfalse.png differ
diff --git a/src/resources/evalFirstChildfalsemini.png b/src/resources/evalFirstChildfalsemini.png
new file mode 100644
index 0000000..32fb2de
Binary files /dev/null and b/src/resources/evalFirstChildfalsemini.png differ
diff --git a/src/resources/evalFirstChildtrue.png b/src/resources/evalFirstChildtrue.png
new file mode 100644
index 0000000..9af1829
Binary files /dev/null and b/src/resources/evalFirstChildtrue.png differ
diff --git a/src/resources/evalFirstChildtruemini.png b/src/resources/evalFirstChildtruemini.png
new file mode 100644
index 0000000..4b8e83a
Binary files /dev/null and b/src/resources/evalFirstChildtruemini.png differ
diff --git a/src/resources/evalLastChildfalse.png b/src/resources/evalLastChildfalse.png
new file mode 100644
index 0000000..f6ac558
Binary files /dev/null and b/src/resources/evalLastChildfalse.png differ
diff --git a/src/resources/evalLastChildfalsemini.png b/src/resources/evalLastChildfalsemini.png
new file mode 100644
index 0000000..2d94b3d
Binary files /dev/null and b/src/resources/evalLastChildfalsemini.png differ
diff --git a/src/resources/evalLastChildtrue.png b/src/resources/evalLastChildtrue.png
new file mode 100644
index 0000000..d810078
Binary files /dev/null and b/src/resources/evalLastChildtrue.png differ
diff --git a/src/resources/evalLastChildtruemini.png b/src/resources/evalLastChildtruemini.png
new file mode 100644
index 0000000..a8b09a4
Binary files /dev/null and b/src/resources/evalLastChildtruemini.png differ
diff --git a/src/resources/evalnamepage.png b/src/resources/evalnamepage.png
index c8ae590..ce77f32 100644
Binary files a/src/resources/evalnamepage.png and b/src/resources/evalnamepage.png differ
diff --git a/src/resources/evalnamepagefalse.png b/src/resources/evalnamepagefalse.png
new file mode 100644
index 0000000..e3f22ae
Binary files /dev/null and b/src/resources/evalnamepagefalse.png differ
diff --git a/src/resources/evalnamepagefalsemini.png b/src/resources/evalnamepagefalsemini.png
new file mode 100644
index 0000000..643e898
Binary files /dev/null and b/src/resources/evalnamepagefalsemini.png differ
diff --git a/src/resources/evalnamepagemini.png b/src/resources/evalnamepagemini.png
index 116aeb5..11ed0aa 100644
Binary files a/src/resources/evalnamepagemini.png and b/src/resources/evalnamepagemini.png differ
diff --git a/src/resources/evalnamepagetrue.png b/src/resources/evalnamepagetrue.png
new file mode 100644
index 0000000..faa836b
Binary files /dev/null and b/src/resources/evalnamepagetrue.png differ
diff --git a/src/resources/evalnamepagetruemini.png b/src/resources/evalnamepagetruemini.png
new file mode 100644
index 0000000..a379a46
Binary files /dev/null and b/src/resources/evalnamepagetruemini.png differ
diff --git a/src/resources/evalnumeropage.png b/src/resources/evalnumeropage.png
index 0eab974..307ea84 100644
Binary files a/src/resources/evalnumeropage.png and b/src/resources/evalnumeropage.png differ
diff --git a/src/resources/evalnumeropageancrage.png b/src/resources/evalnumeropageancrage.png
index 6731405..0ffd252 100644
Binary files a/src/resources/evalnumeropageancrage.png and b/src/resources/evalnumeropageancrage.png differ
diff --git a/src/resources/evalnumeropageancragefalse.png b/src/resources/evalnumeropageancragefalse.png
new file mode 100644
index 0000000..06ff5de
Binary files /dev/null and b/src/resources/evalnumeropageancragefalse.png differ
diff --git a/src/resources/evalnumeropageancragefalsemini.png b/src/resources/evalnumeropageancragefalsemini.png
new file mode 100644
index 0000000..be80433
Binary files /dev/null and b/src/resources/evalnumeropageancragefalsemini.png differ
diff --git a/src/resources/evalnumeropageancragetrue.png b/src/resources/evalnumeropageancragetrue.png
new file mode 100644
index 0000000..8c9ebb3
Binary files /dev/null and b/src/resources/evalnumeropageancragetrue.png differ
diff --git a/src/resources/evalnumeropageancragetruemini.gng b/src/resources/evalnumeropageancragetruemini.gng
new file mode 100644
index 0000000..2835ece
Binary files /dev/null and b/src/resources/evalnumeropageancragetruemini.gng differ
diff --git a/src/resources/evalnumeropageancragetruemini.png b/src/resources/evalnumeropageancragetruemini.png
new file mode 100644
index 0000000..2835ece
Binary files /dev/null and b/src/resources/evalnumeropageancragetruemini.png differ
diff --git a/src/resources/evalnumeropageancragetruemini.pngng b/src/resources/evalnumeropageancragetruemini.pngng
new file mode 100644
index 0000000..2835ece
Binary files /dev/null and b/src/resources/evalnumeropageancragetruemini.pngng differ
diff --git a/src/resources/evalnumeropagefalse.png b/src/resources/evalnumeropagefalse.png
new file mode 100644
index 0000000..46c3f50
Binary files /dev/null and b/src/resources/evalnumeropagefalse.png differ
diff --git a/src/resources/evalnumeropagefalsemini.png b/src/resources/evalnumeropagefalsemini.png
new file mode 100644
index 0000000..b8fd380
Binary files /dev/null and b/src/resources/evalnumeropagefalsemini.png differ
diff --git a/src/resources/evalnumeropagemini.png b/src/resources/evalnumeropagemini.png
index d1086a7..9f72058 100644
Binary files a/src/resources/evalnumeropagemini.png and b/src/resources/evalnumeropagemini.png differ
diff --git a/src/resources/evalnumeropagetrue.png b/src/resources/evalnumeropagetrue.png
new file mode 100644
index 0000000..58ddf62
Binary files /dev/null and b/src/resources/evalnumeropagetrue.png differ
diff --git a/src/resources/evalnumeropagetruemini.png b/src/resources/evalnumeropagetruemini.png
new file mode 100644
index 0000000..bba6b30
Binary files /dev/null and b/src/resources/evalnumeropagetruemini.png differ
diff --git a/src/resources/evalpasparagraphevidefalse.png b/src/resources/evalpasparagraphevidefalse.png
new file mode 100644
index 0000000..6193003
Binary files /dev/null and b/src/resources/evalpasparagraphevidefalse.png differ
diff --git a/src/resources/evalpasparagraphevidefalsemini.png b/src/resources/evalpasparagraphevidefalsemini.png
new file mode 100644
index 0000000..311752b
Binary files /dev/null and b/src/resources/evalpasparagraphevidefalsemini.png differ
diff --git a/src/resources/evalpasparagraphevidetrue.png b/src/resources/evalpasparagraphevidetrue.png
new file mode 100644
index 0000000..fc65743
Binary files /dev/null and b/src/resources/evalpasparagraphevidetrue.png differ
diff --git a/src/resources/evalpasparagraphevidetruemini.png b/src/resources/evalpasparagraphevidetruemini.png
new file mode 100644
index 0000000..9d976b7
Binary files /dev/null and b/src/resources/evalpasparagraphevidetruemini.png differ
diff --git a/src/resources/premierenfant.png b/src/resources/premierenfant.png
index f5cfc58..641b2ad 100644
Binary files a/src/resources/premierenfant.png and b/src/resources/premierenfant.png differ
diff --git a/src/resources/premierenfantmini.png b/src/resources/premierenfantmini.png
index 4e6241c..df96977 100644
Binary files a/src/resources/premierenfantmini.png and b/src/resources/premierenfantmini.png differ