diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index 9fa37179..d695884e 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -47,6 +47,19 @@ Contract = 1 ReadAndSign = 2 End Enum + + Public Enum ColorType + ReceiverColor1 = 1 + ReceiverColor2 = 2 + ReceiverColor3 = 3 + ReceiverColor4 = 4 + ReceiverColor5 = 5 + ReceiverColor6 = 6 + ReceiverColor7 = 7 + ReceiverColor8 = 8 + ReceiverColor9 = 9 + ReceiverColor10 = 10 + End Enum #End Region End Class diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb index b6831215..f034139d 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb @@ -1,10 +1,19 @@ -Imports DigitalData.Modules.Base +Imports System.Drawing +Imports DigitalData.Modules.Base Imports EnvelopeGenerator.Common.Constants Public Class EnvelopeReceiver Public Property Id As Integer = 0 Public Property UserId As Integer Public Property Signature As String + Public ReadOnly Property Color As Color + Get + Return Helpers.ColorTypeToColor(ColorType) + End Get + End Property + + Public Property ColorType As ColorType + Public Property Name As String Public Property Company As String = "" diff --git a/EnvelopeGenerator.Common/Helpers.vb b/EnvelopeGenerator.Common/Helpers.vb index 9d5fc5c5..53e83efc 100644 --- a/EnvelopeGenerator.Common/Helpers.vb +++ b/EnvelopeGenerator.Common/Helpers.vb @@ -1,4 +1,7 @@ -Public Class Helpers +Imports System.Drawing +Imports EnvelopeGenerator.Common.Constants + +Public Class Helpers ''' ''' Encodes the EnvelopeUUID and the ReceiverSignature into an EnvelopeKey @@ -8,7 +11,7 @@ ''' The EnvelopeKey Public Shared Function EncodeEnvelopeReceiverId(pEnvelopeUuid As String, pReceiverSignature As String) As String Dim oString = $"{pEnvelopeUuid}::{pReceiverSignature}" - Dim oBytes = Text.Encoding.UTF8.GetBytes(oString) + Dim oBytes = System.Text.Encoding.UTF8.GetBytes(oString) Dim oBase64String = Convert.ToBase64String(oBytes) Return oBase64String @@ -21,7 +24,7 @@ ''' A tuple containing EnvelopeUUID and Receiver Signature Public Shared Function DecodeEnvelopeReceiverId(pEnvelopeReceiverId As String) As Tuple(Of String, String) Dim oBytes = Convert.FromBase64String(pEnvelopeReceiverId) - Dim oString = Text.Encoding.UTF8.GetString(oBytes) + Dim oString = System.Text.Encoding.UTF8.GetString(oBytes) Dim oSplit = oString.Split(New String() {"::"}, StringSplitOptions.None) Return New Tuple(Of String, String)(oSplit(0), oSplit(1)) @@ -33,4 +36,39 @@ Return oURL End Function + + Public Shared Function ColorTypeToColor(pColorType As ColorType) As Color + Select Case pColorType + Case ColorType.ReceiverColor1 + Return Color.Blue + + Case ColorType.ReceiverColor2 + Return Color.Maroon + + Case ColorType.ReceiverColor3 + Return Color.LightSeaGreen + + Case ColorType.ReceiverColor4 + Return Color.LimeGreen + + Case ColorType.ReceiverColor5 + Return Color.Magenta + + Case ColorType.ReceiverColor6 + Return Color.MediumSpringGreen + + Case ColorType.ReceiverColor7 + Return Color.OrangeRed + + Case ColorType.ReceiverColor8 + Return Color.DodgerBlue + + Case ColorType.ReceiverColor9 + Return Color.Purple + + Case ColorType.ReceiverColor10 + Return Color.Gold + + End Select + End Function End Class diff --git a/EnvelopeGenerator.Common/Models/ReceiverModel.vb b/EnvelopeGenerator.Common/Models/ReceiverModel.vb index 921bfd7b..01686402 100644 --- a/EnvelopeGenerator.Common/Models/ReceiverModel.vb +++ b/EnvelopeGenerator.Common/Models/ReceiverModel.vb @@ -11,14 +11,15 @@ Public Class ReceiverModel MyBase.New(pState) End Sub - Private Function ToReceiver(pRow As DataRow) As EnvelopeReceiver + Private Function ToReceiver(pRow As DataRow, pColorIndex As Integer) As EnvelopeReceiver Return New EnvelopeReceiver() With { .Id = pRow.ItemEx("GUID", 0), .Email = pRow.ItemEx("EMAIL_ADDRESS", ""), .Name = pRow.ItemEx("NAME", ""), .Sequence = pRow.ItemEx("SEQUENCE", 0), .Signature = pRow.ItemEx("SIGNATURE", ""), - .Status = ReceiverStatus.Unsigned + .Status = ReceiverStatus.Unsigned, + .ColorType = DirectCast(pColorIndex + 1, ColorType) } End Function diff --git a/EnvelopeGenerator.Form/My Project/licenses.licx b/EnvelopeGenerator.Form/My Project/licenses.licx index 30be7390..d48dd520 100644 --- a/EnvelopeGenerator.Form/My Project/licenses.licx +++ b/EnvelopeGenerator.Form/My Project/licenses.licx @@ -1,12 +1,13 @@ -DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, 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.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.TextEdit, 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.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.XtraEditors.Repository.RepositoryItemComboBox, 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.XtraLayout.LayoutControl, DevExpress.XtraLayout.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.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.XtraEditors.Repository.RepositoryItemTextEdit, 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.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 diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index a147ea8b..25351ecd 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -65,9 +65,12 @@ Partial Public Class frmEnvelopeEditor Me.GridReceivers = New DevExpress.XtraGrid.GridControl() Me.EnvelopeReceiverBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colColor = New DevExpress.XtraGrid.Columns.GridColumn() + Me.RepositoryItemColorPickEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit() 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.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -82,6 +85,7 @@ 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() @@ -109,7 +113,9 @@ 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.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemPictureEdit1, 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() @@ -125,6 +131,7 @@ 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 @@ -371,7 +378,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.GridReceivers.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemEmailEdit, Me.RepositoryItemPictureEdit1, Me.RepositoryItemColorPickEdit1, Me.RepositoryItemColorEdit1}) Me.GridReceivers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceivers}) ' 'EnvelopeReceiverBindingSource @@ -382,25 +389,41 @@ Partial Public Class frmEnvelopeEditor 'ViewReceivers ' Me.ViewReceivers.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple - Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEmail, Me.colName}) + Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colColor, Me.colEmail, Me.colName}) Me.ViewReceivers.GridControl = Me.GridReceivers Me.ViewReceivers.Name = "ViewReceivers" Me.ViewReceivers.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[True] Me.ViewReceivers.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom Me.ViewReceivers.OptionsView.ShowGroupPanel = False - Me.ViewReceivers.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colEmail, DevExpress.Data.ColumnSortOrder.Ascending)}) + Me.ViewReceivers.OptionsView.ShowIndicator = False ' - 'colName + 'colColor ' - Me.colName.FieldName = "Name" - Me.colName.Name = "colName" - resources.ApplyResources(Me.colName, "colName") + resources.ApplyResources(Me.colColor, "colColor") + Me.colColor.ColumnEdit = Me.RepositoryItemColorEdit1 + Me.colColor.FieldName = "Color" + Me.colColor.ImageOptions.SvgImage = CType(resources.GetObject("colColor.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.colColor.ImageOptions.SvgImageSize = New System.Drawing.Size(14, 14) + Me.colColor.MaxWidth = 40 + Me.colColor.MinWidth = 25 + Me.colColor.Name = "colColor" + Me.colColor.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] + ' + '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 ' 'colEmail ' Me.colEmail.ColumnEdit = Me.RepositoryItemEmailEdit Me.colEmail.FieldName = "Email" Me.colEmail.Name = "colEmail" + Me.colEmail.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] resources.ApplyResources(Me.colEmail, "colEmail") ' 'RepositoryItemEmailEdit @@ -408,6 +431,17 @@ Partial Public Class frmEnvelopeEditor resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit") Me.RepositoryItemEmailEdit.Name = "RepositoryItemEmailEdit" ' + 'colName + ' + Me.colName.FieldName = "Name" + Me.colName.Name = "colName" + Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] + resources.ApplyResources(Me.colName, "colName") + ' + 'RepositoryItemPictureEdit1 + ' + Me.RepositoryItemPictureEdit1.Name = "RepositoryItemPictureEdit1" + ' 'LayoutControlGroup2 ' Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -518,6 +552,12 @@ 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") @@ -554,7 +594,9 @@ 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.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemPictureEdit1, 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() @@ -570,6 +612,7 @@ 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() @@ -622,6 +665,10 @@ Partial Public Class frmEnvelopeEditor Friend WithEvents LayoutControlGroup4 As LayoutControlGroup Friend WithEvents LayoutControlGroup5 As LayoutControlGroup Friend WithEvents LayoutControlItem5 As LayoutControlItem + Friend WithEvents colColor As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents RepositoryItemColorPickEdit1 As Repository.RepositoryItemColorPickEdit + Friend WithEvents RepositoryItemPictureEdit1 As Repository.RepositoryItemPictureEdit + Friend WithEvents RepositoryItemColorEdit1 As Repository.RepositoryItemColorEdit #End Region diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 437e2b58..6a7319c5 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -452,6 +452,43 @@ 14, 35 + + + + + False + + + + Combo + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGUCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUmVkX3RvX0JsYWNrIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3 + IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuUmVke2ZpbGw6I0QxMUMxQzt9 + CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KCS5zdDB7b3BhY2l0eTowLjU7fQo8L3N0eWxlPg0KICA8Y2ly + Y2xlIGN4PSI5IiBjeT0iOSIgcj0iNyIgY2xhc3M9IlJlZCIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQog + ICAgPGNpcmNsZSBjeD0iOSIgY3k9IjI1IiByPSI3IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAg + PGcgY2xhc3M9InN0MCI+DQogICAgPGNpcmNsZSBjeD0iMjUiIGN5PSI5IiByPSI3IiBjbGFzcz0iUmVk + IiAvPg0KICA8L2c+DQogIDxjaXJjbGUgY3g9IjI1IiBjeT0iMjUiIHI9IjciIGNsYXNzPSJCbGFjayIg + Lz4NCjwvc3ZnPgs= + + + + True + + + 0 + + + 40 + False @@ -459,13 +496,25 @@ True - 0 + 1 + + + 362 True - 1 + 2 + + + 444 + + + False + + + Combo 871, 200 @@ -911,12 +960,18 @@ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colName + + colColor - + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.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 + colEmail @@ -929,6 +984,18 @@ DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colName + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemPictureEdit1 + + + DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + LayoutControlGroup2 @@ -989,6 +1056,12 @@ 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 2c0bf02c..8e0d77b2 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -5,6 +5,7 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.Common.Constants Imports EnvelopeGenerator.Common.My Partial Public Class frmEnvelopeEditor @@ -303,4 +304,14 @@ Partial Public Class frmEnvelopeEditor pen.Dispose() End If End Sub + + Private Sub ViewReceivers_InitNewRow(sender As Object, e As InitNewRowEventArgs) Handles ViewReceivers.InitNewRow + Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle) + Dim oRowCount = ViewReceivers.RowCount + 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.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index 210b65e1..564a11c7 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -255,7 +255,7 @@ Partial Public Class frmFieldEditor oAnnotation.Left = CSng(pElement.X) oAnnotation.Top = CSng(pElement.Y) oAnnotation.Fill = True - oAnnotation.FillColor = Color.Gainsboro + oAnnotation.FillColor = SelectedReceiver.Color oAnnotation.BorderWidth = 0.01 oAnnotation.Text = SIGNATURE_LABEL oAnnotation.Tag = GetAnnotationTag(pReceiverId, oPage, pElement.Id) @@ -270,7 +270,7 @@ Partial Public Class frmFieldEditor If TypeOf pAnnotation Is AnnotationStickyNote Then Dim oAnnotation As AnnotationStickyNote = pAnnotation oAnnotation.Fill = True - oAnnotation.FillColor = Color.Gainsboro + oAnnotation.FillColor = SelectedReceiver.Color oAnnotation.Text = SIGNATURE_LABEL oAnnotation.Alignment = StringAlignment.Center oAnnotation.LineAlignment = StringAlignment.Center