From 446b5092ba2924a3afba06c57988411799dd4f09 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 2 Dec 2008 08:28:37 +0000 Subject: [PATCH] - Modified report viewer window to be displayed as an embedded window at the desktop --- .../src/org/adempiere/webui/window/ZkJRViewer.java | 2 +- .../org/adempiere/webui/window/ZkJRViewerProvider.java | 8 ++++---- .../adempiere/webui/window/ZkReportViewerProvider.java | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java index 6a76ea2b26..dfc72f4a7e 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java @@ -60,5 +60,5 @@ public class ZkJRViewer extends Window { this.appendChild(grid); this.setBorder("normal"); - } + } } diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java index bdb514b8cf..9d2324cb31 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java @@ -3,8 +3,8 @@ package org.adempiere.webui.window; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperPrint; -import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.component.Window; +import org.adempiere.webui.session.SessionManager; import org.compiere.report.JRViewerProvider; public class ZkJRViewerProvider implements JRViewerProvider { @@ -12,10 +12,10 @@ public class ZkJRViewerProvider implements JRViewerProvider { public void openViewer(JasperPrint jasperPrint, String title) throws JRException { Window viewer = new ZkJRViewer(jasperPrint, title); - viewer.setAttribute("mode", "modal"); - viewer.setClosable(true); viewer.setWidth("95%"); - AEnv.showWindow(viewer); + + viewer.setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED); + SessionManager.getAppDesktop().showWindow(viewer); } } diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java index 249195dbe2..d51d92ec68 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java @@ -30,8 +30,6 @@ public class ZkReportViewerProvider implements ReportViewerProvider { public void openViewer(ReportEngine report) { Window viewer = new ZkReportViewer(report, report.getName()); - viewer.setAttribute("mode", "overlapped"); - viewer.setClosable(true); viewer.setWidth("95%"); viewer.setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED);