From 549f7c324993a27c013594eb95a1971f21a52e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pe=C3=B1uela?= Date: Thu, 11 Oct 2012 14:00:08 -0500 Subject: [PATCH] IDEMPIERE-77 Start on the left, Cancel on the right --- org.adempiere.install/install.app.launch | 2 +- .../org/compiere/install/KeyStoreDialog.java | 16 +++-- .../compiere/install/util/ConfirmPanel.java | 11 +++- .../server.product.launch | 66 +++++++++---------- .../adwindow/AbstractADWindowContent.java | 5 +- .../adempiere/webui/apps/ProcessDialog.java | 8 ++- .../webui/apps/ProcessModalDialog.java | 6 +- .../webui/component/ConfirmPanel.java | 8 +-- .../adempiere/webui/component/Messagebox.java | 6 +- .../webui/panel/CustomizeGridViewPanel.java | 4 +- .../adempiere/webui/panel/WAttachment.java | 3 +- .../webui/window/WLocatorDialog.java | 8 +-- .../adempiere/webui/window/WMediaDialog.java | 8 +-- 13 files changed, 84 insertions(+), 67 deletions(-) diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 13ba2d1018..b6a0ca30cd 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -19,7 +19,7 @@ - + diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java b/org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java index 6bbdbc6e90..f1f3c4fc96 100644 --- a/org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java +++ b/org.adempiere.install/src/org/compiere/install/KeyStoreDialog.java @@ -23,6 +23,7 @@ import java.awt.HeadlessException; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFrame; @@ -86,11 +87,14 @@ 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); - - private JButton bOK = ConfirmPanel.createOKButton("OK"); - private JButton bCancel = ConfirmPanel.createCancelButton("Cancel"); + // Invert OK/Cancel IDEMPIERE-77 + private JButton bOK = ConfirmPanel.createOKButton(""); + private JButton bCancel = ConfirmPanel.createCancelButton(""); private boolean m_ok = false; + + + /** * Static Layout */ @@ -115,12 +119,14 @@ public class KeyStoreDialog extends JDialog implements ActionListener getContentPane().add (panel, BorderLayout.CENTER); // JPanel confirmPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - confirmPanel.add(bCancel); + // Invert OK/Cancel IDEMPIERE-77 confirmPanel.add(bOK); + confirmPanel.add(bCancel); getContentPane().add (confirmPanel, BorderLayout.SOUTH); // - bCancel.addActionListener(this); bOK.addActionListener(this); + bCancel.addActionListener(this); + } // jbInit /** diff --git a/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java b/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java index 235c0fc327..07d4a5f389 100644 --- a/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java +++ b/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java @@ -24,6 +24,7 @@ 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; @@ -48,7 +49,8 @@ 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 @@ -61,6 +63,7 @@ public final class ConfirmPanel extends JPanel JButton button = (JButton)aa.getButton(); button.setMargin(s_insets); button.setDefaultCapable(true); + button.setIcon(ImagenOk); return button; } // createOKButton @@ -86,6 +89,7 @@ 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 @@ -494,10 +498,11 @@ public final class ConfirmPanel extends JPanel // JPanel okCancel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); okCancel.setOpaque(false); - bCancel = createCancelButton(withText); - okCancel.add(bCancel); + // Invert OK/Cancel IDEMPIERE-77 bOK = createOKButton(withText); okCancel.add(bOK); + bCancel = createCancelButton(withText); + okCancel.add(bCancel); setCancelVisible(withCancelButton); this.add(okCancel, BorderLayout.EAST); // diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 86d7eb4330..c9fc508ee6 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index 931fd81560..be1f4941ee 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -1903,7 +1903,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements div.appendChild(hbox); Button btnOk = new Button(); - btnOk.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "OK"))); + // Invert - Unify OK/Cancel IDEMPIERE-77 + //btnOk.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "OK"))); btnOk.setImage("/images/Ok16.png"); btnOk.addEventListener(Events.ON_CLICK, new EventListener() { @@ -1953,7 +1954,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements hbox.appendChild(btnOk); Button btnCancel = new Button(); - btnCancel.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Cancel"))); + //btnCancel.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Cancel"))); btnCancel.setImage("/images/Cancel16.png"); btnCancel.addEventListener(Events.ON_CLICK, new EventListener() { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java index 3c565a0d63..aa785b23d4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java @@ -168,15 +168,17 @@ public class ProcessDialog extends Window implements EventListener, IProc Div div = new Div(); Hbox hbox = new Hbox(); String label = Msg.getMsg(Env.getCtx(), "Start"); - bOK = new Button(label.replaceAll("&", "")); + // Invert - Unify OK/Cancel IDEMPIERE-77 + //bOK = new Button(label.replaceAll("&", "")); + bOK = new Button(); bOK.setImage("/images/Ok16.png"); bOK.setId("Ok"); bOK.addEventListener(Events.ON_CLICK, this); bOK.setSclass("action-image-text-button"); hbox.appendChild(bOK); - label = Msg.getMsg(Env.getCtx(), "Cancel"); - Button btn = new Button(label.replaceAll("&", "")); + //label = Msg.getMsg(Env.getCtx(), "Cancel"); + Button btn = new Button(); btn.setImage("/images/Cancel16.png"); btn.setId("Cancel"); btn.addEventListener(Events.ON_CLICK, this); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java index 2ddcd6ab6c..2aa9899175 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java @@ -174,13 +174,15 @@ public class ProcessModalDialog extends Window implements EventListener, Hbox hbox = new Hbox(); hbox.setWidth("100%"); hbox.setStyle("margin-top: 10px"); - Button btn = new Button("Ok"); + Button btn = new Button(""); + btn.setImage("/images/Ok24.png"); LayoutUtils.addSclass("action-text-button", btn); btn.setId("Ok"); btn.addEventListener(Events.ON_CLICK, this); hbox.appendChild(btn); - btn = new Button("Cancel"); + btn = new Button(""); + btn.setImage("/images/Cancel24.png"); btn.setId("Cancel"); LayoutUtils.addSclass("action-text-button", btn); btn.addEventListener(Events.ON_CLICK, this); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java index 2ec6451698..5facd56c37 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java @@ -56,7 +56,7 @@ public final class ConfirmPanel extends Hbox public static final String A_HISTORY = "History"; /** Action String Zoom. */ public static final String A_ZOOM = "Zoom"; - + /** Action String Process. */ public static final String A_PROCESS = "Process"; /** Action String Print. */ @@ -171,11 +171,11 @@ public final class ConfirmPanel extends Hbox init(); + addComponentsRight(createButton(A_OK)); + setVisible(A_CANCEL, withCancelButton); if (withCancelButton) - addComponentsRight(createButton(A_CANCEL)); - - addComponentsRight(createButton(A_OK)); + addComponentsRight(createButton(A_CANCEL)); if (withRefreshButton) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java index 27472b251e..7643c79d98 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java @@ -112,13 +112,13 @@ public class Messagebox extends Window implements EventListener Properties ctx = Env.getCtx(); lblMsg.setEncode(false); lblMsg.setValue(msg); - - btnOk.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "OK"))); + // Invert - Unify OK/Cancel IDEMPIERE-77 + //btnOk.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "OK"))); btnOk.setImage("/images/Ok16.png"); btnOk.addEventListener(Events.ON_CLICK, this); LayoutUtils.addSclass("action-text-button", btnOk); - btnCancel.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "Cancel"))); + //btnCancel.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "Cancel"))); btnCancel.setImage("/images/Cancel16.png"); btnCancel.addEventListener(Events.ON_CLICK, this); LayoutUtils.addSclass("action-text-button", btnCancel); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java index 1ad3734235..a1d6f0b0f1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java @@ -271,7 +271,7 @@ public class CustomizeGridViewPanel extends Panel southPanel.setAlign("Right"); southPanel.setStyle("margin-top: 2px; margin-right: 4px"); String label = Msg.getMsg(Env.getCtx(), "save"); - Button bOK = new Button(label); + Button bOK = new Button(); bOK.setImage("/images/Ok16.png"); bOK.setId("Ok"); EventListener onClickListener = new EventListener() @@ -290,7 +290,7 @@ public class CustomizeGridViewPanel extends Panel bOK.setSclass("action-button"); southPanel.appendChild(bOK); label = Msg.getMsg(Env.getCtx(), "Cancel"); - Button btn = new Button(label.replaceAll("&", "")); + Button btn = new Button(); btn.setImage("/images/Cancel16.png"); btn.setId("Cancel"); EventListener onClickCancelListener = new EventListener() diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java index 7cc87033c6..09b6488c99 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java @@ -291,8 +291,9 @@ public class WAttachment extends Window implements EventListener confirmPanel.appendChild(bDeleteAll); confirmPanel.appendChild(bRefresh); - confirmPanel.appendChild(bCancel); confirmPanel.appendChild(bOk); + confirmPanel.appendChild(bCancel); + text.setTooltiptext(Msg.getElement(Env.getCtx(), "TextMsg")); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java index 142f2b92c3..eefbae2304 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java @@ -254,15 +254,15 @@ public class WLocatorDialog extends Window implements EventListener boxButtons.setWidth("100%"); boxButtons.setStyle("padding: 5px;"); boxButtons.setPack("end"); + + btnOk.setImage("/images/Ok16.png"); + btnOk.addEventListener(Events.ON_CLICK, this); btnCancel.setImage("/images/Cancel16.png"); btnCancel.addEventListener(Events.ON_CLICK, this); - btnOk.setImage("/images/Ok16.png"); - btnOk.addEventListener(Events.ON_CLICK, this); - - boxButtons.appendChild(btnCancel); boxButtons.appendChild(btnOk); + boxButtons.appendChild(btnCancel); mainBox.setWidth("250px"); mainBox.setStyle("text-align:right"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java index 36c1a1e2ce..ce4aee7799 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java @@ -180,14 +180,14 @@ public class WMediaDialog extends Window implements EventListener southPane.appendChild(confirmPanel); southPane.setHeight("30px"); - bCancel.setImage("/images/Cancel24.png"); - bCancel.addEventListener(Events.ON_CLICK, this); - bOk.setImage("/images/Ok24.png"); bOk.addEventListener(Events.ON_CLICK, this); + + bCancel.setImage("/images/Cancel24.png"); + bCancel.addEventListener(Events.ON_CLICK, this); - confirmPanel.appendChild(bCancel); confirmPanel.appendChild(bOk); + confirmPanel.appendChild(bCancel); addEventListener(Events.ON_UPLOAD, this); }