Browse Source

Pull request #3988: REPORT-51103 优化展示效果;改个报错日志,方便定位问题

Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0

* commit '7149acf78ce26599aa5b0270cc812e68d3ea4ee2':
  REPORT-51103  改个日志方便定位问题
  REPORT-51103  优化界面显示
  REPORT-51103 加上遗漏的mysql另一种驱动;优化展示效果
feature/10.0
Xiqiu 4 years ago
parent
commit
c86c59b2c7
  1. 10
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java

10
designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@ -99,7 +99,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
protected void done() { protected void done() {
try { try {
get(); get();
dialog.setSize(new Dimension(380, 118)); dialog.setSize(new Dimension(380, 125));
okButton.setEnabled(true); okButton.setEnabled(true);
uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully")); message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
@ -210,7 +210,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail")); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right")); directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
} else { } else {
dialog.setSize(new Dimension(380, 260)); dialog.setSize(new Dimension(380, 270));
hiddenPanel.setVisible(true); hiddenPanel.setVisible(true);
detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail")); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail"));
directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down")); directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down"));
@ -349,7 +349,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
okButton.setEnabled(false); okButton.setEnabled(false);
dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true); dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
dialog.setSize(new Dimension(380, 118)); dialog.setSize(new Dimension(380, 125));
okButton.setEnabled(false); okButton.setEnabled(false);
JPanel jp = new JPanel(); JPanel jp = new JPanel();
JPanel upPane = new JPanel(); JPanel upPane = new JPanel();
@ -362,10 +362,10 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right")); directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail")); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
detailLabel.setForeground(Color.BLUE); detailLabel.setForeground(Color.BLUE);
hiddenPanel.setLayout(new BorderLayout(10, 0)); hiddenPanel.setLayout(new BorderLayout(2, 0));
hiddenPanel.add(new JPanel(), BorderLayout.WEST); hiddenPanel.add(new JPanel(), BorderLayout.WEST);
hiddenPanel.add(new JPanel(), BorderLayout.EAST); hiddenPanel.add(new JPanel(), BorderLayout.EAST);
downPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 9)); downPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 15, 9));
downPane.add(okButton); downPane.add(okButton);
downPane.add(cancelButton); downPane.add(cancelButton);
jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS)); jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));

2
designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java

@ -205,7 +205,7 @@ public class UILookAndFeel extends MetalLookAndFeel {
"com/fr/design/images/lookandfeel/" + fileName, UILookAndFeel.class); "com/fr/design/images/lookandfeel/" + fileName, UILookAndFeel.class);
if (url == null) { if (url == null) {
FineLoggerFactory.getLogger().error("Icon directory could not be resolved."); FineLoggerFactory.getLogger().error(fileName + " :Icon directory could not be resolved.");
return null; return null;
} }
} }

Loading…
Cancel
Save