Browse Source

REPORT-3163 合作开发9.0设计器=>条件属性=》去掉原来的菜单项入口

master
plough 7 years ago
parent
commit
dcce3eccb1
  1. 37
      designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
  2. 1
      designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
  3. 1
      designer/src/com/fr/grid/selection/CellSelection.java
  4. 1
      designer/src/com/fr/poly/creator/ECBlockPane.java

37
designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java

@ -1,37 +0,0 @@
/*
* Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
*/
package com.fr.design.actions.cell;
import com.fr.base.BaseUtils;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.present.ConditionAttributesGroupPane;
import com.fr.design.dialog.BasicPane;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.report.cell.TemplateCellElement;
/**
* Condition Attributes.
*/
public class ConditionAttributesAction extends AbstractCellElementAction {
public ConditionAttributesAction(ElementCasePane t) {
super(t);
this.setMenuKeySet(KeySetUtils.CONDITION_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/highlight.png"));
}
@Override
protected BasicPane populateBasicPane(TemplateCellElement cellElement) {
ConditionAttributesGroupPane pane = ConditionAttributesGroupPane.getInstance();
pane.populate(cellElement.getHighlightGroup());
return pane;
}
@Override
protected void updateBasicPane(BasicPane bp, TemplateCellElement cellElement) {
cellElement.setHighlightGroup(((ConditionAttributesGroupPane)bp).updateHighlightGroup());
}
}

1
designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@ -183,7 +183,6 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
menuDef.addShortCut(new CellExpandAttrAction()); menuDef.addShortCut(new CellExpandAttrAction());
menuDef.addShortCut(new CellWidgetAttrAction(this)); menuDef.addShortCut(new CellWidgetAttrAction(this));
menuDef.addShortCut(new GlobalStyleMenuDef(this)); menuDef.addShortCut(new GlobalStyleMenuDef(this));
menuDef.addShortCut(new ConditionAttributesAction(this));
// 单元格形态 // 单元格形态
menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this)); menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));

1
designer/src/com/fr/grid/selection/CellSelection.java

@ -458,7 +458,6 @@ public class CellSelection extends Selection {
} }
popup.add(new CellExpandAttrAction().createMenuItem()); popup.add(new CellExpandAttrAction().createMenuItem());
popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu()); popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu());
popup.add(new ConditionAttributesAction(ePane).createMenuItem());
popup.add(new CellAttributeAction().createMenuItem()); popup.add(new CellAttributeAction().createMenuItem());
// cut, copy and paste // cut, copy and paste
popup.addSeparator(); popup.addSeparator();

1
designer/src/com/fr/poly/creator/ECBlockPane.java

@ -142,7 +142,6 @@ public class ECBlockPane extends PolyElementCasePane {
menuDef.addShortCut(new CellExpandAttrAction()); menuDef.addShortCut(new CellExpandAttrAction());
menuDef.addShortCut(new CellWidgetAttrAction(this)); menuDef.addShortCut(new CellWidgetAttrAction(this));
menuDef.addShortCut(new GlobalStyleMenuDef(this)); menuDef.addShortCut(new GlobalStyleMenuDef(this));
menuDef.addShortCut(new ConditionAttributesAction(this));
// 单元格形态 // 单元格形态
menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this)); menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));

Loading…
Cancel
Save