diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb index f034139d..a4d02a45 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb @@ -1,4 +1,5 @@ Imports System.Drawing +Imports DevExpress.Utils.Svg Imports DigitalData.Modules.Base Imports EnvelopeGenerator.Common.Constants @@ -12,6 +13,13 @@ Public Class EnvelopeReceiver End Get End Property + Public ReadOnly Property Image As SvgBitmap + Get + Return SvgBitmap.FromFile("Images/circle.svg") + End Get + End Property + + Public Property ColorType As ColorType diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index 511b5ba1..99526e98 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -45,6 +45,7 @@ On + False ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll @@ -196,5 +197,10 @@ Settings.Designer.vb + + + PreserveNewest + + \ No newline at end of file diff --git a/EnvelopeGenerator.Common/Helpers.vb b/EnvelopeGenerator.Common/Helpers.vb index 53e83efc..74539b20 100644 --- a/EnvelopeGenerator.Common/Helpers.vb +++ b/EnvelopeGenerator.Common/Helpers.vb @@ -1,4 +1,5 @@ Imports System.Drawing +Imports DevExpress.Utils.Svg Imports EnvelopeGenerator.Common.Constants Public Class Helpers @@ -71,4 +72,17 @@ Public Class Helpers End Select End Function + + Public Shared Function GetColorCircle(pBaseImage As SvgImage, pColor As Color) As SvgImage + Dim oColoredImage As SvgImage = pBaseImage. + Clone(Sub(el As SvgElement, table As Hashtable) + If TypeOf el Is SvgCircle Then + el.Styles.Clear() + table("StyleName") = String.Empty + table("Fill") = ColorTranslator.ToHtml(pColor) + End If + End Sub) + + Return oColoredImage + End Function End Class diff --git a/EnvelopeGenerator.Common/Images/circle.svg b/EnvelopeGenerator.Common/Images/circle.svg new file mode 100644 index 00000000..e0d1b515 --- /dev/null +++ b/EnvelopeGenerator.Common/Images/circle.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 25351ecd..b1c195f8 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -66,11 +66,14 @@ Partial Public Class frmEnvelopeEditor Me.EnvelopeReceiverBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colColor = New DevExpress.XtraGrid.Columns.GridColumn() - Me.RepositoryItemColorPickEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit() + Me.RepositoryItemPictureEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit() Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemPictureEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit() + Me.RepositoryItemColorPickEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit() + Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit() + Me.RepositoryItemImageEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemImageEdit() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -85,7 +88,6 @@ Partial Public Class frmEnvelopeEditor Me.FrmEditorBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() - Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -113,9 +115,12 @@ Partial Public Class frmEnvelopeEditor CType(Me.GridReceivers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemPictureEdit2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemImageEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -131,7 +136,6 @@ Partial Public Class frmEnvelopeEditor CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager1 @@ -378,7 +382,7 @@ Partial Public Class frmEnvelopeEditor Me.GridReceivers.MainView = Me.ViewReceivers Me.GridReceivers.MenuManager = Me.RibbonControl1 Me.GridReceivers.Name = "GridReceivers" - Me.GridReceivers.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemEmailEdit, Me.RepositoryItemPictureEdit1, Me.RepositoryItemColorPickEdit1, Me.RepositoryItemColorEdit1}) + Me.GridReceivers.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemEmailEdit, Me.RepositoryItemPictureEdit1, Me.RepositoryItemColorPickEdit1, Me.RepositoryItemColorEdit1, Me.RepositoryItemImageEdit1, Me.RepositoryItemPictureEdit2}) Me.GridReceivers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceivers}) ' 'EnvelopeReceiverBindingSource @@ -409,14 +413,10 @@ Partial Public Class frmEnvelopeEditor Me.colColor.Name = "colColor" Me.colColor.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] ' - 'RepositoryItemColorPickEdit1 + 'RepositoryItemPictureEdit2 ' - resources.ApplyResources(Me.RepositoryItemColorPickEdit1, "RepositoryItemColorPickEdit1") - Me.RepositoryItemColorPickEdit1.AutomaticColor = System.Drawing.Color.Black - Me.RepositoryItemColorPickEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemColorPickEdit1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.RepositoryItemColorPickEdit1.Name = "RepositoryItemColorPickEdit1" - Me.RepositoryItemColorPickEdit1.ReadOnly = True - Me.RepositoryItemColorPickEdit1.ShowDropDown = DevExpress.XtraEditors.Controls.ShowDropDown.Never + Me.RepositoryItemPictureEdit2.Name = "RepositoryItemPictureEdit2" + Me.RepositoryItemPictureEdit2.SvgImageSize = New System.Drawing.Size(16, 16) ' 'colEmail ' @@ -442,6 +442,27 @@ Partial Public Class frmEnvelopeEditor ' Me.RepositoryItemPictureEdit1.Name = "RepositoryItemPictureEdit1" ' + 'RepositoryItemColorPickEdit1 + ' + resources.ApplyResources(Me.RepositoryItemColorPickEdit1, "RepositoryItemColorPickEdit1") + Me.RepositoryItemColorPickEdit1.AutomaticColor = System.Drawing.Color.Black + Me.RepositoryItemColorPickEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemColorPickEdit1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemColorPickEdit1.Name = "RepositoryItemColorPickEdit1" + Me.RepositoryItemColorPickEdit1.ReadOnly = True + Me.RepositoryItemColorPickEdit1.ShowDropDown = DevExpress.XtraEditors.Controls.ShowDropDown.Never + ' + 'RepositoryItemColorEdit1 + ' + resources.ApplyResources(Me.RepositoryItemColorEdit1, "RepositoryItemColorEdit1") + Me.RepositoryItemColorEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemColorEdit1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemColorEdit1.Name = "RepositoryItemColorEdit1" + ' + 'RepositoryItemImageEdit1 + ' + resources.ApplyResources(Me.RepositoryItemImageEdit1, "RepositoryItemImageEdit1") + Me.RepositoryItemImageEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemImageEdit1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemImageEdit1.Name = "RepositoryItemImageEdit1" + ' 'LayoutControlGroup2 ' Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -552,12 +573,6 @@ Partial Public Class frmEnvelopeEditor Me.OpenFileDialog1.FileName = "OpenFileDialog1" resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1") ' - 'RepositoryItemColorEdit1 - ' - resources.ApplyResources(Me.RepositoryItemColorEdit1, "RepositoryItemColorEdit1") - Me.RepositoryItemColorEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemColorEdit1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.RepositoryItemColorEdit1.Name = "RepositoryItemColorEdit1" - ' 'frmEnvelopeEditor ' resources.ApplyResources(Me, "$this") @@ -594,9 +609,12 @@ Partial Public Class frmEnvelopeEditor CType(Me.GridReceivers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemPictureEdit2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemImageEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() @@ -612,7 +630,6 @@ Partial Public Class frmEnvelopeEditor CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -669,6 +686,8 @@ Partial Public Class frmEnvelopeEditor Friend WithEvents RepositoryItemColorPickEdit1 As Repository.RepositoryItemColorPickEdit Friend WithEvents RepositoryItemPictureEdit1 As Repository.RepositoryItemPictureEdit Friend WithEvents RepositoryItemColorEdit1 As Repository.RepositoryItemColorEdit + Friend WithEvents RepositoryItemImageEdit1 As Repository.RepositoryItemImageEdit + Friend WithEvents RepositoryItemPictureEdit2 As Repository.RepositoryItemPictureEdit #End Region diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 6a7319c5..23df77b6 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -516,6 +516,12 @@ Combo + + False + + + Combo + 871, 200 @@ -966,11 +972,11 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RepositoryItemColorPickEdit1 + + RepositoryItemPictureEdit2 - - DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit, 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 colEmail @@ -996,6 +1002,24 @@ DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RepositoryItemColorPickEdit1 + + + DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemColorEdit1 + + + DevExpress.XtraEditors.Repository.RepositoryItemColorEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemImageEdit1 + + + DevExpress.XtraEditors.Repository.RepositoryItemImageEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + LayoutControlGroup2 @@ -1056,12 +1080,6 @@ System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - RepositoryItemColorEdit1 - - - DevExpress.XtraEditors.Repository.RepositoryItemColorEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmEnvelopeEditor diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 8e0d77b2..ed15734f 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -1,4 +1,6 @@ Imports System.ComponentModel +Imports DevExpress.Utils.Drawing +Imports DevExpress.Utils.Svg Imports DevExpress.XtraEditors Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid @@ -311,7 +313,6 @@ Partial Public Class frmEnvelopeEditor Dim oColorType = DirectCast(oRowCount, ColorType) oReceiver.ColorType = oColorType - 'Dim oColor = Helpers.ColorTypeToColor(oColorType) - 'ViewReceivers.SetRowCellValue(e.RowHandle, colColor, oColor) End Sub + End Class diff --git a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb index 38fc4a73..c3cc96d9 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb @@ -47,11 +47,13 @@ Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) 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() Me.SuspendLayout() ' 'ribbonControl1 @@ -102,6 +104,7 @@ ' 'PopupMenu1 ' + Me.PopupMenu1.MenuDrawMode = DevExpress.XtraBars.MenuDrawMode.SmallImagesText Me.PopupMenu1.Name = "PopupMenu1" Me.PopupMenu1.Ribbon = Me.ribbonControl1 ' @@ -192,6 +195,11 @@ resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") Me.barDockControlRight.Manager = Me.BarManager1 ' + 'SvgImageCollection1 + ' + Me.SvgImageCollection1.ImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.None + Me.SvgImageCollection1.Add("appointmentnightclock", "image://svgimages/scheduling/appointmentnightclock.svg") + ' 'frmFieldEditor ' resources.ApplyResources(Me, "$this") @@ -209,6 +217,7 @@ CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -237,4 +246,5 @@ Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl + Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection End Class diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx index ff369e2c..4049cdca 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.resx @@ -283,7 +283,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null $this @@ -486,10 +486,19 @@ DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + SvgImageCollection1 + + + DevExpress.Utils.SvgImageCollection, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmFieldEditor DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 409, 17 + \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index 564a11c7..11f95d08 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -1,4 +1,7 @@ -Imports DevExpress.XtraBars +Imports System.Collections +Imports DevExpress.Utils +Imports DevExpress.Utils.Svg +Imports DevExpress.XtraBars Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.My @@ -63,26 +66,36 @@ Partial Public Class frmFieldEditor If Controller.LoadElements() = False Then MsgBox(Resources.Envelope.Elements_could_not_be_loaded, MsgBoxStyle.Critical, Text) Else - LoadAnnotations(SelectedReceiver.Id) + For Each oReceiver In Receivers + LoadAnnotations(oReceiver.Id) + Next + 'LoadAnnotations(SelectedReceiver.Id) GDViewer.DisplayFirstPage() End If End Sub Private Function CreateBarItem(pReceiver As EnvelopeReceiver) As BarItem Dim oItem = New BarButtonItem(BarManager1, pReceiver.Name) + Dim oBaseCircle As SvgImage = SvgImageCollection1.Item(0) + Dim oColorCircle = Helpers.GetColorCircle(oBaseCircle, pReceiver.Color) + + oItem.ImageOptions.SvgImage = oColorCircle + AddHandler oItem.ItemClick, AddressOf ReceiverItem_Click oItem.Tag = pReceiver Return oItem End Function + + Private Sub ReceiverItem_Click(sender As Object, e As ItemClickEventArgs) Me.SuspendLayout() - Dim oReceiver As EnvelopeReceiver = e.Item.Tag + Dim oSelectedReceiver As EnvelopeReceiver = e.Item.Tag Dim oCurrentPage = GDViewer.CurrentPage Dim oCurrentPosition = GDViewer.GetVScrollBarPosition() - If oReceiver.Id = SelectedReceiver.Id Then + If oSelectedReceiver.Id = SelectedReceiver.Id Then Exit Sub End If @@ -90,9 +103,13 @@ Partial Public Class frmFieldEditor If Controller.SaveElements(SelectedReceiver.Id) Then - SetReceiver(oReceiver) + SetReceiver(oSelectedReceiver) ClearAnnotations() - LoadAnnotations(oReceiver.Id) + + For Each oReceiver In Receivers + LoadAnnotations(oReceiver.Id) + Next + DisplayPage(oCurrentPage) GDViewer.SetVScrollBarPosition(oCurrentPosition) GDViewer.Redraw() @@ -105,7 +122,10 @@ Partial Public Class frmFieldEditor End Sub Private Sub SetReceiver(pReceiver As EnvelopeReceiver) + Dim oBaseCircle As SvgImage = SvgImageCollection1.Item(0) + txtReceiver.Caption = pReceiver.Name + txtReceiver.ImageOptions.SvgImage = Helpers.GetColorCircle(oBaseCircle, pReceiver.Color) SelectedReceiver = pReceiver End Sub @@ -128,28 +148,9 @@ Partial Public Class frmFieldEditor End If End Sub - Private Sub Viewer_AnnotationAddedByUser(pAnnotationIdx As Integer) - Dim oAnnotation = GDViewer.GetAnnotationFromIdx(pAnnotationIdx) - Dim oPage = GDViewer.CurrentPage - Dim oTag = GetAnnotationTag(SelectedReceiver.Id, oPage, -1) - - If TypeOf oAnnotation Is AnnotationStickyNote Then - Dim oStickyNote As AnnotationStickyNote = oAnnotation - oStickyNote.Width = SIGNATURE_WIDTH - oStickyNote.Height = SIGNATURE_HEIGHT - oStickyNote.Tag = oTag - - ApplyAnnotationStyle(oAnnotation) - End If - - oAnnotation.CanRotate = False - oAnnotation.CanEdit = False - oAnnotation.CanResize = False - End Sub - - Private Sub Viewer_BeforeAnnotationAddedByUser(pAnnotationIdx As Integer) - 'NOOP + Dim oAnnotation As Annotation = GDViewer.GetAnnotationFromIdx(pAnnotationIdx) + ApplyAnnotationStyleForNewAnnotation(oAnnotation, SelectedReceiver.Color) End Sub Private Sub btnSave_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnSave.ItemClick @@ -248,16 +249,22 @@ Partial Public Class frmFieldEditor Private Sub LoadAnnotation(pElement As EnvelopeDocumentElement, pReceiverId As Integer) Dim oAnnotation As AnnotationStickyNote = Manager.AddStickyNoteAnnot(0, 0, 0, 0, "SIGNATUR") Dim oPage = pElement.Page + Dim oReceiver = Receivers.Where(Function(r) r.Id = pReceiverId).Single() + + Dim oAnnotationColor = oReceiver.Color + If oReceiver.Id <> SelectedReceiver.Id Then + oAnnotationColor = Color.FromArgb(30, oReceiver.Color) + + oAnnotation.CanSelect = False + End If If Manager.GetStat() = GdPictureStatus.OK Then + ApplyAnnotationStyleForExistingAnnotation(oAnnotation, oAnnotationColor) + oAnnotation.Width = CSng(pElement.Width) oAnnotation.Height = CSng(pElement.Height) oAnnotation.Left = CSng(pElement.X) oAnnotation.Top = CSng(pElement.Y) - oAnnotation.Fill = True - oAnnotation.FillColor = SelectedReceiver.Color - oAnnotation.BorderWidth = 0.01 - oAnnotation.Text = SIGNATURE_LABEL oAnnotation.Tag = GetAnnotationTag(pReceiverId, oPage, pElement.Id) Else Dim oStatus = Manager.GetStat() @@ -266,15 +273,48 @@ Partial Public Class frmFieldEditor End If End Sub - Private Sub ApplyAnnotationStyle(ByRef pAnnotation As Annotation) + Private Sub Viewer_AnnotationAddedByUser(pAnnotationIdx As Integer) + Dim oAnnotation = GDViewer.GetAnnotationFromIdx(pAnnotationIdx) + Dim oPage = GDViewer.CurrentPage + Dim oTag = GetAnnotationTag(SelectedReceiver.Id, oPage, -1) + + If TypeOf oAnnotation Is AnnotationStickyNote Then + Dim oStickyNote As AnnotationStickyNote = oAnnotation + oStickyNote.Width = SIGNATURE_WIDTH + oStickyNote.Height = SIGNATURE_HEIGHT + oStickyNote.Tag = oTag + + ApplyAnnotationStyleForExistingAnnotation(oAnnotation, SelectedReceiver.Color) + End If + End Sub + + Private Sub ApplyAnnotationStyleForExistingAnnotation(ByRef pAnnotation As Annotation, pColor As Color) + ApplyAnnotationStyle(pAnnotation, pColor, pIsNewAnnotation:=False) + End Sub + + Private Sub ApplyAnnotationStyleForNewAnnotation(ByRef pAnnotation As Annotation, pColor As Color) + ApplyAnnotationStyle(pAnnotation, pColor, pIsNewAnnotation:=True) + End Sub + + Private Sub ApplyAnnotationStyle(ByRef pAnnotation As Annotation, pColor As Color, pIsNewAnnotation As Boolean) If TypeOf pAnnotation Is AnnotationStickyNote Then Dim oAnnotation As AnnotationStickyNote = pAnnotation oAnnotation.Fill = True - oAnnotation.FillColor = SelectedReceiver.Color + oAnnotation.FillColor = pColor oAnnotation.Text = SIGNATURE_LABEL oAnnotation.Alignment = StringAlignment.Center oAnnotation.LineAlignment = StringAlignment.Center oAnnotation.BorderWidth = 0.01 + oAnnotation.FontSize = 16 + oAnnotation.FontStyle = FontStyle.Regular + + oAnnotation.CanEditText = False + oAnnotation.CanEdit = False + oAnnotation.CanRotate = False + + If pIsNewAnnotation = False Then + oAnnotation.CanResize = False + End If End If End Sub @@ -332,6 +372,10 @@ Partial Public Class frmFieldEditor Private Function GetAnnotationTag(pReceiver As Integer, pPage As Integer, pGuid As Integer) As String Return $"{pReceiver}|{pPage}|{pGuid}" End Function + + Private Sub PopupMenu1_BeforePopup(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles PopupMenu1.BeforePopup + + End Sub End Class