diff --git a/src/main/java/ui/JMenuBarTurtle.java b/src/main/java/ui/JMenuBarTurtle.java index 8699230bd03f98f105f8033ed045e1fbd21c75e4..a72929bbc04ddff20d8294dc2eff2ceac13f90f2 100644 --- a/src/main/java/ui/JMenuBarTurtle.java +++ b/src/main/java/ui/JMenuBarTurtle.java @@ -613,6 +613,8 @@ public class JMenuBarTurtle extends JMenuBar { menuItem.addMouseListener(mgui.mouseHandler); menuItem = vAndV.add(mgui.actions[TGUIAction.ACT_AVATAR_FV_UPPAAL]); menuItem.setName("V&V Avatar UPPAAL"); + menuItem = vAndV.add(mgui.actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER]); + menuItem.setName("Internal model-checker"); menuItem.addMouseListener(mgui.mouseHandler); menuItem = vAndV.add(mgui.actions[TGUIAction.ACT_AVATAR_FV_PROVERIF]); menuItem.setName("V&V ProVerif"); @@ -621,14 +623,6 @@ public class JMenuBarTurtle extends JMenuBar { menuItem.setName("V&V Avatar Static Analysis"); menuItem.addMouseListener(mgui.mouseHandler); - /* - * vAndV.addSeparator(); menuItem = - * vAndV.add(mgui.actions[TGUIAction.ACT_DEADLOCK_SEEKER_AUT]); - * menuItem.addMouseListener(mgui.mouseHandler); menuItem = - * vAndV.add(mgui.actions[TGUIAction.ACT_DEADLOCK_SEEKER_SAVED_AUT]); - * menuItem.addMouseListener(mgui.mouseHandler); - */ - // Code generation menuItem = codeG.add(mgui.actions[TGUIAction.ACT_GEN_JAVA]); diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java index e02c8c96b136cc9a2c5031223da09f46e9a5f69d..afa2245b804906f64316d450c8de10b0bca741fe 100644 --- a/src/main/java/ui/MainGUI.java +++ b/src/main/java/ui/MainGUI.java @@ -3637,9 +3637,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per } public void aboutVersion() { - JFrameBasicText jft = new JFrameBasicText("About TTool ...", DefaultText.getAboutText(), IconManager.imgic324); + JFrameBasicText jft = new JFrameBasicText("About TTool ...", DefaultText.getAboutText(), + new ImageIcon(IconManager.imgic324.getImage().getScaledInstance(650, 415, java.awt.Image.SCALE_SMOOTH))); jft.setIconImage(IconManager.img8); - GraphicLib.centerOnParent(jft, 740, 800); + GraphicLib.centerOnParent(jft, 700, 800); jft.setVisible(true); } diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java index 0f960bb7d29b88cc1d4f82624a0486db855f468e..390b8a84de87b5312ecdf598d97d827560adbaf0 100755 --- a/src/main/java/ui/util/DefaultText.java +++ b/src/main/java/ui/util/DefaultText.java @@ -72,11 +72,12 @@ public class DefaultText { sb.append("TTool version " + getFullVersion() + "\n"); sb.append("Copyright IMT - Telecom Paris / Ludovic Apvrille \n"); sb.append("\nContact: ludovic.apvrille@telecom-paris.fr\n"); - sb.append("\nProgrammers\n\tTelecom ParisTech: Ludovic Apvrille, Dominique Blouin, Fabien Tessier, \n\tDaniel Knorreck, Florian Lugou, Letitia Li\n"); + sb.append("\nProgrammers\n\tTelecom ParisTech: Ludovic Apvrille, Dominique Blouin, Fabien Tessier, \n\t" + + "Daniel Knorreck, Florian Lugou, Letitia Li\n\tMaysam Zoor\n\tMinh Hiep Pham, Levan Truong\n"); sb.append("\n\tNokia: Andrea Enrici\n"); sb.append("\n\tLIP6: Daniela Genius\n"); sb.append("\nFor more information:\n"); - sb.append("http://ttool.telecom-paristech.fr/\n\n"); + sb.append("https://ttool.telecom-paris.fr/\n\n"); return sb; } diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java index 804fb3abed632de212e4db509956108b994c1840..106bd5ac92e5229be506487915226f87af23a9f8 100755 --- a/src/main/java/ui/util/IconManager.java +++ b/src/main/java/ui/util/IconManager.java @@ -415,7 +415,7 @@ public class IconManager { private static String icon322 = "toolbarButtonGraphics/general/TipOfTheDay16.gif"; private static String icon323 = "toolbarButtonGraphics/general/TipOfTheDay24.gif"; - private static String icon324 = "starting_logo.gif"; + private static String icon324 = "starting_logo.png"; private static String icon330 = "toolbarButtonGraphics/general/Cut16.gif"; private static String icon331 = "toolbarButtonGraphics/general/Cut24.gif"; diff --git a/src/main/java/ui/window/JFrameBasicText.java b/src/main/java/ui/window/JFrameBasicText.java index 3e0379040aca8714cf8d155d7ea072749b88ea63..8ae939138610d0abc944d0e41dac7b92749af688 100644 --- a/src/main/java/ui/window/JFrameBasicText.java +++ b/src/main/java/ui/window/JFrameBasicText.java @@ -121,6 +121,9 @@ public class JFrameBasicText extends JFrame implements ActionListener { if ( imgic != null ) { JButton button2 = new JButton(imgic); + button2.setBorderPainted(false); + button2.setFocusPainted(false); + button2.setContentAreaFilled(false); jp = new JPanel(); jp.add(button2); framePanel.add(jp, BorderLayout.NORTH); diff --git a/src/main/resources/ui/util/starting_logo.png b/src/main/resources/ui/util/starting_logo.png index 45bce4de750fe88a734d5ba888f628999658f925..2df776f41b1f7974dc6af5b9324885c019f372f5 100644 Binary files a/src/main/resources/ui/util/starting_logo.png and b/src/main/resources/ui/util/starting_logo.png differ diff --git a/src/main/resources/ui/util/starting_logo.xcf b/src/main/resources/ui/util/starting_logo.xcf index d063c73d8d1c47bc41e5a94fc7b8d330d3431be7..0cb59e0e4e16074e330c8ed1be12571dfcb0755d 100644 Binary files a/src/main/resources/ui/util/starting_logo.xcf and b/src/main/resources/ui/util/starting_logo.xcf differ diff --git a/src/main/resources/ui/util/starting_logo_old.png b/src/main/resources/ui/util/starting_logo_old.png new file mode 100644 index 0000000000000000000000000000000000000000..45bce4de750fe88a734d5ba888f628999658f925 Binary files /dev/null and b/src/main/resources/ui/util/starting_logo_old.png differ