From 7eb00b551e64adcf960194d65dc682a5cec57dc8 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 22 Mar 2007 16:05:18 +0000 Subject: [PATCH] * [ 1684137 ] File Logout is not closing Viewer windows --- client/src/org/compiere/apps/AEnv.java | 2 +- client/src/org/compiere/print/AReport.java | 3 ++- client/src/org/compiere/print/Viewer.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/org/compiere/apps/AEnv.java b/client/src/org/compiere/apps/AEnv.java index a7567c0138..dc4f78cbed 100644 --- a/client/src/org/compiere/apps/AEnv.java +++ b/client/src/org/compiere/apps/AEnv.java @@ -315,7 +315,7 @@ public final class AEnv } else if (actionCommand.equals("Logout")) { - AMenu aMenu = (AMenu)Env.getWindow(WindowNo); + AMenu aMenu = (AMenu)Env.getWindow(0); aMenu.logout(); } diff --git a/client/src/org/compiere/print/AReport.java b/client/src/org/compiere/print/AReport.java index c483fb98e7..be58321d29 100644 --- a/client/src/org/compiere/print/AReport.java +++ b/client/src/org/compiere/print/AReport.java @@ -211,7 +211,8 @@ public class AReport implements ActionListener { // It's a default report using the standard printing engine ReportEngine re = new ReportEngine (Env.getCtx(), pf, m_query, info); - new Viewer(re); + Viewer viewer = new Viewer(re); + AEnv.addToWindowManager(viewer); } // if (m_popup.isVisible()) // m_popup.setVisible(false); diff --git a/client/src/org/compiere/print/Viewer.java b/client/src/org/compiere/print/Viewer.java index b63ce70bd4..6ea5d00e8e 100644 --- a/client/src/org/compiere/print/Viewer.java +++ b/client/src/org/compiere/print/Viewer.java @@ -386,6 +386,7 @@ public class Viewer extends CFrame AEnv.addMenuItem("Export", null, null, mFile, this); mFile.addSeparator(); AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), mFile, this); + AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); // View