Browse Source

处理MenuKeySet名称问题

persist/11.0-arabic
obo 7 months ago
parent
commit
e699ea6f71
  1. 2
      designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/file/BatchCompileAction.java
  3. 2
      designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java
  4. 2
      designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
  5. 2
      designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java
  6. 3
      designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
  7. 2
      designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java
  8. 23
      designer-base/src/main/java/com/fr/design/i18n/DesignI18nProviderImpl.java
  9. 8
      designer-base/src/main/java/com/fr/design/menu/MenuKeySet.java
  10. 2
      designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java
  11. 2
      designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java
  12. 2
      designer-form/src/main/java/com/fr/design/actions/FormECParallelCalAction.java
  13. 2
      designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java
  14. 2
      designer-form/src/main/java/com/fr/design/actions/TemplateParameterAction.java
  15. 2
      designer-form/src/main/java/com/fr/design/actions/file/export/EmbeddedFormExportExportAction.java
  16. 2
      designer-form/src/main/java/com/fr/design/fit/FormFitAttrAction.java
  17. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java
  18. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java
  19. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/ExcelExportAction.java
  20. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/PDFExportAction.java
  21. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/PageExcelExportAction.java
  22. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java
  23. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java
  24. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java
  25. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java
  26. 2
      designer-realize/src/main/java/com/fr/design/actions/form/FormECBackgroundAction.java
  27. 2
      designer-realize/src/main/java/com/fr/design/actions/form/FormECColumnsAction.java
  28. 2
      designer-realize/src/main/java/com/fr/design/actions/form/FormECFrozenAction.java
  29. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java
  30. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java
  31. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java
  32. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java
  33. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java
  34. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java
  35. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java
  36. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java
  37. 2
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java
  38. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java
  39. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportColumnsAction.java
  40. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
  41. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportExportAttrAction.java
  42. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportFooterAction.java
  43. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java
  44. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java
  45. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java
  46. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java
  47. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportParameterAction.java
  48. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportPrintSettingAction.java
  49. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java
  50. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportWebAttrAction.java
  51. 2
      designer-realize/src/main/java/com/fr/design/actions/report/ReportWriteAttrAction.java
  52. 2
      designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
  53. 2
      designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java
  54. 2
      designer-realize/src/main/java/com/fr/design/actions/server/TemplateThemeManagerAction.java
  55. 2
      designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java
  56. 2
      designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrAction.java

