diff --git a/designer/src/com/fr/design/actions/cell/CellAttributeAction.java b/designer/src/com/fr/design/actions/cell/CellAttributeAction.java index 949d72de0c..e2455a1599 100644 --- a/designer/src/com/fr/design/actions/cell/CellAttributeAction.java +++ b/designer/src/com/fr/design/actions/cell/CellAttributeAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.cell; +import com.fr.base.BaseUtils; import com.fr.design.menu.KeySetUtils; import com.fr.general.Inter; @@ -9,9 +10,9 @@ import com.fr.general.Inter; public class CellAttributeAction extends CellAttributeTableAction { public CellAttributeAction() { this.setMenuKeySet(KeySetUtils.CELL_OTHER_ATTR); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - // this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellAttr.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellAttr.png")); } @Override diff --git a/designer/src/com/fr/design/actions/edit/HyperlinkAction.java b/designer/src/com/fr/design/actions/edit/HyperlinkAction.java index 2fcc46901f..38fc9bece5 100644 --- a/designer/src/com/fr/design/actions/edit/HyperlinkAction.java +++ b/designer/src/com/fr/design/actions/edit/HyperlinkAction.java @@ -17,7 +17,7 @@ public class HyperlinkAction extends UpdateAction { public HyperlinkAction() { this.setMenuKeySet(KeySetUtils.HYPER_LINK); - this.setName(getMenuKeySet().getMenuKeySetName() + "..."); + this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/hyperLink.png")); } diff --git a/designer/src/com/fr/grid/selection/CellSelection.java b/designer/src/com/fr/grid/selection/CellSelection.java index 890affae32..ea3234e85f 100644 --- a/designer/src/com/fr/grid/selection/CellSelection.java +++ b/designer/src/com/fr/grid/selection/CellSelection.java @@ -434,9 +434,10 @@ public class CellSelection extends Selection { popup.add(new CleanAuthorityAction(ePane).createMenuItem()); return popup; } - popup.add(DeprecatedActionManager.getCellMenu(ePane).createJMenu()); popup.add(new EditCellAction(ePane).createMenuItem()); + popup.add(DeprecatedActionManager.getCellMenu(ePane).createJMenu()); // richer:add global style menu + popup.add(new CellExpandAttrAction().createMenuItem()); if (!ConfigManager.getProviderInstance().hasStyle()) { UIMenu styleMenu = new UIMenu(KeySetUtils.GLOBAL_STYLE.getMenuName()); styleMenu.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cell.png")); @@ -455,13 +456,12 @@ public class CellSelection extends Selection { } else { popup.add(new StyleAction().createMenuItem()); } + popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu()); + popup.add(new CellAttributeAction().createMenuItem()); JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (jTemplate.isJWorkBook()){ //表单中报表块编辑屏蔽掉 控件设置 popup.add(new CellWidgetAttrAction().createMenuItem()); } - popup.add(new CellExpandAttrAction().createMenuItem()); - popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu()); - popup.add(new CellAttributeAction().createMenuItem()); popup.add(new ConditionAttributesAction().createMenuItem()); popup.add(new HyperlinkAction().createMenuItem()); // cut, copy and paste diff --git a/designer_base/src/com/fr/design/menu/KeySetUtils.java b/designer_base/src/com/fr/design/menu/KeySetUtils.java index 401da7fb99..01022433e6 100644 --- a/designer_base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer_base/src/com/fr/design/menu/KeySetUtils.java @@ -756,7 +756,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("ExpandD-Cell_Expand_Attributes"); + return Inter.getLocText("FR-Designer_Expand"); } @Override @@ -978,7 +978,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Format_A-Cell_Attributes"); + return Inter.getLocText("FR-Designer_Other"); } @Override