diff --git a/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java b/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java index 86fd04e..b6ae53a 100644 --- a/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java +++ b/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java @@ -13,6 +13,7 @@ public class TextConstants { public static final String FILE = "FILE"; public static final String RUN = "RUN"; + public static final String DE_BUG = "DE_BUG"; public static final String NEW = "NEW"; public static final String OPEN = "OPEN"; public static final String OPEN_DIRECTORY = "OPEN_DIRECTORY"; diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java b/src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java index 447742a..03edb9f 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java +++ b/src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java @@ -32,10 +32,12 @@ public class TopMenuBarManager extends AbstractManager { LanguageTopMenu languageTopMenu = LanguageTopMenu.getInstance(); SettingTopMenu settingTopMenu = SettingTopMenu.getInstance(); - HelpTopMenu helpTopMenu = HelpTopMenu.getInstance(); RunTopMenu runTopMenu=RunTopMenu.getInstance(); PluginTopMenu pluginTopMenu = PluginTopMenu.getInstance(); + + HelpTopMenu helpTopMenu = HelpTopMenu.getInstance(); + private TopMenuBarManager() { } @@ -76,14 +78,18 @@ public class TopMenuBarManager extends AbstractManager { public void registerTopMenuBar() { // 文件菜单 registerNode(fileTopMenu.getMenu()); + // 设置菜单 registerNode(topMenuBar.getSetMenu()); - // 帮助菜单 - registerNode(helpTopMenu.getMenu()); + // 插件菜单 registerNode(topMenuBar.getPluginMenu()); + // 运行菜单 registerNode(runTopMenu.getMenu()); + + // 帮助菜单 + registerNode(helpTopMenu.getMenu()); } diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java index bc714f6..d7280ce 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java @@ -32,17 +32,25 @@ public class TopMenuBar extends MenuBar { */ private final Menu setMenu = new Menu(); - /** - * 帮助菜单 - */ - private final Menu helpMenu = new Menu(); + /// 菜单按钮 /** * 插件菜单 */ private final Menu pluginMenu = new Menu(); - private final Menu runMenu = new Menu(); + /** + * 运行菜单 + */ + private final Menu runMenu = new Menu(); + /** + * 调试菜单 + */ + private final MenuItem deBugItem = new MenuItem(); + /** + * 新建 + */ + private final MenuItem newItem = new MenuItem(); /** * 语言菜单 */ @@ -50,12 +58,9 @@ public class TopMenuBar extends MenuBar { /** * 新建 */ - private final MenuItem newItem = new MenuItem(); + private final MenuItem runItem = new MenuItem(); + - /** - * 新建 - */ - private final MenuItem aboutItem = new MenuItem(); /** * 打开 */ @@ -107,6 +112,15 @@ public class TopMenuBar extends MenuBar { */ private final MenuItem pluginManagerItem = new MenuItem(); + /** + * 帮助菜单 + */ + private final Menu helpMenu = new Menu(); + + /** + * 关于 + */ + private final MenuItem aboutItem = new MenuItem(); private TopMenuBar() { } @@ -157,6 +171,13 @@ public class TopMenuBar extends MenuBar { public MenuItem getNewItem() { return newItem; } + public MenuItem getRunItem() { + return runItem; + } + + public MenuItem getDeBugItem() { + return deBugItem; + } public MenuItem getAboutItem() { diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java index a6d2893..f12f366 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java @@ -7,6 +7,7 @@ import org.jcnc.jnotepad.api.core.views.top.menu.AbstractTopMenu; import java.util.HashMap; import java.util.Map; +import static org.jcnc.jnotepad.common.constants.TextConstants.DE_BUG; import static org.jcnc.jnotepad.common.constants.TextConstants.RUN; /** @@ -58,7 +59,12 @@ public class RunTopMenu extends AbstractTopMenu { */ @Override protected void registerTopMenu() { - // 文件菜单 + // 运行 + registerMenuItem(topMenuBar.getRunItem(), RUN, "runItem", null); + + // 调试 + registerMenuItem(topMenuBar.getDeBugItem(), DE_BUG, "deBugItem", null); + } } diff --git a/src/main/resources/i18n/i18n.properties b/src/main/resources/i18n/i18n.properties index b39e0a6..6cd910c 100644 --- a/src/main/resources/i18n/i18n.properties +++ b/src/main/resources/i18n/i18n.properties @@ -9,6 +9,7 @@ PLUGIN=插件 CHINESE=中文 title=JNotepad OPEN=打开 +DE_BUG=调试 OPEN_DIRECTORY=打开文件夹 ABOUT=关于 RUN=运行 diff --git a/src/main/resources/i18n/i18n_en.properties b/src/main/resources/i18n/i18n_en.properties index 6729cb6..524adb0 100644 --- a/src/main/resources/i18n/i18n_en.properties +++ b/src/main/resources/i18n/i18n_en.properties @@ -13,6 +13,7 @@ OPEN=Open OPEN_DIRECTORY=Open Directory HELP=Help RUN=Run +DE_BUG=Debug OPEN_CONFIGURATION_FILE=Open Configuration File RENAME=Rename TOP=Window Top diff --git a/src/main/resources/i18n/i18n_zh_CN.properties b/src/main/resources/i18n/i18n_zh_CN.properties index 70bb2e2..61ebca0 100644 --- a/src/main/resources/i18n/i18n_zh_CN.properties +++ b/src/main/resources/i18n/i18n_zh_CN.properties @@ -12,6 +12,7 @@ OPEN=打开 OPEN_DIRECTORY=打开文件夹 HELP=帮助 RUN=运行 +DE_BUG=调试 ABOUT=关于 OPEN_CONFIGURATION_FILE=打开配置文件 RENAME=重命名