2
designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@ -24,7 +24,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
public TableDataSourceAction(JTemplate<?, ?> t) {
super(t);
this.setMenuKeySet(KeySetUtils.TEMPLATE_TABLE_DATA_SOURCE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_web/datasource");
}

2
designer-base/src/main/java/com/fr/design/actions/file/BatchCompileAction.java

@ -16,7 +16,7 @@ import java.awt.event.ActionEvent;
public class BatchCompileAction extends UpdateAction {
public BatchCompileAction() {
this.setMenuKeySet(COMPILE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/nx/app/designer/transform/batch_transform.png"));
}

2
designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java

@ -17,7 +17,7 @@ import java.awt.event.ActionEvent;
public class PreferenceAction extends UpdateAction {
public PreferenceAction() {
this.setMenuKeySet(KeySetUtils.PREFERENCE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.generateAndSetSearchText(PreferencePane.class.getName());
}

2
designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java

@ -18,7 +18,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
public SaveAsTemplateAction(JTemplate<?, ?> dPane) {
super(dPane);
this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_file/saveAs");
}

2
designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java

@ -17,7 +17,7 @@ import java.awt.event.ActionEvent;
public class AboutAction extends UpdateAction {
public AboutAction() {
this.setMenuKeySet(ABOUT);
this.setName(getMenuKeySet().getMenuKeySetName()+"...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
}

3
designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java

@ -4,6 +4,7 @@
package com.fr.design.actions.server;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.svg.IconUtils;
import com.fr.config.Configuration;
import com.fr.design.actions.UpdateAction;
@ -27,7 +28,7 @@ import java.awt.event.ActionEvent;
public class FunctionManagerAction extends UpdateAction {
public FunctionManagerAction() {
this.setMenuKeySet(FUNCTION_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName()+"...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_web/function");
this.generateAndSetSearchText(FunctionManagerPane.class.getName());

2
designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java

@ -29,7 +29,7 @@ import java.awt.event.ActionEvent;
public class GlobalParameterAction extends UpdateAction {
public GlobalParameterAction() {
this.setMenuKeySet(GLOBAL_PARAMETER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/p");
}

23
designer-base/src/main/java/com/fr/design/i18n/DesignI18nProviderImpl.java

@ -0,0 +1,23 @@
package com.fr.design.i18n;
import com.fr.stable.fun.I18nProvider;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
/**
* description
*
* @author obo
* @since 11.0
* Created on 2024/07/16
*/
public class DesignI18nProviderImpl implements I18nProvider {
@Override
public Map<Locale, String> obtainAll() {
Map<Locale, String> map = new HashMap<>();
map.put(new Locale("ar", "SA"), "Arabic");
return map;
}
}

8
designer-base/src/main/java/com/fr/design/menu/MenuKeySet.java

@ -1,6 +1,8 @@
package com.fr.design.menu;
import com.fr.base.i18n.BidiUtils;
import javax.swing.*;
/**
@ -27,7 +29,11 @@ public abstract class MenuKeySet {
public abstract String getMenuName();
public String getMenuKeySetName(){
return getMenuName()+ "(" +getMnemonic() + ")";
return BidiUtils.rtl() ? "(" +getMnemonic() + ")" + getMenuName() : getMenuName()+ "(" +getMnemonic() + ")";
}
public String getMenuKeySetNameWithDot(){
return BidiUtils.rtl() ? "..." + getMenuKeySetName() : getMenuKeySetName() + "...";
}
public abstract KeyStroke getKeyStroke();

2
designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@ -43,7 +43,7 @@ public class ReportFitAttrAction extends JTemplateAction {
private void initMenuStyle() {
this.setMenuKeySet(REPORT_FIT_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/reportfit/fit");
}

2
designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java

@ -33,7 +33,7 @@ public class ChartPreStyleAction extends UpdateAction {
public ChartPreStyleAction() {
this.setMenuKeySet(CHART_DEFAULT_STYLE);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("com/fr/design/images/chart/ChartType");
this.generateAndSetSearchText(ChartPreStyleManagerPane.class.getName());

2
designer-form/src/main/java/com/fr/design/actions/FormECParallelCalAction.java

@ -41,7 +41,7 @@ public class FormECParallelCalAction extends JTemplateAction<JForm> {
private void initMenuStyle() {
this.setMenuKeySet(FORM_PARALLEL_SETTING);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("com/fr/design/form/images/parallel.png");
}

2
designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java

@ -35,7 +35,7 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
public FormMobileAttrAction(JForm jf) {
super(jf);
this.setMenuKeySet(REPORT_APP_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/mobile.png"));
}

2
designer-form/src/main/java/com/fr/design/actions/TemplateParameterAction.java

@ -20,7 +20,7 @@ public class TemplateParameterAction extends JTemplateAction<JForm> {
public TemplateParameterAction(JForm jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.png"));
}

2
designer-form/src/main/java/com/fr/design/actions/file/export/EmbeddedFormExportExportAction.java

@ -28,7 +28,7 @@ public class EmbeddedFormExportExportAction extends AbstractExportAction<JForm>
public EmbeddedFormExportExportAction(JForm jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.EMBEDDED_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"));
}

2
designer-form/src/main/java/com/fr/design/fit/FormFitAttrAction.java

@ -43,7 +43,7 @@ public class FormFitAttrAction extends JTemplateAction {
private void initMenuStyle() {
this.setMenuKeySet(REPORT_FIT_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/reportfit/fit");
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java

@ -23,7 +23,7 @@ public class CSVExportAction extends AbstractWorkBookExportAction {
public CSVExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.CSV_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/csv.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java

@ -20,7 +20,7 @@ public class EmbeddedExportExportAction extends AbstractWorkBookExportAction {
public EmbeddedExportExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.EMBEDDED_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/ExcelExportAction.java

@ -12,7 +12,7 @@ public class ExcelExportAction extends AbstractExcelExportAction {
public ExcelExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.SIMPLE_EXCEL_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/excel.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/PDFExportAction.java

@ -21,7 +21,7 @@ public class PDFExportAction extends AbstractWorkBookExportAction {
public PDFExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.PDF_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/pdf.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/PageExcelExportAction.java

@ -10,7 +10,7 @@ public class PageExcelExportAction extends AbstractExcelExportAction {
public PageExcelExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.PAGE_EXCEL_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/excel.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java

@ -14,7 +14,7 @@ public class PageToSheetExcelExportAction extends AbstractExcelExportAction {
super(jwb);
this.setMenuKeySet(KeySetUtils.PAGETOSHEET_EXCEL_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/excel.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java

@ -22,7 +22,7 @@ public class SVGExportAction extends AbstractWorkBookExportAction {
super(jwb);
this.setMenuKeySet(KeySetUtils.SVG_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/svg.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java

@ -19,7 +19,7 @@ public class TextExportAction extends AbstractWorkBookExportAction {
public TextExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.TEXT_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java

@ -21,7 +21,7 @@ public class WordExportAction extends AbstractWorkBookExportAction {
public WordExportAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.WORD_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/word.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/form/FormECBackgroundAction.java

@ -18,7 +18,7 @@ public class FormECBackgroundAction extends AbastractFormECAction<FormElementCas
public FormECBackgroundAction(FormElementCasePaneDelegate rc) {
super(rc);
this.setMenuKeySet(KeySetUtils.REPORT_BACKGROUND);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/background.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/form/FormECColumnsAction.java

@ -14,7 +14,7 @@ public class FormECColumnsAction extends AbastractFormECAction<FormElementCasePa
public FormECColumnsAction(FormElementCasePaneDelegate t) {
super(t);
this.setMenuKeySet(KeySetUtils.EC_COLUMNS);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/form/toolbar/ec_columns.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/form/FormECFrozenAction.java

@ -22,7 +22,7 @@ public class FormECFrozenAction extends AbastractFormECAction<FormElementCasePan
public FormECFrozenAction(FormElementCasePaneDelegate t) {
super(t);
this.setMenuKeySet(KeySetUtils.EC_FROZEN);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/form/toolbar/ec_frozen.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java

@ -29,7 +29,7 @@ public class AutoChartCellAction extends AbstractCellAction implements WorkBookS
private void initAction() {
this.setMenuKeySet(INSERT_AUTO_CHART);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/auto_chart.png"));
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java

@ -28,7 +28,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
private void initAction() {
this.setMenuKeySet(INSERT_SLOPE_LINE);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/bias/bias");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java

@ -27,7 +27,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
private void initAction() {
this.setMenuKeySet(INSERT_CHART);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/chart/chart");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java

@ -20,7 +20,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
private void initAction() {
this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/bindcolunm/bind_column");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java

@ -24,7 +24,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
private void initAction() {
this.setMenuKeySet(INSERT_FORMULA);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/formula/formula");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java

@ -27,7 +27,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
private void initAction() {
this.setMenuKeySet(INSERT_TEXT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/text/text");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java

@ -27,7 +27,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
private void initAction() {
this.setMenuKeySet(INSERT_IMAGE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/image/image");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java

@ -23,7 +23,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
private void initAction() {
this.setMenuKeySet(INSERT_RICHTEXT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/richtext/richtext");
}

2
designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java

@ -22,7 +22,7 @@ public class SubReportCellAction extends AbstractCellAction {
private void initAction() {
this.setMenuKeySet(INSERT_SUB_REPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/standard/subreport/sub_report");
}

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java

@ -22,7 +22,7 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
public ReportBackgroundAction(ReportComponent rc) {
super(rc);
this.setMenuKeySet(KeySetUtils.REPORT_BACKGROUND);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/background");
}

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportColumnsAction.java

@ -15,7 +15,7 @@ public class ReportColumnsAction extends ReportComponentAction<WorkSheetDesigner
public ReportColumnsAction(WorkSheetDesigner t) {
super(t);
this.setMenuKeySet(KeySetUtils.REPORT_COLUMN);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/linearAttr");
}

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java

@ -21,7 +21,7 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
public ReportEngineAttrAction(WorkSheetDesigner tc) {
super(tc);
this.setMenuKeySet(KeySetUtils.REPORT_ENGINE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/reportEngineAttr");
this.generateAndSetSearchText(ReportEnginePane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportExportAttrAction.java

@ -17,7 +17,7 @@ public class ReportExportAttrAction extends JWorkBookAction {
public ReportExportAttrAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.REPORT_EXPORT_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName()+"...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_file/export");
this.generateAndSetSearchText(ReportExportAttrPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportFooterAction.java

@ -28,7 +28,7 @@ public class ReportFooterAction extends ReportComponentAction<ReportComponent> {
public ReportFooterAction(ReportComponent rc) {
super(rc);
this.setMenuKeySet(KeySetUtils.REPORT_FOOTER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/footer");
}

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java

@ -31,7 +31,7 @@ public class ReportHeaderAction extends ReportComponentAction<ReportComponent> {
public ReportHeaderAction(ReportComponent rc) {
super(rc);
this.setMenuKeySet(KeySetUtils.REPORT_HEADER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/header");
}

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java

@ -33,7 +33,7 @@ public class ReportMobileAttrAction extends JWorkBookAction{
public ReportMobileAttrAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(REPORT_APP_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/mobile");
this.generateAndSetSearchText(ReportMobileAttrPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java

@ -25,7 +25,7 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
public ReportPageAttrAction(WorkSheetDesigner t) {
super(t);
this.setMenuKeySet(KeySetUtils.REPORT_PAGE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_file/repeatAndFrozen");
this.generateAndSetSearchText(RepeatAndFreezeSettingPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java

@ -26,7 +26,7 @@ public class ReportPageSetupAction extends ReportComponentAction<ReportComponent
public ReportPageSetupAction(ReportComponent rc) {
super(rc);
this.setMenuKeySet(KeySetUtils.REPORT_PAGE_SETUP);
this.setName(getMenuKeySet().getMenuKeySetName()+"...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_file/pageSetup");
this.generateAndSetSearchText(PageSetupPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportParameterAction.java

@ -26,7 +26,7 @@ public class ReportParameterAction extends JWorkBookAction {
public ReportParameterAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/p");
}

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportPrintSettingAction.java

@ -25,7 +25,7 @@ public class ReportPrintSettingAction extends JWorkBookAction {
public ReportPrintSettingAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(REPORT_APP_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("com/fr/web/images/print");
this.setSearchText(ReportPrintSettingPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

@ -24,7 +24,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
public ReportWatermarkAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.REPORT_WATERMARK);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/watermark");
this.generateAndSetSearchText(WatermarkPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportWebAttrAction.java

@ -28,7 +28,7 @@ public class ReportWebAttrAction extends JWorkBookAction {
public ReportWebAttrAction(JWorkBook jwb) {
super(jwb);
this.setMenuKeySet(KeySetUtils.REPORT_WEB_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName()+"...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/webreportattribute");
this.generateAndSetSearchText(ReportWebAttrPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/report/ReportWriteAttrAction.java

@ -25,7 +25,7 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
public ReportWriteAttrAction(WorkSheetDesigner t) {
super(t);
this.setMenuKeySet(KeySetUtils.REPORT_WRITE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_report/reportWriteAttr");
this.generateAndSetSearchText(ReportWriteAttrPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java

@ -31,7 +31,7 @@ public class ServerConfigManagerAction extends UpdateAction {
public ServerConfigManagerAction() {
this.setMenuKeySet(SERVER_CONFIG_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_web/edit");
this.generateAndSetSearchText(EditReportServerParameterPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java

@ -26,7 +26,7 @@ public class StyleListAction extends UpdateAction {
public StyleListAction() {
this.setMenuKeySet(PREDEFINED_STYLES);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_web/style");
this.generateAndSetSearchText(StyleManagerPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/server/TemplateThemeManagerAction.java

@ -21,7 +21,7 @@ public class TemplateThemeManagerAction extends SnapChatUpdateAction {
public TemplateThemeManagerAction() {
super(SnapChatAllTypes.UpdateAction.TEMPLATE_THEMES_MANAGER);
this.setMenuKeySet(TEMPLATE_THEMES_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/icon/icon_predefined_style.png"));
this.generateAndSetSearchText(TemplateThemeGridPagesPane.class.getName());

2
designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java

@ -22,7 +22,7 @@ import java.awt.event.WindowEvent;
public class WidgetManagerAction extends UpdateAction {
public WidgetManagerAction() {
this.setMenuKeySet(WIDGET_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_format/modified");
}

2
designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrAction.java

@ -24,7 +24,7 @@ public class CalculateAttrAction extends JTemplateAction<JWorkBook> {
private void initMenuStyle() {
this.setMenuKeySet(CALCULATE_FIT_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setName(getMenuKeySet().getMenuKeySetNameWithDot());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/center.png"));
}

Loading…
Cancel
Save