From 68aa6746857175807bfb2d795d36a2919d70eea9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 22 Aug 2018 22:04:25 +0000 Subject: [PATCH] case 3646 --- source/WinFormApp/ReportEditor.cs | 19 ++++++++++++++----- source/WinFormApp/ReportEditor2.cs | 17 ++++++++++++----- source/WinFormApp/Util.cs | 13 +++++++------ source/ri/ri/ReportView.aspx.cs | 11 ++++++----- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/source/WinFormApp/ReportEditor.cs b/source/WinFormApp/ReportEditor.cs index a713f91..b5ae989 100644 --- a/source/WinFormApp/ReportEditor.cs +++ b/source/WinFormApp/ReportEditor.cs @@ -210,8 +210,9 @@ namespace AyaNova mxr.DesignerLoaded += new DesignerLoadedEventHandler(r_DesignerLoaded); - if (AyaBizUtils.Trial) - Util.WatermarkReport(mxr, true); + //case 3646 removed + //if (AyaBizUtils.Trial) + // Util.WatermarkReport(mxr, true); //mxr.ExportOptions.Email.RecipientAddress = strEmail; @@ -278,7 +279,10 @@ namespace AyaNova if (bReportLayoutIsDirty) { MemoryStream mStream = new MemoryStream(); - if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + + //case 3646 + //if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + //Case 232 //xrDesignPanel1.Report.SaveState(mStream); xrDesignPanel1.Report.SaveLayout(mStream); @@ -318,7 +322,10 @@ namespace AyaNova if (bReportLayoutIsDirty) { MemoryStream mStream = new MemoryStream(); - if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + + //case 3646 removed + //if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + //Case 232 //xrDesignPanel1.Report.SaveState(mStream); xrDesignPanel1.Report.SaveLayout(mStream); @@ -353,7 +360,9 @@ namespace AyaNova { //Save before exit MemoryStream mStream = new MemoryStream(); - if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + + //case 3646 removed + //if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); //Case 232 //xrDesignPanel1.Report.SaveState(mStream); diff --git a/source/WinFormApp/ReportEditor2.cs b/source/WinFormApp/ReportEditor2.cs index 0f43659..9ce2105 100644 --- a/source/WinFormApp/ReportEditor2.cs +++ b/source/WinFormApp/ReportEditor2.cs @@ -215,8 +215,9 @@ namespace AyaNova mxr.DesignerLoaded += new DesignerLoadedEventHandler(r_DesignerLoaded); - if (AyaBizUtils.Trial) - Util.WatermarkReport(mxr, true); + //case 3646 removed + //if (AyaBizUtils.Trial) + // Util.WatermarkReport(mxr, true); //xrDesignMdiController1.OpenReport(mxr); @@ -283,7 +284,9 @@ namespace AyaNova if (bReportLayoutIsDirty) { MemoryStream mStream = new MemoryStream(); - if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + + //case 3646 removed + //if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); xrDesignPanel1.Report.SaveLayout(mStream); @@ -327,7 +330,9 @@ namespace AyaNova if (bReportLayoutIsDirty) { MemoryStream mStream = new MemoryStream(); - if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + + //case 3646 removed + //if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); xrDesignPanel1.Report.SaveLayout(mStream); @@ -362,7 +367,9 @@ namespace AyaNova { //Save before exit MemoryStream mStream = new MemoryStream(); - if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); + + //case 3646 removed + //if (AyaBizUtils.Trial) Util.WatermarkReport(mxr, false); xrDesignPanel1.Report.SaveLayout(mStream); diff --git a/source/WinFormApp/Util.cs b/source/WinFormApp/Util.cs index da11a7f..2edc308 100644 --- a/source/WinFormApp/Util.cs +++ b/source/WinFormApp/Util.cs @@ -5802,13 +5802,14 @@ At first I was happy to find your code that solved my problem, but I did not lik } } - - if(AyaBizUtils.Trial) - { - WatermarkReport(x,true); - x.PrintingSystem.SetCommandVisibility(DevExpress.XtraPrinting.PrintingSystemCommand.Watermark,DevExpress.XtraPrinting.CommandVisibility.None); - } + + //case 3646 removed + //if(AyaBizUtils.Trial) + //{ + // WatermarkReport(x,true); + // x.PrintingSystem.SetCommandVisibility(DevExpress.XtraPrinting.PrintingSystemCommand.Watermark,DevExpress.XtraPrinting.CommandVisibility.None); + //} //case 1039 //log.Debug("ReportHandleToolClick: Initialization complete, displaying report"); diff --git a/source/ri/ri/ReportView.aspx.cs b/source/ri/ri/ReportView.aspx.cs index e848d3e..3ae9e89 100644 --- a/source/ri/ri/ReportView.aspx.cs +++ b/source/ri/ri/ReportView.aspx.cs @@ -99,11 +99,12 @@ namespace ri } } - - if (AyaBizUtils.Trial) - { - WatermarkReport(x, true); - } + + //case 3646 removed + //if (AyaBizUtils.Trial) + //{ + // WatermarkReport(x, true); + //} //pass it to the viewer component this.ReportViewer1.Report = x;