diff --git a/designer/src/com/fr/design/actions/edit/DeleteAction.java b/designer/src/com/fr/design/actions/edit/DeleteAction.java index 0fe1f7817c..b2d69b58c5 100644 --- a/designer/src/com/fr/design/actions/edit/DeleteAction.java +++ b/designer/src/com/fr/design/actions/edit/DeleteAction.java @@ -25,7 +25,7 @@ public class DeleteAction extends ElementCaseAction { 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)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)); } @Override diff --git a/designer/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java b/designer/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java index 2259388d45..3a4f43e66e 100644 --- a/designer/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java +++ b/designer/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java @@ -27,7 +27,7 @@ public class BringFloatElementForwardAction extends AbstractFloatElementOrderAct this.setName(Inter.getLocText("M_Edit-Bring_Forward")); this.setMnemonic('F'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER)); } @Override diff --git a/designer/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java b/designer/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java index b50d683060..d5b8279632 100644 --- a/designer/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java +++ b/designer/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java @@ -28,7 +28,7 @@ public class BringFloatElementToFrontAction extends AbstractFloatElementOrderAct this.setName(Inter.getLocText("M_Edit-Bring_to_Front")); this.setMnemonic('T'); 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)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); } @Override diff --git a/designer/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java b/designer/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java index e1eedc3550..a52c9e1302 100644 --- a/designer/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java +++ b/designer/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java @@ -27,7 +27,7 @@ public class SendFloatElementBackwardAction extends AbstractFloatElementOrderAct this.setName(Inter.getLocText("M_Edit-Send_Backward")); this.setMnemonic('B'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); } @Override diff --git a/designer/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java b/designer/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java index ee8fa31d4e..ef5827d90e 100644 --- a/designer/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java +++ b/designer/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java @@ -28,7 +28,7 @@ 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/control/to_bottom.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); } @Override diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index cd54b84933..922793155d 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -1994,7 +1994,7 @@ FR-Designer_AlphaFine_EnableInternetSearch=SearchOnLine FR-Designer_AlphaFine_Shortcut_Config=Shortcut Config FR-Designer_AlphaFine_SearchRange=Search Range FR-Designer_AlphaFine_Recommend=Recommend -FR-Designer-Plugin_Addon=Plugin Addon +FR-Designer-Plugin_Addon=FanRuan Market FR-Designer_Templates=FR-Designer_Templates FR-Designer_Templates_Content=Templates Contents FR-Designer_AlphaFine_ShowAll=show all diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index e40d22099c..017e45e7cc 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1992,7 +1992,7 @@ FR-Designer_AlphaFine_EnableInternetSearch=Search OnLine FR-Designer_AlphaFine_Shortcut_Config=Shortcut Config FR-Designer_AlphaFine_SearchRange=Search Range FR-Designer_AlphaFine_Recommend=Recommend -FR-Designer-Plugin_Addon=Plugin Addon +FR-Designer-Plugin_Addon=FanRuan Market FR-Designer_Templates=Files FR-Designer_Templates_Content=Files'contents FR-Designer_AlphaFine_ShowAll=Show all diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 82734f02f9..bcbd7386d7 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1994,7 +1994,7 @@ FR-Designer_AlphaFine_EnableInternet=\u8054\u7F51 FR-Designer_AlphaFine_EnableInternetSearch=\u8054\u7F51\u641C\u7D22 FR-Designer_AlphaFine_Shortcut_Config=\u5FEB\u6377\u952E\u914D\u7F6E FR-Designer_AlphaFine_SearchRange=\u641C\u7D22\u8303\u56F4 -FR-Designer-Plugin_Addon=\u5E94\u7528\u4E2D\u5FC3 +FR-Designer-Plugin_Addon=\u5E06\u8F6F\u5E02\u573A FR-Designer_Templates=\u6A21\u677F FR-Designer_Templates_Content=\u6A21\u677F\u5185\u5BB9 FR-Designer_AlphaFine_ShowAll=\u663E\u793A\u5168\u90E8 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 7f274e7157..a099f145a2 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1992,7 +1992,7 @@ FR-Designer_AlphaFine_EnableInternetSearch=\u806F\u7DB2\u641C\u7D22 FR-Designer_AlphaFine_Shortcut_Config=\u5FEB\u6377\u9375\u914D\u7F6E FR-Designer_AlphaFine_SearchRange=\u641C\u7D22\u7BC4\u570D FR-Designer_AlphaFine_Recommend=\u731C\u60A8\u9700\u8981 -FR-Designer-Plugin_Addon=\u61C9\u7528\u4E2D\u5FC3 +FR-Designer-Plugin_Addon=\u5E06\u8EDF\u5E02\u5834 FR-Designer_Templates=\u6A21\u677F FR-Designer_Templates_Content=\u6A21\u677F\u5167\u5BB9 FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528 diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java index 95cde265df..ce57343c29 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -37,13 +38,13 @@ public class MoveDownAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); int targetIndex = container.getComponentZOrder(creator) + 1; if (targetIndex >= container.getComponentCount()) { return false; } container.setComponentZOrder(creator, targetIndex); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java index 9fc69953b8..5a69805253 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -37,13 +38,13 @@ public class MoveToBottomAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); int targetIndex = container.getComponentCount() - 1; if (container.getComponentZOrder(creator) >= targetIndex) { return false; } container.setComponentZOrder(creator, targetIndex); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java index 47be1b9f2a..0995df3ca1 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -37,12 +38,12 @@ public class MoveToTopAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); if (container.getComponentZOrder(creator) == 0) { return false; } container.setComponentZOrder(creator, 0); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java index 512b075d9b..654b39d695 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -36,13 +37,14 @@ public class MoveUpAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); int targetIndex = container.getComponentZOrder(creator) - 1; if (targetIndex < 0) { return false; } container.setComponentZOrder(creator, targetIndex); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java b/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java index 5e02e45223..e4281174b6 100644 --- a/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java +++ b/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java @@ -126,6 +126,14 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme return this; } + public void setComponentZOrder(XCreator creator, int targetIndex) { + super.setComponentZOrder(creator, targetIndex); // 设计器界面上更改 + // 以下是数据层更改，会反映到 web 端 + WLayout layout = this.toData(); + String widgetName = creator.toData().getWidgetName(); + layout.setWidgetIndex(layout.getWidget(widgetName), targetIndex); + } + /** * 当前组件zorder位置替换新的控件 *