MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-04-07 09:17:57 +02:00
parent a6b5977ef3
commit b7692143b4
53 changed files with 308 additions and 102 deletions

View File

@ -66,7 +66,6 @@ public class MnGroupeMethodeEvaluer {
if(listeDesNodesAllContent.isAllContent(nod) ) {
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(new actAllContent());
mnGroupeMethodeEvaluer.add(new actAllContent());
}
// Pour la méthode evalAncrageNumeroAbsoluePage

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -2,9 +2,9 @@
<svg
inkscape:export-ydpi="51.200001"
inkscape:export-xdpi="51.200001"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\evaluerstyle.png"
inkscape:export-filename="evaluerstylefalsemini.png"
sodipodi:docname="evaluerstyle.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8"
version="1.1"
viewBox="0 0 11.90625 11.90625"
@ -41,7 +41,7 @@
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="32.065537"
inkscape:cx="16.479897"
inkscape:cx="2.0440183"
inkscape:zoom="7.8277187"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -49,23 +49,29 @@
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0">
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
id="guide25"
orientation="0,-1"
position="94.049365,180.07197" />
position="94.049365,180.07197"
inkscape:locked="false" />
<sodipodi:guide
position="8.9572181,11.534441"
orientation="0,-1"
id="guide4043" />
id="guide4043"
inkscape:locked="false" />
<sodipodi:guide
position="5.8813432,7.9515537"
orientation="0,-1"
id="guide4083" />
id="guide4083"
inkscape:locked="false" />
<sodipodi:guide
position="6.0841481,3.0166336"
orientation="1,0"
id="guide4279" />
id="guide4279"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">
@ -100,12 +106,34 @@
x="6.4307361"
y="7.1444883">S</tspan></text>
<g
id="g923"
transform="matrix(1.0352696,0,0,1.0658949,-0.43470013,7.1496941)"
style="stroke-width:0.772273">
id="g919"
transform="matrix(1.077757,0,0,1.1015764,-0.42785455,8.2983005)"
style="stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10"
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(1.0781672,0,0,1.1004826,-5.8841675,12.463335)"
style="stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
@ -113,9 +141,9 @@
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.20433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
</g>

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -8,10 +8,10 @@
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:export-filename="heritagestylemini.png"
inkscape:export-filename="heritagestylefalsemini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="heritagestyle.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@ -29,7 +29,7 @@
showgrid="false"
showguides="false"
inkscape:zoom="11.688363"
inkscape:cx="25.623777"
inkscape:cx="46.627573"
inkscape:cy="15.656598"
inkscape:window-width="1920"
inkscape:window-height="1009"
@ -102,4 +102,36 @@
width="0.76964015"
height="5.3422079"
x="9.3941374"
y="3.9925473" /></g></g></svg>
y="3.9925473" /></g><g
id="g923"
transform="matrix(1.0781672,0,0,1.1004826,11.755235,2.1874966)"
style="stroke-width:0.553289"><rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" /><path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16"
sodipodi:nodetypes="ccccc" /></g><g
id="g919"
transform="matrix(1.077757,0,0,1.1015764,11.871018,-6.7772546)"
style="stroke:#000000;stroke-width:0.57493;stroke-opacity:1"><rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" /><path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" /><path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g></svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -2,9 +2,9 @@
<svg
inkscape:export-ydpi="51.200001"
inkscape:export-xdpi="51.200001"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\evaluerstyle.png"
inkscape:export-filename="evaluerstylefalsemini.png"
sodipodi:docname="evaluerstyle.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8"
version="1.1"
viewBox="0 0 11.90625 11.90625"
@ -41,7 +41,7 @@
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="32.065537"
inkscape:cx="16.479897"
inkscape:cx="2.0440183"
inkscape:zoom="7.8277187"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -49,23 +49,29 @@
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0">
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
id="guide25"
orientation="0,-1"
position="94.049365,180.07197" />
position="94.049365,180.07197"
inkscape:locked="false" />
<sodipodi:guide
position="8.9572181,11.534441"
orientation="0,-1"
id="guide4043" />
id="guide4043"
inkscape:locked="false" />
<sodipodi:guide
position="5.8813432,7.9515537"
orientation="0,-1"
id="guide4083" />
id="guide4083"
inkscape:locked="false" />
<sodipodi:guide
position="6.0841481,3.0166336"
orientation="1,0"
id="guide4279" />
id="guide4279"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">
@ -100,12 +106,34 @@
x="6.4307361"
y="7.1444883">S</tspan></text>
<g
id="g923"
transform="matrix(1.0352696,0,0,1.0658949,-0.43470013,7.1496941)"
style="stroke-width:0.772273">
id="g919"
transform="matrix(1.077757,0,0,1.1015764,-0.42785455,8.2983005)"
style="stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10"
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(1.0781672,0,0,1.1004826,-5.8841675,12.463335)"
style="stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
@ -113,9 +141,9 @@
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.20433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
</g>

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -8,10 +8,10 @@
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:export-filename="heritagestylemini.png"
inkscape:export-filename="heritagestylefalsemini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="heritagestyle.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@ -29,7 +29,7 @@
showgrid="false"
showguides="false"
inkscape:zoom="11.688363"
inkscape:cx="25.623777"
inkscape:cx="46.627573"
inkscape:cy="15.656598"
inkscape:window-width="1920"
inkscape:window-height="1009"
@ -102,4 +102,36 @@
width="0.76964015"
height="5.3422079"
x="9.3941374"
y="3.9925473" /></g></g></svg>
y="3.9925473" /></g><g
id="g923"
transform="matrix(1.0781672,0,0,1.1004826,11.755235,2.1874966)"
style="stroke-width:0.553289"><rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" /><path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16"
sodipodi:nodetypes="ccccc" /></g><g
id="g919"
transform="matrix(1.077757,0,0,1.1015764,11.871018,-6.7772546)"
style="stroke:#000000;stroke-width:0.57493;stroke-opacity:1"><rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" /><path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" /><path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g></svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@ -11,6 +11,7 @@ import javax.swing.KeyStroke;
import cXML.node;
import fenetres.allContent;
import fenetres.create;
import list.listeDesNodesAllContent;
public class actAllContent extends AbstractAction{
@ -22,13 +23,15 @@ public class actAllContent extends AbstractAction{
putValue( Action.NAME, "Evaluer le contenu du node" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer le contenu du node (SHIFT+A)" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/allcontentmini.png")) );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.SHIFT_DOWN_MASK) );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.SHIFT_DOWN_MASK) );
putValue( Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/allcontentmini.png")) );
}
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
new allContent(nod,fenetres.create.getTextNodeSelect(),false);
if(listeDesNodesAllContent.isAllContent(nod)) {
new allContent(nod,fenetres.create.getTextNodeSelect(),false);
}
}
}

