REPORT-4634 组件叠加体验优化=>视觉调整=>右键菜单调整

designer/src/com/fr/design/actions/edit/DeleteAction.java

@@ -8,6 +8,9 @@ import com.fr.design.actions.ElementCaseAction;
 import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
 
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+
 /**
  * Delete Row, Column or FloatElement..
  */
@@ -18,10 +21,11 @@ public class DeleteAction extends ElementCaseAction {
     public DeleteAction(ElementCasePane t) {
 		super(t);
 		
-        this.setName(Inter.getLocText("M_Edit-Delete") + "...");
+        this.setName(Inter.getLocText("M_Edit-Delete"));
         this.setMnemonic('D');
         //Richie:删除菜单图标
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png"));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
     }
     
     @Override

designer/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java

@@ -9,6 +9,11 @@ import com.fr.design.mainframe.ElementCasePane;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.ElementCase;
 
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Bring FloatElement forward.
  */
@@ -21,7 +26,8 @@ public class BringFloatElementForwardAction extends AbstractFloatElementOrderAct
 		
         this.setName(Inter.getLocText("M_Edit-Bring_Forward"));
         this.setMnemonic('F');
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/bringForward.png"));
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png"));
+		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER));
 	}
 
 	@Override

designer/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java

@@ -9,6 +9,12 @@ import com.fr.design.mainframe.ElementCasePane;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.ElementCase;
 
+import javax.swing.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Bring FloatElement to front.
  */
@@ -20,8 +26,9 @@ public class BringFloatElementToFrontAction extends AbstractFloatElementOrderAct
 		super(t);
 		
         this.setName(Inter.getLocText("M_Edit-Bring_to_Front"));
-        this.setMnemonic('t');
+        this.setMnemonic('T');
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/bringToFront.png"));
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_top.png"));
+		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK));
 	}
 
 	@Override

designer/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java

@@ -9,6 +9,11 @@ import com.fr.design.mainframe.ElementCasePane;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.ElementCase;
 
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Send FloatElement backward.
  */
@@ -21,7 +26,8 @@ public class SendFloatElementBackwardAction extends AbstractFloatElementOrderAct
 		
         this.setName(Inter.getLocText("M_Edit-Send_Backward"));
         this.setMnemonic('B');
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/sendBackward.png"));
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png"));
+		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER));
 	}
 
 	@Override

designer/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java

@@ -9,6 +9,12 @@ import com.fr.design.mainframe.ElementCasePane;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.ElementCase;
 
+import javax.swing.*;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 /**
  * Send FloatElement to back.
  */
@@ -21,7 +27,8 @@ public class SendFloatElementToBackAction extends AbstractFloatElementOrderActio
 		
         this.setName(Inter.getLocText("M_Edit-Send_to_Back"));
         this.setMnemonic('K');
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/sendToBack.png"));
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png"));
+		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK));
 	}
 
 	@Override

designer/src/com/fr/design/actions/utils/DeprecatedActionManager.java

@@ -68,23 +68,6 @@ public class DeprecatedActionManager {
         return clearMenu;
     }
 
-    /**
-     * Order menu
-     */
-    public static JMenu getOrderMenu(ElementCasePane ePane) {
-        JMenu orderMenu = new JMenu(Inter.getLocText("M_Edit-Order"));
-        orderMenu.setIcon(UIConstants.BLACK_ICON);
-        orderMenu.setMnemonic('O');
-        orderMenu.setBackground(UIConstants.NORMAL_BACKGROUND);
-
-        orderMenu.add(new BringFloatElementToFrontAction(ePane).createMenuItem());
-        orderMenu.add(new SendFloatElementToBackAction(ePane).createMenuItem());
-        orderMenu.add(new BringFloatElementForwardAction(ePane).createMenuItem());
-        orderMenu.add(new SendFloatElementBackwardAction(ePane).createMenuItem());
-
-        return orderMenu;
-    }
-
     /**
      * Cell Style.
      */

designer/src/com/fr/grid/selection/FloatSelection.java

