From 859500f8a67e3779db7f7f103bd54a8af9fe8f52 Mon Sep 17 00:00:00 2001 From: xiqiu Date: Thu, 13 Jan 2022 15:19:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-64012=20=E4=BC=98=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/connect/JDBCDefPane.java | 6 +++++- .../com/fr/design/data/datapane/connect/SshPane.java | 5 ++++- .../com/fr/design/data/datapane/connect/SslPane.java | 11 ++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index d735eb0b6..e8c7c17b8 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -6,6 +6,7 @@ import com.fr.data.driver.config.DriverLoaderConfig; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.solution.entity.DriverClasses; import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxUI; @@ -29,6 +30,7 @@ import com.fr.third.guava.collect.HashBiMap; import com.fr.workspace.WorkContext; import javax.swing.BorderFactory; +import javax.swing.ImageIcon; import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.swing.JPasswordField; @@ -195,7 +197,9 @@ public class JDBCDefPane extends JPanel { userNameTextField = new UITextField(15); userNameTextField.setName(USER_NAME); passwordTextField = new UIPasswordFieldWithFixedLength(15); - dbtypeButton = new UIButton("."); + dbtypeButton = new UIButton(); + dbtypeButton.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); + dbtypeButton.setPreferredSize(new Dimension(20, 20)); dbtypeButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL")); dbtypeButton.addActionListener(dbtypeButtonActionListener); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java index 16374bd5c..5e3122085 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java @@ -8,6 +8,7 @@ import com.fr.data.security.ssh.SshType; import com.fr.data.security.ssh.impl.KeyVerifySsh; import com.fr.data.security.ssh.impl.NormalSsh; import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.editor.NotNegativeIntegerEditor; import com.fr.design.gui.ibutton.UIButton; @@ -27,6 +28,7 @@ import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; import com.fr.third.guava.collect.HashBiMap; +import javax.swing.ImageIcon; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.SwingConstants; @@ -70,10 +72,11 @@ public class SshPane extends BasicPane { private double p = TableLayout.PREFERRED; private double f = TableLayout.FILL; private JPanel jPanel; - private UIButton fileChooserButton = new UIButton("..."); + private UIButton fileChooserButton = new UIButton(); private double[] columnSize = new double[]{208, p}; public SshPane() { + fileChooserButton.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Ssh_Settings"))); this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); typeMap.keySet().forEach(key -> type.addItem(key)); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java index e50d95edc..801c44144 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java @@ -6,6 +6,7 @@ import com.fr.data.security.ssl.SslException; import com.fr.data.security.ssl.SslType; import com.fr.data.security.ssl.impl.NormalSsl; import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.connect.SshPane.KeyFileUITextField; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; @@ -22,6 +23,7 @@ import com.fr.file.filter.ChooseFileFilter; import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; +import javax.swing.ImageIcon; import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; @@ -40,11 +42,11 @@ import static com.fr.design.i18n.Toolkit.i18nText; public class SslPane extends BasicPane { UICheckBox usingSsl = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Using")); private KeyFileUITextField keyPathCa = new KeyFileUITextField(); - private UIButton fileChooserButtonCa = new UIButton("..."); + private UIButton fileChooserButtonCa = new UIButton(); private KeyFileUITextField keyPathClientCert = new KeyFileUITextField(); - private UIButton fileChooserButtonClientCert = new UIButton("..."); + private UIButton fileChooserButtonClientCert = new UIButton(); private KeyFileUITextField keyPathClientKey = new KeyFileUITextField(); - private UIButton fileChooserButtonClientKey = new UIButton("..."); + private UIButton fileChooserButtonClientKey = new UIButton(); private UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca")); private UITextField cipher = new UITextField(); private JPanel jPanel; @@ -55,6 +57,9 @@ public class SslPane extends BasicPane { private double[] columnSize = new double[]{208, p}; public SslPane() { + fileChooserButtonCa.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); + fileChooserButtonClientCert.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); + fileChooserButtonClientKey.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Ssl_Settings"))); this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();