diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 2c7519ac8f..c7ccf0f772 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -487,6 +487,7 @@ public class AlphaFineDialog extends UIDialog { Rectangle paneRectangle = new Rectangle(AlphaFinePane.createAlphaFinePane().getLocationOnScreen(), AlphaFinePane.createAlphaFinePane().getSize()); if (!dialogRectangle.contains(p) && !paneRectangle.contains(p)) { AlphaFineDialog.this.dispose(); + System.out.print(p + "\n"); } } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java index f0d5d7ca65..f818fb587c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java @@ -2,6 +2,8 @@ package com.fr.design.mainframe.alphafine.component; import com.fr.base.BaseUtils; import com.fr.design.DesignerEnvManager; +import com.fr.design.actions.help.alphafine.AlphafineContext; +import com.fr.design.actions.help.alphafine.AlphafineListener; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.mainframe.alphafine.AlphaFineHelper; @@ -40,6 +42,12 @@ public class AlphaFinePane extends BasicPane { AlphaFineHelper.showAlphaFineDialog(); } }); + AlphafineContext.addAlphafineContextListener(new AlphafineListener() { + @Override + public void showDialog() { + AlphaFineHelper.showAlphaFineDialog(); + } + }); } @Override diff --git a/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj b/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj index fea7820778..48701f7640 100644 --- a/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj +++ b/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj @@ -1,8 +1,8 @@ package com.fr.aspectj.designerbase; import com.fr.design.DesignerEnvManager; -import com.fr.design.actions.help.AlphaFine.AlphafineConfigManager; -import com.fr.design.actions.help.AlphaFine.RemindDialog; +import com.fr.design.actions.help.alphafine.AlphafineConfigManager; +import com.fr.design.actions.help.alphafine.RemindDialog; import com.fr.design.mainframe.DesignerContext; import java.awt.event.ActionEvent; diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java index e7b4f7dfcc..75b4749d83 100644 --- a/designer_base/src/com/fr/design/DesignerEnvManager.java +++ b/designer_base/src/com/fr/design/DesignerEnvManager.java @@ -5,7 +5,7 @@ package com.fr.design; import com.fr.base.*; import com.fr.dav.LocalEnv; -import com.fr.design.actions.help.AlphaFine.AlphafineConfigManager; +import com.fr.design.actions.help.alphafine.AlphafineConfigManager; import com.fr.design.constants.UIConstants; import com.fr.env.RemoteEnv; import com.fr.env.SignIn; diff --git a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineAction.java b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineAction.java similarity index 96% rename from designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineAction.java rename to designer_base/src/com/fr/design/actions/help/alphafine/AlphafineAction.java index 7cb1ec2396..fdd6e060e2 100644 --- a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineAction.java +++ b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineAction.java @@ -1,4 +1,4 @@ -package com.fr.design.actions.help.AlphaFine; +package com.fr.design.actions.help.alphafine; import com.fr.base.BaseUtils; import com.fr.design.DesignerEnvManager; @@ -9,7 +9,6 @@ import com.fr.design.dialog.DialogActionListener; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigManager.java b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigManager.java similarity index 99% rename from designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigManager.java rename to designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigManager.java index 3aa6f44bdb..eba6de79cd 100644 --- a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigManager.java +++ b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigManager.java @@ -1,4 +1,4 @@ -package com.fr.design.actions.help.AlphaFine; +package com.fr.design.actions.help.alphafine; import com.fr.stable.OperatingSystem; import com.fr.stable.StringUtils; diff --git a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigPane.java similarity index 99% rename from designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java rename to designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigPane.java index 5d4d75275c..d982cbeece 100644 --- a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java +++ b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineConfigPane.java @@ -1,4 +1,4 @@ -package com.fr.design.actions.help.AlphaFine; +package com.fr.design.actions.help.alphafine; import com.fr.design.DesignerEnvManager; import com.fr.design.dialog.BasicPane; diff --git a/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineContext.java b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineContext.java new file mode 100644 index 0000000000..429f299d6c --- /dev/null +++ b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineContext.java @@ -0,0 +1,29 @@ +package com.fr.design.actions.help.alphafine; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by XiaXiang on 2017/5/27. + */ +public class AlphafineContext { + private static List fireLoginContextListener = new ArrayList(); + + /** + * 触发AlphaFine弹窗 + */ + public static void fireAlphaFineContextListener() { + for (AlphafineListener l : fireLoginContextListener) { + l.showDialog(); + } + } + + /** + * 添加一个弹出AlphaFine的监听事件 + * + * @param l AlphaFine框弹出监听事件 + */ + public static void addAlphafineContextListener(AlphafineListener l) { + fireLoginContextListener.add(l); + } +} diff --git a/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineListener.java b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineListener.java new file mode 100644 index 0000000000..01c7905d61 --- /dev/null +++ b/designer_base/src/com/fr/design/actions/help/alphafine/AlphafineListener.java @@ -0,0 +1,8 @@ +package com.fr.design.actions.help.alphafine; + +/** + * Created by XiaXiang on 2017/5/27. + */ +public interface AlphafineListener { + void showDialog(); +} diff --git a/designer_base/src/com/fr/design/actions/help/AlphaFine/RemindDialog.java b/designer_base/src/com/fr/design/actions/help/alphafine/RemindDialog.java similarity index 90% rename from designer_base/src/com/fr/design/actions/help/AlphaFine/RemindDialog.java rename to designer_base/src/com/fr/design/actions/help/alphafine/RemindDialog.java index 11486f1138..9ae6f864a4 100644 --- a/designer_base/src/com/fr/design/actions/help/AlphaFine/RemindDialog.java +++ b/designer_base/src/com/fr/design/actions/help/alphafine/RemindDialog.java @@ -1,12 +1,10 @@ -package com.fr.design.actions.help.AlphaFine; +package com.fr.design.actions.help.alphafine; import com.fr.design.DesignerEnvManager; -import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.UIDialog; import com.fr.design.utils.gui.GUICoreUtils; import java.awt.*; -import java.awt.event.*; /** * Created by XiaXiang on 2017/5/26. diff --git a/designer_base/src/com/fr/design/actions/help/AlphaFine/RemindPane.java b/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java similarity index 92% rename from designer_base/src/com/fr/design/actions/help/AlphaFine/RemindPane.java rename to designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java index ac93bad8e2..17cb6e456c 100644 --- a/designer_base/src/com/fr/design/actions/help/AlphaFine/RemindPane.java +++ b/designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java @@ -1,4 +1,4 @@ -package com.fr.design.actions.help.AlphaFine; +package com.fr.design.actions.help.alphafine; import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ibutton.UIButton; @@ -45,9 +45,11 @@ public class RemindPane extends JPanel { openButton.set4ToolbarButton(); openButton.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent e) { + System.out.print(e.getLocationOnScreen() + "\n"); //manager.setOperateCount(0); dialog.dispose(); + AlphafineContext.fireAlphaFineContextListener(); } }); backgroundLabel = new UILabel(Inter.getLocText("FR-Designer-Alphafine_No_Remind")); @@ -59,7 +61,7 @@ public class RemindPane extends JPanel { private boolean isCheck = false; @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent e) { if (isCheck) { checkLabel.setIcon(unCheckIcon); manager.setNeedRemind(true); @@ -75,7 +77,7 @@ public class RemindPane extends JPanel { backgroundPane.add(new UILabel(labelIcon), BorderLayout.CENTER); closeButton.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent e) { //manager.setOperateCount(0); dialog.dispose(); diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index ff49aa7b07..f80e20331c 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -11,7 +11,7 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.actions.community.*; import com.fr.design.actions.file.*; import com.fr.design.actions.help.AboutAction; -import com.fr.design.actions.help.AlphaFine.AlphafineAction; +import com.fr.design.actions.help.alphafine.AlphafineAction; import com.fr.design.actions.help.TutorialAction; import com.fr.design.actions.help.WebDemoAction; import com.fr.design.actions.server.*;