@@ -1,32 +1,35 @@
 package com.fr.grid.selection;
 
-import java.awt.Toolkit;
-
-import javax.swing.JPopupMenu;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.design.actions.cell.CleanAuthorityAction;
 import com.fr.design.actions.cell.FloatStyleAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.edit.*;
-import com.fr.design.actions.utils.DeprecatedActionManager;
+import com.fr.design.actions.edit.order.BringFloatElementForwardAction;
+import com.fr.design.actions.edit.order.BringFloatElementToFrontAction;
+import com.fr.design.actions.edit.order.SendFloatElementBackwardAction;
+import com.fr.design.actions.edit.order.SendFloatElementToBackAction;
 import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
 import com.fr.design.designer.TargetComponent;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.CellElementPropertyPane;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.mainframe.ElementCasePane.Clear;
+import com.fr.design.selection.QuickEditor;
+import com.fr.design.utils.DesignUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.TemplateElementCase;
-import com.fr.design.selection.QuickEditor;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.unit.FU;
 import com.fr.stable.unit.OLDPIX;
-import com.fr.design.utils.DesignUtils;
+
+import javax.swing.*;
+import java.awt.*;
 /**
  * the float selection
  * @editor zhou
@@ -114,24 +117,28 @@ public class FloatSelection extends Selection {
 
     @Override
     public JPopupMenu createPopupMenu(ElementCasePane ePane) {
-        JPopupMenu popup = new JPopupMenu();
+        JPopupMenu popup = new UIPopupMenu();
         if (BaseUtils.isAuthorityEditing()) {
             popup.add(new CleanAuthorityAction(ePane).createMenuItem());
             return popup;
         }
-        popup.add(DeprecatedActionManager.getCellMenu(ePane).createJMenu());
         popup.add(new FloatStyleAction(ePane).createMenuItem());
         popup.add(new HyperlinkAction().createMenuItem());
-
         // cut, copy and paste
         popup.addSeparator();
+
         popup.add(new CutAction(ePane).createMenuItem());
         popup.add(new CopyAction(ePane).createMenuItem());
         popup.add(new PasteAction(ePane).createMenuItem());
         popup.add(new DeleteAction(ePane).createMenuItem());
+        popup.addSeparator();
 
+        popup.add(new BringFloatElementToFrontAction(ePane).createMenuItem());
+        popup.add(new SendFloatElementToBackAction(ePane).createMenuItem());
+        popup.add(new BringFloatElementForwardAction(ePane).createMenuItem());
+        popup.add(new SendFloatElementBackwardAction(ePane).createMenuItem());
         popup.addSeparator();
-        popup.add(DeprecatedActionManager.getOrderMenu(ePane));
+
         popup.add(new EditFloatElementNameAction(ePane).createMenuItem());
 
         return popup;

designer_base/src/com/fr/design/locale/designer.properties

@@ -2149,7 +2149,7 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.
 FR-Designer_Format_JavaScript=Format Code
-FR-Designer_Move_Up=Move up
+FR-Designer_Move_Up=Move up(F)
-FR-Designer_Move_Down=Move down
+FR-Designer_Move_Down=Move down(B)
-FR-Designer_Move_To_Top=Move to top
+FR-Designer_Move_To_Top=Move to top(T)
-FR-Designer_Move_To_Bottom=Move to bottom
+FR-Designer_Move_To_Bottom=Move to bottom(K)

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2148,7 +2148,7 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.
 FR-Designer_Format_JavaScript=Format Code
-FR-Designer_Move_Up=Move up
+FR-Designer_Move_Up=Move up(F)
-FR-Designer_Move_Down=Move down
+FR-Designer_Move_Down=Move down(B)
-FR-Designer_Move_To_Top=Move to top
+FR-Designer_Move_To_Top=Move to top(T)
-FR-Designer_Move_To_Bottom=Move to bottom
+FR-Designer_Move_To_Bottom=Move to bottom(K)

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2149,7 +2149,7 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=\u82E5\u542F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8BC1\u4E66\u8DEF\u5F84\u3001https\u79D8\u94A5\uFF09\uFF0C\u5FC5\u987B\u91CD\u542F\u8BBE\u8BA1\u5668\u624D\u80FD\u751F\u6548\u3002
 FR-Designer_Format_JavaScript=\u683C\u5F0F\u5316\u4EE3\u7801
-FR-Designer_Move_Up=\u4E0A\u79FB\u4E00\u5C42
+FR-Designer_Move_Up=\u4E0A\u79FB\u4E00\u5C42(F)
-FR-Designer_Move_Down=\u4E0B\u79FB\u4E00\u5C42
+FR-Designer_Move_Down=\u4E0B\u79FB\u4E00\u5C42(B)
-FR-Designer_Move_To_Top=\u7F6E\u4E8E\u9876\u5C42
+FR-Designer_Move_To_Top=\u7F6E\u4E8E\u9876\u5C42(T)
-FR-Designer_Move_To_Bottom=\u7F6E\u4E8E\u5E95\u5C42
+FR-Designer_Move_To_Bottom=\u7F6E\u4E8E\u5E95\u5C42(K)

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2148,7 +2148,7 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=\u82E5\u555F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8B49\u66F8\u8DEF\u5F91\u3001https\u7955\u9470\uFF09\uFF0C\u5FC5\u9808\u91CD\u555F\u8A2D\u8A08\u5668\u624D\u80FD\u751F\u6548\u3002
 FR-Designer_Format_JavaScript=Format Code
-FR-Designer_Move_Up=\u4E0A\u79FB\u4E00\u5C64
+FR-Designer_Move_Up=\u4E0A\u79FB\u4E00\u5C64(F)
-FR-Designer_Move_Down=\u4E0B\u79FB\u4E00\u5C64
+FR-Designer_Move_Down=\u4E0B\u79FB\u4E00\u5C64(B)
-FR-Designer_Move_To_Top=\u7F6E\u65BC\u9802\u5C64
+FR-Designer_Move_To_Top=\u7F6E\u65BC\u9802\u5C64(T)
-FR-Designer_Move_To_Bottom=\u7F6E\u65BC\u5E95\u5C64
+FR-Designer_Move_To_Bottom=\u7F6E\u65BC\u5E95\u5C64(K)

designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java

@@ -24,7 +24,7 @@ public class MoveDownAction extends FormEditAction {
     public MoveDownAction(FormDesigner t) {
         super(t);
         this.setName(Inter.getLocText("FR-Designer_Move_Down"));
-        this.setMnemonic('T');
+        this.setMnemonic('B');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER));
     }

designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java

@@ -24,7 +24,7 @@ public class MoveToBottomAction extends FormEditAction {
     public MoveToBottomAction(FormDesigner t) {
         super(t);
         this.setName(Inter.getLocText("FR-Designer_Move_To_Bottom"));
-        this.setMnemonic('T');
+        this.setMnemonic('K');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK));
     }

designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java

@@ -23,7 +23,7 @@ public class MoveUpAction extends FormEditAction {
     public MoveUpAction(FormDesigner t) {
         super(t);
         this.setName(Inter.getLocText("FR-Designer_Move_Up"));
-        this.setMnemonic('T');
+        this.setMnemonic('F');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER));
     }

designer_form/src/com/fr/design/designer/creator/XCreator.java

@@ -7,10 +7,10 @@ import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
-import com.fr.design.designer.beans.actions.*;
 import com.fr.design.designer.beans.events.DesignerEditor;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.fun.WidgetPropertyUIProvider;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.*;
 import com.fr.design.utils.gui.LayoutUtils;
@@ -673,7 +673,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 */
 	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
         UpdateAction[] actions = formDesigner.getActions();
-		JPopupMenu popup = new JPopupMenu();
+		JPopupMenu popup = new UIPopupMenu();
         for (int i = 0; i < actions.length; i++) {
             if (i == SHORTS_SEPARATOR_POS) {
                 popup.addSeparator();