diff --git a/analyseWriter.exe b/analyseWriter.exe index 4e4337b..b9d5672 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index d678497..0e7ecfa 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/icons/accueil.png b/icons/accueil.png index e361e4e..4ced6de 100644 Binary files a/icons/accueil.png and b/icons/accueil.png differ diff --git a/icons/accueill.svg b/icons/accueill.svg index 77be1ca..17f4c25 100644 --- a/icons/accueill.svg +++ b/icons/accueill.svg @@ -1,15 +1,15 @@ - - - - - + gradientTransform="matrix(0.14980356,0,0,0.14583711,148.74869,42.662618)" /> @@ -206,7 +185,7 @@ x2="20.001341" y1="122" y2="6" - gradientTransform="matrix(0.5509721,0,0,0.58233671,-393.86607,-406.16976)"> + gradientTransform="matrix(0.05004456,0,0,0.05004456,119.83699,12.210793)"> + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -366,404 +464,6 @@ id="layer1" inkscape:groupmode="layer" inkscape:label="Calque 1"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - analyseWriter - analyseWriter + transform="matrix(0.97206001,0,0,1,7.6175426,-42.748911)" + style="display:inline"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g6332" + transform="matrix(0.1695813,0,0,-0.08707046,513.86183,221.78458)"> - ODF + style="fill:url(#radialGradient217);stroke:none;stroke-width:3.36831;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;paint-order:fill markers stroke" + id="rect32012" + width="849.70654" + height="409.83182" + x="-2897.6877" + y="-1540.005" + transform="scale(1,-1)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Évaluer les mises en forme des documents ODF. + Évaluer les mises en forme des documents ODF. + + + + analyseWriter + analyseWriter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="g4" + transform="matrix(1.0909112,0,0,1.0909112,-15.191548,-4.2833715)"> + + + Évaluer les savoir-faire de la mise en forme des documents ODF. - Évaluer les savoir-faire de la mise en forme des documents ODF. + id="tspan24466" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';fill:#ffffff;stroke-width:0.0683021" + x="162.44266" + y="49.571529">ODF diff --git a/icons/bye-bye.png b/icons/bye-bye.png index 90f54c5..376a74c 100644 Binary files a/icons/bye-bye.png and b/icons/bye-bye.png differ diff --git a/src/analyseWriter/fenetres/about.java b/src/analyseWriter/fenetres/about.java index 63bc1a1..19c3673 100644 --- a/src/analyseWriter/fenetres/about.java +++ b/src/analyseWriter/fenetres/about.java @@ -66,32 +66,32 @@ public final class about extends JFrame { lblNewLabelTitre.setBounds(0, 0, 514, 126); contentPane.add(lblNewLabelTitre); - JLabel lblNewLabelVersion = new JLabel("Version : " + commandes.version + " "+ commandes.branch + ""); + JLabel lblNewLabelVersion = new JLabel("Version : V4.5.0 Origin"); lblNewLabelVersion.setFont(new Font("Tahoma", Font.PLAIN, 16)); lblNewLabelVersion.setBounds(20, 145, 240, 20); contentPane.add(lblNewLabelVersion); - JLabel lblNewLabelAnnee = new JLabel("Année : " + commandes.Annee + ""); + JLabel lblNewLabelAnnee = new JLabel("Année : 2024"); lblNewLabelAnnee.setFont(new Font("Tahoma", Font.PLAIN, 16)); lblNewLabelAnnee.setBounds(20, 163, 240, 20); contentPane.add(lblNewLabelAnnee); JLabel lblCredit = new JLabel("Crédit"); lblCredit.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 14)); - lblCredit.setBounds(20, 287, 112, 20); + lblCredit.setBounds(20, 256, 112, 20); getContentPane().add(lblCredit); - JLabel lblNewLabelAuteur = new JLabel("Pablo Rodriguez"); + JLabel lblNewLabelAuteur = new JLabel("

Pablo Rodriguez
Enseignant d'informatique - TICE
Université d'Artois

"); lblNewLabelAuteur.setFont(new Font("Tahoma", Font.PLAIN, 14)); - lblNewLabelAuteur.setBounds(20, 310, 250, 20); + lblNewLabelAuteur.setBounds(20, 275, 250, 55); contentPane.add(lblNewLabelAuteur); JLabel lblCommentaire = new JLabel("Outil permettant l’évaluation des fichiers réalisés par des étudiants avec un traitement de texte au format ODF."); lblCommentaire.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblCommentaire.setHorizontalAlignment(SwingConstants.LEFT); lblCommentaire.setVerticalAlignment(SwingConstants.TOP); - lblCommentaire.setBounds(20, 230, 472, 46); + lblCommentaire.setBounds(20, 212, 472, 46); getContentPane().add(lblCommentaire); JLabel lblLicence = new JLabel("Licence : GNU GLP 3.0 "); @@ -116,7 +116,7 @@ public final class about extends JFrame { } }); - btnNewButton.setBounds(270, 146, 222, 72); + btnNewButton.setBounds(270, 146, 222, 55); getContentPane().add(btnNewButton); JLabel lblGPL3 = new JLabel(""); diff --git a/src/analyseWriter/fenetres/chargeBaseAuDemarrage.java b/src/analyseWriter/fenetres/chargeBaseAuDemarrage.java index 32c2e01..765c53f 100644 --- a/src/analyseWriter/fenetres/chargeBaseAuDemarrage.java +++ b/src/analyseWriter/fenetres/chargeBaseAuDemarrage.java @@ -44,7 +44,7 @@ public class chargeBaseAuDemarrage extends JFrame { private final JLabel label = new JLabel(commandes.PathBaseEvaluations); public chargeBaseAuDemarrage() { - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setBounds(100, 100, 1200, 600); int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth(); @@ -126,6 +126,7 @@ private void ListenerAction() { addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent windowEvent) { + mainApp.getInstance(); dispose(); } });