midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 40378f0fdaec

This commit is contained in:
Heng Sin Low 2013-01-23 11:03:50 +08:00
parent 69022d906e 573e919b3a
commit d8ab6df543
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java
View File

@ -86,13 +86,10 @@ public class KeyStoreDialog extends JDialog implements ActionListener
private JTextField fS = new JTextField(20);
private JLabel lC = new JLabel("(C) Country (2 Char)");
private JTextField fC = new JTextField(2);
// Invert OK/Cancel IDEMPIERE-77
private JButton bOK = ConfirmPanel.createOKButton("");
private JButton bCancel = ConfirmPanel.createCancelButton("");
private boolean m_ok = false;
private JButton bOK = ConfirmPanel.createOKButton("OK");
private JButton bCancel = ConfirmPanel.createCancelButton("Cancel");
private boolean m_ok = false;
/**
* Static Layout
@ -118,14 +115,12 @@ public class KeyStoreDialog extends JDialog implements ActionListener
getContentPane().add (panel, BorderLayout.CENTER);
//
JPanel confirmPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
// Invert OK/Cancel IDEMPIERE-77
confirmPanel.add(bOK);
confirmPanel.add(bCancel);
getContentPane().add (confirmPanel, BorderLayout.SOUTH);
//
bOK.addActionListener(this);
bCancel.addActionListener(this);
bOK.addActionListener(this);
} // jbInit
/**

7
org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java
View File

@ -24,7 +24,6 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFrame;
@ -49,8 +48,7 @@ public final class ConfirmPanel extends JPanel
*
*/
private static final long serialVersionUID = 6041019802043360966L;
private static ImageIcon ImagenCancel = new ImageIcon("/images/Cancel24.png");
private static ImageIcon ImagenOk = new ImageIcon("/images/Ok24.png");
/**
* Create OK Button with label text and F4 Shortcut
@ -63,7 +61,6 @@ public final class ConfirmPanel extends JPanel
JButton button = (JButton)aa.getButton();
button.setMargin(s_insets);
button.setDefaultCapable(true);
button.setIcon(ImagenOk);
return button;
} // createOKButton
@ -89,7 +86,6 @@ public final class ConfirmPanel extends JPanel
AppsAction aa = new AppsAction (A_CANCEL, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), text);
JButton button = (JButton)aa.getButton();
button.setMargin(s_insets);
button.setIcon(ImagenCancel);
return button;
} // createCancelButton
@ -498,7 +494,6 @@ public final class ConfirmPanel extends JPanel
//
JPanel okCancel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
okCancel.setOpaque(false);
// Invert OK/Cancel IDEMPIERE-77
bOK = createOKButton(withText);
okCancel.add(bOK);
bCancel = createCancelButton(withText);

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -992,6 +992,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
public void onEvent(Event event) throws Exception
{
m_createNew = false;
if (Events.ON_SELECT.equals(event.getName()))
{
if (event.getTarget() instanceof Listbox)