diff --git a/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd b/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd index eecfab4742..d625aa2bac 100644 --- a/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd +++ b/samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd @@ -4,7 +4,6 @@ Microsoft Sans Serif, 10pt FormSheet - D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\FormSheet\JCA.srd 50 True @@ -43,7 +42,7 @@ False Window ..\..\Logos\Bannerbeige2.gif - D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif + D:\SharpDevelop3.0_WorkingCopy\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif 50, 50 diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs index 30d364a019..2ec64c4647 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs @@ -84,20 +84,26 @@ namespace ICSharpCode.Reports.Addin private static void Absolut2RelativePath (BaseSection section, string fileName) { + foreach (Control item in section.Controls) { BaseImageItem baseImageItem = item as BaseImageItem; if (baseImageItem != null) { baseImageItem.ReportFileName = fileName; if (Path.IsPathRooted(baseImageItem.ImageFileName)) { + Console.WriteLine("Absolut2RelativePath"); + Console.WriteLine("Image Filename {0}",fileName); + Console.WriteLine("Image Filename {0}",baseImageItem.ImageFileName); string d = ICSharpCode.Reports.Core.FileUtility.GetRelativePath( Path.GetDirectoryName(fileName), Path.GetDirectoryName(baseImageItem.ImageFileName)); baseImageItem.RelativeFileName = d + Path.DirectorySeparatorChar + Path.GetFileName(baseImageItem.ImageFileName); + Console.WriteLine("Rel Filename {0}",baseImageItem.RelativeFileName); } } } + Console.WriteLine(""); } private static void old_Absolut2RelativePath (BaseSection section, string fileName) diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs index 7d6f999583..48b2e2fa53 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs @@ -62,23 +62,21 @@ namespace ICSharpCode.Reports.Addin this.ClientRectangle.Bottom -1); base.DrawControl(graphics,rect); - if (this.Image != null) { - - if (this.scaleImageToSize) { - graphics.DrawImageUnscaled(this.Image,this.Location.X,this.Location.Y); - } else { - graphics.DrawImage(this.Image,this.ClientRectangle); - } + if (this.scaleImageToSize) { + graphics.DrawImageUnscaled(this.Image,this.Location.X,this.Location.Y); + } else { + graphics.DrawImage(this.Image,this.ClientRectangle); } } + #region Property's [Category("Image")] [EditorAttribute ( typeof(FileNameEditor), typeof(UITypeEditor) ) ] public string ImageFileName { get { return imageFileName; } set { imageFileName = value; - System.Diagnostics.Trace.WriteLine(String.Format(" {0}",this.ImageFileName)); + this.relativeFileName = FileUtility.GetRelativePath(Path.GetFullPath(this.reportFileName),Path.GetFullPath(this.ImageFileName)); } } @@ -98,55 +96,16 @@ namespace ICSharpCode.Reports.Addin private Image LoadImage () - { - try { - Image im; - string absFileName = this.AbsoluteFileName; - if (!String.IsNullOrEmpty(absFileName) && File.Exists(absFileName)) { - im = Image.FromFile (this.AbsoluteFileName); - } else { - im = BaseImageItem.ErrorBitmap(base.Size); - } - if (im == null) { - string str = String.Format(CultureInfo.InvariantCulture, - "Unable to Load {0}",imageFileName); - throw new ReportException(str); - } - return im; - } catch (System.OutOfMemoryException) { - throw; - } catch (System.IO.FileNotFoundException) { - throw; - } - } - - - - private Image old_LoadImage () { try { Image im = null; - if (!string.IsNullOrEmpty(relativeFileName)) { - string testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName)); - if (File.Exists(testFileName)){ - System.Diagnostics.Trace.WriteLine("Found"); - } - } - - - this.relativeFileName = FileUtility.GetRelativePath(this.ReportFileName,this.ImageFileName); string absFileName = this.AbsoluteFileName; if (!String.IsNullOrEmpty(absFileName) && File.Exists(absFileName)){ im = Image.FromFile (absFileName); } else { im = BaseImageItem.ErrorBitmap(base.Size); } - if (im == null) { - string str = String.Format(CultureInfo.InvariantCulture, - "Unable to Load {0}",imageFileName); - throw new ReportException(str); - } return im; } catch (System.OutOfMemoryException) { @@ -172,12 +131,12 @@ namespace ICSharpCode.Reports.Addin return null; } set { - this.imageFileName = String.Empty; this.image = value; this.imageSource = GlobalEnums.ImageSource.External; } } + [Category("Layout")] public bool ScaleImageToSize { get { return scaleImageToSize; } @@ -216,45 +175,40 @@ namespace ICSharpCode.Reports.Addin [Category("Image")] public string ReportFileName { get { return Path.GetFullPath(reportFileName); } - set { reportFileName = value; - System.Diagnostics.Trace.WriteLine(""); - System.Diagnostics.Trace.WriteLine(String.Format("ReportFileName {0}",Path.GetFullPath(this.reportFileName)));} + set { reportFileName = value;} } [Category("Image")] -// [Browsable(false)] + [Browsable(false)] public string RelativeFileName { get { return relativeFileName; } - set { relativeFileName = value; - System.Diagnostics.Trace.WriteLine(""); - System.Diagnostics.Trace.WriteLine(String.Format(" {0}",this.relativeFileName)); - } + set { relativeFileName = value;} } [XmlIgnoreAttribute] -// [Category("Image")] + [Category("Image")] // [Browsable(false)] public string AbsoluteFileName { get { - string absolute = FileUtility.GetAbsolutePath(reportFileName,imageFileName); - if (File.Exists(absolute)){ - System.Diagnostics.Trace.WriteLine("Image.AbsoluteFileName"); - System.Diagnostics.Trace.WriteLine(String.Format("Absolute FIleN {0}",absolute)); - System.Diagnostics.Trace.WriteLine(String.Format("Report FileNam {0}",this.reportFileName)); - System.Diagnostics.Trace.WriteLine(String.Format("Image absolute {0}",this.ImageFileName)); - System.Diagnostics.Trace.WriteLine(String.Format("Image relative {0}",this.relativeFileName)); - string t = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName)); - System.Diagnostics.Trace.WriteLine(String.Format("rebuild {0}",t)); - System.Diagnostics.Trace.WriteLine("---------"); - return absolute; - } +//D:\SharpDevelop3.0_WorkingCopy\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos + if (!string.IsNullOrEmpty(relativeFileName)) { + Console.WriteLine(""); string testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName)); if (File.Exists(testFileName)){ + Console.WriteLine("Image found with Relative Filename"); + Console.WriteLine("Report Filename {0}",this.reportFileName); + Console.WriteLine("Relative Filename {0}",this.relativeFileName); + Console.WriteLine("Image Filename {0}",this.ImageFileName); return testFileName; + } else { + Console.WriteLine("AbsoluteFileName can't load image"); + Console.WriteLine("Report Filename {0}",this.reportFileName); + Console.WriteLine("Relative Filename {0}",this.relativeFileName); + Console.WriteLine("Image Filename {0}",this.ImageFileName); } } return this.ImageFileName; diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index 13cec3f4ec..05aa9b2be9 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -329,9 +329,8 @@ ReportViewer.Designer.cs + ResXFileCodeGenerator - - @@ -379,9 +378,6 @@ - - - {D81F5C91-D7DB-46E5-BC99-49488FB6814C} Irony diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs index c6f078b70b..374ee82e16 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs @@ -34,7 +34,7 @@ namespace ICSharpCode.Reports.Core { private string columnName; private string baseTableName; private string reportFileName; - private string relativeFileName = "aa"; + private string relativeFileName; public BaseImageItem():base() { } @@ -194,9 +194,19 @@ namespace ICSharpCode.Reports.Core { get { if (!string.IsNullOrEmpty(relativeFileName)) { string testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName)); - System.Diagnostics.Trace.WriteLine(String.Format(" AbsoluteFilename {0}",Path.GetFullPath(testFileName))); + if (File.Exists(testFileName)){ + Console.WriteLine("Image found with Relative Filename"); + Console.WriteLine("Report Filename {0}",this.reportFileName); + Console.WriteLine("Relative Filename {0}",this.relativeFileName); + Console.WriteLine("Image Filename {0}",this.ImageFileName); return testFileName; + + } else { + Console.WriteLine("AbsoluteFileName can't load image"); + Console.WriteLine("Report Filename {0}",this.reportFileName); + Console.WriteLine("Relative Filename {0}",this.relativeFileName); + Console.WriteLine("Image Filename {0}",this.ImageFileName); } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index b7b00b9658..7e41cf3577 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -59,11 +59,22 @@ namespace ICSharpCode.Reports.Core.ReportViewer previewRenderer = PreviewRenderer.CreateInstance(); this.CheckEnable(); this.printButton.Enabled = false; + this.printButton.ImageTransparentColor = Color.White; + this.pdfButton.Enabled = false; + this.pdfButton.ImageTransparentColor = Color.White; + this.firstPageButton.Enabled = false; + this.firstPageButton.ImageTransparentColor = Color.White; + this.forwardButton.Enabled = false; + this.forwardButton.ImageTransparentColor = Color.White; + this.backButton.Enabled = false; + this.backButton.ImageTransparentColor = Color.White; + this.lastPageButton.Enabled = false; + this.lastPageButton.ImageTransparentColor = Color.White; this.numericToolStripTextBox2.Navigate += new EventHandler (OnNavigate); } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx index 051c5b8804..a42f6a5b33 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx @@ -127,99 +127,98 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKDSURBVDhPddJbSNNRHMBxe62HoOihh6woUCvSiaGoeb9k - KWIpKkoXDE2ENKFIJALrQXrQCE1Zxiopnbm08rLUvCyvWCZphotZ2dycc07b8l7f/moKf9QDPw7n/M75 - cM75HRv+t2PPjSQ2m7nQOElkrWl1esO+1zDHufqJ5ZzN6oo4pYkxYdAyB5E145sCOssiXnI9AQqDGDit - GOWhgCarFwkq020IDBhm8SkepncWoir0YiC8ZITHAnB5cJ7AYu06oOv7b7wfaOj8BZlfF5DkD4mB0EfD - FAinSuibw69oJbna2jUWQorU1BgXSP44Q2SnFfe7g2LghFRDru4v8T0zeBVq1jaXthsIlw7SYoXYDgsn - 683EtFlwzf4sBgLz1GT/WCSi3crxeyv6k4ZhTuX1o5yCsKZJ/KpNhAqvH6aawiWrVwz45wxwQz1PUPMU - ofmDyJTfSJRrkI0u4q2cwOOVEf/qcXyF8H9jxjmjWwz4ZPeS/mUez9pJgnP68bvSSEaDjjM98xwqNeBR - acTtxRiuQvncq0wcTW8VAx5Z3SR9mkFSOYHnrZ7lZNxNFaGF/QSrrDgU65E80+MohKTcxOGUJjHgltlB - fPc09iVjOF5tW3vES7ffEZL7Ht+3VmylP7Ev0mL3VI/DRaUYcLmmIqJ1mr0yPUdSW0RlLCjrx+16E17C - 9Xbe17JHqsX+/Gsx4JTWSFCDhV35WhyS6tZ9JHmNGudUJY4KI9vzdeyPVogB+xQlrlVmtt0Z4mBCzYZf - ue3DCAfiy3F8acY2ulwM2KXV4aT6g03OKPvOVm8ILE0OaEzsjipjZ5BMDGwNkLEjtpItIaXYxcg3BZYS - XX16vJIqltf8A0jvUCl10jfWAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ4SURBVDhPfZNbSBNQGMfttR6CpIcesqJArcgLhqLm/ZKl + iKWoKF0wNBHShCKRCKwH6UEjNMWMVVJe0rTystS8LK9YNtKMLWZlc3PObdqW9/o1rISD2oGPA+f/4wfn + nO+zsfm7Dj/Rk9xh4mzbNNFNBv6dr7fLdQucbjGKTILUwCTQuQDRjVMbCjTmZXwqtQTV6ETmRM0E94yQ + qlwmpEqzrmBEN49f2RjyeYip1YpMZPk4D6yCC4pFgsvUawT9X37ge1dF33fI/rSES+GoyITfH6NIB0lD + CwSUimGPykxYqZJG/RKp7+aI7rPgeUshCo6WqMjX/CJxcA6fYtVqWNGjI7JEQacF4nvNHGsxEddtxj33 + gygILlCS+3WZqB4LR27/sT9sHeN4wTDSGYhonyagwUC49fUjZDO45chFQWDeCFeVi4R0zBBeqEAi/Uxy + pQrJxDK+UiNez/UENkzhb63AlyZcswZEgV+unMyPi3g3TROaN0zAxTayWjWcHFxkf4UOrzo9Hk8ncbd+ + n2e9gUOZXaLAK2eAlPdzuNQZ8b4+uBImXJMRXjxMqMyCY5kWl8danKzlUm3gQFq7KPDI7iVxYBaH8kmc + LnWvhudvvCYs/w3+ryzYlXzDoVSN/SMtjuekosDtsoyorll2SbQcTO8UwqKqYTyutONjvZ7tHTU7S9Q4 + nHkhCpwz2ghpNbO9UI1jSvOaRqpsVOKaLsWpRs/WQg17YmtExiFNinu9iS03R9mX1LhuK3e/HWdvYjVO + z0zYxVaLjH1GM86yn9jkTbD7VMOGwzSiMrAjpgrbEInIbA6SsC2+jk1hFdjHVf53nPuHtPik1K4wvwGp + DrGrfrdfrQAAAABJRU5ErkJggg== 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 + aWdu5gzEk/wF+WKJCvx7/gmaQpy22Bx1qAAAAABJRU5ErkJggg== - Qk02AwAAAAAAADYAAAAoAAAAEAAAABAAAAABABgAAAAAAAAAAADEDgAAxA4AAAAAAAAAAAAA////7rtf - +enQ////////////////////////////7bdU8L5h78Bm66s1////////////6a1E56k+/PPm//////// - ////////////////7LZU//nB///q7bhb////////////569V//jQ4qNA+OnW//////////////////// - 5qpG/Npp/+6d6K1S////////////3pUx+9t7//LI3Zs/9eDJ////////////////5KNF+tlu/+6h5adP - ////////////2ZA69MhU989p++u22pxJ893G////////////3pxC+dNj/+mX4qBM////////////1Yg3 - 88VY77tK88dZ//TB2ZpP6cao////////3Zg+985c/uaP3ZpI////////////0II08cJN7rtM7bVC8L9N - //G41JRL4ryi////2ZI99MZR/OGI2pRF////////////y3ky77lD7LVB7LVD67I77rg//Oif3alm37if - 2ZVM8cBG+tp91o5D////////////xHIu7bQ66a036q4467A76agq+s5T5rx5vnFC1I5H8Lc8+tdy0IhA - ////////////v2sr7awx56Yv56Yx56Mp9MJH1JhMwn9b////zoM87rAx99Jny4I7////////////uGQp - 56Un5Jwo45oe9L1BzI9Jw4Ro////////xXUv6qco9stcx3s4////////////s2Ao5Jod5JYT8Lc+v3g4 - 1KqX////////////wW8s558f9sRRwnY0////////////rVch5pUP660vuG8y2rap//////////////// - umcp5JUV87xGvnAw////////////rFce77EvrFwj5c3F////////////////////tmMk3ooL77Q3uGso - ////////////n0YTqlUZ7d3W////////////////////////tV4g6I4A/cIwunAn////////////r2c+ - 59PJ////////////////////////////qVgnqEkBsFkSn0QK//////// + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + 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 + 4JaMNNKK50J/vvDxNPhZAQMAAAAASUVORK5CYII= diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.BrowserAfter.png b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.BrowserAfter.png deleted file mode 100644 index c1543df939..0000000000 Binary files a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.BrowserAfter.png and /dev/null differ diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.BrowserBefore.png b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.BrowserBefore.png deleted file mode 100644 index c165b435ed..0000000000 Binary files a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.BrowserBefore.png and /dev/null differ diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.Print.png b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.Print.png deleted file mode 100644 index 5e4406244e..0000000000 Binary files a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.Print.png and /dev/null differ diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.StopProcess.png b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.StopProcess.png deleted file mode 100644 index 4cc4a7c08c..0000000000 Binary files a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons.16x16.StopProcess.png and /dev/null differ diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/MakePdf.bmp b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/MakePdf.bmp deleted file mode 100644 index ee047812a9..0000000000 Binary files a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/MakePdf.bmp and /dev/null differ