From 9ce19b714326154c05505206cfeb306790bbd225 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 3 Aug 2018 11:41:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?REPORT-9943=2010.0=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E2=80=9C=E6=89=93=E5=8D=B0=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E2=80=9D=E6=94=B9=E5=90=8D=E4=B8=BA=E2=80=9C=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=A1=BA=E5=BA=8F=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/report/PageSetupPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 745af3cfe..9b450c569 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); // page order - JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Order")); + JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine_Designer_Page_Order")); JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); outpageOrderPane.add(pageOrderPane); defaultPane.add(outpageOrderPane); From 97b61363a380cf140e272cfe1268932ae47065e4 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 3 Aug 2018 13:46:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?REPORT-9943=2010.0=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E2=80=9C=E6=89=93=E5=8D=B0=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E2=80=9D=E6=94=B9=E5=90=8D=E4=B8=BA=E2=80=9C=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=A1=BA=E5=BA=8F=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/report/PageSetupPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 9b450c569..179189fbb 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); // page order - JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine_Designer_Page_Order")); + JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Page_Order")); JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); outpageOrderPane.add(pageOrderPane); defaultPane.add(outpageOrderPane); From aea8f77c041e3e1e535c95ba718479956f9d3dc4 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 3 Aug 2018 13:49:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?REPORT-9943=2010.0=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E2=80=9C=E6=89=93=E5=8D=B0=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E2=80=9D=E6=94=B9=E5=90=8D=E4=B8=BA=E2=80=9C=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=A1=BA=E5=BA=8F=E2=80=9D=3D>=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/report/PageSetupPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 179189fbb..16c85da0c 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); // page order - JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Page_Order")); + JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Page_Order")); JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); outpageOrderPane.add(pageOrderPane); defaultPane.add(outpageOrderPane); From eb99b89c1e1a8eaf597a1168e777c935aa7fd829 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Fri, 3 Aug 2018 10:59:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?REPORT-10263=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=9D=83=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?= =?UTF-8?q?1=EF=BC=8C2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/env/RemoteEnvPane.java | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index a49779ea4..e66eb699d 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -1,5 +1,7 @@ package com.fr.env; +import com.fr.base.FRContext; +import com.fr.base.ServerConfig; import com.fr.design.DesignerEnvManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.border.UITitledBorder; @@ -12,7 +14,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.scrollruler.ModLineBorder; - +import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.third.guava.base.Strings; import com.fr.workspace.WorkContext; @@ -193,6 +195,10 @@ public class RemoteEnvPane extends BasicBeanPane { fillIndividualField(); } }; + /** + * 测试链接对话框确定取消按钮面板 + */ + private JPanel dialogDownPane = new JPanel(); public RemoteEnvPane() { @@ -381,6 +387,16 @@ public class RemoteEnvPane extends BasicBeanPane { new double[]{PREFERRED, PREFERRED, PREFERRED, PREFERRED}, new double[]{FILL} )); + + setDefaultAppAndServlet(); + } + + /** + * 设置 app 和 servlet 默认值 + */ + private void setDefaultAppAndServlet() { + webAppNameInput.setText(FRContext.getCommonOperator().getAppName()); + servletNameInput.setText(ServerConfig.getInstance().getServletName()); } @@ -512,21 +528,28 @@ public class RemoteEnvPane extends BasicBeanPane { } else { message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); + } } catch (InterruptedException | ExecutionException e) { + FineLoggerFactory.getLogger().error(e, e.getMessage()); message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } + dialogDownPane.remove(cancelButton); + dialogDownPane.revalidate(); + dialogDownPane.repaint(); } }; worker.execute(); initMessageDialog(); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dialog.dispose(); } }); cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dialog.dispose(); worker.cancel(true); @@ -534,6 +557,7 @@ public class RemoteEnvPane extends BasicBeanPane { }); dialog.addWindowListener(new WindowAdapter() { + @Override public void windowClosed(WindowEvent e) { worker.cancel(true); } @@ -554,17 +578,17 @@ public class RemoteEnvPane extends BasicBeanPane { okButton.setEnabled(false); JPanel jp = new JPanel(); JPanel upPane = new JPanel(); - JPanel downPane = new JPanel(); + dialogDownPane = new JPanel(); uiLabel = new UILabel(UIManager.getIcon("OptionPane.informationIcon")); upPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10)); upPane.add(uiLabel); upPane.add(message); - downPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0)); - downPane.add(okButton); - downPane.add(cancelButton); + dialogDownPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0)); + dialogDownPane.add(okButton); + dialogDownPane.add(cancelButton); jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS)); jp.add(upPane); - jp.add(downPane); + jp.add(dialogDownPane); dialog.add(jp); dialog.setResizable(false); dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(RemoteEnvPane.this)); From c670b046054f3ab2afd513ea0b9f42f192f0423b Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Fri, 3 Aug 2018 12:21:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?REPORT-10263=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=9D=83=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?= =?UTF-8?q?3,4,11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/remote/ui/UserManagerPane.java | 20 ++++++++++++++----- .../ui/list/AddingMemberListCellRender.java | 13 ++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index b201abc55..d78e0b060 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -14,7 +14,6 @@ import com.fr.design.remote.ui.list.AddedMemberListCellRender; import com.fr.design.remote.ui.list.AddingMemberList; import com.fr.design.remote.ui.list.AddingMemberListCellRender; import com.fr.design.remote.ui.list.MemberListSelectedChangeListener; -import com.fr.locale.InterProviderFactory; import com.fr.stable.StringUtils; import com.fr.third.guava.collect.ImmutableList; import com.fr.workspace.WorkContext; @@ -95,12 +94,15 @@ public class UserManagerPane extends BasicPane { * 输入框绑定事件 */ private KeyAdapter keyFieldKeyListener = new KeyAdapter() { + @Override - public void keyReleased(KeyEvent e) { + public void keyPressed(KeyEvent e) { // 判断按下的键是否是回车键 - // 对话框回车键绑定的是对话框的确定按钮，因此按确定没有办法搜索 + // 对话框回车键绑定的是对话框的确定按钮 if (e.getKeyCode() == KeyEvent.VK_ENTER) { searchAddingMembers(keyWord); + // has been processed + e.consume(); } } }; @@ -351,8 +353,14 @@ public class UserManagerPane extends BasicPane { addingMembers.clear(); String username = WorkContext.getConnector().currentUser(); synchronized (addingMembers) { - addingMembers.addAll(WorkContext.getCurrent().get(DecisionOperator.class).getMembers(username, keyword)); + Collection more = WorkContext.getCurrent().get(DecisionOperator.class).getMembers(username, keyword); pageNum = 1; + if (!more.isEmpty()) { + addingMembers.addAll(more); + if (more.size() >= DEFAULT_NUM_EACH_PAGE) { + addingMembers.add(RemoteDesignMember.DEFAULT_MEMBER); + } + } } return addingMembers; } @@ -372,12 +380,14 @@ public class UserManagerPane extends BasicPane { protected List doInBackground() { String username = WorkContext.getConnector().currentUser(); synchronized (addingMembers) { + addingMembers.remove(RemoteDesignMember.DEFAULT_MEMBER); Collection more = WorkContext.getCurrent().get(DecisionOperator.class).getMembers(username, keyword, pageNum + 1, count); if (!more.isEmpty()) { pageNum += 1; + addingMembers.addAll(more); + addingMembers.add(RemoteDesignMember.DEFAULT_MEMBER); } - addingMembers.addAll(more); } return addingMembers; } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java index cccdf7d3f..b2ca3f812 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java @@ -9,6 +9,7 @@ import javax.swing.BorderFactory; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.ListCellRenderer; +import javax.swing.SwingConstants; import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; @@ -43,10 +44,12 @@ public class AddingMemberListCellRender extends JPanel implements ListCellRender if (member.equals(RemoteDesignMember.DEFAULT_MEMBER)) { this.setLabelText(member.getUsername()); check.setVisible(false); + fixLoadingDisplay(); } else { this.setLabelText(member.getRealName() + "(" + member.getUsername() + ")"); check.setVisible(true); check.setSelected(member.isSelected()); + recoveryCommonDisplay(); } return this; } @@ -54,4 +57,14 @@ public class AddingMemberListCellRender extends JPanel implements ListCellRender private void setLabelText(String name) { label.setText(name); } + + private void fixLoadingDisplay() { + label.setIcon(null); + label.setHorizontalAlignment(SwingConstants.CENTER); + } + + private void recoveryCommonDisplay() { + label.setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png")); + label.setHorizontalAlignment(SwingConstants.LEFT); + } } From 295601fb66e92cfcae057681ca90e67a8721b03b Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Fri, 3 Aug 2018 13:45:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-10263=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=9D=83=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/remote/ui/UserManagerPane.java | 8 ++- .../ui/list/AddedMemberListCellRender.java | 4 +- .../main/java/com/fr/env/RemoteEnvPane.java | 56 +++++++++---------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index d78e0b060..ecbfe9011 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui; import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; @@ -193,15 +194,16 @@ public class UserManagerPane extends BasicPane { public UserManagerPane() { - this.setBorder(BorderFactory.createEmptyBorder()); + this.setBorder(BorderFactory.createEmptyBorder(0,4,0,4)); this.setLayout(new BorderLayout()); this.add( - TableLayoutHelper.createTableLayoutPane( + TableLayoutHelper.createCommonTableLayoutPane( new Component[][]{ new Component[]{createLeftPanel(), createRightPanel()} }, new double[]{TableLayout.FILL}, - new double[]{TableLayout.FILL, TableLayout.FILL} + new double[]{TableLayout.FILL, TableLayout.FILL}, + LayoutConstants.VGAP_LARGE ), BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java index 84ee0d27f..f29378f62 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java @@ -23,9 +23,9 @@ public class AddedMemberListCellRender extends JPanel implements ListCellRendere this.setLayout(new FlowLayout(FlowLayout.LEFT)); label = new UILabel(); - label.setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png")); - label.setPreferredSize(new Dimension(260, 20)); + label.setPreferredSize(new Dimension(264, 20)); this.setPreferredSize(new Dimension(this.getPreferredSize().width, 25)); + label.setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png")); this.add(label); this.add(new IconButton()); diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index e66eb699d..edd3589a7 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -11,6 +11,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.scrollruler.ModLineBorder; @@ -41,7 +42,6 @@ import java.awt.Component; import java.awt.Dialog; import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; @@ -65,14 +65,14 @@ public class RemoteEnvPane extends BasicBeanPane { private JDialog dialog; private UILabel message = new UILabel(); - private UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); - private UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + private UIButton okButton = new UIButton(Toolkit.i18nText("OK")); + private UIButton cancelButton = new UIButton(Toolkit.i18nText("Cancel")); private UILabel uiLabel = new UILabel(); /** * 是否启用 https 勾选框 */ - private UICheckBox httpsCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Enable_Https")); + private UICheckBox httpsCheckbox = new UICheckBox(Toolkit.i18nText("FR-Designer_RemoteEnv_Enable_Https")); /** * 主机位置输入框 */ @@ -124,11 +124,11 @@ public class RemoteEnvPane extends BasicBeanPane { /** * https 密钥标签 */ - private UILabel certSecretKeyLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Secret_Key")); + private UILabel certSecretKeyLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Secret_Key")); /** * https证书路径标签 */ - private UILabel certPathLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Cert_Path")); + private UILabel certPathLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Cert_Path")); /** * https 证书路径输入框 */ @@ -207,7 +207,7 @@ public class RemoteEnvPane extends BasicBeanPane { contentPanel.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Config"))) + UITitledBorder.createBorderWithTitle(Toolkit.i18nText("FR-Designer_RemoteEnv_Config"))) ); @@ -218,7 +218,7 @@ public class RemoteEnvPane extends BasicBeanPane { new EmptyBorder(15, 0, 0, 0), BorderFactory.createTitledBorder( new ModLineBorder(ModLineBorder.TOP), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Server") + Toolkit.i18nText("FR-Designer_RemoteEnv_Server") ) ) ); @@ -237,7 +237,7 @@ public class RemoteEnvPane extends BasicBeanPane { new EmptyBorder(15, 0, 0, 0), BorderFactory.createTitledBorder( new ModLineBorder(ModLineBorder.TOP), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Platform_Account") + Toolkit.i18nText("FR-Designer_RemoteEnv_Platform_Account") ) )); @@ -248,9 +248,9 @@ public class RemoteEnvPane extends BasicBeanPane { JPanel testPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); testPanel.setBorder(BorderFactory.createEmptyBorder()); testPanel.setPreferredSize(new Dimension(437, 20)); - UIButton testConnectionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Test_Connection")); + UIButton testConnectionButton = new UIButton(Toolkit.i18nText("FR-Designer_RemoteEnv_Test_Connection")); - testConnectionButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); + testConnectionButton.setToolTipText(Toolkit.i18nText("Datasource-Test_Connection")); testConnectionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ev) { @@ -323,19 +323,19 @@ public class RemoteEnvPane extends BasicBeanPane { // 主机名 - UILabel hostNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Host_IP")); + UILabel hostNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Host_IP")); hostNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 端口 - UILabel portLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Port")); + UILabel portLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Port")); portLabel.setHorizontalAlignment(SwingConstants.RIGHT); // web应用 - UILabel webAppNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Web_Name")); + UILabel webAppNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Web_Name")); webAppNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // servlet - UILabel servletNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Servlet_Name")); + UILabel servletNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Servlet_Name")); servletNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 主机位置 - UILabel remoteEnvURLLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_URL")); + UILabel remoteEnvURLLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_URL")); remoteEnvURLLabel.setHorizontalAlignment(SwingConstants.RIGHT); enableSubDocListener(); @@ -359,7 +359,7 @@ public class RemoteEnvPane extends BasicBeanPane { JTextPane urlTipsPane = new JTextPane(); urlTipsPane.setEditable(false); - urlTipsPane.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Server_Config_Tips")); + urlTipsPane.setText(Toolkit.i18nText("FR-Designer_RemoteEnv_Server_Config_Tips")); urlTipsPane.setBackground(urlPanel.getBackground()); urlTipsPane.setForeground(TIPS_FONT_COLOR); @@ -373,7 +373,7 @@ public class RemoteEnvPane extends BasicBeanPane { JTextPane httpsTipsPane = new JTextPane(); httpsTipsPane.setEditable(false); - httpsTipsPane.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Tips")); + httpsTipsPane.setText(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Tips")); httpsTipsPane.setBackground(configPanel.getBackground()); httpsTipsPane.setForeground(TIPS_FONT_COLOR); @@ -441,18 +441,18 @@ public class RemoteEnvPane extends BasicBeanPane { private void packAccountPanel(JPanel accountPanel) { // 用户名 - UILabel userNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Username")); + UILabel userNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Username")); userNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 密码 - UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Password")); + UILabel passwordLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Password")); passwordLabel.setHorizontalAlignment(SwingConstants.RIGHT); //输入密码的时候检测下大写锁定 passwordInput.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - if (Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) { - passwordInput.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("CapsLock")); + if (java.awt.Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) { + passwordInput.setToolTipText(Toolkit.i18nText("CapsLock")); } else { passwordInput.setToolTipText(null); } @@ -512,7 +512,7 @@ public class RemoteEnvPane extends BasicBeanPane { try { return WorkContext.getConnector().testConnection(connection); } catch (AuthException e) { - message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); return null; } @@ -523,16 +523,16 @@ public class RemoteEnvPane extends BasicBeanPane { okButton.setEnabled(true); try { if (get()) { - message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); } else { - message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } } catch (InterruptedException | ExecutionException e) { FineLoggerFactory.getLogger().error(e, e.getMessage()); - message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } dialogDownPane.remove(cancelButton); @@ -568,11 +568,11 @@ public class RemoteEnvPane extends BasicBeanPane { } private void initMessageDialog() { - message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "..."); + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "..."); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); - dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"), true); + dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Datasource-Test_Connection"), true); dialog.setSize(new Dimension(268, 118)); okButton.setEnabled(false); From 17c81aba0b931b2e5e790012342b4e1984522efe Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Fri, 3 Aug 2018 13:57:31 +0800 Subject: [PATCH 7/8] =?UTF-8?q?REPORT-10263=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=9D=83=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?= =?UTF-8?q?10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/gui/itree/filetree/FileTreeIcon.java | 13 ++++++++++--- .../gui/modern_style_cht_file_icon_16x16.png | Bin 0 -> 609 bytes .../gui/modern_style_cpt_file_icon_16x16.png | Bin 0 -> 564 bytes .../gui/modern_style_frm_file_icon_16x16.png | Bin 0 -> 497 bytes 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java index 5647033cc..130240aea 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java @@ -37,6 +37,13 @@ public class FileTreeIcon { public static final Icon FRM_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/frm.png"); public static final Icon CHT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cht.png"); + public static final Icon MODERN_CPT_FILE_IMAGE_ICON = + BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png"); + public static final Icon MODERN_FRM_FILE_IMAGE_ICON = + BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png"); + public static final Icon MODERN_CHT_FILE_IMAGE_ICON = + BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png"); + public static final LockIcon FOLDER_LOCK_ICON = new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/fold.png")); public static final LockIcon FILE_LOCK_ICON = @@ -205,19 +212,19 @@ public class FileTreeIcon { if (isLocked) { return FileTreeIcon.CPT_FILE_LOCK_ICON; } else { - return FileTreeIcon.CPT_FILE_IMAGE_ICON; + return FileTreeIcon.MODERN_CPT_FILE_IMAGE_ICON; } } else if (fileType == FRM_FILE) { //form frm if (isLocked) { return FileTreeIcon.FRM_FILE_LOCK_ICON; } else { - return FileTreeIcon.FRM_FILE_IMAGE_ICON; + return FileTreeIcon.MODERN_FRM_FILE_IMAGE_ICON; } } else if (fileType == CHT_FILE) { //chart cht if (isLocked) { return FileTreeIcon.CHT_FILE_LOCK_ICON; } else { - return FileTreeIcon.CHT_FILE_IMAGE_ICON; + return FileTreeIcon.MODERN_CHT_FILE_IMAGE_ICON; } } else { if (isLocked) { diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e244a9bb22c865e7a4cae47caaefd0f32d4443 GIT binary patch literal 609 zcmV-n0-pVeP)Px%8%ab#R5%fRQ@w5zK@k4-e(cK`qX?oi%0+|}2vJec_FtOOPTCHxk+wC`==UvFM?A%~B&>JCwC3;`?apQ}^ePL5JfNL3$wgH3mRVe@*XGaL4LtIJL zK$ltdFRV3*XLkkhY6_E1E11r@{nHCxO663A40%qBQ$>`N#EH^F(@vpG@MX3&JxsFnh);v zRiU=UY&PTIy=JrdknB2`{j|4j+i?&C6LKs(CMJyAyWj7>YPDLADdsl^E<_W-&zXqv v=}p*i94~D8UoMyV`HF70dq^A0M%wrTVkY8~k<`H&00000NkvXXu0mjfK)Vx1 literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..15966d96d17a8445fa9d06fe635d1c03cbaae870 GIT binary patch literal 564 zcmV-40?Yl0P)Px$?ny*JR5%fZQ_X4FO$h6O-wNa6GziUyATNx5ex)e=^F&A572FwUHBSq zeSo|{1!=bt#D%RJT_p?*g0>oGGBG!EJ!jep(_~5yT<$$T-*>-z4p#x$U@*|?^?G$W zoht0#WR_(~&+~ru`~8K^#m#23Ua3?*+O}OtgIC$)WzzTkK-cvrF&)yt&oy5@L1j@_7m<5J3q_rL!l9K847FC^q`3$8Dqk(6)&>}?mZ+bS$; zxqeB&4%@rWXLx(`15Y260n5Pm--3!H5lD;!Vp*|7)iUhyo30-+VitwzcV!Nb6 zAr-7-)z%akDpk=s@j{%q0k$?xJnB>trJIprStCet2C3Mvbd>Yjl}0A{WX~oL5qeGu zgTBLJu>a{C6w0)00&18>-PtT?F-Va7)`pH3cdkr1&aDybJ+9(;tB9(70p_YV4@)qj zIqq2kVJIMkFjSSbWsLD|*#NJ!?byKS*Khc;h>*|ci6s0`tJQvT&Dt2#z~nrq5eQnQ zX@dUCVGsnb+wHc$N^mWirfKobv)SyB&M$kt-dRE(_aK+cN%{}|Xf(QJ+E7ULF}?d$ zr_(u4z`VzepnsqbhrwRP`TQR?@1>^Bmy}Te0000Px$t4TybR5%fZlg&=TKoG~LA5e-~q6cUQ9P|YUG4VjsBdpc<{_~sNsRC%j;ZU<}`yvcOh1SQ+G|hB2n|%%j zgG49iR;y)Omi1OeOVjjVyrL-Zji&4R4LW*4!1sN%-EN-%)|UK2_o2x(X*6hX840ORzLKJDn8>0+zz-M+A&3KpEwss_Jn9 zj)Y-M+DaiC?e1HlgsYkgkNpa4k`U(e@YkQv<2VMQkgXtaX4QZ(6Xb@Vi(`xle0m8S zB@_}*Q4q*#ma|asWHJHHIT(h4&%A!F*Xs-N$@9oj(wqn=n8dNsM%c;sola-9FYvFJ zrfE>A;Js`%Bb?tlj`Nl2ixN;d#s6XDx^BKpGB11*#D2lL@4DUYa Date: Fri, 3 Aug 2018 14:28:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=97=A0=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/env/RemoteEnvPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index edd3589a7..15a46f8b5 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -65,8 +65,8 @@ public class RemoteEnvPane extends BasicBeanPane { private JDialog dialog; private UILabel message = new UILabel(); - private UIButton okButton = new UIButton(Toolkit.i18nText("OK")); - private UIButton cancelButton = new UIButton(Toolkit.i18nText("Cancel")); + private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); + private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_Cancel")); private UILabel uiLabel = new UILabel(); /**