From b8471389b924a9014f433c28a44949845fb277a3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 4 Dec 2023 10:36:00 +0100 Subject: [PATCH] thumbnails for element editor, better colors --- EnvelopeGenerator.Common/Helpers.vb | 20 ++-- .../EnvelopeGenerator.Form.vbproj | 1 + .../My Project/licenses.licx | 19 ++-- .../frmFieldEditor.Designer.vb | 71 +++++++++++- EnvelopeGenerator.Form/frmFieldEditor.resx | 102 +++++++++++++++++- EnvelopeGenerator.Form/frmFieldEditor.vb | 25 +++-- 6 files changed, 207 insertions(+), 31 deletions(-) diff --git a/EnvelopeGenerator.Common/Helpers.vb b/EnvelopeGenerator.Common/Helpers.vb index bd0e0c75..d3c400c1 100644 --- a/EnvelopeGenerator.Common/Helpers.vb +++ b/EnvelopeGenerator.Common/Helpers.vb @@ -41,34 +41,34 @@ Public Class Helpers Public Shared Function ColorTypeToColor(pColorType As ColorType) As Color Select Case pColorType Case ColorType.ReceiverColor1 - Return Color.Blue + Return ColorTranslator.FromHtml("#22c55e") Case ColorType.ReceiverColor2 - Return Color.Maroon + Return ColorTranslator.FromHtml("#3b82f6") Case ColorType.ReceiverColor3 - Return Color.LightSeaGreen + Return ColorTranslator.FromHtml("#8b5cf6") Case ColorType.ReceiverColor4 - Return Color.LimeGreen + Return ColorTranslator.FromHtml("#f59e0b") Case ColorType.ReceiverColor5 - Return Color.Magenta + Return ColorTranslator.FromHtml("#ef4444") Case ColorType.ReceiverColor6 - Return Color.MediumSpringGreen + Return ColorTranslator.FromHtml("#14b8a6") Case ColorType.ReceiverColor7 - Return Color.OrangeRed + Return ColorTranslator.FromHtml("#d946ef") Case ColorType.ReceiverColor8 - Return Color.DodgerBlue + Return ColorTranslator.FromHtml("#06b6d4") Case ColorType.ReceiverColor9 - Return Color.Purple + Return ColorTranslator.FromHtml("#10b981") Case ColorType.ReceiverColor10 - Return Color.Gold + Return ColorTranslator.FromHtml("#84cc16") End Select End Function diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 8e743078..9091b4dd 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -52,6 +52,7 @@ + diff --git a/EnvelopeGenerator.Form/My Project/licenses.licx b/EnvelopeGenerator.Form/My Project/licenses.licx index d48dd520..6f2ce757 100644 --- a/EnvelopeGenerator.Form/My Project/licenses.licx +++ b/EnvelopeGenerator.Form/My Project/licenses.licx @@ -1,13 +1,14 @@ -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb index c3cc96d9..17e9befc 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb @@ -48,12 +48,20 @@ Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.ThumbnailEx2 = New GdPicture14.ThumbnailEx() CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() + Me.SplitContainerControl1.SuspendLayout() Me.SuspendLayout() ' 'ribbonControl1 @@ -200,11 +208,64 @@ Me.SvgImageCollection1.ImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.None Me.SvgImageCollection1.Add("appointmentnightclock", "image://svgimages/scheduling/appointmentnightclock.svg") ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 + resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") + Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' + Me.SplitContainerControl1.Panel1.Controls.Add(Me.ThumbnailEx2) + resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") + ' + 'SplitContainerControl1.Panel2 + ' + Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) + resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") + Me.SplitContainerControl1.SplitterPosition = 199 + ' + 'ThumbnailEx2 + ' + Me.ThumbnailEx2.AllowDropFiles = False + Me.ThumbnailEx2.AllowMoveItems = False + Me.ThumbnailEx2.BackColor = System.Drawing.SystemColors.Control + Me.ThumbnailEx2.CheckBoxes = False + Me.ThumbnailEx2.CheckBoxesMarginLeft = 0 + Me.ThumbnailEx2.CheckBoxesMarginTop = 0 + Me.ThumbnailEx2.DefaultItemCheckState = False + Me.ThumbnailEx2.DefaultItemTextPrefix = "" + Me.ThumbnailEx2.DisplayAnnotations = True + resources.ApplyResources(Me.ThumbnailEx2, "ThumbnailEx2") + Me.ThumbnailEx2.EnableDropShadow = True + Me.ThumbnailEx2.HorizontalTextAlignment = GdPicture14.TextAlignment.TextAlignmentCenter + Me.ThumbnailEx2.HotTracking = False + Me.ThumbnailEx2.LockGdViewerEvents = False + Me.ThumbnailEx2.MultiSelect = False + Me.ThumbnailEx2.Name = "ThumbnailEx2" + Me.ThumbnailEx2.OwnDrop = False + Me.ThumbnailEx2.PauseThumbsLoading = False + Me.ThumbnailEx2.PdfIncreaseTextContrast = False + Me.ThumbnailEx2.PreloadAllItems = True + Me.ThumbnailEx2.RotateExif = True + Me.ThumbnailEx2.SelectedThumbnailBackColor = System.Drawing.Color.FromArgb(CType(CType(38, Byte), Integer), CType(CType(160, Byte), Integer), CType(CType(218, Byte), Integer)) + Me.ThumbnailEx2.SelectedThumbnailBackColorAlpha = 100 + Me.ThumbnailEx2.ShowText = True + Me.ThumbnailEx2.TextMarginLeft = 0 + Me.ThumbnailEx2.TextMarginTop = 0 + Me.ThumbnailEx2.ThumbnailAlignment = GdPicture14.ThumbnailAlignment.ThumbnailAlignmentVertical + Me.ThumbnailEx2.ThumbnailBackColor = System.Drawing.Color.Transparent + Me.ThumbnailEx2.ThumbnailBorder = False + Me.ThumbnailEx2.ThumbnailForeColor = System.Drawing.Color.Black + Me.ThumbnailEx2.ThumbnailSize = New System.Drawing.Size(128, 128) + Me.ThumbnailEx2.ThumbnailSpacing = New System.Drawing.Size(0, 0) + Me.ThumbnailEx2.VerticalTextAlignment = GdPicture14.TextAlignment.TextAlignmentCenter + ' 'frmFieldEditor ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.DocumentViewer1) + Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.ribbonControl1) Me.Controls.Add(Me.barDockControlLeft) Me.Controls.Add(Me.barDockControlRight) @@ -218,6 +279,12 @@ CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -247,4 +314,6 @@ Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents ThumbnailEx2 As GdPicture14.ThumbnailEx End Class diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx index 4049cdca..8b09bb5e 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.resx @@ -271,10 +271,10 @@ Fill - 0, 158 + 0, 0 - 1125, 500 + 916, 500 3 @@ -286,7 +286,7 @@ DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null - $this + SplitContainerControl1.Panel2 0 @@ -393,6 +393,84 @@ 1125, 658 + + Fill + + + 0, 158 + + + Fill + + + 0, 0 + + + 199, 500 + + + 0 + + + ThumbnailEx2 + + + GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb + + + SplitContainerControl1.Panel1 + + + 0 + + + Panel1 + + + SplitContainerControl1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 0 + + + Panel2 + + + SplitContainerControl1.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 1 + + + 1125, 500 + + + 15 + + + SplitContainerControl1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + Sign Flow - Signatur-Editor @@ -501,4 +579,22 @@ 409, 17 + + Fill + + + 0, 0 + + + 212, 381 + + + 0 + + + ThumbnailEx1 + + + GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb + \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index 11f95d08..8bf5987e 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -48,14 +48,7 @@ Partial Public Class frmFieldEditor Throw New ArgumentNullException("GDPictureKey") End If - DocumentViewer1.Init(LogConfig, GDPictureKey) - DocumentViewer1.LoadFile(Document.Filepath) - - If DocumentViewer1.PdfViewer IsNot Nothing Then - GDViewer = DocumentViewer1.PdfViewer - Manager = GDViewer.GetAnnotationManager() - Manager.InitFromGdViewer(GDViewer) - End If + InitializeViewer() SetReceiver(Receivers.First()) Dim oItems = Receivers.Select(AddressOf CreateBarItem).ToArray() @@ -71,6 +64,22 @@ Partial Public Class frmFieldEditor Next 'LoadAnnotations(SelectedReceiver.Id) GDViewer.DisplayFirstPage() + + ThumbnailEx2.LoadFromGdViewer(GDViewer) + ThumbnailEx2.Refresh() + End If + End Sub + + Private Sub InitializeViewer() + DocumentViewer1.Init(LogConfig, GDPictureKey) + DocumentViewer1.LoadFile(Document.Filepath) + + If DocumentViewer1.PdfViewer IsNot Nothing Then + GDViewer = DocumentViewer1.PdfViewer + Manager = GDViewer.GetAnnotationManager() + Manager.InitFromGdViewer(GDViewer) + Else + Logger.Warn("Viewer could not be initialized!") End If End Sub