diff --git a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb index 83d9606..46545ed 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb @@ -22,12 +22,9 @@ Partial Class frmSendungAnhangImport 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungAnhangImport)) Me.lbl = New System.Windows.Forms.Label() Me.flpnlAviso = New System.Windows.Forms.FlowLayoutPanel() - Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement() - Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement() Me.flpnlSendungen = New System.Windows.Forms.FlowLayoutPanel() Me.lblSendungen = New System.Windows.Forms.Label() Me.lblImport = New System.Windows.Forms.Label() @@ -49,7 +46,7 @@ Partial Class frmSendungAnhangImport Me.lblSeiten = New System.Windows.Forms.Label() Me.cbxDelPDF = New System.Windows.Forms.CheckBox() Me.btnAdd = New System.Windows.Forms.Button() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip() Me.DateiHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AusZwischenablageeinfügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -57,7 +54,6 @@ Partial Class frmSendungAnhangImport Me.pnl = New System.Windows.Forms.Panel() Me.Button5 = New System.Windows.Forms.Button() Me.PdfViewer = New Spire.PdfViewer.Forms.PdfViewer() - Me.WebBrowser = New System.Windows.Forms.WebBrowser() Me.Button3 = New System.Windows.Forms.Button() Me.btnSndDel = New System.Windows.Forms.Button() Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() @@ -72,6 +68,9 @@ Partial Class frmSendungAnhangImport Me.Button17 = New System.Windows.Forms.Button() Me.lblRgPreis = New System.Windows.Forms.Label() Me.pnlSendung = New System.Windows.Forms.Panel() + Me.UsrCntlSendungAnhangElement1 = New AVISO.usrCntlSendungAnhangElement() + Me.UsrCntlSendungAnhangElement2 = New AVISO.usrCntlSendungAnhangElement() + Me.WebBrowser = New System.Windows.Forms.WebBrowser() Me.flpnlAviso.SuspendLayout() Me.pnlAnfuegen.SuspendLayout() Me.cntxt.SuspendLayout() @@ -103,36 +102,6 @@ Partial Class frmSendungAnhangImport Me.flpnlAviso.Size = New System.Drawing.Size(200, 825) Me.flpnlAviso.TabIndex = 7 ' - 'UsrCntlSendungAnhangElement1 - ' - Me.UsrCntlSendungAnhangElement1.ACTIVE = False - Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White - Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False" - Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing - Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing - Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1" - Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64) - Me.UsrCntlSendungAnhangElement1.TabIndex = 0 - ' - 'UsrCntlSendungAnhangElement2 - ' - Me.UsrCntlSendungAnhangElement2.ACTIVE = False - Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White - Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False" - Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing - Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing - Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73) - Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2" - Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64) - Me.UsrCntlSendungAnhangElement2.TabIndex = 1 - ' 'flpnlSendungen ' Me.flpnlSendungen.AllowDrop = True @@ -504,15 +473,6 @@ Partial Class frmSendungAnhangImport Me.PdfViewer.Threshold = 60 Me.PdfViewer.ViewerBackgroundColor = System.Drawing.Color.FromArgb(CType(CType(229, Byte), Integer), CType(CType(229, Byte), Integer), CType(CType(229, Byte), Integer)) ' - 'WebBrowser - ' - Me.WebBrowser.Dock = System.Windows.Forms.DockStyle.Fill - Me.WebBrowser.Location = New System.Drawing.Point(0, 0) - Me.WebBrowser.MinimumSize = New System.Drawing.Size(20, 20) - Me.WebBrowser.Name = "WebBrowser" - Me.WebBrowser.Size = New System.Drawing.Size(844, 655) - Me.WebBrowser.TabIndex = 1 - ' 'Button3 ' Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -671,6 +631,45 @@ Partial Class frmSendungAnhangImport Me.pnlSendung.Size = New System.Drawing.Size(243, 860) Me.pnlSendung.TabIndex = 0 ' + 'UsrCntlSendungAnhangElement1 + ' + Me.UsrCntlSendungAnhangElement1.ACTIVE = False + Me.UsrCntlSendungAnhangElement1.BackColor = System.Drawing.Color.White + Me.UsrCntlSendungAnhangElement1.FILE_ANHID = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_DOCID = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_NAME = "False" + Me.UsrCntlSendungAnhangElement1.FILE_PAGES = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_PATH = Nothing + Me.UsrCntlSendungAnhangElement1.FILE_TYPE = Nothing + Me.UsrCntlSendungAnhangElement1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlSendungAnhangElement1.Name = "UsrCntlSendungAnhangElement1" + Me.UsrCntlSendungAnhangElement1.Size = New System.Drawing.Size(130, 64) + Me.UsrCntlSendungAnhangElement1.TabIndex = 0 + ' + 'UsrCntlSendungAnhangElement2 + ' + Me.UsrCntlSendungAnhangElement2.ACTIVE = False + Me.UsrCntlSendungAnhangElement2.BackColor = System.Drawing.Color.White + Me.UsrCntlSendungAnhangElement2.FILE_ANHID = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_DOCID = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_NAME = "False" + Me.UsrCntlSendungAnhangElement2.FILE_PAGES = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_PATH = Nothing + Me.UsrCntlSendungAnhangElement2.FILE_TYPE = Nothing + Me.UsrCntlSendungAnhangElement2.Location = New System.Drawing.Point(3, 73) + Me.UsrCntlSendungAnhangElement2.Name = "UsrCntlSendungAnhangElement2" + Me.UsrCntlSendungAnhangElement2.Size = New System.Drawing.Size(130, 64) + Me.UsrCntlSendungAnhangElement2.TabIndex = 1 + ' + 'WebBrowser + ' + Me.WebBrowser.Dock = System.Windows.Forms.DockStyle.Fill + Me.WebBrowser.Location = New System.Drawing.Point(0, 0) + Me.WebBrowser.MinimumSize = New System.Drawing.Size(20, 20) + Me.WebBrowser.Name = "WebBrowser" + Me.WebBrowser.Size = New System.Drawing.Size(844, 655) + Me.WebBrowser.TabIndex = 1 + ' 'frmSendungAnhangImport ' Me.AllowDrop = True diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index e45fe8b..6cf7faf 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -3,6 +3,9 @@ 'Imports iTextSharp.text Imports System.IO Imports Spire.Pdf +Imports Spire.Pdf.Conversion +Imports Spire.Pdf.Conversion.Compression +Imports Spire.Pdf.Exporting Imports VERAG_PROG_ALLGEMEIN 'Imports GrapeCity.Documents.Pdf @@ -115,6 +118,11 @@ Public Class frmSendungAnhangImport initFlpANH_LIST() End Sub + AddHandler USRCNTL.ME_COMPRESS, Sub(docId, anhId) + compressElement(docId, anhId) + initFlpANH_LIST() + End Sub + AddHandler USRCNTL.KeyDown, Sub(ob As Object, ev As KeyEventArgs) If ev.KeyCode = Keys.Delete Then deleteActiveElement(getAcitvePnl()) @@ -645,11 +653,11 @@ Public Class frmSendungAnhangImport Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean 'ITEXTSHARP Try - Dim impPage As itextsharp.text.pdf.PdfImportedPage = Nothing - Dim Reader As New itextsharp.text.pdf.PdfReader(SourceFile) + Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing + Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile) If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf" - Dim srcDoc As New itextsharp.text.Document() 'Reader.GetPageSizeWithRotation(0)) - Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) + Dim srcDoc As New iTextSharp.text.Document() 'Reader.GetPageSizeWithRotation(0)) + Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) PdfCopyProvider.SetFullCompression() srcDoc.Open() For Each p In pagesToExtract @@ -660,7 +668,7 @@ Public Class frmSendungAnhangImport End If impPage = PdfCopyProvider.GetImportedPage(Reader, p) ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite - PdfCopyProvider.SetPageSize(New itextsharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p))) + PdfCopyProvider.SetPageSize(New iTextSharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p))) ' ----- PDF Seite in das neue Dokument einfügen PdfCopyProvider.AddPage(impPage) @@ -896,7 +904,7 @@ Public Class frmSendungAnhangImport Try PagesLeft = 0 - Dim r As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(sourceFile) + Dim r As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(sourceFile) Dim pagesToKeep As New List(Of Integer) For p = 1 To r.NumberOfPages Dim del = False @@ -918,9 +926,9 @@ Public Class frmSendungAnhangImport Using fs As FileStream = New FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None) - Using doc As itextsharp.text.Document = New itextsharp.text.Document() + Using doc As iTextSharp.text.Document = New iTextSharp.text.Document() - Dim w As itextsharp.text.pdf.PdfWriter = itextsharp.text.pdf.PdfWriter.GetInstance(doc, fs) + Dim w As iTextSharp.text.pdf.PdfWriter = iTextSharp.text.pdf.PdfWriter.GetInstance(doc, fs) doc.Open() For Each page As Integer In pagesToKeep doc.NewPage() @@ -1046,6 +1054,100 @@ Public Class frmSendungAnhangImport Return False End Function + Shared Function compressElement(FILE_DOCID, FILE_ANHID, Optional showMessage = True) As Boolean + + If Not showMessage OrElse vbYes = MsgBox("Möchten Sie das Element komprimieren? Durch Minderung der Datenqualität gehen Informationen eventuell verloren.", vbYesNoCancel) Then + Try + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(FILE_DOCID) + + 'Load a PDF document while initializing the PdfCompressor object + Dim compressor As Spire.Pdf.Conversion.Compression.PdfCompressor = New Spire.Pdf.Conversion.Compression.PdfCompressor(DS.GET_TOP1_PATH) + 'Get text compression options + Dim textCompression As TextCompressionOptions = compressor.Options.TextCompressionOptions + 'Compress fonts + textCompression.CompressFonts = True + 'Unembed fonts + textCompression.UnembedFonts = True + 'Get image compression options + Dim imageCompression As ImageCompressionOptions = compressor.Options.ImageCompressionOptions + 'Set the compressed image quality + imageCompression.ImageQuality = ImageQuality.High + + 'Resize images + imageCompression.ResizeImages = True + 'Compress images + imageCompression.CompressImage = True + 'Save the compressed document to file + compressor.CompressToFile(DS.GET_TOP1_PATH) + + 'Load the pdf document + Dim doc As New PdfDocument() + + doc.LoadFromFile(DS.GET_TOP1_PATH) + 'Compress the content in document + CompressContent(doc) + + 'Compress the images in document + CompressImage(doc) + + 'Save the document + doc.SaveToFile(DS.GET_TOP1_PATH) + + 'View the pdf document + PDFDocumentViewer(DS.GET_TOP1_PATH) + + 'Dim Convert = New PdfGrayConverter("C:\Users\DEVELOPER1\Desktop\CompressDocument_result2.pdf") + 'Convert.ToGrayPdf("C:\Users\DEVELOPER1\Desktop\CompressDocument_result3.pdf") + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan") + End Try + End If + Return False + End Function + Private Shared Sub CompressContent(ByVal doc As PdfDocument) + 'Disable the incremental update + doc.FileInfo.IncrementalUpdate = False + + 'Set the compression level to best + doc.CompressionLevel = PdfCompressionLevel.Best + End Sub + + Private Shared Sub CompressImage(ByVal doc As PdfDocument) + Try + 'Disable the incremental update + doc.FileInfo.IncrementalUpdate = False + + 'Traverse all pages + For Each page As PdfPageBase In doc.Pages + If page IsNot Nothing Then + + + + + + If page.ImagesInfo IsNot Nothing Then + For Each info As PdfImageInfo In page.ImagesInfo + page.TryCompressImage(info.Index) + Next info + End If + End If + Next page + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan") + End Try + End Sub + Private Shared Sub PDFDocumentViewer(ByVal fileName As String) + Try + Process.Start(fileName) + Catch + End Try + End Sub + + + Private Sub frmSendungAnhangImport_Load(sender As Object, e As EventArgs) Handles Me.Load Me.Height = Screen.PrimaryScreen.WorkingArea.Height @@ -1226,6 +1328,7 @@ Public Class frmSendungAnhangImport If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.AddRange(ListToAdd_flpnlSendungen.ToArray) If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.AddRange(ListToAdd_flpnlAviso.ToArray) + 'If act Is Nothing Then initLocationViewer("", "PDF") End Sub @@ -1239,6 +1342,7 @@ Public Class frmSendungAnhangImport USRCNTL.FILE_NAME = a.anh_Name USRCNTL.FILE_TYPE = a.anh_Typ + USRCNTL.FILE_SIZE = a.anh_size.ToString("N0") & " KB" USRCNTL.FILE_ANHID = a.anh_id USRCNTL.FILE_DOCID = a.anh_docId @@ -1326,7 +1430,7 @@ Public Class frmSendungAnhangImport End Try End Sub - Sub addUsrcnlToPnl(TMP_Path, dicId, anhId, Optional filename = "", Optional Typ = "") + Sub addUsrcnlToPnl(TMP_Path, dicId, anhId, Optional filename = "", Optional Typ = "", Optional Size = "") Dim USRCNTL As New usrCntlSendungAnhangElement Dim fi As New FileInfo(TMP_Path) @@ -1339,6 +1443,7 @@ Public Class frmSendungAnhangImport USRCNTL.FILE_ANHID = anhId USRCNTL.FILE_TYPE = Typ + USRCNTL.FILE_SIZE = Size initElement(USRCNTL) flpnlAviso.Controls.Add(USRCNTL) diff --git a/Aviso/Anhänge/usrCntlSendungAnhangElement.Designer.vb b/Aviso/Anhänge/usrCntlSendungAnhangElement.Designer.vb index c193ac7..174ec7d 100644 --- a/Aviso/Anhänge/usrCntlSendungAnhangElement.Designer.vb +++ b/Aviso/Anhänge/usrCntlSendungAnhangElement.Designer.vb @@ -27,9 +27,11 @@ Partial Class usrCntlSendungAnhangElement Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.lbl = New System.Windows.Forms.Label() Me.AnhängeVerschiebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PDFsZusammenführenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.KomprimierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.lbl = New System.Windows.Forms.Label() + Me.lblSize = New System.Windows.Forms.Label() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxt.SuspendLayout() Me.SuspendLayout() @@ -49,39 +51,27 @@ Partial Class usrCntlSendungAnhangElement ' 'cntxt ' - Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UmbenennenToolStripMenuItem, Me.LöschenToolStripMenuItem, Me.AnhängeVerschiebenToolStripMenuItem, Me.PDFsZusammenführenToolStripMenuItem}) + Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UmbenennenToolStripMenuItem, Me.LöschenToolStripMenuItem, Me.AnhängeVerschiebenToolStripMenuItem, Me.PDFsZusammenführenToolStripMenuItem, Me.KomprimierenToolStripMenuItem}) Me.cntxt.Name = "cntxt" Me.cntxt.Size = New System.Drawing.Size(206, 114) ' 'UmbenennenToolStripMenuItem ' Me.UmbenennenToolStripMenuItem.Name = "UmbenennenToolStripMenuItem" - Me.UmbenennenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.UmbenennenToolStripMenuItem.Size = New System.Drawing.Size(205, 22) Me.UmbenennenToolStripMenuItem.Text = "Umbenennen" ' 'LöschenToolStripMenuItem ' Me.LöschenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.del Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem" - Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.LöschenToolStripMenuItem.Size = New System.Drawing.Size(205, 22) Me.LöschenToolStripMenuItem.Text = "Löschen" ' - 'lbl - ' - Me.lbl.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lbl.ContextMenuStrip = Me.cntxt - Me.lbl.Location = New System.Drawing.Point(36, 0) - Me.lbl.Name = "lbl" - Me.lbl.Size = New System.Drawing.Size(140, 27) - Me.lbl.TabIndex = 1 - Me.lbl.Text = "NAME" - Me.lbl.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' 'AnhängeVerschiebenToolStripMenuItem ' Me.AnhängeVerschiebenToolStripMenuItem.Name = "AnhängeVerschiebenToolStripMenuItem" - Me.AnhängeVerschiebenToolStripMenuItem.Size = New System.Drawing.Size(197, 22) + Me.AnhängeVerschiebenToolStripMenuItem.Size = New System.Drawing.Size(205, 22) Me.AnhängeVerschiebenToolStripMenuItem.Text = "Anhänge verschieben..." ' 'PDFsZusammenführenToolStripMenuItem @@ -91,12 +81,44 @@ Partial Class usrCntlSendungAnhangElement Me.PDFsZusammenführenToolStripMenuItem.Size = New System.Drawing.Size(205, 22) Me.PDFsZusammenführenToolStripMenuItem.Text = "PDFs zusammenführen..." ' + 'KomprimierenToolStripMenuItem + ' + Me.KomprimierenToolStripMenuItem.Name = "KomprimierenToolStripMenuItem" + Me.KomprimierenToolStripMenuItem.Size = New System.Drawing.Size(205, 22) + Me.KomprimierenToolStripMenuItem.Text = "Komprimieren" + ' + 'lbl + ' + Me.lbl.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lbl.ContextMenuStrip = Me.cntxt + Me.lbl.Location = New System.Drawing.Point(36, 0) + Me.lbl.Name = "lbl" + Me.lbl.Size = New System.Drawing.Size(140, 24) + Me.lbl.TabIndex = 1 + Me.lbl.Text = "NAME asd asdasd" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "asdasdasd" + Me.lbl.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'lblSize + ' + Me.lblSize.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblSize.ContextMenuStrip = Me.cntxt + Me.lblSize.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.5!) + Me.lblSize.Location = New System.Drawing.Point(136, 18) + Me.lblSize.Name = "lblSize" + Me.lblSize.Size = New System.Drawing.Size(44, 10) + Me.lblSize.TabIndex = 2 + Me.lblSize.Text = "1.500 KB" + Me.lblSize.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' 'usrCntlSendungAnhangElement ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ContextMenuStrip = Me.cntxt + Me.Controls.Add(Me.lblSize) Me.Controls.Add(Me.lbl) Me.Controls.Add(Me.pic) Me.Name = "usrCntlSendungAnhangElement" @@ -114,4 +136,6 @@ Partial Class usrCntlSendungAnhangElement Friend WithEvents LöschenToolStripMenuItem As ToolStripMenuItem Friend WithEvents AnhängeVerschiebenToolStripMenuItem As ToolStripMenuItem Friend WithEvents PDFsZusammenführenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents KomprimierenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents lblSize As Label End Class diff --git a/Aviso/Anhänge/usrCntlSendungAnhangElement.vb b/Aviso/Anhänge/usrCntlSendungAnhangElement.vb index 2c02e57..0625b8e 100644 --- a/Aviso/Anhänge/usrCntlSendungAnhangElement.vb +++ b/Aviso/Anhänge/usrCntlSendungAnhangElement.vb @@ -16,6 +16,7 @@ Public Class usrCntlSendungAnhangElement Public Event ME_CLICK(STRG_PRESSED) Public Event ME_DELETE(FILE_DOCID, FILE_ANHID) + Public Event ME_COMPRESS(FILE_DOCID, FILE_ANHID) 'Public Event PropertyChanged As PropertyChangedEventHandler Implements INotifyPropertyChanged.PropertyChanged @@ -24,6 +25,7 @@ Public Class usrCntlSendungAnhangElement ' RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(info)) 'End Sub + Private ACTIVE_Value As Boolean = False Public Property ACTIVE As Boolean Get @@ -87,6 +89,23 @@ Public Class usrCntlSendungAnhangElement End Set End Property + + + Private FILE_SIZE_Value As String = False + Public Property FILE_SIZE As String + Get + Return Me.FILE_SIZE_Value + End Get + + Set(ByVal value As String) + If Not (value = FILE_SIZE) Then + Me.FILE_SIZE_Value = value + Me.lblSize.Text = value + ' NotifyPropertyChanged("FILE_NAME") + End If + End Set + End Property + 'Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click, lbl.Click, Me.Click ' RaiseEvent ME_CLICK(My.Computer.Keyboard.CtrlKeyDown) 'End Sub @@ -165,4 +184,14 @@ Public Class usrCntlSendungAnhangElement MsgBox(ex.Message & ex.StackTrace) End Try End Sub + + Private Sub usrCntlSendungAnhangElement_Load(sender As Object, e As EventArgs) Handles Me.Load + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then + KomprimierenToolStripMenuItem.Visible = True + End If + End Sub + + Private Sub KomprimierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KomprimierenToolStripMenuItem.Click + RaiseEvent ME_COMPRESS(FILE_DOCID, FILE_ANHID) + End Sub End Class diff --git a/Aviso/App.config b/Aviso/App.config index 63ffc81..a1e778d 100644 --- a/Aviso/App.config +++ b/Aviso/App.config @@ -1,15 +1,15 @@ - + -
+
- + - + @@ -21,55 +21,55 @@ 200, 200 - + - + - + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 93bef05..45a256c 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -17,7 +17,7 @@ AVISO 512 WindowsForms - v4.7 + v4.8 false @@ -282,17 +282,12 @@ ..\..\..\dll\NumericBox.dll - - False - ..\..\..\dll\Spire.PDF\2023\Spire.License.dll + + ..\..\..\dll\Spire.PDF\2024\Spire.Pdf.dll - + False - ..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll - - - False - ..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll + ..\..\..\dll\Spire.PDF\2024\Spire.PdfViewer.Forms.dll @@ -1621,6 +1616,7 @@ + Always @@ -1636,7 +1632,6 @@ Always - diff --git a/Aviso/My Project/Application.Designer.vb b/Aviso/My Project/Application.Designer.vb index 0d143a4..f763796 100644 --- a/Aviso/My Project/Application.Designer.vb +++ b/Aviso/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.AVISO.frmLogin 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/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 4ee09de..024e189 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -958,6 +958,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die <?xml version="1.0" encoding="utf-8" standalone="yes"?> + '''<License Key="PeQezZrFLTMrIgEAK1BoHk0gh6gdmwDKMvN6ITlC5j6D/r6sSq/TXAl5H/H/P/NvV74UnH1KUt0Cy0ef1LzPpvmqxVTsiTYA2eB3CX21oTggkxa3qP/UOJ42Kk8rwgVqchV9RJj9SlZb/zzhfN3nB4NR9rfoiwRDoE45ECcmsCO948+auxqRrc1ikuFDIM2j2YpwzoFxw3QCtLNAjhWhA8Ly7HUCNbtibu6rOnuePVThtmVNfQeTuagFSCDovxIJzlvFggZaQXI7zh3PEChu65zP7VZoJyxzfagJv5JItQCrX8BP+5YgKe6B7NBzUFGl1RqcucKn+MAQypgXrRXQY4UAWfQ4g9QTN2JTpaHZfgg22sGGV+cccDJmekfUPGfBOzlnzedJelMNWDVNBw7prh8vTdNRsOTJoFYDbh82UwRNkXethAElaJ9apM [Rest der Zeichenfolge wurde abgeschnitten]"; ähnelt. + ''' + Public ReadOnly Property license_elic() As String + Get + Return ResourceManager.GetString("license_elic", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 297f136..47cd934 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -691,4 +691,7 @@ ..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\license.elic.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + \ No newline at end of file diff --git a/Aviso/My Project/Settings.Designer.vb b/Aviso/My Project/Settings.Designer.vb index 936f759..c2375c0 100644 --- a/Aviso/My Project/Settings.Designer.vb +++ b/Aviso/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/My Project/license.elic.xml b/Aviso/My Project/license.elic.xml index fb5cc36..9cc4e50 100644 --- a/Aviso/My Project/license.elic.xml +++ b/Aviso/My Project/license.elic.xml @@ -1,24 +1,27 @@ - - + + + B081D0F5-EF94-42F2-B287-4812D84164CE Runtime VERAG Spedition AG al@verag.ag VERAG Spedition AG - 2022-07-12T00:00:00Z - 2023-07-12T00:00:00Z + 2024-08-31T00:00:00Z + 2025-08-31T00:00:00Z - Spire.PDFViewer for Forms - 7.1 + Spire.PDF Pro Edition + 10.7 + Developer Subscription 1 1 - Spire.PDF Pro Edition - 8.7 + Spire.PDFViewer for Forms + 7.12 + Developer Subscription 1 1 @@ -29,4 +32,4 @@ sales@e-iceblue.com http://www.e-iceblue.com - \ No newline at end of file + diff --git a/Aviso/Resources/license.elic.xml b/Aviso/Resources/license.elic.xml index fb5cc36..9cc4e50 100644 --- a/Aviso/Resources/license.elic.xml +++ b/Aviso/Resources/license.elic.xml @@ -1,24 +1,27 @@ - - + + + B081D0F5-EF94-42F2-B287-4812D84164CE Runtime VERAG Spedition AG al@verag.ag VERAG Spedition AG - 2022-07-12T00:00:00Z - 2023-07-12T00:00:00Z + 2024-08-31T00:00:00Z + 2025-08-31T00:00:00Z - Spire.PDFViewer for Forms - 7.1 + Spire.PDF Pro Edition + 10.7 + Developer Subscription 1 1 - Spire.PDF Pro Edition - 8.7 + Spire.PDFViewer for Forms + 7.12 + Developer Subscription 1 1 @@ -29,4 +32,4 @@ sales@e-iceblue.com http://www.e-iceblue.com - \ No newline at end of file + diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index 65ccac0..f15c3bf 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -62,6 +62,8 @@ Public Class frmLogin lblVersion.ContextMenuStrip = ctxUpdate If Application.ProductVersion.StartsWith("0") Then lblVersion.Text += " BETA" + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() + Dim pfadDatei As String = Application.StartupPath & "\Standort.txt" firma = "VERAG" diff --git a/Aviso/packages.config b/Aviso/packages.config index 002632e..8ab584f 100644 --- a/Aviso/packages.config +++ b/Aviso/packages.config @@ -7,7 +7,7 @@ - + @@ -28,5 +28,5 @@ - + \ No newline at end of file diff --git a/Gemeinsames/App.config b/Gemeinsames/App.config index 5f70bbd..a86c646 100644 --- a/Gemeinsames/App.config +++ b/Gemeinsames/App.config @@ -1,6 +1,6 @@ - + diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index 458d258..63794a4 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -14,7 +14,7 @@ Gemeinsames 512 Windows - v4.7 + v4.8 false @@ -160,6 +160,7 @@ True Application.myapp + True True diff --git a/Gemeinsames/My Project/Settings.Designer.vb b/Gemeinsames/My Project/Settings.Designer.vb index 1fd9fbb..173d452 100644 --- a/Gemeinsames/My Project/Settings.Designer.vb +++ b/Gemeinsames/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase