diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index b24389c7..367d176c 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -424,7 +424,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup5}) Me.LayoutControlGroup4.Name = "LayoutControlGroup4" Me.LayoutControlGroup4.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 530) + Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 418) Me.LayoutControlGroup4.TextVisible = False ' 'LayoutControlGroup5 @@ -432,7 +432,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5}) Me.LayoutControlGroup5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup5.Name = "LayoutControlGroup5" - Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 530) + Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 418) resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5") ' 'LayoutControlItem5 @@ -440,7 +440,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem5.Control = Me.GridDocuments Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 485) + Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 373) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False ' @@ -594,7 +594,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup3}) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" Me.LayoutControlGroup2.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.LayoutControlGroup2.Size = New System.Drawing.Size(899, 249) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(796, 249) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlGroup3 @@ -602,7 +602,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup3.Name = "LayoutControlGroup3" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(899, 249) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(796, 249) resources.ApplyResources(Me.LayoutControlGroup3, "LayoutControlGroup3") ' 'LayoutControlItem2 @@ -610,7 +610,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem2.Control = Me.GridReceivers Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 204) + Me.LayoutControlItem2.Size = New System.Drawing.Size(772, 204) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -644,7 +644,7 @@ Partial Public Class frmEnvelopeEditor Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1}) Me.Root.Name = "Root" Me.Root.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.Root.Size = New System.Drawing.Size(899, 263) + Me.Root.Size = New System.Drawing.Size(796, 151) Me.Root.TextVisible = False ' 'LayoutControlGroup1 @@ -653,7 +653,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 263) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(796, 151) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem3 @@ -662,7 +662,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 216) + Me.LayoutControlItem3.Size = New System.Drawing.Size(770, 104) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem3.TextSize = New System.Drawing.Size(46, 13) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 27ecec05..9a09f5bf 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -485,13 +485,13 @@ Start - 1164, 132 + 1061, 132 - 0, 662 + 0, 550 - 1164, 22 + 1061, 22 RibbonStatusBar1 @@ -518,7 +518,7 @@ 2 - 223, 481 + 223, 369 0 @@ -545,7 +545,7 @@ Ihre Dokumente - 251, 530 + 251, 418 1 @@ -627,7 +627,7 @@ 0 - 32 + 54 False @@ -696,7 +696,7 @@ Combo - 871, 200 + 768, 200 0 @@ -726,7 +726,7 @@ Empfänger - 899, 249 + 796, 249 1 @@ -756,7 +756,7 @@ 0, 0, 0, 0 - 903, 253 + 800, 253 1 @@ -795,7 +795,7 @@ Segoe UI, 9.75pt - 853, 180 + 750, 68 2 @@ -825,7 +825,7 @@ Ihre Nachricht - 899, 263 + 796, 151 0 @@ -855,7 +855,7 @@ 0, 0, 0, 0 - 903, 267 + 800, 155 1 @@ -888,7 +888,7 @@ 1 - 903, 530 + 800, 418 0 @@ -921,7 +921,7 @@ 1 - 1164, 530 + 1061, 418 1 @@ -985,7 +985,7 @@ 6, 13 - 1164, 684 + 1061, 572 diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx index 5fcb652a..b8429942 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.resx @@ -123,7 +123,7 @@ - 0, 59 + 0, 132 Fill @@ -132,7 +132,7 @@ 0, 0 - 199, 600 + 199, 402 @@ -172,7 +172,7 @@ 0, 0 - 917, 600 + 577, 402 3 @@ -205,7 +205,7 @@ 1 - 1126, 600 + 786, 402 15 @@ -397,7 +397,7 @@ Combo - 1126, 88 + 786, 132 ribbonControl1 @@ -427,7 +427,7 @@ 0, 0 - 1126, 0 + 786, 0 barDockControlTop @@ -445,10 +445,10 @@ Bottom - 0, 659 + 0, 534 - 1126, 0 + 786, 0 barDockControlBottom @@ -469,7 +469,7 @@ 0, 0 - 0, 659 + 0, 534 barDockControlLeft @@ -487,10 +487,10 @@ Right - 1126, 0 + 786, 0 - 0, 659 + 0, 534 barDockControlRight @@ -511,7 +511,7 @@ 6, 13 - 1689, 988 + 786, 534 Segoe UI, 8.25pt diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index f6b9cfc3..89309357 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -169,7 +169,7 @@ Partial Class frmMain 'SplitContainerControl1.Panel2 ' resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") - Me.SplitContainerControl1.SplitterPosition = 272 + Me.SplitContainerControl1.SplitterPosition = 335 ' 'XtraTabControlMain ' @@ -181,8 +181,8 @@ Partial Class frmMain 'XtraTabPage1 ' Me.XtraTabPage1.Controls.Add(Me.GridEnvelopes) - Me.XtraTabPage1.Name = "XtraTabPage1" resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1") + Me.XtraTabPage1.Name = "XtraTabPage1" ' 'GridEnvelopes ' @@ -191,6 +191,7 @@ Partial Class frmMain Me.GridEnvelopes.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles) Me.GridEnvelopes.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout) Me.GridEnvelopes.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode) + Me.GridEnvelopes.EmbeddedNavigator.Margin = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridEnvelopes.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) Me.GridEnvelopes.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) GridLevelNode1.LevelTemplate = Me.ViewReceivers @@ -207,6 +208,7 @@ Partial Class frmMain 'ViewReceivers ' Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColReceiverStatus, Me.ColName, Me.ColEmail, Me.ColSignedDate, Me.colAccessCode, Me.ColStatusReceiver}) + Me.ViewReceivers.DetailHeight = 431 Me.ViewReceivers.GridControl = Me.GridEnvelopes Me.ViewReceivers.Name = "ViewReceivers" Me.ViewReceivers.OptionsBehavior.Editable = False @@ -221,6 +223,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColReceiverStatus, "ColReceiverStatus") Me.ColReceiverStatus.FieldName = "StatusTranslated" + Me.ColReceiverStatus.MinWidth = 27 Me.ColReceiverStatus.Name = "ColReceiverStatus" Me.ColReceiverStatus.OptionsColumn.AllowEdit = False ' @@ -228,6 +231,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColName, "ColName") Me.ColName.FieldName = "Name" + Me.ColName.MinWidth = 27 Me.ColName.Name = "ColName" Me.ColName.OptionsColumn.AllowEdit = False ' @@ -235,6 +239,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColEmail, "ColEmail") Me.ColEmail.FieldName = "EmailAddress" + Me.ColEmail.MinWidth = 27 Me.ColEmail.Name = "ColEmail" Me.ColEmail.OptionsColumn.AllowEdit = False ' @@ -242,6 +247,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColSignedDate, "ColSignedDate") Me.ColSignedDate.FieldName = "SignedDateDisplayValue" + Me.ColSignedDate.MinWidth = 27 Me.ColSignedDate.Name = "ColSignedDate" Me.ColSignedDate.OptionsColumn.AllowEdit = False ' @@ -249,17 +255,20 @@ Partial Class frmMain ' resources.ApplyResources(Me.colAccessCode, "colAccessCode") Me.colAccessCode.FieldName = "AccessCode" + Me.colAccessCode.MinWidth = 27 Me.colAccessCode.Name = "colAccessCode" ' 'ColStatusReceiver ' resources.ApplyResources(Me.ColStatusReceiver, "ColStatusReceiver") Me.ColStatusReceiver.FieldName = "Status" + Me.ColStatusReceiver.MinWidth = 27 Me.ColStatusReceiver.Name = "ColStatusReceiver" ' 'ViewHistory ' Me.ViewHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatus, Me.ColHistoryUserReference, Me.ColHistoryDate}) + Me.ViewHistory.DetailHeight = 431 Me.ViewHistory.GridControl = Me.GridEnvelopes Me.ViewHistory.Name = "ViewHistory" Me.ViewHistory.OptionsBehavior.Editable = False @@ -272,12 +281,14 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColHistoryStatus, "ColHistoryStatus") Me.ColHistoryStatus.FieldName = "StatusTranslated" + Me.ColHistoryStatus.MinWidth = 27 Me.ColHistoryStatus.Name = "ColHistoryStatus" ' 'ColHistoryUserReference ' resources.ApplyResources(Me.ColHistoryUserReference, "ColHistoryUserReference") Me.ColHistoryUserReference.FieldName = "UserReference" + Me.ColHistoryUserReference.MinWidth = 27 Me.ColHistoryUserReference.Name = "ColHistoryUserReference" ' 'ColHistoryDate @@ -286,11 +297,13 @@ Partial Class frmMain Me.ColHistoryDate.DisplayFormat.FormatString = "G" Me.ColHistoryDate.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.ColHistoryDate.FieldName = "ActionDate" + Me.ColHistoryDate.MinWidth = 27 Me.ColHistoryDate.Name = "ColHistoryDate" ' 'ViewEnvelopes ' Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen, Me.GridColumn2}) + Me.ViewEnvelopes.DetailHeight = 431 Me.ViewEnvelopes.GridControl = Me.GridEnvelopes Me.ViewEnvelopes.Name = "ViewEnvelopes" Me.ViewEnvelopes.OptionsBehavior.Editable = False @@ -302,24 +315,28 @@ Partial Class frmMain ' resources.ApplyResources(Me.colEnvelopeId, "colEnvelopeId") Me.colEnvelopeId.FieldName = "Id" + Me.colEnvelopeId.MinWidth = 27 Me.colEnvelopeId.Name = "colEnvelopeId" ' 'colContractType ' resources.ApplyResources(Me.colContractType, "colContractType") Me.colContractType.FieldName = "EnvelopeTypeTitle" + Me.colContractType.MinWidth = 27 Me.colContractType.Name = "colContractType" ' 'colStatus ' resources.ApplyResources(Me.colStatus, "colStatus") Me.colStatus.FieldName = "StatusTranslated" + Me.colStatus.MinWidth = 27 Me.colStatus.Name = "colStatus" ' 'colTitle ' resources.ApplyResources(Me.colTitle, "colTitle") Me.colTitle.FieldName = "Title" + Me.colTitle.MinWidth = 27 Me.colTitle.Name = "colTitle" ' 'colAddedWhen @@ -328,6 +345,7 @@ Partial Class frmMain Me.colAddedWhen.DisplayFormat.FormatString = "G" Me.colAddedWhen.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.colAddedWhen.FieldName = "AddedWhen" + Me.colAddedWhen.MinWidth = 27 Me.colAddedWhen.Name = "colAddedWhen" ' 'GridColumn2 @@ -336,10 +354,12 @@ Partial Class frmMain Me.GridColumn2.DisplayFormat.FormatString = "G" Me.GridColumn2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.GridColumn2.FieldName = "ChangedWhen" + Me.GridColumn2.MinWidth = 27 Me.GridColumn2.Name = "GridColumn2" ' 'RibbonControl ' + Me.RibbonControl.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(40, 37, 40, 37) Me.RibbonControl.ExpandCollapseItem.Id = 0 Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer) Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer) @@ -347,6 +367,7 @@ Partial Class frmMain resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.MaxItemId = 22 Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.OptionsMenuMinWidth = 440 Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show @@ -549,6 +570,7 @@ Partial Class frmMain ' 'RibbonPageGroupReceiver ' + Me.RibbonPageGroupReceiver.Enabled = False Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.bbtnitm_ResendInvitation) Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.bbtnitm2Faktor) @@ -583,8 +605,8 @@ Partial Class frmMain 'XtraTabPage2 ' Me.XtraTabPage2.Controls.Add(Me.GridCompleted) - Me.XtraTabPage2.Name = "XtraTabPage2" resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2") + Me.XtraTabPage2.Name = "XtraTabPage2" ' 'GridCompleted ' @@ -593,6 +615,7 @@ Partial Class frmMain Me.GridCompleted.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles) Me.GridCompleted.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout) Me.GridCompleted.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode) + Me.GridCompleted.EmbeddedNavigator.Margin = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridCompleted.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) Me.GridCompleted.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) GridLevelNode3.LevelTemplate = Me.ViewReceiversCompleted @@ -609,6 +632,7 @@ Partial Class frmMain 'ViewReceiversCompleted ' Me.ViewReceiversCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColStatusCompleted, Me.ColNameCompleted, Me.ColEmailCompleted, Me.ColSignedDateCompleted}) + Me.ViewReceiversCompleted.DetailHeight = 431 Me.ViewReceiversCompleted.GridControl = Me.GridCompleted Me.ViewReceiversCompleted.Name = "ViewReceiversCompleted" Me.ViewReceiversCompleted.OptionsBehavior.Editable = False @@ -623,29 +647,34 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColStatusCompleted, "ColStatusCompleted") Me.ColStatusCompleted.FieldName = "StatusTranslated" + Me.ColStatusCompleted.MinWidth = 27 Me.ColStatusCompleted.Name = "ColStatusCompleted" ' 'ColNameCompleted ' resources.ApplyResources(Me.ColNameCompleted, "ColNameCompleted") Me.ColNameCompleted.FieldName = "Name" + Me.ColNameCompleted.MinWidth = 27 Me.ColNameCompleted.Name = "ColNameCompleted" ' 'ColEmailCompleted ' resources.ApplyResources(Me.ColEmailCompleted, "ColEmailCompleted") Me.ColEmailCompleted.FieldName = "EmailAddress" + Me.ColEmailCompleted.MinWidth = 27 Me.ColEmailCompleted.Name = "ColEmailCompleted" ' 'ColSignedDateCompleted ' resources.ApplyResources(Me.ColSignedDateCompleted, "ColSignedDateCompleted") Me.ColSignedDateCompleted.FieldName = "SignedDateDisplayValue" + Me.ColSignedDateCompleted.MinWidth = 27 Me.ColSignedDateCompleted.Name = "ColSignedDateCompleted" ' 'ViewHistoryCompleted ' Me.ViewHistoryCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatusCompleted, Me.ColHistoryUserReferenceCompleted, Me.ColHistoryDateCompleted}) + Me.ViewHistoryCompleted.DetailHeight = 431 Me.ViewHistoryCompleted.GridControl = Me.GridCompleted Me.ViewHistoryCompleted.Name = "ViewHistoryCompleted" Me.ViewHistoryCompleted.OptionsBehavior.Editable = False @@ -660,12 +689,14 @@ Partial Class frmMain ' resources.ApplyResources(Me.ColHistoryStatusCompleted, "ColHistoryStatusCompleted") Me.ColHistoryStatusCompleted.FieldName = "StatusTranslated" + Me.ColHistoryStatusCompleted.MinWidth = 27 Me.ColHistoryStatusCompleted.Name = "ColHistoryStatusCompleted" ' 'ColHistoryUserReferenceCompleted ' resources.ApplyResources(Me.ColHistoryUserReferenceCompleted, "ColHistoryUserReferenceCompleted") Me.ColHistoryUserReferenceCompleted.FieldName = "UserReference" + Me.ColHistoryUserReferenceCompleted.MinWidth = 27 Me.ColHistoryUserReferenceCompleted.Name = "ColHistoryUserReferenceCompleted" ' 'ColHistoryDateCompleted @@ -674,11 +705,13 @@ Partial Class frmMain Me.ColHistoryDateCompleted.DisplayFormat.FormatString = "G" Me.ColHistoryDateCompleted.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.ColHistoryDateCompleted.FieldName = "ActionDate" + Me.ColHistoryDateCompleted.MinWidth = 27 Me.ColHistoryDateCompleted.Name = "ColHistoryDateCompleted" ' 'ViewCompleted ' Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn6, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7, Me.GridColumn1}) + Me.ViewCompleted.DetailHeight = 431 Me.ViewCompleted.GridControl = Me.GridCompleted Me.ViewCompleted.Name = "ViewCompleted" Me.ViewCompleted.OptionsBehavior.Editable = False @@ -690,25 +723,28 @@ Partial Class frmMain ' resources.ApplyResources(Me.GridColumn3, "GridColumn3") Me.GridColumn3.FieldName = "EnvelopeTypeTitle" + Me.GridColumn3.MinWidth = 27 Me.GridColumn3.Name = "GridColumn3" ' 'GridColumn6 ' resources.ApplyResources(Me.GridColumn6, "GridColumn6") Me.GridColumn6.FieldName = "Comment" - Me.GridColumn6.MinWidth = 80 + Me.GridColumn6.MinWidth = 107 Me.GridColumn6.Name = "GridColumn6" ' 'GridColumn4 ' resources.ApplyResources(Me.GridColumn4, "GridColumn4") Me.GridColumn4.FieldName = "StatusTranslated" + Me.GridColumn4.MinWidth = 27 Me.GridColumn4.Name = "GridColumn4" ' 'GridColumn5 ' resources.ApplyResources(Me.GridColumn5, "GridColumn5") Me.GridColumn5.FieldName = "Title" + Me.GridColumn5.MinWidth = 27 Me.GridColumn5.Name = "GridColumn5" ' 'GridColumn7 @@ -717,6 +753,7 @@ Partial Class frmMain Me.GridColumn7.DisplayFormat.FormatString = "G" Me.GridColumn7.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.GridColumn7.FieldName = "AddedWhen" + Me.GridColumn7.MinWidth = 27 Me.GridColumn7.Name = "GridColumn7" ' 'GridColumn1 @@ -725,14 +762,15 @@ Partial Class frmMain Me.GridColumn1.DisplayFormat.FormatString = "G" Me.GridColumn1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.GridColumn1.FieldName = "ChangedWhen" + Me.GridColumn1.MinWidth = 27 Me.GridColumn1.Name = "GridColumn1" ' 'XtraTabPageAdmin ' Me.XtraTabPageAdmin.Controls.Add(Me.SplitContainerControl2) Me.XtraTabPageAdmin.Controls.Add(Me.PanelControl1) - Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin" resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin") + Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin" ' 'SplitContainerControl2 ' @@ -747,11 +785,12 @@ Partial Class frmMain 'SplitContainerControl2.Panel2 ' resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2") - Me.SplitContainerControl2.SplitterPosition = 907 + Me.SplitContainerControl2.SplitterPosition = 1209 ' 'GridControlData ' resources.ApplyResources(Me.GridControlData, "GridControlData") + Me.GridControlData.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlData.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControlData.MainView = Me.GridViewData Me.GridControlData.MenuManager = Me.RibbonControl Me.GridControlData.Name = "GridControlData" @@ -759,6 +798,7 @@ Partial Class frmMain ' 'GridViewData ' + Me.GridViewData.DetailHeight = 431 Me.GridViewData.GridControl = Me.GridControlData Me.GridViewData.Name = "GridViewData" Me.GridViewData.OptionsView.ShowAutoFilterRow = True @@ -833,8 +873,8 @@ Partial Class frmMain Me.XtraTabPage3.Controls.Add(Me.Label1) Me.XtraTabPage3.Controls.Add(Me.Button1) Me.XtraTabPage3.Controls.Add(Me.txtEnvID) - Me.XtraTabPage3.Name = "XtraTabPage3" resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3") + Me.XtraTabPage3.Name = "XtraTabPage3" ' 'Label1 ' diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index d151f249..38b19f9f 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -123,7 +123,10 @@ - 0, 158 + 0, 194 + + + 4, 4, 4, 4 Fill @@ -131,6 +134,9 @@ 0, 0 + + 4, 4, 4, 4 + Fill @@ -147,6 +153,9 @@ NoControl + + 4, 4, 4, 4 + None @@ -166,7 +175,7 @@ 0 - 129 + 172 Email Anrede @@ -178,7 +187,7 @@ 1 - 406 + 541 Email @@ -190,7 +199,7 @@ 2 - 332 + 443 Unterschrieben wann @@ -202,7 +211,7 @@ 4 - 110 + 147 Zugangscode @@ -214,11 +223,14 @@ 3 - 107 + 143 Status + + 100 + Empfänger @@ -231,6 +243,9 @@ 0 + + 100 + Benutzer @@ -240,6 +255,9 @@ 1 + + 100 + Datum @@ -249,12 +267,18 @@ 2 + + 100 + 0, 0 GridColumn1 + + 100 + Typ @@ -265,7 +289,7 @@ 2 - 112 + 149 Status @@ -277,7 +301,7 @@ 1 - 180 + 240 Titel @@ -289,7 +313,7 @@ 0 - 538 + 717 Erstellt am @@ -301,7 +325,7 @@ 3 - 130 + 173 Zuletzt geändert am @@ -313,7 +337,10 @@ 4 - 130 + 173 + + + 4, 4, 4, 4 0 @@ -931,6 +958,9 @@ 0, 0 + + 4, 4, 4, 4 + Start @@ -953,13 +983,16 @@ Einstellungen - 1090, 158 + 1356, 194 - 0, 660 + 0, 605 + + + 4, 4, 4, 4 - 1090, 22 + 1356, 28 RibbonStatusBar @@ -986,7 +1019,7 @@ 2 - 725, 313 + 1354, 371 2 @@ -1003,8 +1036,11 @@ 0 + + 4, 4, 4, 4 + - 1088, 469 + 1354, 371 Offene Umschläge @@ -1022,7 +1058,7 @@ 0 - 1090, 492 + 1356, 399 3 @@ -1042,6 +1078,9 @@ NoControl + + 4, 4, 4, 4 + None @@ -1057,6 +1096,9 @@ 0 + + 100 + Email Anrede @@ -1066,6 +1108,9 @@ 1 + + 100 + Email @@ -1075,6 +1120,9 @@ 2 + + 100 + Unterschrieben wann @@ -1084,6 +1132,9 @@ 3 + + 100 + Empfänger @@ -1096,6 +1147,9 @@ 0 + + 100 + Benutzer @@ -1105,6 +1159,9 @@ 1 + + 100 + Datum @@ -1114,6 +1171,9 @@ 2 + + 100 + 0, 0 @@ -1127,7 +1187,7 @@ 3 - 100 + 133 Kommentar @@ -1139,7 +1199,7 @@ 1 - 80 + 107 Status @@ -1151,7 +1211,7 @@ 2 - 163 + 217 Titel @@ -1163,7 +1223,7 @@ 0 - 482 + 643 Erstellt am @@ -1175,7 +1235,7 @@ 4 - 120 + 160 Zuletzt geändert am @@ -1187,10 +1247,13 @@ 5 - 120 + 160 + + + 4, 4, 4, 4 - 725, 313 + 1354, 371 3 @@ -1207,8 +1270,11 @@ 0 + + 4, 4, 4, 4 + - 1088, 469 + 1354, 371 Abgeschlossene Umschläge @@ -1229,16 +1295,25 @@ Fill - 0, 53 + 0, 79 + + + 4, 4, 4, 4 Fill + + 4, 4, 4, 4 + 0, 0 + + 4, 4, 4, 4 + - 715, 259 + 840, 203 1 @@ -1286,7 +1361,7 @@ 1 - 725, 259 + 1354, 292 2 @@ -1304,10 +1379,13 @@ 0 - 109, 26 + 145, 32 + + + 4, 4, 4, 4 - 98, 35 + 131, 43 5 @@ -1328,10 +1406,13 @@ 0 - 5, 26 + 7, 32 + + + 4, 4, 4, 4 - 98, 35 + 131, 43 4 @@ -1352,10 +1433,13 @@ 1 - 474, 5 + 632, 6 + + + 4, 4, 4, 4 - 318, 68 + 424, 84 2 @@ -1376,10 +1460,13 @@ 0 - 339, 26 + 452, 32 + + + 4, 4, 4, 4 - 104, 35 + 139, 43 3 @@ -1400,10 +1487,13 @@ 0 - 229, 26 + 305, 32 + + + 4, 4, 4, 4 - 104, 35 + 139, 43 2 @@ -1424,10 +1514,13 @@ 1 - 119, 26 + 159, 32 + + + 4, 4, 4, 4 - 104, 35 + 139, 43 1 @@ -1448,10 +1541,13 @@ 2 - 9, 26 + 12, 32 + + + 4, 4, 4, 4 - 104, 35 + 139, 43 0 @@ -1472,10 +1568,13 @@ 3 - 11, 5 + 15, 6 + + + 4, 4, 4, 4 - 457, 68 + 609, 84 1 @@ -1501,8 +1600,11 @@ 0, 0 + + 4, 4, 4, 4 + - 1088, 80 + 1354, 79 0 @@ -1519,8 +1621,11 @@ 1 + + 4, 4, 4, 4 + - 1088, 469 + 1354, 371 Auswertungen (Admin) - BETA @@ -1541,10 +1646,13 @@ True - 14, 12 + 12, 10 + + + 4, 0, 4, 0 - 44, 9 + 82, 16 2 @@ -1565,10 +1673,13 @@ 0 - 36, 128 + 87, 284 + + + 4, 4, 4, 4 - 299, 35 + 719, 78 1 @@ -1589,10 +1700,13 @@ 1 - 36, 51 + 87, 114 + + + 4, 4, 4, 4 - 150, 30 + 359, 26 0 @@ -1609,8 +1723,11 @@ 2 + + 4, 4, 4, 4 + - 1088, 469 + 1354, 371 Admin Test @@ -1670,7 +1787,7 @@ 1 - 1090, 502 + 1356, 411 5 @@ -1688,16 +1805,16 @@ 0 - 193, 17 + 231, 17 - 317, 17 + 378, 17 PDF Files|*.pdf - 453, 17 + 545, 17 True @@ -1706,10 +1823,10 @@ 108 - 6, 13 + 8, 16 - 1090, 682 + 1356, 633 @@ -1789,6 +1906,9 @@ +qXqgBdTIMhSQTYXyYmTiijBAO/kGpVrVa5ZuXblGnYz4Ev/A4y2+8cnCiQpAAAAAElFTkSuQmCC + + 4, 4, 4, 4 + CenterScreen diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index 63325ab3..b6525cd6 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -269,9 +269,10 @@ Public Class frmMain Private Sub ViewEnvelopes_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles ViewEnvelopes.FocusedRowChanged If ViewEnvelopes.FocusedRowHandle < 0 Then + RibbonPageGroupReceiver.Enabled = False Exit Sub End If - sd + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) txtEnvelopeIdLabel.Caption = String.Format(txtEnvelopeIdLabel.Tag, oEnvelope.Id) @@ -802,7 +803,6 @@ Public Class frmMain If ViewEnvelopes.FocusedRowHandle < 0 Then Exit Sub End If - Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) Dim oView As GridView = GridEnvelopes.FocusedView If oView.Name = ViewReceivers.Name Then @@ -925,4 +925,49 @@ Public Class frmMain Dim oGridlayoutFullFilename = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) Return oGridlayoutFullFilename End Function + Private Sub ViewReceivers_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles ViewReceivers.FocusedRowChanged + + Dim detailView As GridView = TryCast(sender, GridView) + + ' Sicherstellen, dass die View gültig ist + If detailView Is Nothing Then + Exit Sub + End If + ' Prüfen, ob der RowHandle gültig ist + If Not detailView.IsValidRowHandle(e.FocusedRowHandle) Then + Exit Sub + End If + + Dim row = detailView.GetRow(e.FocusedRowHandle) + + If row Is Nothing Then + Exit Sub + End If + + Dim oReceiver As Receiver = CType(row, Receiver) + 'Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title) + + If Not IsNothing(oReceiver) Then + Dim oDT As DataTable = DB_DD_ECM.GetDatatable($"SELECT * FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{oReceiver.EmailAddress}'") + If Not IsNothing(oDT) Then + If oDT.Rows.Count = 1 Then + RibbonPageGroupReceiver.Enabled = True + Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE") + Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY") + If Not IsDBNull(oTOTP) And Not IsDBNull(oTFA_REG_DL) Then + bbtnitm2Faktor.Enabled = True + Else + bbtnitm2Faktor.Enabled = False + End If + Else + RibbonPageGroupReceiver.Enabled = False + End If + + End If + End If + + + + + End Sub End Class \ No newline at end of file