Browse Source

Pull request #1950: REPORT-35463 调整帮助文档菜单项在帮助菜单和社区菜单的情况

Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0

* commit '6664c7fcd97c4ed46cb481212e6d59bd0cd61c43':
  REPORT-35463 调整帮助文档菜单项在帮助菜单和社区菜单的情况
feature/big-screen
Yuan.Wang 4 years ago
parent
commit
307aa3ffda
  1. 10
      designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java
  2. 14
      designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

10
designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java

@ -138,8 +138,9 @@ public enum SupportLocaleImpl implements SupportLocale {
@Override
public Set<Locale> support() {
Set<Locale> set = new HashSet<Locale>();
set.add(Locale.CHINA);
set.add(Locale.TAIWAN);
set.add(Locale.US);
set.add(Locale.KOREA);
set.add(Locale.JAPAN);
return set;
}
},
@ -151,9 +152,8 @@ public enum SupportLocaleImpl implements SupportLocale {
@Override
public Set<Locale> support() {
Set<Locale> set = new HashSet<Locale>();
set.add(Locale.US);
set.add(Locale.KOREA);
set.add(Locale.JAPAN);
set.add(Locale.CHINA);
set.add(Locale.TAIWAN);
return set;
}
}

14
designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@ -592,7 +592,12 @@ public abstract class ToolBarMenuDock {
shortCuts.add(SeparatorDef.DEFAULT);
shortCuts.add(new VideoAction());
shortCuts.add(new TutorialAction());
LocaleCenter.buildAction(new LocaleAction() {
@Override
public void execute() {
shortCuts.add(new TutorialAction());
}
}, SupportLocaleImpl.TUTORIAL_COMMUNITY);
shortCuts.add(new QuestionAction());
shortCuts.add(new TechSolutionAction());
@ -625,13 +630,6 @@ public abstract class ToolBarMenuDock {
shortCuts.add(new TechSupportAction());
}
}, SupportLocaleImpl.TECH_SUPPORT_COMMUNITY);
LocaleCenter.buildAction(new LocaleAction() {
@Override
public void execute() {
shortCuts.add(new TutorialAction());
}
}, SupportLocaleImpl.TUTORIAL_COMMUNITY);
shortCuts.add(SeparatorDef.DEFAULT);

Loading…
Cancel
Save