Browse Source

Merge pull request #364 in BA/design from ~KERRY/design:dev to dev

* commit '4bc79f9c7e77314eb35040413c269997ef6feafb':
  REPORT-419 更新升级在远程设计禁止使用
master
superman 8 years ago
parent
commit
ed2723575a
  1. 1
      designer_base/src/com/fr/design/fun/MenuHandler.java
  2. 3
      designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

1
designer_base/src/com/fr/design/fun/MenuHandler.java

@ -18,6 +18,7 @@ public interface MenuHandler extends Mutable {
int LAST = -1;
int HIDE =-2;
String HELP = "help";
String SERVER = "server";

3
designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@ -525,6 +525,9 @@ public abstract class ToolBarMenuDock {
for (MenuHandler handler : target) {
int insertPosition = handler.insertPosition(menuDef.getShortCutCount());
if (insertPosition == MenuHandler.HIDE) {
return;
}
ShortCut shortCut = action.methodAction(handler);
if (shortCut == null) {
continue;

Loading…
Cancel
Save