diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java index e627e5106654f9deff67692052bb737f8d8fd236..8550f8bdd14d4db218aa550b54ee959719496337 100644 --- a/src/main/java/ui/ActionPerformer.java +++ b/src/main/java/ui/ActionPerformer.java @@ -139,6 +139,8 @@ public class ActionPerformer { mgui.lastDiag(); } else if (command.equals(mgui.actions[TGUIAction.ACT_ABOUT].getActionCommand())) { mgui.aboutVersion(); + } else if (command.equals(mgui.actions[TGUIAction.ACT_INTEGRATED_HELP].getActionCommand())) { + mgui.showIntegratedHelp(); } else if (command.equals(mgui.actions[TGUIAction.FIRST_DIAGRAM].getActionCommand())) { mgui.firstDiag(); //@author: Huy TRUONG. diff --git a/src/main/java/ui/JMenuBarTurtle.java b/src/main/java/ui/JMenuBarTurtle.java index 39b09b20c721d381ea81ac452289011140575a41..e72e86db5e67a19712916c973c16061eb50dc9b0 100644 --- a/src/main/java/ui/JMenuBarTurtle.java +++ b/src/main/java/ui/JMenuBarTurtle.java @@ -779,6 +779,9 @@ public class JMenuBarTurtle extends JMenuBar { // HELP + menuItem = help.add(mgui.actions[TGUIAction.ACT_INTEGRATED_HELP]); + menuItem.setName("Help"); + menuItem.addMouseListener(mgui.mouseHandler); menuItem = help.add(mgui.actions[TGUIAction.ACT_TTOOL_CONFIGURATION]); menuItem.setName("Help Configuration"); menuItem.addMouseListener(mgui.mouseHandler); diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java index ae04ecf6a90df11743a74b17ccafd8f1cab2de27..639cdadcf6372827c91ed31012bfbbb056a4caae 100644 --- a/src/main/java/ui/MainGUI.java +++ b/src/main/java/ui/MainGUI.java @@ -712,6 +712,12 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per return helpManager; } + public void showIntegratedHelp() { + if (helpManager != null) { + openHelpFrame(helpManager); + } + } + public void openHelpFrame(HelpEntry he) { if (helpFrame == null) { helpFrame = new JFrameHelp("Help", helpManager, he); diff --git a/src/main/java/ui/ModeManager.java b/src/main/java/ui/ModeManager.java index ba3f925aa0970635fde9f9189979c5816ed5d0d5..7556b775a8f683b8b485da1d7fd28bd2f4a362f8 100644 --- a/src/main/java/ui/ModeManager.java +++ b/src/main/java/ui/ModeManager.java @@ -72,6 +72,7 @@ public class ModeManager { actions[TGUIAction.ACT_OPEN_LAST].setEnabled(true); actions[TGUIAction.ACT_QUIT].setEnabled(true); actions[TGUIAction.ACT_ABOUT].setEnabled(true); + actions[TGUIAction.ACT_INTEGRATED_HELP].setEnabled(true); actions[TGUIAction.ACT_TTOOL_CONFIGURATION].setEnabled(true); actions[TGUIAction.ACT_TURTLE_WEBSITE].setEnabled(true); actions[TGUIAction.ACT_TURTLE_DOCUMENTATION].setEnabled(true); diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java index 76353ac81354fe8dcb3f9c1af9ba29f508652d87..d0940e93e1202bc33bf2cb0d0fde34502f6fae9c 100644 --- a/src/main/java/ui/TGUIAction.java +++ b/src/main/java/ui/TGUIAction.java @@ -90,7 +90,8 @@ public class TGUIAction extends AbstractAction { public static final int ACT_TURTLE_DOCUMENTATION = 118; public static final int ACT_DIPLODOCUS_DOCUMENTATION = 242; public static final int ACT_SYSMLSEC_DOCUMENTATION = 426; - public static final int ACT_ABOUT = 4; + public static final int ACT_ABOUT = 518; + public static final int ACT_INTEGRATED_HELP = 4; public static final int ACT_ENHANCE = 160; public static final int ACT_TTOOL_CONFIGURATION = 323; @@ -672,7 +673,7 @@ public class TGUIAction extends AbstractAction { public static final int MOVE_ENABLED = 463; public static final int FIRST_DIAGRAM = 464; - public static final int NB_ACTION = 518; + public static final int NB_ACTION = 519; private static final TAction [] actions = new TAction[NB_ACTION]; @@ -913,6 +914,7 @@ public class TGUIAction extends AbstractAction { actions[ACT_GEN_DOC_REQ] = new TAction("gen-doc-req", "SysML requirements documentation", IconManager.imgic28, IconManager.imgic28, "SysML requirements documentation", "SysML requirements documentation is displayed in an array, and may be further automatically generated in html format", 0); actions[ACT_ABOUT] = new TAction("about-command", "About", IconManager.imgic30, IconManager.imgic31, "About", "TTool information", 0); + actions[ACT_INTEGRATED_HELP] = new TAction("integrated-help", "Integrated help", IconManager.imgic30, IconManager.imgic31, "Integrated help", "TTool internal help", 0); actions[ACT_TURTLE_WEBSITE] = new TAction("turtle-website-command", "TTool's website", IconManager.imgic30, IconManager.imgic31, "TTool's website", "Various information (e.g., documentation) on TTool", 0); actions[ACT_TURTLE_DOCUMENTATION] = new TAction("turtle-docu-command", "AVATAR online help", IconManager.imgic30, IconManager.imgic31, "AVATAR online help", "AVATAR online help", 0); actions[ACT_DIPLODOCUS_DOCUMENTATION] = new TAction("diplo-docu-command", "DIPLODOCUS online help", IconManager.imgic30, IconManager.imgic31, "DIPLODOCUS online help", "DIPLODOCUS online help", 0);