diff --git a/designer_base/src/com/fr/design/actions/help/AboutPane.java b/designer_base/src/com/fr/design/actions/help/AboutPane.java index 1155f4e92..9c8953597 100644 --- a/designer_base/src/com/fr/design/actions/help/AboutPane.java +++ b/designer_base/src/com/fr/design/actions/help/AboutPane.java @@ -47,7 +47,7 @@ public class AboutPane extends JPanel { BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane( getBuildTitle(), - GeneralUtils.readFullBuildNO(), + GeneralUtils.readBuildNO(), new String[]{ Inter.getLocText("FR-Designer-Basic_Copy_Build_NO"), Inter.getLocText("FR-Designer-Basic_Copy_Build_NO_OK") 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 index a2152d5a3..11486f113 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 @@ -25,14 +25,7 @@ public class RemindDialog extends UIDialog { private void initComponent() { final AlphafineConfigManager manager = DesignerEnvManager.getEnvManager().getAlphafineConfigManager(); - remindPane = new RemindPane(manager); - remindPane.navigateButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - dispose(); - manager.setOperateCount(0); - } - }); + remindPane = new RemindPane(manager, this); this.add(remindPane); } 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 index 5862b731f..ac93bad8e 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,5 +1,6 @@ package com.fr.design.actions.help.AlphaFine; +import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.general.IOUtils; @@ -25,37 +26,28 @@ public class RemindPane extends JPanel { private Icon closeIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind_close.png"); private Icon labelIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind.png"); private Icon openIcon = IOUtils.readIcon("com/fr/design/mainframe/alphafine/images/open.png"); - public JComponent navigateButton = new JComponent() { + public JComponent closeButton = new JComponent() { protected void paintComponent(Graphics g) { closeIcon.paintIcon(this, g, 0, 0); } }; - public RemindPane(AlphafineConfigManager manager) { + public RemindPane(AlphafineConfigManager manager, UIDialog remindDialog) { this.setPreferredSize(new Dimension(600, 400)); - initUI(manager); + initUI(manager, remindDialog); this.setLayout(getAbsoluteLayout()); } - private void initUI(final AlphafineConfigManager manager) { - openButton = new UIButton() { - @Override - public void paintComponent(Graphics g) { - g.setColor( Color.white ); - g.fillRect(0, 0, getSize().width, getSize().height); - super.paintComponent(g); - } - }; - openButton.setContentAreaFilled(false); - openButton.setForeground(new Color(0x3394F0)); + private void initUI(final AlphafineConfigManager manager, final UIDialog dialog) { + + openButton = new UIButton(); openButton.setIcon(openIcon); - openButton.setFont(LARGE_FONT); openButton.set4ToolbarButton(); openButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { - - + //manager.setOperateCount(0); + dialog.dispose(); } }); backgroundLabel = new UILabel(Inter.getLocText("FR-Designer-Alphafine_No_Remind")); @@ -81,7 +73,15 @@ public class RemindPane extends JPanel { }); backgroundPane = new JPanel(new BorderLayout()); backgroundPane.add(new UILabel(labelIcon), BorderLayout.CENTER); - add(navigateButton, 0); + closeButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + //manager.setOperateCount(0); + dialog.dispose(); + + } + }); + add(closeButton, 0); add(checkLabel, 1); add(openButton, 2); add(backgroundLabel, 3); @@ -113,7 +113,7 @@ public class RemindPane extends JPanel { public void layoutContainer(Container parent) { int width = parent.getWidth(); int height = parent.getHeight(); - navigateButton.setBounds((width - 30), 0, 30, 30); + closeButton.setBounds((width - 30), 0, 30, 30); openButton.setBounds(30, 300, 150, 40); backgroundLabel.setBounds(95, 350, 100, 20); checkLabel.setBounds(70, 350, 20, 20); diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 9d6332e6a..e632fafd2 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2005,4 +2005,5 @@ FR-Designer_Templates_Content=Templates Contents FR-Designer_AlphaFine_ShowAll=show all FR-Designer_AlphaFine_Latest=Latest FR-Designer_AlphaFine_ShowLess=show less -FR-Designer_Alphafine=AlphaFine \ No newline at end of file +FR-Designer_Alphafine=AlphaFine +FR-Designer-Alphafine_No_Remind= \ No newline at end of file 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 e8f9e376c..774beedf5 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 @@ -2003,4 +2003,5 @@ FR-Designer_Templates_Content=Template'Contents FR-Designer_AlphaFine_ShowAll=show all FR-Designer_AlphaFine_Latest=Recent FR-Designer_AlphaFine_ShowLess=show less -FR-Designer_Alphafine=AlphaFine \ No newline at end of file +FR-Designer_Alphafine=AlphaFine +FR-Designer-Alphafine_No_Remind=don't remind \ No newline at end of file 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 1fe8ac3c1..008f2df8d 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 @@ -2001,4 +2001,5 @@ FR-Designer_AlphaFine_ShowAll=\u663E\u793A\u5168\u90E8 FR-Designer_AlphaFine_Conclude=\u731C\u60A8\u9700\u8981 FR-Designer_AlphaFine_Latest=\u672C\u5730\u5E38\u7528 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77 -FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 \ No newline at end of file +FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 +FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A \ No newline at end of file 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 08a75d41e..4a8a86d71 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 @@ -1999,4 +1999,5 @@ FR-Designer_Templates_Content=\u6A21\u677F\u5167\u5BB9 FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77 FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 -FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8 \ No newline at end of file +FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8 +FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A \ No newline at end of file diff --git a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index 0bf286e51..e45ade484 100644 --- a/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -187,7 +187,7 @@ public class DesignerLogHandler { } private JTextPane initLogJTextArea() { - JTextPane resultPane = new JTextPane(); + final JTextPane resultPane = new JTextPane(); InputMap inputMap = resultPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), DefaultEditorKit.copyAction); inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), DefaultEditorKit.selectAllAction);