diff --git a/src/calc/commandes.java b/src/calc/commandes.java index 44182d3..eff9067 100644 --- a/src/calc/commandes.java +++ b/src/calc/commandes.java @@ -22,7 +22,7 @@ public class commandes { public static nodeAC nodeACCSV = null; //**version - public static String version ="V1.0.0"; // La version actuelle + public static String version ="V2.0.1"; // La version actuelle public static String branch = "Origin"; public static String Annee ="2022"; diff --git a/src/fenetres/about.java b/src/fenetres/about.java index 2ee9b9e..f3c005d 100644 --- a/src/fenetres/about.java +++ b/src/fenetres/about.java @@ -44,7 +44,7 @@ public final class about extends JFrame { setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); getContentPane().setLayout(null); - ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") ); + ImageIcon img = new ImageIcon(about.class.getResource("/resources/evalcalc.png") ); setIconImage(img.getImage()); JPanel contentPane = (JPanel) getContentPane(); @@ -99,7 +99,7 @@ public final class about extends JFrame { btnNewButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { - String url = "https://forge.chapril.org/pablo/analyseWriter/releases"; + String url = "https://forge.chapril.org/pablo/analyseCalc/releases"; java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); } catch (java.io.IOException e1) { diff --git a/src/fenetres/create.java b/src/fenetres/create.java index bc9ad42..0e4395c 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -132,7 +132,7 @@ public final class create extends JFrame { setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2); ImageIcon img = new ImageIcon(mainApp.class.getResource("/resources/evalcalc.png")); - setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch); + setTitle(commandes.Titre + " - " + commandes.version + " " + commandes.branch); setIconImage(img.getImage()); setLocationRelativeTo( null ); diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java index bda5adb..0b200ce 100644 --- a/src/fenetres/evaluate.java +++ b/src/fenetres/evaluate.java @@ -66,9 +66,9 @@ public class evaluate extends JFrame { */ public evaluate() { - ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") ); + ImageIcon img = new ImageIcon(mainApp.class.getResource("/resources/evalcalc.png")); this.setIconImage(img.getImage()); - setTitle(calc.commandes.Titre + " " + calc.commandes.version + " " + calc.commandes.branch); + setTitle(calc.commandes.Titre + " - " + calc.commandes.version + " " + calc.commandes.branch); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setBounds(100, 100, 980, 700); @@ -780,13 +780,12 @@ public class evaluate extends JFrame { @Override public void actionPerformed( ActionEvent e ) { try { - String url = "https://www.youtube.com/channel/UCBSfItcCVnbRJdQbVE9ppjQ"; + String url = "https://www.youtube.com/channel/UCG3tJWp_oZvOumH5kWUJ55g"; java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); } catch (java.io.IOException e1) { System.out.println(e1.getMessage()); } - System.out.println( "Affiche les tutoriels." ); } }; diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java index 68497b9..5362797 100644 --- a/src/fenetres/mainApp.java +++ b/src/fenetres/mainApp.java @@ -52,7 +52,7 @@ public class mainApp extends JFrame implements ActionListener{ frmEvalwriter = new JFrame(); frmEvalwriter.setResizable(false); - frmEvalwriter.setTitle(calc.commandes.Titre); + frmEvalwriter.setTitle(calc.commandes.Titre + " - " +calc.commandes.version + " "+ calc.commandes.branch); frmEvalwriter.setBounds(100, 100, 500, 380); int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth(); int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight(); @@ -104,7 +104,7 @@ public class mainApp extends JFrame implements ActionListener{ btnTutoriels.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { - String url = "https://www.youtube.com/channel/UCBSfItcCVnbRJdQbVE9ppjQ"; + String url = "https://www.youtube.com/channel/UCG3tJWp_oZvOumH5kWUJ55g"; java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); } catch (java.io.IOException e1) { diff --git a/src/resources/evalcalc.png b/src/resources/evalcalc.png index be45b57..301787e 100644 Binary files a/src/resources/evalcalc.png and b/src/resources/evalcalc.png differ