解决冲突
This commit is contained in:
parent
fe32898fef
commit
7736971546
@ -36,6 +36,12 @@ public class TopMenuBar extends MenuBar {
|
|||||||
* 帮助菜单
|
* 帮助菜单
|
||||||
*/
|
*/
|
||||||
private final Menu helpMenu = new Menu();
|
private final Menu helpMenu = new Menu();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 运行菜单
|
||||||
|
*/
|
||||||
|
private final Menu runMenu = new Menu();
|
||||||
|
|
||||||
/// 菜单按钮
|
/// 菜单按钮
|
||||||
/**
|
/**
|
||||||
* 插件菜单
|
* 插件菜单
|
||||||
@ -56,6 +62,16 @@ public class TopMenuBar extends MenuBar {
|
|||||||
*/
|
*/
|
||||||
private final MenuItem aboutItem = new MenuItem();
|
private final MenuItem aboutItem = new MenuItem();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调试
|
||||||
|
*/
|
||||||
|
private final MenuItem deBugItem = new MenuItem();
|
||||||
|
/**
|
||||||
|
* 运行
|
||||||
|
*/
|
||||||
|
|
||||||
|
private final MenuItem runItem = new MenuItem();
|
||||||
|
|
||||||
private final MenuItem developerItem = new MenuItem();
|
private final MenuItem developerItem = new MenuItem();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -213,4 +229,16 @@ public class TopMenuBar extends MenuBar {
|
|||||||
public MenuItem getDeveloperItem() {
|
public MenuItem getDeveloperItem() {
|
||||||
return developerItem;
|
return developerItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Menu getRunMenu() {
|
||||||
|
return runMenu;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MenuItem getDeBugItem() {
|
||||||
|
return deBugItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MenuItem getRunItem() {
|
||||||
|
return runItem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,3 +24,5 @@ ROW=行数
|
|||||||
FILE=文件
|
FILE=文件
|
||||||
MANAGER_PLUGIN=管理插件
|
MANAGER_PLUGIN=管理插件
|
||||||
ENCODE=编码
|
ENCODE=编码
|
||||||
|
DE_BUG=调试
|
||||||
|
RUN=运行
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user