View File

@ -1,12 +1,14 @@
package action;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Enumeration;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import cXML.node;
import fenetres.attributs;
@ -25,7 +27,7 @@ public class actAttribut extends AbstractAction{
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/attributmini.png")) );
putValue( Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/attributmini.png")) );
putValue( Action.SHORT_DESCRIPTION, "Evaluer les attributs du traitement de texte Writer" );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.SHIFT_DOWN_MASK) );
}
@Override
public void actionPerformed(ActionEvent e) {

View File

@ -13,7 +13,7 @@ public class actEvaluerLegacyStyleParentFalse extends AbstractAction{
{
putValue( Action.NAME, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestylefalse.png")) );
}
private static final long serialVersionUID = 1L;

View File

@ -13,7 +13,7 @@ public class actEvaluerNomDuStyleHeriteFalse extends AbstractAction{
{
putValue( Action.NAME, "Supprime l'évaluation du nom du style hérité." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du nom du style hérité." );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestylefalsemini.png")) );
}
/**
*

View File

@ -14,9 +14,8 @@ import fenetres.create;
public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom du style hérité. Si pas d'héritage alors évalue celui du nom de ce style.\n"
+ "Interreant pour les formatages directs.");
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")));
putValue( Action.SHORT_DESCRIPTION, "Evaluer le nom du style hérité.\nSi pas d'héritage alors évalue celui du nom de ce style.");
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestyletruemini.png")));
}
/**
*

View File

@ -20,7 +20,7 @@ public class actEvaluerStyleFalse extends AbstractAction{
{
putValue( Action.NAME, "N'évaluer pas le style." );
putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans le fichier de l'étudiant" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")));
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaluerstylefalsemini.png")));
}
@Override
public void actionPerformed(ActionEvent e) {

View File

@ -22,7 +22,7 @@ public class actEvaluerStyleTrue extends AbstractAction{
{
putValue( Action.NAME, "Evaluer le style." );
putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans le fichier de l'étudiant");
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")));
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaluerstyletruemini.png")));
}
@Override
public void actionPerformed(ActionEvent e) {

View File

@ -1,6 +1,7 @@
package action;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
@ -9,6 +10,7 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import cXML.node;
@ -19,8 +21,9 @@ public class actTitrePrincipal extends AbstractAction{
*/
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Titre principal" );
putValue( Action.NAME, "Titre principal (SHIFT+0)" );
putValue( Action.SHORT_DESCRIPTION, "Titre principal" );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_0, KeyEvent.SHIFT_DOWN_MASK) );
}
@Override
public void actionPerformed(ActionEvent e) {

View File

@ -31,20 +31,13 @@ public class actUpNode extends AbstractAction{
@Override
public void actionPerformed(ActionEvent e) {
if(fenetres.create.getTree().getSelectionPath()!=null) {
// DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) fenetres.create.getTree().getSelectionPath().getLastPathComponent();
node nod = (node) fenetres.create.getSelectNode().getUserObject();
DefaultMutableTreeNode selectNode = fenetres.create.getSelectNode();
DefaultMutableTreeNode selectParentNode = (DefaultMutableTreeNode) selectNode.getParent();
int selectedNodeIndex = selectNode.getParent().getIndex(selectNode);
// int a = JOptionPane.showConfirmDialog(null,"Voulez-vous monter le node " + selectNode.toString()+ "?", "Sélectionner un choix", JOptionPane.YES_NO_OPTION);
//
// if(a == JOptionPane.YES_NO_OPTION) {
if(!nod.chemin().contains("setting")) {
@ -69,12 +62,9 @@ public class actUpNode extends AbstractAction{
fenetres.create.getTree().setSelectionPath(path);
fenetres.create.getTree().expandPath(path);
}
}else {
JOptionPane.showMessageDialog(null,"Vous ne devez pas déplacer ce node !", "Oh non!!!", JOptionPane.INFORMATION_MESSAGE);
}
// }
}
}

View File

@ -28,6 +28,7 @@ import javax.swing.JSplitPane;
import javax.swing.JToolBar;
import javax.swing.JTree;
import javax.swing.KeyStroke;
import javax.swing.SwingConstants;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
@ -68,9 +69,19 @@ import action.actTutoriels;
import action.actUpNode;
import action.actTitre2;
import action.actTitre3;
import action.actAllContent;
import action.actEvaluerNomDuStyleHeriteTrue;
import action.actEvaluerNomDuStyleHeriteFalse;
import action.actEvaluerStyleTrue;
import action.actEvaluerStyleFalse;
import cXML.Run;
import cXML.node;
import list.listeDesNodesAllContent;
import list.listeDesNodesAnalyseStyle;
import list.listeDesNodesFormatageDirect;
import menucontextuel.CreatePopupMenu;
import net.miginfocom.swing.MigLayout;
import java.awt.event.ActionListener;
@ -91,15 +102,35 @@ public final class create extends JFrame {
private JMenuBar menuBar = new JMenuBar();
private static JButton buttonEvaluate;
private JPanel panelPrincipal;
private JPanel panelDroiteBoutons= new JPanel();
private static create instance;
public static boolean isDispose = true;
private static JLabel lblInfo = new JLabel("Fichier d'analyse");
private final JButton btnAllContent = new JButton(new actAllContent());
private final JButton btnAttribut= new JButton(new actAttribut());
private final JButton btnevalNameLegacyStyleTrue = new JButton(new actEvaluerNomDuStyleHeriteTrue());
private final JButton btnevalNameLegacyStyleFalse = new JButton(new actEvaluerNomDuStyleHeriteFalse());
private final JButton btnanalyseStyletrue = new JButton(new actEvaluerStyleTrue());
private final JButton btnanalyseStylefalse = new JButton(new actEvaluerStyleFalse());
// private AbstractAction allContent = new actAllContent();
// private static JTable table = new JTable();
/**
* Création de la fenêtre.</br>
*/
public create() {
btnAllContent.setEnabled(false);
btnevalNameLegacyStyleTrue.setIcon(new ImageIcon(create.class.getResource("/resources/heritagestyletrue.png")));
btnevalNameLegacyStyleTrue.setEnabled(false);
btnevalNameLegacyStyleFalse.setIcon(new ImageIcon(create.class.getResource("/resources/heritagestylefalse.png")));
btnevalNameLegacyStyleFalse.setEnabled(false);
btnanalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstyletrue.png")));
btnanalyseStyletrue.setEnabled(false);
btnanalyseStylefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstylefalse.png")));
btnanalyseStylefalse.setEnabled(false);
setBackground(new Color(255, 255, 255));
try {
initialize();
@ -192,28 +223,60 @@ public final class create extends JFrame {
panelLeft.add(leftScrollPane,BorderLayout.CENTER);
JScrollPane rightScrollPane = new JScrollPane( );
JScrollPane rightScrollPane = new JScrollPane();
textNodeSelect.setBackground(Color.LIGHT_GRAY);
// rightScrollPane.setViewportView(textNodeSelect);
textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15));
JScrollPane ScrollPaneTableBouton = new JScrollPane( );
// JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, table );
panelDroiteBoutons.setBorder(null);
panelDroiteBoutons.setLayout(new MigLayout("", "[40px:n,fill][40px:n,fill][40px:n,fill][40px:n,fill]", "[20px][40px][40px][60px][60px][60px][60px][60px][60px][60px][60px][60px][60px]"));
// ScrollPaneTableBouton = new JScrollPane(panelDroiteBoutons);
rightScrollPane.setViewportView(panelDroiteBoutons);
ScrollPaneTableBouton = new JScrollPane(textNodeSelect);
btnAttribut.setText("");
// Ligne 2
btnAttribut.setHorizontalAlignment(SwingConstants.LEFT);
btnAttribut.setForeground(new Color(0, 128, 192));
panelDroiteBoutons.add(btnAttribut, "cell 0 1,grow");
btnAttribut.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/attribut.png")));
btnAllContent.setText("");
btnAllContent.setHorizontalAlignment(SwingConstants.LEFT);
btnAllContent.setForeground(new Color(0, 128, 192));
panelDroiteBoutons.add(btnAllContent, "cell 1 1,grow");
btnAllContent.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/allcontent.png")));
btnevalNameLegacyStyleTrue.setText("");
panelDroiteBoutons.add(btnevalNameLegacyStyleTrue, "cell 0 2");
btnevalNameLegacyStyleFalse.setText("");
panelDroiteBoutons.add(btnevalNameLegacyStyleFalse, "cell 1 2");
btnanalyseStyletrue.setText("");
panelDroiteBoutons.add(btnanalyseStyletrue, "cell 2 2");
btnanalyseStylefalse.setText("");
panelDroiteBoutons.add(btnanalyseStylefalse, "cell 3 2");
JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton );
splitPane2.setBounds(10, 10, 1364, 783);
splitPane2.setBounds(10, 10, 1364, 783);
splitPane2.setDividerLocation(0.8);
splitPane2.setDividerLocation(0.26);
// JSplitPane splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panelLeft, rightScrollPane );
JSplitPane splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panelLeft, splitPane2 );
splitPane1.setBounds(10, 10, 1364, 783); //10, 10, 1364, 783
splitPane1.setDividerLocation(0.25);
textNodeSelect.setBackground(Color.LIGHT_GRAY);
rightScrollPane.setViewportView(textNodeSelect);
textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15));
// ScrollPaneTable.setViewportView(table);
leftScrollPane.setViewportView(tree);
tree.setFont(new Font("Tahoma", Font.PLAIN, 16));
@ -222,20 +285,18 @@ public final class create extends JFrame {
panelPrincipal.setLayout(new GridLayout(1, 1, 0, 0));
panelPrincipal.add(toolBarPrincipal);
if(commandes.fichierAnalyseValide) {
tree.setVisible(true);
// table.setModel(new myTableModel(commandes.sujet.retourneFirstEnfantsByName("structurepage")));
// table.setVisible(true);
constructionTree();
}else {
tree.setVisible(false);
// table.setVisible(false);
}
this.setExtendedState(MAXIMIZED_BOTH);
rightScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
// orig = (Point) rightScrollPane.getViewport().getViewPosition().clone();
ListenerAction();
@ -280,6 +341,24 @@ public final class create extends JFrame {
node nod = (node) selectNode.getUserObject(); //node sélectionné.
new CreatePopupMenu(nod); // création du popup menu.
textNodeSelect.refreshAffichage(nod); //affiche des informations sur le node.
btnevalNameLegacyStyleTrue.setEnabled(false);
btnevalNameLegacyStyleFalse.setEnabled(false);
btnanalyseStyletrue.setEnabled(false);
btnanalyseStylefalse.setEnabled(false);
btnAllContent.setEnabled(false);
if(listeDesNodesAllContent.isAllContent(nod)) {
btnAllContent.setEnabled(true);
}
if(listeDesNodesFormatageDirect.isFormatageDirect(nod)) {
btnevalNameLegacyStyleTrue.setEnabled(true);
btnevalNameLegacyStyleFalse.setEnabled(true);
}
if(listeDesNodesAnalyseStyle.isAnalyseStyle(nod)) {
btnanalyseStyletrue.setEnabled(true);
btnanalyseStylefalse.setEnabled(true);
}
}
}
});
@ -298,6 +377,7 @@ public final class create extends JFrame {
}
});
}
@ -326,16 +406,7 @@ public final class create extends JFrame {
mnuFile.addSeparator();
JMenuItem menuItem_4 = mnuFile.add( new actSaveEvaluation());
menuItem_4.setText("Enregistrer l'évaluation");
// mnuFile.addSeparator();
// /*JMenuItem mnuNewFile =*/
// mnuFile.add( new actOpen() );
// mnuFile.add( new actNewFichierAnalyse() );
//
//// mnuFile.add( new actPathBaseEvaluations() );
//
// mnuFile.addSeparator();
// mnuFile.add( new actSaveFileAnalysis() );
// mnuFile.add( new actSaveAs() );
mnuFile.addSeparator();
JMenuItem menuItem_5 = mnuFile.add( new actExit());
menuItem_5.setText("Quitter");
@ -371,6 +442,10 @@ public final class create extends JFrame {
JMenu mnEvaluer = new JMenu("Evaluer");
mnEvaluer.add(new actEvalueTrue());
mnEvaluer.add(new actEvalueFalse());
mnEvaluer.addSeparator();
mnEvaluer.add(new actAttribut());
mnEvaluer.addSeparator();
mnEvaluer.add(new actAllContent());
mnNode.add(mnEvaluer);
mnNode.addSeparator();
@ -386,7 +461,7 @@ public final class create extends JFrame {
// Définition du menu déroulant "Création évaluation" et de son contenu
JMenu mnuExercice = new JMenu( "Création évaluation" );
JMenu mnuExercice = new JMenu( "Evaluer les fichiers des étudiants" );
mnuExercice.setMnemonic( 'N' );
mnuExercice.add(new actEvaluer());
@ -494,7 +569,6 @@ public final class create extends JFrame {
JButton btnAttribut = new JButton(new actAttribut());
btnAttribut.setText("");
btnAttribut.setIcon(new ImageIcon(create.class.getResource("/resources/attribut.png")));
toolBarPrincipal.add(btnAttribut);
@ -601,6 +675,7 @@ public final class create extends JFrame {
System.out.println( "Cut" );
}
};
/**
* Ferme l'application.</br>

View File

@ -85,6 +85,13 @@ public class listeAttributsAnalyseWriter {
case "producteur": return true;
case "progression": return true;
case "version": return true;
case "patch":return true;
case "modificationDateMini":return true;
case "dossier":return true;
case "tolerance_text":return true;
case "Initial_Creator":return true;
case "filenameAnalyse":return true;
case "controleDateModificationMini":return true;
case "OU": return true;

View File

@ -13,19 +13,10 @@ public class listeDesNodesAllContent {
String nameNode = nod.getNomElt();
switch (nameNode) {
case "text:p": return true;
case "text:span": return true;
case "text:list": return true;
case "text:tab":return true;
case "text:title":return true;
case "text:subject":return true;
case "page":return true;
case "text:time":return true;
case "structurepage":return true;
case "text:index-body":return true;
if(nameNode.contains("style:")) return false;
switch (nameNode) {
case "fichier":return false;
case "number:text":return false;
case "text:page-count":return false;
case "OU":return false;
@ -38,7 +29,24 @@ public class listeDesNodesAllContent {
case "style:default-style\"":return false;
case "saut:automatique":return false;
case "style:tab-stops":return false;
case "sequences":return false;
case "text:sequence-dec":return false;
case "numerotationchapitre":return false;
case "text:outline-level-style":return false;
case "style:list-level-properties":return false;
case "style:list-level-label-alignment":return false;
case "frames":return false;
case "style:graphic-properties":return false;
case "office:meta":return false;
case "meta:document-statistic":return false;
case "draw:contour-polygon":return false;
case "text:s":return false;
case "text:database-display":return false;
case "sections":return false;
case "tableaux":return false;
case "biblio":return false;
case "tablematieres":return false;
case "tableillustrations":return false;
default: return true;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 854 B