Browse Source

Merging in latest from upstream (BA/design:refs/heads/master)

* commit 'b9f6a92efc7692193c9561a1346d2ff0ac9e4032':
  重命名文件对话框文字居中
  重命名文件对话框文字居中
master
zheng 8 years ago
parent
commit
5a97811f9e
  1. 53
      designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

53
designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -390,36 +390,43 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
jd.setLayout(new GridLayout(2, 2)); jd.setLayout(new GridLayout(2, 2));
jd.setModal(true); jd.setModal(true);
UILabel newNameLabel = new UILabel(Inter.getLocText("FR-Designer_Enter-New-FileName")); UILabel newNameLabel = new UILabel(Inter.getLocText("FR-Designer_Enter-New-FileName"));
// newNameLabel.setBounds(20, 10, 130, 30); newNameLabel.setMinimumSize(new Dimension(150, 27));
newNameLabel.setPreferredSize(new Dimension(150, 20)); newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
jt = new UITextField(oldName); jt = new UITextField(oldName);
jt.getDocument().addDocumentListener(getdoDocumentListener()); jt.getDocument().addDocumentListener(getdoDocumentListener());
jt.selectAll(); jt.selectAll();
// jt.setBounds(130, 15, 150, 20);
jt.setPreferredSize(new Dimension(150, 20)); jt.setPreferredSize(new Dimension(150, 20));
JPanel tmp = new JPanel(); JPanel newNamePanel = new JPanel();
tmp.add(newNameLabel); newNamePanel.setLayout(new BoxLayout(newNamePanel, BoxLayout.X_AXIS));
JPanel newNamePanel = new JPanel(new BorderLayout()); newNamePanel.add(Box.createHorizontalGlue());
newNamePanel.add(tmp, BorderLayout.SOUTH); newNamePanel.add(newNameLabel);
newNamePanel.add(Box.createHorizontalStrut(5));
jd.add(newNamePanel); jd.add(newNamePanel);
tmp = new JPanel(); JPanel jtPanel = new JPanel();
tmp.add(jt); jtPanel.setLayout(new BoxLayout(jtPanel, BoxLayout.Y_AXIS));
JPanel jtPanel = new JPanel(new BorderLayout()); JPanel containJt = new JPanel(new BorderLayout());
jtPanel.add(tmp, BorderLayout.SOUTH); containJt.add(jt, BorderLayout.WEST);
containJt.setMaximumSize(new Dimension(200, 20));
jtPanel.add(Box.createVerticalGlue());
jtPanel.add(containJt);
jtPanel.add(Box.createVerticalGlue());
jd.add(jtPanel); jd.add(jtPanel);
addUITextFieldListener(nodeFile, path); addUITextFieldListener(nodeFile, path);
hintsLabel = new UILabel(); hintsLabel = new UILabel();
hintsLabel.setBounds(20, 50, 250, 30); hintsLabel.setBounds(20, 50, 250, 30);
hintsLabel.setMaximumSize(new Dimension(200, 30));
hintsLabel.setHorizontalAlignment(SwingConstants.RIGHT);
hintsLabel.setForeground(Color.RED); hintsLabel.setForeground(Color.RED);
hintsLabel.setVisible(false); hintsLabel.setVisible(false);
confirmButton = new UIButton(Inter.getLocText("FR-Designer_Confirm")); confirmButton = new UIButton(Inter.getLocText("FR-Designer_Confirm"));
// confirmButton.setBounds(180, 90, 60, 25); confirmButton.setPreferredSize(new Dimension(80, 25));
confirmButton.setPreferredSize(new Dimension(80, 30)); confirmButton.setMinimumSize(new Dimension(80, 25));
confirmButton.setMaximumSize(new Dimension(80, 25));
confirmButton.addActionListener(new ActionListener() { confirmButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
confirmClose(nodeFile, path); confirmClose(nodeFile, path);
@ -427,8 +434,9 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
}); });
UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel")); UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel"));
// cancelButton.setBounds(250, 90, 60, 25); cancelButton.setPreferredSize(new Dimension(80, 25));
cancelButton.setPreferredSize(new Dimension(80, 30)); cancelButton.setMinimumSize(new Dimension(80, 25));
cancelButton.setMaximumSize(new Dimension(80, 25));
cancelButton.addActionListener(new ActionListener() { cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -436,13 +444,18 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
} }
}); });
jd.add(new JPanel()); JPanel hintsPanel = new JPanel();
hintsPanel.setLayout(new BorderLayout());
hintsPanel.add(hintsLabel, BorderLayout.EAST);
jd.add(hintsLabel);
JPanel btPanel = new JPanel(new BorderLayout()); JPanel btPanel = new JPanel(new BorderLayout());
tmp = new JPanel(); btPanel.setLayout(new BoxLayout(btPanel, BoxLayout.X_AXIS));
tmp.add(confirmButton); btPanel.add(Box.createHorizontalGlue());
tmp.add(cancelButton); btPanel.add(confirmButton);
btPanel.add(tmp, BorderLayout.SOUTH); btPanel.add(Box.createHorizontalStrut(5));
btPanel.add(cancelButton);
btPanel.add(Box.createHorizontalStrut(20));
jd.add(btPanel); jd.add(btPanel);
jd.setSize(380, 200); jd.setSize(380, 200);

Loading…
Cancel
Save