diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index eaaee2e87467594691617d1ad959c180d773f11b..af4eae7903434d6b6e50c1741f5d213ef56f966f 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -75,6 +75,7 @@ public class IconManager {
public static ImageIcon imgic60, imgic61, imgic62, imgic63, imgic64, imgic65, imgic66;
public static ImageIcon imgic70, imgic71, imgic72, imgic73, imgic75, imgic76, imgic77;
public static ImageIcon imgic80, imgic82, imgic84, imgic86, imgic88;
+ public static ImageIcon imgic90, imgic92;
// Class diagram
public static ImageIcon imgic100, imgic101, imgic102, imgic104, imgic106, imgic108;
@@ -243,6 +244,8 @@ public class IconManager {
private static String icon84 = "images/avatarrd.gif";
private static String icon86 = "images/avatarfvuppaal.png";
private static String icon88 = "images/avatarfvproverif.png";
+ private static String icon90 = "images/genlotos.gif";
+ private static String icon92 = "images/genuppaal.gif";
private static String icon100 = "images/toolbarButtonGraphics/general/Properties16.gif";
private static String icon101 = "images/toolbarButtonGraphics/general/Properties24.gif";
@@ -638,6 +641,8 @@ public class IconManager {
imgic84 = getIcon(icon84);
imgic86 = getIcon(icon86);
imgic88 = getIcon(icon88);
+ imgic90 = getIcon(icon90);
+ imgic92 = getIcon(icon92);
imgic100 = getIcon(icon100);
imgic101 = getIcon(icon101);
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index b0f7143fbe09067a092aa6fcdd3c2003501bb784..1c6d226757612e91877d4f6dc19de9ed3a604d8a 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -50,6 +50,8 @@ import javax.swing.*;
//import java.awt.*;
//import java.awt.event.*;
+import myutil.*;
+
/**
* Class *
* @author Ludovic APVRILLE
@@ -249,6 +251,9 @@ public class JToolBarMainTurtle extends JToolBar {
}
public void showAvatarActions(boolean b) {
+
+ TraceManager.addDev("Show avatar options with b = " + b);
+
avatarSimu.setVisible(b);
avatarFVUPPAAL.setVisible(b);
if (avatarFVProVerif != null) {
@@ -312,4 +317,72 @@ public class JToolBarMainTurtle extends JToolBar {
}
}
+
+ public void showDiplodocusActions(boolean b) {
+
+ TraceManager.addDev("Show diplodocus options with b = " + b);
+
+ avatarSimu.setVisible(!b);
+ avatarFVUPPAAL.setVisible(!b);
+ if (avatarFVProVerif != null) {
+ avatarFVProVerif.setVisible(!b);
+ }
+
+ if (genrtlotos != null) {
+ genrtlotos.setVisible(!b);
+ }
+
+ if (genlotos != null) {
+ genlotos.setVisible(b);
+ }
+
+ if (genuppaal != null) {
+ genuppaal.setVisible(b);
+ }
+
+ if (checkcode != null) {
+ checkcode.setVisible(!b);
+ }
+
+ if (simulation != null) {
+ simulation.setVisible(!b);
+ }
+
+ if (validation != null) {
+ validation.setVisible(b);
+ }
+
+ if (oneClickrtlotos != null) {
+ oneClickrtlotos.setVisible(!b);
+ }
+
+ if (onclicklotos != null) {
+ onclicklotos.setVisible(b);
+ }
+
+ if (gensystemc != null) {
+ gensystemc.setVisible(b);
+ }
+
+ if (simusystemc != null) {
+ simusystemc.setVisible(b);
+ }
+
+ if (gentml != null) {
+ gentml.setVisible(b);
+ }
+
+ if (genjava != null) {
+ genjava.setVisible(!b);
+ }
+
+ if (nc != null) {
+ nc.setVisible(!b);
+ }
+
+ if (gendesign != null) {
+ gendesign.setVisible(b);
+ }
+
+ }
} // Class
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index bb5fc57a369f9ad649f223aa2d2c45c66bb5f6a2..386f017e46dec5a94ae27d242096b94d54967f78 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -5270,7 +5270,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener {
if ((getCurrentTURTLEPanel() instanceof AvatarDesignPanel) || (getCurrentTURTLEPanel() instanceof AvatarRequirementPanel)) {
mainBar.showAvatarActions(true);
- } else {
+ } else if ((getCurrentTURTLEPanel() instanceof TMLDesignPanel) || (getCurrentTURTLEPanel() instanceof TMLComponentDesignPanel) || (getCurrentTURTLEPanel() instanceof TMLArchiPanel)){
+ mainBar.showDiplodocusActions(true);
+ } else {
mainBar.showAvatarActions(false);
}
setEditMode();
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index 81277334c9b7adc693b339ac2dfe25d21254923e..1765ef5a9e7088b751cbad2b7fda363edfae745d 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -555,10 +555,10 @@ public class TGUIAction extends AbstractAction {
actions[ACT_MODEL_CHECKING] = new TAction("checking-command", "Syntax analysis", IconManager.imgic36, IconManager.imgic37, "Syntax analysis", "Checks that all diagrams follows the TURTLE's syntax", KeyEvent.VK_F5);
actions[ACT_GEN_RTLOTOS] = new TAction("gen_rtlotos-command", "Generate RT-LOTOS", IconManager.imgic34, IconManager.imgic35, "Generate RT-LOTOS specification", "Generates a RT-LOTOS specification from TURTLE diagrams", KeyEvent.VK_F6);
- actions[ACT_GEN_LOTOS] = new TAction("gen_lotos-command", "Generate LOTOS", IconManager.imgic34, IconManager.imgic35, "Generate LOTOS specification", "Generates a LOTOS specification from TURTLE diagrams", '0');
+ actions[ACT_GEN_LOTOS] = new TAction("gen_lotos-command", "Generate LOTOS", IconManager.imgic90, IconManager.imgic90, "Generate LOTOS specification", "Generates a LOTOS specification from TURTLE diagrams", '0');
actions[ACT_ONECLICK_LOTOS_RG] = new TAction("gen_rglotos-command", "Generate LOTOS-based RG", IconManager.imgic342, IconManager.imgic342, "Generate LOTOS-based RG ", "Generates a LOTOS-based RG from TURTLE diagrams", '0');
actions[ACT_ONECLICK_RTLOTOS_RG] = new TAction("gen_rgrtlotos-command", "Generate RT-LOTOS-based RG", IconManager.imgic342, IconManager.imgic342, "Generate RT-LOTOS-based RG ", "Generates an RT-LOTOS-based RG from TURTLE diagrams", '0');
- actions[ACT_GEN_UPPAAL] = new TAction("gen_uppaal-command", "Generate UPPAAL", IconManager.imgic34, IconManager.imgic35, "Generate UPPAAL specification", "Generates a UPPAAL specification from TTool diagrams", '0');
+ actions[ACT_GEN_UPPAAL] = new TAction("gen_uppaal-command", "Generate UPPAAL", IconManager.imgic92, IconManager.imgic92, "Generate UPPAAL specification", "Generates a UPPAAL specification from TTool diagrams", '0');
actions[ACT_GEN_PROVERIF] = new TAction("gen_proverif-command", "Generate ProVerif Code", IconManager.imgic34, IconManager.imgic35, "Generate ProVerif specification", "Generates a ProVerif specification from AVATAR diagrams", '0');
actions[ACT_GEN_JAVA] = new TAction("gen_java-command", "Generate JAVA", IconManager.imgic38, IconManager.imgic39, "Generate JAVA", "Generates Java code from TURTLE diagrams", 0);
actions[ACT_SIMU_JAVA] = new TAction("gen_simujava-command", "Java-based simulation", IconManager.imgic38, IconManager.imgic39, "JAVA-based simualtion", "Simulate diagrams using Java language", 0);
diff --git a/src/ui/images/genlotos.gif b/src/ui/images/genlotos.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a34080d68014cb79e323460373b026f6cb4d21e3
Binary files /dev/null and b/src/ui/images/genlotos.gif differ
diff --git a/src/ui/images/genrtlotos.gif b/src/ui/images/genrtlotos.gif
index 2b6ad6c435a943a54bc1b979904edbc92eb1bef0..6798497cca7509e104940d8b9b471c14957fae53 100755
Binary files a/src/ui/images/genrtlotos.gif and b/src/ui/images/genrtlotos.gif differ
diff --git a/src/ui/images/genuppaal.gif b/src/ui/images/genuppaal.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a456f66bad2cec869c75fa99889de509b4429bba
Binary files /dev/null and b/src/ui/images/genuppaal.gif differ