diff --git a/AVISO_INFO/AVISO_INFO.vbproj b/AVISO_INFO/AVISO_INFO.vbproj index a3ef872..3aa6b6c 100644 --- a/AVISO_INFO/AVISO_INFO.vbproj +++ b/AVISO_INFO/AVISO_INFO.vbproj @@ -11,7 +11,7 @@ AVISO_INFO 512 WindowsForms - v4.7 + v4.8 true @@ -126,6 +126,7 @@ True Application.myapp + True True diff --git a/AVISO_INFO/App.config b/AVISO_INFO/App.config index 5f70bbd..a86c646 100644 --- a/AVISO_INFO/App.config +++ b/AVISO_INFO/App.config @@ -1,6 +1,6 @@ - + diff --git a/AVISO_INFO/My Project/Application.Designer.vb b/AVISO_INFO/My Project/Application.Designer.vb index 71b7d2f..18dc7ce 100644 --- a/AVISO_INFO/My Project/Application.Designer.vb +++ b/AVISO_INFO/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.AVISO_INFO.frmInfo End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/AVISO_INFO/My Project/Resources.Designer.vb b/AVISO_INFO/My Project/Resources.Designer.vb index 0a45691..54796f4 100644 --- a/AVISO_INFO/My Project/Resources.Designer.vb +++ b/AVISO_INFO/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/AVISO_INFO/My Project/Settings.Designer.vb b/AVISO_INFO/My Project/Settings.Designer.vb index f7f54c5..487be12 100644 --- a/AVISO_INFO/My Project/Settings.Designer.vb +++ b/AVISO_INFO/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 2027c83..5483f84 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -150,42 +150,15 @@ ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + F:\PROGRAMMIERUNG\dll\ActiveReports18\DS.Documents.Imaging.dll + ..\packages\EAGetMail.5.3.5\lib\net461\EAGetMail.dll ..\Gemeinsames\bin\Debug\Gemeinsames.dll - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Chart.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Document.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Design.Win.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Document.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Excel.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Word.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Common.dll - - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll - ..\packages\itext7.7.1.11\lib\net40\itext.barcodes.dll @@ -221,6 +194,66 @@ False ..\..\..\dll\itextsharp.pdfa.dll + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Chart.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.DataProviders.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.DataProviders.Excel.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Document.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Document.Drawing.Gc.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Document.Drawing.Gdi.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Drawing.Gc.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Drawing.Gdi.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Rdl.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Rendering.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Scripting.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Design.Win.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Export.Excel.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Export.Pdf.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Export.Word.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Viewer.Common.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Viewer.Win.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Win.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.Data.ExpressionInfo.dll + ..\..\..\dll\ASP.NET\Microsoft.AspNetCore.Authentication.dll diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index 9d88def..d410f3d 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -111,6 +111,7 @@ Public Class usrCntlBenachrichtigungen .Columns("ab_Vermerk").Visible = False .Columns("ab_collAnhId").Visible = False .Columns("ab_ReminderVermerkID").Visible = False + .Columns("ab_VermerkID").Visible = False .Columns("ab_ReminderVermerkCode").Visible = False .Columns("ab_TO_Art").Visible = False diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb index 28ec3eb..ac07703 100644 --- a/Aviso/Classes/cSendungsoptions.vb +++ b/Aviso/Classes/cSendungsoptions.vb @@ -644,7 +644,7 @@ Public Class SendungOptions rpt.Run(False) ' If Printername = "" Then rpt.Dispose() : Exit Sub rpt.Document.Printer.PrinterName = Printername - rpt.Document.PrintOptions.Margin = New GrapeCity.ActiveReports.Extensibility.Printing.Margin(0, 0, 0, 0) + rpt.Document.PrintOptions.Margin = New GrapeCity.ActiveReports.Printing.Margin(0, 0, 0, 0) rpt.Document.Printer.OriginAtMargins = False 'rpt.Document.Printer.PrinterSettings.PrintRange = Printing.PrintRange.Selection 'rpt.Document.Printer.PrinterSettings.PrintRange = Printing.PrintRange.CurrentPage diff --git a/Aviso/My Project/licenses.licx b/Aviso/My Project/licenses.licx index 7483222..8c5f570 100644 --- a/Aviso/My Project/licenses.licx +++ b/Aviso/My Project/licenses.licx @@ -1 +1,2 @@ -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff +GrapeCity.ActiveReports.SectionReport, MESCIUS.ActiveReports +GrapeCity.ActiveReports.Viewer.Win.Viewer, MESCIUS.ActiveReports.Viewer.Win \ No newline at end of file diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index 311835b..048428a 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -96,26 +96,86 @@ - - ..\..\..\..\..\..\..\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll + + C:\Program Files (x86)\MESCIUS\ActiveReports 18\Tools\zh-CN\ActiveReports.Imports.resources.dll - - ..\..\..\..\..\..\..\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Document.dll + + C:\Program Files (x86)\MESCIUS\ActiveReports 18\Tools\zh-CN\ActiveReports.Imports.Win.resources.dll - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Document.dll + + F:\PROGRAMMIERUNG\dll\ActiveReports18\DS.Documents.Imaging.dll - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Excel.dll + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.dll - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Chart.dll - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Rdf.dll + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.DataProviders.dll - - C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.DataProviders.Excel.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Document.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Document.Drawing.Gc.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Document.Drawing.Gdi.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Drawing.Gc.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Drawing.Gdi.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Rdl.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Rendering.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Core.Scripting.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Design.Win.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Export.Excel.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Export.Pdf.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Export.Word.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Viewer.Common.dll + + + False + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Viewer.Win.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.ActiveReports.Win.dll + + + F:\PROGRAMMIERUNG\dll\ActiveReports18\MESCIUS.Data.ExpressionInfo.dll @@ -214,6 +274,7 @@ frmGrayOut.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb diff --git a/Gemeinsames/My Project/licenses.licx b/Gemeinsames/My Project/licenses.licx new file mode 100644 index 0000000..8c5f570 --- /dev/null +++ b/Gemeinsames/My Project/licenses.licx @@ -0,0 +1,2 @@ +GrapeCity.ActiveReports.SectionReport, MESCIUS.ActiveReports +GrapeCity.ActiveReports.Viewer.Win.Viewer, MESCIUS.ActiveReports.Viewer.Win \ No newline at end of file diff --git a/Gemeinsames/rptSendungen.Designer.vb b/Gemeinsames/rptSendungen.Designer.vb index b409f66..00552b6 100644 --- a/Gemeinsames/rptSendungen.Designer.vb +++ b/Gemeinsames/rptSendungen.Designer.vb @@ -1733,7 +1733,7 @@ Partial Public Class rptSendungen Me.PageSettings.Margins.Top = 0! Me.PageSettings.Orientation = GrapeCity.ActiveReports.Document.Section.PageOrientation.Portrait Me.PageSettings.PaperHeight = 11.69291! - Me.PageSettings.PaperKind = System.Drawing.Printing.PaperKind.A4 + Me.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.A4 Me.PageSettings.PaperWidth = 8.267716! Me.PrintWidth = 8.132299! Me.Sections.Add(Me.Detail)