MAJ V4.4.2 - ajout de la méthode allContent pour le node structurepage

bin/.gitignore

@@ -1,79 +1,6 @@
 /MEPTL/
 /calcul/
-/downnode.svg
-/downnodemini.png
-/entetenon.png
-/entetenon.svg
-/entetenonmini.png
-/enteteoui.png
-/enteteoui.svg
-/enteteouimini.png
-/et.png
-/et.svg
-/etmini.png
-/evalcalc.png
-/evalformatagedirect.png
-/evalformatagedirect.svg
-/evalformatagedirectmini.png
-/evalnamepage.png
-/evalnamepage.svg
-/evalnamepagemini.png
-/evalnamesequence.png
-/evalnamesequence.svg
-/evalnamesequencemini.png
-/evalnode.svg
-/evalnodemini.png
-/evalnumeroabsoluepage.png
-/evalnumeroabsoluepage.svg
-/evalnumeroabsoluepagemini.png
-/evalnumeropage.png
-/evalnumeropage.svg
-/evalnumeropageancrage.png
-/evalnumeropageancrage.svg
-/evalnumeropageancragemini.png
-/evalnumeropagemini.png
-/evalpasparagraphevide.png
-/evalpasparagraphevide.svg
-/evalpasparagraphevidemini.png
-/evaltextuserdefined.png
-/evaltextuserdefined.svg
-/evaltextuserdefinedmini.png
-/evaluate.png
-/evaluate.svg
-/evaluatemax.png
-/evaluatemini.png
-/evaluatemultiple.png
-/evaluatemultiple.svg
-/evaluatemultiplemax.png
-/evaluatemultiplemini.png
-/evaluer.png
-/evaluer.svg
 /evaluer/
-/evaluerFalse.svg
-/evaluerTrue.svg
-/evaluerfalse.png
-/evaluerfalsemini.png
-/evaluermini.png
-/evaluerstyle.png
-/evaluerstyle.svg
-/evaluerstylemini.png
-/evaluertouslesenfants.png
-/evaluertouslesenfants.svg
-/evaluertouslesenfantsfaux.png
-/evaluertouslesenfantsfaux.svg
-/evaluertouslesenfantsfauxmini.png
-/evaluertouslesenfantsmaxi.png
-/evaluertouslesenfantsmini.png
-/evaluertouslesstylesparagraphes.png
-/evaluertouslesstylesparagraphes.svg
-/evaluertouslesstylesparagraphesmini.png
-/evaluertrue.png
-/evaluertruemini.png
-/evalwriter.ico
-/evalwriter.png
-/evalwriter.svg
-/evalwriter32.png
-/exit.png
 /exit.svg
 /exitmini.png
 /expandAll.svg

bin/evalnombredepagemaxi.svg

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="45"
+   height="45"
+   viewBox="0 0 11.90625 11.90625"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="evalnombredepagemaxi.svg"
+   inkscape:export-filename="evalnombredepagemini.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"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="11.675119"
+     inkscape:cx="14.261097"
+     inkscape:cy="21.884145"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g350" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#f2f2f2;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       id="rect483"
+       width="6.0733089"
+       height="8.9577303"
+       x="3.644604"
+       y="0.48329094" />
+    <rect
+       style="fill:#f2f2f2;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       id="rect375"
+       width="6.0733089"
+       height="8.9577303"
+       x="2.6220307"
+       y="1.0753484" />
+    <rect
+       style="fill:#f2f2f2;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+       id="rect373"
+       width="6.0733089"
+       height="8.9577303"
+       x="1.5994575"
+       y="1.6674058" />
+    <g
+       id="g350">
+      <rect
+         style="fill:#f2f2f2;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
+         id="rect263"
+         width="6.0733089"
+         height="8.9577303"
+         x="0.57688421"
+         y="2.2594633" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.2532px;line-height:1.2;font-family:Symbol;-inkscape-font-specification:Symbol;stroke-width:0.264583"
+         x="-8.985301"
+         y="8.1101532"
+         id="text291"
+         transform="scale(-0.78480738,1.274198)"><tspan
+           sodipodi:role="line"
+           id="tspan289"
+           style="stroke-width:0.264583"
+           x="-8.985301"
+           y="8.1101532">≥</tspan></text>
+    </g>
+  </g>
+</svg>

src/fenetres/afficheText.java

@@ -347,7 +347,7 @@ public class afficheText extends JEditorPane {
 			//**********************************
 			//** Affiche le contenu d'un node **
 			//**********************************
-			if(!nod.getNomElt().equals("fichier")&&!nod.getNomElt().equals("setting")&&!nod.getNomElt().equals("structurepage")) {
+			if(!nod.getNomElt().equals("fichier")&&!nod.getNomElt().equals("setting")) {
 				if(!nod.retourneLesContenusEnfants("").isEmpty()) {
 					sb.append("<br><h4><u>Contenu</u></h4>" + nod.retourneLesContenusEnfants2("").replace("&apos;", "&#8217;") + "<br>" ); //+ nod.retourneLesContenusEnfants("")
 				}

src/fenetres/createPopupMenu.java

@@ -655,8 +655,10 @@ public class createPopupMenu extends JPopupMenu {
 		mnNiveau1.add(mnSautNiveau1());
 		mnNiveau1.addSeparator();
 		mnNiveau1.add(mnTitreNiveau1());
-		mnNiveau1.addSeparator();
-		mnNiveau1.add(mnAddMenuNiveau1());
+		if(nod.getLevel()>1) {
+			mnNiveau1.addSeparator();
+			mnNiveau1.add(mnAddMenuNiveau1());
+		}
 		if(nod.getNomElt().equals("structurepage")) {
 			mnNiveau1.addSeparator();
 			mnNiveau1.add(mnaddTitreToutesLesPages());

src/list/listeDesNodesAllContent.java

@@ -21,7 +21,7 @@ public class listeDesNodesAllContent {
 		if(nameNode.equals("text:date")) return true;
 		if(nameNode.equals("text:time")) return true;
 		
-		if(nameNode.equals("structurepage")) return false;
+		if(nameNode.equals("structurepage")) return true;
 		if(nameNode.equals("number:text")) return false;
 		if(nameNode.equals("text:page-number")) return false;
 		if(nameNode.equals("text:page-count")) return false;