diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java
index 8f31f12..8ee3321 100644
--- a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java
+++ b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java
@@ -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
diff --git a/analyseWriter.exe b/analyseWriter.exe
index ea26087..3163d0e 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/bin/action/actAllContent.class b/bin/action/actAllContent.class
index aa9bd99..075caf3 100644
Binary files a/bin/action/actAllContent.class and b/bin/action/actAllContent.class differ
diff --git a/bin/action/actAttribut.class b/bin/action/actAttribut.class
index 61de7e8..d021c41 100644
Binary files a/bin/action/actAttribut.class and b/bin/action/actAttribut.class differ
diff --git a/bin/action/actEvaluerLegacyStyleParentFalse.class b/bin/action/actEvaluerLegacyStyleParentFalse.class
index 7cbabeb..78ef7b9 100644
Binary files a/bin/action/actEvaluerLegacyStyleParentFalse.class and b/bin/action/actEvaluerLegacyStyleParentFalse.class differ
diff --git a/bin/action/actEvaluerNomDuStyleHeriteFalse.class b/bin/action/actEvaluerNomDuStyleHeriteFalse.class
index f9f7d76..f582955 100644
Binary files a/bin/action/actEvaluerNomDuStyleHeriteFalse.class and b/bin/action/actEvaluerNomDuStyleHeriteFalse.class differ
diff --git a/bin/action/actEvaluerNomDuStyleHeriteTrue.class b/bin/action/actEvaluerNomDuStyleHeriteTrue.class
index c06239b..6be71a6 100644
Binary files a/bin/action/actEvaluerNomDuStyleHeriteTrue.class and b/bin/action/actEvaluerNomDuStyleHeriteTrue.class differ
diff --git a/bin/action/actEvaluerStyleFalse.class b/bin/action/actEvaluerStyleFalse.class
index 3da2fdd..d13e6a5 100644
Binary files a/bin/action/actEvaluerStyleFalse.class and b/bin/action/actEvaluerStyleFalse.class differ
diff --git a/bin/action/actEvaluerStyleTrue.class b/bin/action/actEvaluerStyleTrue.class
index f87ab39..57fc352 100644
Binary files a/bin/action/actEvaluerStyleTrue.class and b/bin/action/actEvaluerStyleTrue.class differ
diff --git a/bin/action/actTitrePrincipal.class b/bin/action/actTitrePrincipal.class
index 237fdca..a583a16 100644
Binary files a/bin/action/actTitrePrincipal.class and b/bin/action/actTitrePrincipal.class differ
diff --git a/bin/action/actUpNode.class b/bin/action/actUpNode.class
index c9dde8d..2925a54 100644
Binary files a/bin/action/actUpNode.class and b/bin/action/actUpNode.class differ
diff --git a/bin/evaluerstyle.png b/bin/evaluerstyle.png
index 62ff3a3..bcf545b 100644
Binary files a/bin/evaluerstyle.png and b/bin/evaluerstyle.png differ
diff --git a/bin/evaluerstyle.svg b/bin/evaluerstyle.svg
index 5ca3442..c1a088e 100644
--- a/bin/evaluerstyle.svg
+++ b/bin/evaluerstyle.svg
@@ -2,9 +2,9 @@
+ y="3.9925473" />
diff --git a/bin/list/listeAttributsAnalyseWriter.class b/bin/list/listeAttributsAnalyseWriter.class
index 1bfdcf6..d5824e8 100644
Binary files a/bin/list/listeAttributsAnalyseWriter.class and b/bin/list/listeAttributsAnalyseWriter.class differ
diff --git a/bin/list/listeDesNodesAllContent.class b/bin/list/listeDesNodesAllContent.class
index aab2b97..809b83b 100644
Binary files a/bin/list/listeDesNodesAllContent.class and b/bin/list/listeDesNodesAllContent.class differ
diff --git a/bin/menucontextuel/MnGroupeMethodeEvaluer.class b/bin/menucontextuel/MnGroupeMethodeEvaluer.class
index 54c80f4..f38e8ac 100644
Binary files a/bin/menucontextuel/MnGroupeMethodeEvaluer.class and b/bin/menucontextuel/MnGroupeMethodeEvaluer.class differ
diff --git a/bin/resources/evaluerstyle.png b/bin/resources/evaluerstyle.png
index 62ff3a3..bcf545b 100644
Binary files a/bin/resources/evaluerstyle.png and b/bin/resources/evaluerstyle.png differ
diff --git a/bin/resources/evaluerstylemini.png b/bin/resources/evaluerstylemini.png
index 62ff3a3..fc33785 100644
Binary files a/bin/resources/evaluerstylemini.png and b/bin/resources/evaluerstylemini.png differ
diff --git a/icons/evaluerstyle.png b/icons/evaluerstyle.png
index 62ff3a3..bcf545b 100644
Binary files a/icons/evaluerstyle.png and b/icons/evaluerstyle.png differ
diff --git a/icons/evaluerstyle.svg b/icons/evaluerstyle.svg
index 5ca3442..c1a088e 100644
--- a/icons/evaluerstyle.svg
+++ b/icons/evaluerstyle.svg
@@ -2,9 +2,9 @@
+ y="3.9925473" />
diff --git a/src/action/actAllContent.java b/src/action/actAllContent.java
index 097651f..988ed01 100644
--- a/src/action/actAllContent.java
+++ b/src/action/actAllContent.java
@@ -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);
+ }
}
-
}
diff --git a/src/action/actAttribut.java b/src/action/actAttribut.java
index 8bc2c70..4b42f68 100644
--- a/src/action/actAttribut.java
+++ b/src/action/actAttribut.java
@@ -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) {
diff --git a/src/action/actEvaluerLegacyStyleParentFalse.java b/src/action/actEvaluerLegacyStyleParentFalse.java
index b47b7fd..3de4eaa 100644
--- a/src/action/actEvaluerLegacyStyleParentFalse.java
+++ b/src/action/actEvaluerLegacyStyleParentFalse.java
@@ -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;
diff --git a/src/action/actEvaluerNomDuStyleHeriteFalse.java b/src/action/actEvaluerNomDuStyleHeriteFalse.java
index 3aeaeff..84a2c67 100644
--- a/src/action/actEvaluerNomDuStyleHeriteFalse.java
+++ b/src/action/actEvaluerNomDuStyleHeriteFalse.java
@@ -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")) );
}
/**
*
diff --git a/src/action/actEvaluerNomDuStyleHeriteTrue.java b/src/action/actEvaluerNomDuStyleHeriteTrue.java
index 9e9b5d3..f6b4bc9 100644
--- a/src/action/actEvaluerNomDuStyleHeriteTrue.java
+++ b/src/action/actEvaluerNomDuStyleHeriteTrue.java
@@ -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")));
}
/**
*
diff --git a/src/action/actEvaluerStyleFalse.java b/src/action/actEvaluerStyleFalse.java
index 97cd488..b71f456 100644
--- a/src/action/actEvaluerStyleFalse.java
+++ b/src/action/actEvaluerStyleFalse.java
@@ -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) {
diff --git a/src/action/actEvaluerStyleTrue.java b/src/action/actEvaluerStyleTrue.java
index 1ee305e..a0bd93f 100644
--- a/src/action/actEvaluerStyleTrue.java
+++ b/src/action/actEvaluerStyleTrue.java
@@ -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) {
diff --git a/src/action/actTitrePrincipal.java b/src/action/actTitrePrincipal.java
index e13bf9a..da4900a 100644
--- a/src/action/actTitrePrincipal.java
+++ b/src/action/actTitrePrincipal.java
@@ -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) {
diff --git a/src/action/actUpNode.java b/src/action/actUpNode.java
index 98c2117..80e4152 100644
--- a/src/action/actUpNode.java
+++ b/src/action/actUpNode.java
@@ -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);
}
-// }
}
}
diff --git a/src/fenetres/create.java b/src/fenetres/create.java
index bd961be..cea9464 100644
--- a/src/fenetres/create.java
+++ b/src/fenetres/create.java
@@ -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.
*/
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.
diff --git a/src/list/listeAttributsAnalyseWriter.java b/src/list/listeAttributsAnalyseWriter.java
index c327fff..6b51ff8 100644
--- a/src/list/listeAttributsAnalyseWriter.java
+++ b/src/list/listeAttributsAnalyseWriter.java
@@ -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;
diff --git a/src/list/listeDesNodesAllContent.java b/src/list/listeDesNodesAllContent.java
index 150cd01..ac27981 100644
--- a/src/list/listeDesNodesAllContent.java
+++ b/src/list/listeDesNodesAllContent.java
@@ -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;
}
diff --git a/src/resources/evaluerstyle.png b/src/resources/evaluerstyle.png
index 62ff3a3..bcf545b 100644
Binary files a/src/resources/evaluerstyle.png and b/src/resources/evaluerstyle.png differ
diff --git a/src/resources/evaluerstylefalse.png b/src/resources/evaluerstylefalse.png
new file mode 100644
index 0000000..81a46dd
Binary files /dev/null and b/src/resources/evaluerstylefalse.png differ
diff --git a/src/resources/evaluerstylefalsemini.png b/src/resources/evaluerstylefalsemini.png
new file mode 100644
index 0000000..df052e3
Binary files /dev/null and b/src/resources/evaluerstylefalsemini.png differ
diff --git a/src/resources/evaluerstylemini.png b/src/resources/evaluerstylemini.png
index 62ff3a3..fc33785 100644
Binary files a/src/resources/evaluerstylemini.png and b/src/resources/evaluerstylemini.png differ
diff --git a/src/resources/evaluerstyletrue.png b/src/resources/evaluerstyletrue.png
new file mode 100644
index 0000000..0b07670
Binary files /dev/null and b/src/resources/evaluerstyletrue.png differ
diff --git a/src/resources/evaluerstyletruemini.png b/src/resources/evaluerstyletruemini.png
new file mode 100644
index 0000000..2275ddf
Binary files /dev/null and b/src/resources/evaluerstyletruemini.png differ
diff --git a/src/resources/heritagestylefalse.png b/src/resources/heritagestylefalse.png
new file mode 100644
index 0000000..260d254
Binary files /dev/null and b/src/resources/heritagestylefalse.png differ
diff --git a/src/resources/heritagestylefalsemini.png b/src/resources/heritagestylefalsemini.png
new file mode 100644
index 0000000..230958f
Binary files /dev/null and b/src/resources/heritagestylefalsemini.png differ
diff --git a/src/resources/heritagestyletrue.png b/src/resources/heritagestyletrue.png
new file mode 100644
index 0000000..a6a1114
Binary files /dev/null and b/src/resources/heritagestyletrue.png differ
diff --git a/src/resources/heritagestyletruemini.png b/src/resources/heritagestyletruemini.png
new file mode 100644
index 0000000..6482a84
Binary files /dev/null and b/src/resources/heritagestyletruemini.png differ