diff --git a/analyseWriter.exe b/analyseWriter.exe index d98312f..1914526 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 2525933..9acad2a 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 3a4a813..00679ef 100644 --- a/bin/.gitignore +++ b/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 diff --git a/bin/evalnombredepagemaxi.png b/bin/evalnombredepagemaxi.png new file mode 100644 index 0000000..a70eb6e Binary files /dev/null and b/bin/evalnombredepagemaxi.png differ diff --git a/bin/evalnombredepagemaxi.svg b/bin/evalnombredepagemaxi.svg new file mode 100644 index 0000000..2ce60c3 --- /dev/null +++ b/bin/evalnombredepagemaxi.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + diff --git a/bin/evalnombredepagemaximini.png b/bin/evalnombredepagemaximini.png new file mode 100644 index 0000000..778f415 Binary files /dev/null and b/bin/evalnombredepagemaximini.png differ diff --git a/bin/evalnombredepagemini.png b/bin/evalnombredepagemini.png new file mode 100644 index 0000000..6759e96 Binary files /dev/null and b/bin/evalnombredepagemini.png differ diff --git a/bin/evalnombredepageminimini.png b/bin/evalnombredepageminimini.png new file mode 100644 index 0000000..11c2a13 Binary files /dev/null and b/bin/evalnombredepageminimini.png differ diff --git a/bin/fenetres/afficheText.class b/bin/fenetres/afficheText.class index 91c68ea..fa417e4 100644 Binary files a/bin/fenetres/afficheText.class and b/bin/fenetres/afficheText.class differ diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class index 8fdd830..28f6b7a 100644 Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ diff --git a/bin/list/listeDesNodesAllContent.class b/bin/list/listeDesNodesAllContent.class index 1f1b4ad..16442dc 100644 Binary files a/bin/list/listeDesNodesAllContent.class and b/bin/list/listeDesNodesAllContent.class differ diff --git a/src/fenetres/afficheText.java b/src/fenetres/afficheText.java index 35a69be..6970eb9 100644 --- a/src/fenetres/afficheText.java +++ b/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("

Contenu

" + nod.retourneLesContenusEnfants2("").replace("'", "’") + "
" ); //+ nod.retourneLesContenusEnfants("") } diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java index c8df7fc..4bb6074 100644 --- a/src/fenetres/createPopupMenu.java +++ b/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()); diff --git a/src/list/listeDesNodesAllContent.java b/src/list/listeDesNodesAllContent.java index 2957861..15ef5d1 100644 --- a/src/list/listeDesNodesAllContent.java +++ b/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;