diff --git a/PROMS/DataLoader/PROMSFixes.Sql b/PROMS/DataLoader/PROMSFixes.Sql index 06d40da8..64912892 100644 --- a/PROMS/DataLoader/PROMSFixes.Sql +++ b/PROMS/DataLoader/PROMSFixes.Sql @@ -12385,6 +12385,13 @@ BEGIN JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child END + if @EItemID is null + BEGIN + select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions + where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion + cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion + Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure + END Select ItemID,PreviousID,ContentID,[DTS],[UserID],[LastChanged], (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount], (SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount], @@ -12555,6 +12562,97 @@ IF (@@Error = 0) PRINT 'StoredProcedure [vesp_GetNonEnhancedDocVersions] Succeed ELSE PRINT 'StoredProcedure [vesp_GetNonEnhancedDocVersions] Error on Creation' GO +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_PurgeEnhancedDocVersionsAndChildren]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_PurgeEnhancedDocVersionsAndChildren]; +GO +/* +vesp_PurgeEnhancedDocVersionsAndChildren 8 -- Background +vesp_PurgeEnhancedDocVersionsAndChildren 9 -- Deviation +*/ + +/***************************************************************************** + Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE + Copyright 2016 - Volian Enterprises, Inc. All rights reserved. +*****************************************************************************/ +CREATE PROCEDURE [dbo].[vesp_PurgeEnhancedDocVersionsAndChildren](@EnhanceID int) -- @EnhanceID -- Enhanced VersionID +WITH EXECUTE AS OWNER +AS +BEGIN TRY -- Try Block + BEGIN TRANSACTION + declare @SourceID int -- Source VersionID + select @SourceID = xEnhanced.value('@VersionID','int') from (select *, cast(config as xml) xconfig from DocVersions) DV + cross apply xconfig.nodes('//Enhanced') tEnhanced(xEnhanced) + where VersionID = @EnhanceID + DECLARE @EnhType int + select @EnhType = xEnhanced.value('@Type','int') + from (select *, cast(config as xml) xConfig from DocVersions where VersionID = @SourceID) DV + cross apply xconfig.nodes('//Enhanced[@VersionID=sql:variable("@EnhanceID")]') tEnhanced(xEnhanced) + -- Fix DocVersion Records + declare @Enh TABLE + ( + ID int, + xConfig xml + ) + insert into @Enh + select DV.VersionID,DV.xConfig + from (select *, cast(config as xml) xConfig from DocVersions where VersionID in(@SourceID,@EnhanceID)) DV + Update @Enh Set xConfig.modify('delete //Enhanced[@Type=sql:variable("@EnhType")]') From @Enh + Update @Enh Set xConfig.modify('delete //Enhanced[@Type="0"]') From @Enh + declare @Enh1 TABLE + ( + ID int, + xConfig xml + ) + insert into @Enh1 -- Links to Enhanced from Source + select CC.ContentID, xConfig from (select *, cast(config as xml) xConfig from Contents) CC + JOIN VEFN_GetVersionItems(cast(@SourceID as varchar(25))) VI ON VI.ContentID = CC.ContentID + cross apply VEFN_GetNewEnhancedData(VI.itemid,@EnhType) VEN + Update @Enh1 Set xConfig.modify('delete //Enhanced[@Type=sql:variable("@EnhType")]') From @Enh1 + + declare @Enh2 TABLE + ( + ID int, + xConfig xml + ) + insert into @Enh2 -- Links to Enhanced from Source + select CC.ContentID, xConfig from (select *, cast(config as xml) xConfig from Contents) CC + JOIN VEFN_GetVersionItems(cast(@EnhanceID as varchar(25))) VI ON VI.ContentID = CC.ContentID + cross apply VEFN_GetNewEnhancedData(VI.itemid,0) VEN + set @EnhType=0 + Update @Enh2 Set xConfig.modify('delete //Enhanced[@Type=sql:variable("@EnhType")]') From @Enh2 + + Update DV Set Config = cast(xConfig as varchar(max)) From DocVersions DV -- Remove Links from DocVersions + Join @Enh EE ON EE.ID = DV.VersionID + Update CC Set Config = cast(xconfig as varchar(max)) From Contents CC -- Remove Links from Source + Join @Enh1 EE ON EE.ID = CC.ContentID + Update CC Set Config = cast(xconfig as varchar(max)) From Contents CC -- Remove Links from Enhanced + Join @Enh2 EE ON EE.ID = CC.ContentID + + SELECT [ContentID],[Number],[Text],[Type],[FormatID],[Config],[DTS],[UserID],[LastChanged], + (SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=[Contents].[ContentID]) [DetailCount], + (SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=[Contents].[ContentID]) [EntryCount], + (SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=[Contents].[ContentID]) [GridCount], + (SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=[Contents].[ContentID]) [ImageCount], + (SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=[Contents].[ContentID]) [ItemCount], + (SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=[Contents].[ContentID]) [PartCount], + (SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=[Contents].[ContentID]) [RoUsageCount], + (SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=[Contents].[ContentID]) [TransitionCount], + (SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=[Contents].[ContentID]) [ZContentCount] + FROM [Contents] where ContentID in (Select ID From @Enh1 UNION Select ID From @Enh2) + + IF( @@TRANCOUNT > 0 ) COMMIT +END TRY +BEGIN CATCH -- Catch Block + IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level + ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit. Top level will rollback + EXEC vlnErrorHandler +END CATCH +GO +-- Display the status of Proc creation +IF (@@Error = 0) PRINT 'StoredProcedure [vesp_PurgeEnhancedDocVersionsAndChildren] Succeeded' +ELSE PRINT 'StoredProcedure [vesp_PurgeEnhancedDocVersionsAndChildren] Error on Creation' +go + PRINT 'Enhanced Document Synchronization code.' ----------------------------------------------------------------------------- @@ -12582,7 +12680,7 @@ BEGIN TRY -- Try Block set nocount on DECLARE @RevDate varchar(255) DECLARE @RevDescription varchar(255) - set @RevDate = '5/9/2016 8:00 AM' + set @RevDate = '5/11/2016 9:00 AM' set @RevDescription = 'Added Enhanced Documents' Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription diff --git a/PROMS/Formats/fmtall/EXEBCKall.xml b/PROMS/Formats/fmtall/EXEBCKall.xml index 57233d29..a3c865a8 100644 Binary files a/PROMS/Formats/fmtall/EXEBCKall.xml and b/PROMS/Formats/fmtall/EXEBCKall.xml differ diff --git a/PROMS/Formats/fmtall/EXEDEVall.xml b/PROMS/Formats/fmtall/EXEDEVall.xml index 2e343aac..09f42595 100644 Binary files a/PROMS/Formats/fmtall/EXEDEVall.xml and b/PROMS/Formats/fmtall/EXEDEVall.xml differ diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs index 391313d3..4410f386 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs @@ -106,6 +106,7 @@ namespace VEPROMS this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.btnUnlinkDocVersion = new System.Windows.Forms.Button(); this.btnNewEnh = new System.Windows.Forms.Button(); this.cbxEnhVersions = new System.Windows.Forms.ComboBox(); this.lblEnhDoc = new System.Windows.Forms.Label(); @@ -224,10 +225,10 @@ namespace VEPROMS // this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ppBtnCancel.Location = new System.Drawing.Point(634, 348); - this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnCancel.Location = new System.Drawing.Point(845, 428); + this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnCancel.Name = "ppBtnCancel"; - this.ppBtnCancel.Size = new System.Drawing.Size(56, 21); + this.ppBtnCancel.Size = new System.Drawing.Size(75, 26); this.ppBtnCancel.TabIndex = 91; this.ppBtnCancel.Text = "Cancel"; this.ppBtnCancel.UseVisualStyleBackColor = true; @@ -236,10 +237,10 @@ namespace VEPROMS // ppBtnOK // this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ppBtnOK.Location = new System.Drawing.Point(561, 348); - this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnOK.Location = new System.Drawing.Point(748, 428); + this.ppBtnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnOK.Name = "ppBtnOK"; - this.ppBtnOK.Size = new System.Drawing.Size(56, 21); + this.ppBtnOK.Size = new System.Drawing.Size(75, 26); this.ppBtnOK.TabIndex = 90; this.ppBtnOK.Text = "OK"; this.ppBtnOK.UseVisualStyleBackColor = true; @@ -248,10 +249,10 @@ namespace VEPROMS // ppBtnDefaultChgBar // this.ppBtnDefaultChgBar.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultChgBar.Location = new System.Drawing.Point(302, 82); - this.ppBtnDefaultChgBar.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefaultChgBar.Location = new System.Drawing.Point(403, 101); + this.ppBtnDefaultChgBar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultChgBar.Name = "ppBtnDefaultChgBar"; - this.ppBtnDefaultChgBar.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefaultChgBar.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultChgBar, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", "This will revert the Change Bar selection back to using the parent\'s (default) se" + "tting.\r\n\r\nCheck \"Show Default Settings\" to display the \"default\" Change Bar (bel" + "ow the Change Bars selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 145))); @@ -269,10 +270,10 @@ namespace VEPROMS this.ppCmbxChangeBarType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChangeBarType.FormattingEnabled = true; this.ppCmbxChangeBarType.ItemHeight = 20; - this.ppCmbxChangeBarType.Location = new System.Drawing.Point(89, 82); - this.ppCmbxChangeBarType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxChangeBarType.Location = new System.Drawing.Point(119, 101); + this.ppCmbxChangeBarType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChangeBarType.Name = "ppCmbxChangeBarType"; - this.ppCmbxChangeBarType.Size = new System.Drawing.Size(210, 26); + this.ppCmbxChangeBarType.Size = new System.Drawing.Size(279, 26); this.ppCmbxChangeBarType.TabIndex = 42; this.ppCmbxChangeBarType.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxChangeBarType.WatermarkText = "select change bar setting"; @@ -285,10 +286,10 @@ namespace VEPROMS // ppBtnDefaultFmt // this.ppBtnDefaultFmt.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultFmt.Location = new System.Drawing.Point(450, 28); - this.ppBtnDefaultFmt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefaultFmt.Location = new System.Drawing.Point(600, 34); + this.ppBtnDefaultFmt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultFmt.Name = "ppBtnDefaultFmt"; - this.ppBtnDefaultFmt.Size = new System.Drawing.Size(50, 23); + this.ppBtnDefaultFmt.Size = new System.Drawing.Size(67, 28); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultFmt, new DevComponents.DotNetBar.SuperTooltipInfo("Default Button", "", "This will revert the format selection back to using the parent\'s format.\r\n\r\nCheck" + " \"Show Default Settings\" to display the \"default\" format name (below the format " + "selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.System)); @@ -305,10 +306,10 @@ namespace VEPROMS this.ppCmbxFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxFormat.FormattingEnabled = true; this.ppCmbxFormat.ItemHeight = 20; - this.ppCmbxFormat.Location = new System.Drawing.Point(14, 28); - this.ppCmbxFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxFormat.Location = new System.Drawing.Point(19, 34); + this.ppCmbxFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxFormat.Name = "ppCmbxFormat"; - this.ppCmbxFormat.Size = new System.Drawing.Size(432, 26); + this.ppCmbxFormat.Size = new System.Drawing.Size(575, 26); this.superTooltip1.SetSuperTooltip(this.ppCmbxFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Format Selection", "", resources.GetString("ppCmbxFormat.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCmbxFormat.TabIndex = 40; this.ppCmbxFormat.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -321,10 +322,9 @@ namespace VEPROMS this.ppLblChangeBarTypeDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblChangeBarTypeDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChangeBarTypeDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChangeBarTypeDefault.Location = new System.Drawing.Point(88, 102); - this.ppLblChangeBarTypeDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChangeBarTypeDefault.Location = new System.Drawing.Point(117, 126); this.ppLblChangeBarTypeDefault.Name = "ppLblChangeBarTypeDefault"; - this.ppLblChangeBarTypeDefault.Size = new System.Drawing.Size(79, 13); + this.ppLblChangeBarTypeDefault.Size = new System.Drawing.Size(107, 17); this.superTooltip1.SetSuperTooltip(this.ppLblChangeBarTypeDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Change Bar setting", "", "Pressing the Default Button (to the right)\r\nwill set the Change Bar setting back " + "to this.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(270, 70))); this.ppLblChangeBarTypeDefault.TabIndex = 27; @@ -336,10 +336,9 @@ namespace VEPROMS this.ppLblFormatDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblFormatDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblFormatDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblFormatDefault.Location = new System.Drawing.Point(10, 50); - this.ppLblFormatDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblFormatDefault.Location = new System.Drawing.Point(13, 62); this.ppLblFormatDefault.Name = "ppLblFormatDefault"; - this.ppLblFormatDefault.Size = new System.Drawing.Size(45, 13); + this.ppLblFormatDefault.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblFormatDefault, new DevComponents.DotNetBar.SuperTooltipInfo("The is the default Format setting", "", "Pressing the Reset Button (to the right)\r\nwill set the format setting back to thi" + "s.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(255, 70))); this.ppLblFormatDefault.TabIndex = 26; @@ -348,10 +347,10 @@ namespace VEPROMS // ppBtnDefCbTxtTyp // this.ppBtnDefCbTxtTyp.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefCbTxtTyp.Location = new System.Drawing.Point(218, 18); - this.ppBtnDefCbTxtTyp.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefCbTxtTyp.Location = new System.Drawing.Point(291, 22); + this.ppBtnDefCbTxtTyp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefCbTxtTyp.Name = "ppBtnDefCbTxtTyp"; - this.ppBtnDefCbTxtTyp.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefCbTxtTyp.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefCbTxtTyp, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefCbTxtTyp.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(235, 150))); this.ppBtnDefCbTxtTyp.TabIndex = 45; this.ppBtnDefCbTxtTyp.Text = "Default"; @@ -362,10 +361,10 @@ namespace VEPROMS // ppBtnDefaultCbPos // this.ppBtnDefaultCbPos.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefaultCbPos.Location = new System.Drawing.Point(210, 67); - this.ppBtnDefaultCbPos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefaultCbPos.Location = new System.Drawing.Point(280, 82); + this.ppBtnDefaultCbPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefaultCbPos.Name = "ppBtnDefaultCbPos"; - this.ppBtnDefaultCbPos.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefaultCbPos.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefaultCbPos, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefaultCbPos.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 145))); this.ppBtnDefaultCbPos.TabIndex = 51; this.ppBtnDefaultCbPos.Text = "Default"; @@ -381,10 +380,10 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarTxtType.FormattingEnabled = true; this.ppCmbxChgBarTxtType.ItemHeight = 20; - this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(62, 16); - this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(83, 20); + this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType"; - this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(153, 26); + this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(203, 26); this.ppCmbxChgBarTxtType.TabIndex = 44; this.ppCmbxChgBarTxtType.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxChgBarTxtType.WatermarkText = "select change bar text type"; @@ -398,10 +397,10 @@ namespace VEPROMS this.ppCmbxChgBarPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarPos.FormattingEnabled = true; this.ppCmbxChgBarPos.ItemHeight = 20; - this.ppCmbxChgBarPos.Location = new System.Drawing.Point(72, 67); - this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxChgBarPos.Location = new System.Drawing.Point(96, 82); + this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarPos.Name = "ppCmbxChgBarPos"; - this.ppCmbxChgBarPos.Size = new System.Drawing.Size(134, 26); + this.ppCmbxChgBarPos.Size = new System.Drawing.Size(177, 26); this.ppCmbxChgBarPos.TabIndex = 50; this.ppCmbxChgBarPos.Visible = false; this.ppCmbxChgBarPos.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -413,10 +412,9 @@ namespace VEPROMS this.ppLblChgBarTxtTypeDefault.AutoSize = true; this.ppLblChgBarTxtTypeDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarTxtTypeDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarTxtTypeDefault.Location = new System.Drawing.Point(70, 37); - this.ppLblChgBarTxtTypeDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarTxtTypeDefault.Location = new System.Drawing.Point(93, 46); this.ppLblChgBarTxtTypeDefault.Name = "ppLblChgBarTxtTypeDefault"; - this.ppLblChgBarTxtTypeDefault.Size = new System.Drawing.Size(79, 13); + this.ppLblChgBarTxtTypeDefault.Size = new System.Drawing.Size(107, 17); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarTxtTypeDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Change Bar Text Type", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Positi" + "on setting back to this.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); this.ppLblChgBarTxtTypeDefault.TabIndex = 13; @@ -427,10 +425,9 @@ namespace VEPROMS this.ppLblChgBarPosDefault.AutoSize = true; this.ppLblChgBarPosDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarPosDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarPosDefault.Location = new System.Drawing.Point(74, 86); - this.ppLblChgBarPosDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarPosDefault.Location = new System.Drawing.Point(99, 106); this.ppLblChgBarPosDefault.Name = "ppLblChgBarPosDefault"; - this.ppLblChgBarPosDefault.Size = new System.Drawing.Size(79, 13); + this.ppLblChgBarPosDefault.Size = new System.Drawing.Size(107, 17); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarPosDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Change Bar Position", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Positi" + "on setting back to this.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(300, 80))); this.ppLblChgBarPosDefault.TabIndex = 12; @@ -440,10 +437,10 @@ namespace VEPROMS // ppBtnDefCbTxt2 // this.ppBtnDefCbTxt2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefCbTxt2.Location = new System.Drawing.Point(118, 47); - this.ppBtnDefCbTxt2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefCbTxt2.Location = new System.Drawing.Point(157, 58); + this.ppBtnDefCbTxt2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefCbTxt2.Name = "ppBtnDefCbTxt2"; - this.ppBtnDefCbTxt2.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefCbTxt2.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefCbTxt2, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefCbTxt2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 150))); this.ppBtnDefCbTxt2.TabIndex = 49; this.ppBtnDefCbTxt2.Text = "Default"; @@ -454,10 +451,10 @@ namespace VEPROMS // ppBtnDefCbTxt1 // this.ppBtnDefCbTxt1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefCbTxt1.Location = new System.Drawing.Point(118, 6); - this.ppBtnDefCbTxt1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefCbTxt1.Location = new System.Drawing.Point(157, 7); + this.ppBtnDefCbTxt1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefCbTxt1.Name = "ppBtnDefCbTxt1"; - this.ppBtnDefCbTxt1.Size = new System.Drawing.Size(44, 20); + this.ppBtnDefCbTxt1.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefCbTxt1, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDefCbTxt1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(250, 150))); this.ppBtnDefCbTxt1.TabIndex = 47; this.ppBtnDefCbTxt1.Text = "Default"; @@ -470,10 +467,9 @@ namespace VEPROMS this.ppLblChgBarUserMsgTwoDefault.AutoSize = true; this.ppLblChgBarUserMsgTwoDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarUserMsgTwoDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarUserMsgTwoDefault.Location = new System.Drawing.Point(66, 67); - this.ppLblChgBarUserMsgTwoDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarUserMsgTwoDefault.Location = new System.Drawing.Point(88, 82); this.ppLblChgBarUserMsgTwoDefault.Name = "ppLblChgBarUserMsgTwoDefault"; - this.ppLblChgBarUserMsgTwoDefault.Size = new System.Drawing.Size(45, 13); + this.ppLblChgBarUserMsgTwoDefault.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarUserMsgTwoDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Message Line Two", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Messag" + "e Line Two setting back to this.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); this.ppLblChgBarUserMsgTwoDefault.TabIndex = 7; @@ -484,10 +480,9 @@ namespace VEPROMS this.ppLblChgBarUserMsgOneDefault.AutoSize = true; this.ppLblChgBarUserMsgOneDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblChgBarUserMsgOneDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ppLblChgBarUserMsgOneDefault.Location = new System.Drawing.Point(66, 28); - this.ppLblChgBarUserMsgOneDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblChgBarUserMsgOneDefault.Location = new System.Drawing.Point(88, 34); this.ppLblChgBarUserMsgOneDefault.Name = "ppLblChgBarUserMsgOneDefault"; - this.ppLblChgBarUserMsgOneDefault.Size = new System.Drawing.Size(45, 13); + this.ppLblChgBarUserMsgOneDefault.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblChgBarUserMsgOneDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Custom Message Line One", "", "Pressing the Default Button (to the right) will set the Cusotom Change Bar Messag" + "e Line One setting back to this.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.ppLblChgBarUserMsgOneDefault.TabIndex = 6; @@ -496,21 +491,20 @@ namespace VEPROMS // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(16, 9); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(21, 11); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(48, 13); + this.label14.Size = new System.Drawing.Size(63, 17); this.label14.TabIndex = 4; this.label14.Text = "Line one"; // // ppTxbxChangeBarUserMsgOne // this.ppTxbxChangeBarUserMsgOne.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_UserCBMess1", true)); - this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(68, 6); - this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(91, 7); + this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgOne.Multiline = false; this.ppTxbxChangeBarUserMsgOne.Name = "ppTxbxChangeBarUserMsgOne"; - this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(57, 24); this.superTooltip1.SetSuperTooltip(this.ppTxbxChangeBarUserMsgOne, new DevComponents.DotNetBar.SuperTooltipInfo("User Defined Message", "", "This message will appear on all change bars", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppTxbxChangeBarUserMsgOne.TabIndex = 46; this.ppTxbxChangeBarUserMsgOne.Text = ""; @@ -519,21 +513,20 @@ namespace VEPROMS // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(16, 50); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Location = new System.Drawing.Point(21, 62); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(47, 13); + this.label15.Size = new System.Drawing.Size(60, 17); this.label15.TabIndex = 5; this.label15.Text = "Line two"; // // ppTxbxChangeBarUserMsgTwo // this.ppTxbxChangeBarUserMsgTwo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_UserCBMess2", true)); - this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(68, 47); - this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(91, 58); + this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgTwo.Multiline = false; this.ppTxbxChangeBarUserMsgTwo.Name = "ppTxbxChangeBarUserMsgTwo"; - this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(57, 24); this.superTooltip1.SetSuperTooltip(this.ppTxbxChangeBarUserMsgTwo, new DevComponents.DotNetBar.SuperTooltipInfo("User Defined Message", "", "This message will appear on all change bars", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppTxbxChangeBarUserMsgTwo.TabIndex = 48; this.ppTxbxChangeBarUserMsgTwo.Text = ""; @@ -542,20 +535,18 @@ namespace VEPROMS // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(4, 18); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(5, 22); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(55, 13); + this.label13.Size = new System.Drawing.Size(71, 17); this.label13.TabIndex = 8; this.label13.Text = "Text Type"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(26, 67); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(35, 82); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(44, 13); + this.label12.Size = new System.Drawing.Size(58, 17); this.label12.TabIndex = 9; this.label12.Text = "Position"; this.label12.Visible = false; @@ -564,10 +555,9 @@ namespace VEPROMS // this.label10.AutoSize = true; this.label10.BackColor = System.Drawing.Color.Transparent; - this.label10.Location = new System.Drawing.Point(10, 11); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(13, 14); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(39, 13); + this.label10.Size = new System.Drawing.Size(52, 17); this.label10.TabIndex = 19; this.label10.Text = "Format"; // @@ -575,10 +565,9 @@ namespace VEPROMS // this.label11.AutoSize = true; this.label11.BackColor = System.Drawing.Color.Transparent; - this.label11.Location = new System.Drawing.Point(17, 84); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(23, 103); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(68, 13); + this.label11.Size = new System.Drawing.Size(90, 17); this.label11.TabIndex = 3; this.label11.Text = "Change Bars"; // @@ -588,10 +577,10 @@ namespace VEPROMS // // ppBtnResetRoVals // - this.ppBtnResetRoVals.Location = new System.Drawing.Point(24, 73); - this.ppBtnResetRoVals.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnResetRoVals.Location = new System.Drawing.Point(32, 90); + this.ppBtnResetRoVals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnResetRoVals.Name = "ppBtnResetRoVals"; - this.ppBtnResetRoVals.Size = new System.Drawing.Size(57, 63); + this.ppBtnResetRoVals.Size = new System.Drawing.Size(76, 78); this.ppBtnResetRoVals.TabIndex = 20; this.ppBtnResetRoVals.Text = "Reset to Previous Values"; this.ppBtnResetRoVals.UseVisualStyleBackColor = true; @@ -600,10 +589,10 @@ namespace VEPROMS // // ppBtnUpRoVals // - this.ppBtnUpRoVals.Location = new System.Drawing.Point(26, 11); - this.ppBtnUpRoVals.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnUpRoVals.Location = new System.Drawing.Point(35, 14); + this.ppBtnUpRoVals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnUpRoVals.Name = "ppBtnUpRoVals"; - this.ppBtnUpRoVals.Size = new System.Drawing.Size(57, 59); + this.ppBtnUpRoVals.Size = new System.Drawing.Size(76, 73); this.superTooltip1.SetSuperTooltip(this.ppBtnUpRoVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update Referenced Objects Values", "", "This button will update all of the Referenced Objects Values in all of the proced" + "ures in this procedure set.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.ppBtnUpRoVals.TabIndex = 23; @@ -615,10 +604,9 @@ namespace VEPROMS // this.label6.AutoSize = true; this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Location = new System.Drawing.Point(9, 17); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Location = new System.Drawing.Point(12, 21); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(72, 13); + this.label6.Size = new System.Drawing.Size(94, 17); this.label6.TabIndex = 12; this.label6.Text = "RO Database"; // @@ -629,10 +617,10 @@ namespace VEPROMS this.ppCmbxProcSetType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxProcSetType.FormattingEnabled = true; this.ppCmbxProcSetType.ItemHeight = 20; - this.ppCmbxProcSetType.Location = new System.Drawing.Point(174, 246); - this.ppCmbxProcSetType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxProcSetType.Location = new System.Drawing.Point(232, 303); + this.ppCmbxProcSetType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxProcSetType.Name = "ppCmbxProcSetType"; - this.ppCmbxProcSetType.Size = new System.Drawing.Size(133, 26); + this.ppCmbxProcSetType.Size = new System.Drawing.Size(176, 26); this.ppCmbxProcSetType.TabIndex = 2; this.ppCmbxProcSetType.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxProcSetType.WatermarkText = "select procedure set type"; @@ -641,21 +629,20 @@ namespace VEPROMS // this.label9.AutoSize = true; this.label9.BackColor = System.Drawing.Color.Transparent; - this.label9.Location = new System.Drawing.Point(23, 249); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(31, 306); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(145, 13); + this.label9.Size = new System.Drawing.Size(195, 17); this.label9.TabIndex = 16; this.label9.Text = "Procedure Set Type (version)"; // // ppRTxtName // this.ppRTxtName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Name", true)); - this.ppRTxtName.Location = new System.Drawing.Point(56, 15); - this.ppRTxtName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppRTxtName.Location = new System.Drawing.Point(75, 18); + this.ppRTxtName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppRTxtName.Multiline = false; this.ppRTxtName.Name = "ppRTxtName"; - this.ppRTxtName.Size = new System.Drawing.Size(210, 19); + this.ppRTxtName.Size = new System.Drawing.Size(279, 22); this.ppRTxtName.TabIndex = 0; this.ppRTxtName.Text = ""; this.ppRTxtName.Leave += new System.EventHandler(this.ppRTxtName_Leave); @@ -664,31 +651,30 @@ namespace VEPROMS // this.lblProcSetRev.AutoSize = true; this.lblProcSetRev.BackColor = System.Drawing.Color.Transparent; - this.lblProcSetRev.Location = new System.Drawing.Point(20, 199); - this.lblProcSetRev.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblProcSetRev.Location = new System.Drawing.Point(27, 245); this.lblProcSetRev.Name = "lblProcSetRev"; - this.lblProcSetRev.Size = new System.Drawing.Size(119, 13); + this.lblProcSetRev.Size = new System.Drawing.Size(157, 17); this.lblProcSetRev.TabIndex = 66; this.lblProcSetRev.Text = "Procedure Set Revision"; // // ppRTxtProcSetRev // this.ppRTxtProcSetRev.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "ProcedureSetRev", true)); - this.ppRTxtProcSetRev.Location = new System.Drawing.Point(171, 196); - this.ppRTxtProcSetRev.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppRTxtProcSetRev.Location = new System.Drawing.Point(228, 241); + this.ppRTxtProcSetRev.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppRTxtProcSetRev.Multiline = false; this.ppRTxtProcSetRev.Name = "ppRTxtProcSetRev"; - this.ppRTxtProcSetRev.Size = new System.Drawing.Size(210, 19); + this.ppRTxtProcSetRev.Size = new System.Drawing.Size(279, 22); this.ppRTxtProcSetRev.TabIndex = 0; this.ppRTxtProcSetRev.Text = ""; // // ppRTxtTitle // this.ppRTxtTitle.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Title", true)); - this.ppRTxtTitle.Location = new System.Drawing.Point(56, 57); - this.ppRTxtTitle.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppRTxtTitle.Location = new System.Drawing.Point(75, 70); + this.ppRTxtTitle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppRTxtTitle.Name = "ppRTxtTitle"; - this.ppRTxtTitle.Size = new System.Drawing.Size(407, 50); + this.ppRTxtTitle.Size = new System.Drawing.Size(541, 61); this.ppRTxtTitle.TabIndex = 1; this.ppRTxtTitle.Text = ""; this.ppRTxtTitle.Visible = false; @@ -698,10 +684,10 @@ namespace VEPROMS this.ppDTPicker.CustomFormat = "MM\'/\'dd\'/\'yyyy hh\':\'mm:ss tt"; this.ppDTPicker.Enabled = false; this.ppDTPicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.ppDTPicker.Location = new System.Drawing.Point(80, 123); - this.ppDTPicker.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppDTPicker.Location = new System.Drawing.Point(107, 151); + this.ppDTPicker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppDTPicker.Name = "ppDTPicker"; - this.ppDTPicker.Size = new System.Drawing.Size(130, 20); + this.ppDTPicker.Size = new System.Drawing.Size(172, 22); this.ppDTPicker.TabIndex = 12; this.ppDTPicker.TabStop = false; this.ppDTPicker.Visible = false; @@ -710,10 +696,9 @@ namespace VEPROMS // this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Location = new System.Drawing.Point(26, 59); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(35, 73); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(27, 13); + this.label1.Size = new System.Drawing.Size(35, 17); this.label1.TabIndex = 3; this.label1.Text = "Title"; this.label1.Visible = false; @@ -722,20 +707,19 @@ namespace VEPROMS // this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Location = new System.Drawing.Point(17, 18); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(23, 22); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); + this.label2.Size = new System.Drawing.Size(45, 17); this.label2.TabIndex = 4; this.label2.Text = "Name"; // // ppTxtBxUserID // this.ppTxtBxUserID.Enabled = false; - this.ppTxtBxUserID.Location = new System.Drawing.Point(70, 169); - this.ppTxtBxUserID.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxtBxUserID.Location = new System.Drawing.Point(93, 208); + this.ppTxtBxUserID.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxtBxUserID.Name = "ppTxtBxUserID"; - this.ppTxtBxUserID.Size = new System.Drawing.Size(116, 20); + this.ppTxtBxUserID.Size = new System.Drawing.Size(153, 22); this.ppTxtBxUserID.TabIndex = 10; this.ppTxtBxUserID.TabStop = false; this.ppTxtBxUserID.Visible = false; @@ -744,10 +728,9 @@ namespace VEPROMS // this.label3.AutoSize = true; this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Location = new System.Drawing.Point(26, 171); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(35, 210); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(43, 13); + this.label3.Size = new System.Drawing.Size(55, 17); this.label3.TabIndex = 5; this.label3.Text = "User ID"; this.label3.Visible = false; @@ -756,10 +739,9 @@ namespace VEPROMS // this.label4.AutoSize = true; this.label4.BackColor = System.Drawing.Color.Transparent; - this.label4.Location = new System.Drawing.Point(20, 125); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(27, 154); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(58, 13); + this.label4.Size = new System.Drawing.Size(73, 17); this.label4.TabIndex = 6; this.label4.Text = "Date/Time"; this.label4.Visible = false; @@ -768,19 +750,19 @@ namespace VEPROMS // this.ppBtnPDFLoc.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.ppBtnPDFLoc.Image = ((System.Drawing.Image)(resources.GetObject("ppBtnPDFLoc.Image"))); - this.ppBtnPDFLoc.Location = new System.Drawing.Point(459, 17); - this.ppBtnPDFLoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnPDFLoc.Location = new System.Drawing.Point(612, 21); + this.ppBtnPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnPDFLoc.Name = "ppBtnPDFLoc"; - this.ppBtnPDFLoc.Size = new System.Drawing.Size(16, 19); + this.ppBtnPDFLoc.Size = new System.Drawing.Size(21, 23); this.ppBtnPDFLoc.TabIndex = 31; this.ppBtnPDFLoc.Click += new System.EventHandler(this.ppBtnPDFLoc_Click); // // ppNumUpDwnOvrdPrnPenWidth // - this.ppNumUpDwnOvrdPrnPenWidth.Location = new System.Drawing.Point(178, 15); - this.ppNumUpDwnOvrdPrnPenWidth.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppNumUpDwnOvrdPrnPenWidth.Location = new System.Drawing.Point(237, 18); + this.ppNumUpDwnOvrdPrnPenWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnOvrdPrnPenWidth.Name = "ppNumUpDwnOvrdPrnPenWidth"; - this.ppNumUpDwnOvrdPrnPenWidth.Size = new System.Drawing.Size(38, 20); + this.ppNumUpDwnOvrdPrnPenWidth.Size = new System.Drawing.Size(51, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnOvrdPrnPenWidth, new DevComponents.DotNetBar.SuperTooltipInfo("Normal Pen Width", "", "This will allow you to override pen width used for normal text and line drawing.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnOvrdPrnPenWidth.TabIndex = 1; // @@ -788,10 +770,9 @@ namespace VEPROMS // this.label19.AutoSize = true; this.label19.BackColor = System.Drawing.Color.Transparent; - this.label19.Location = new System.Drawing.Point(5, 16); - this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label19.Location = new System.Drawing.Point(7, 20); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(165, 13); + this.label19.Size = new System.Drawing.Size(222, 17); this.label19.TabIndex = 0; this.label19.Text = "Override Normal Pen Width (dots)"; // @@ -799,28 +780,27 @@ namespace VEPROMS // this.label20.AutoSize = true; this.label20.BackColor = System.Drawing.Color.Transparent; - this.label20.Location = new System.Drawing.Point(6, 47); - this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label20.Location = new System.Drawing.Point(8, 58); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(153, 13); + this.label20.Size = new System.Drawing.Size(205, 17); this.label20.TabIndex = 2; this.label20.Text = "Override Bold Pen Width (dots)"; // // ppNumUpDwnOverdPrnPenBoldWidth // - this.ppNumUpDwnOverdPrnPenBoldWidth.Location = new System.Drawing.Point(178, 46); - this.ppNumUpDwnOverdPrnPenBoldWidth.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppNumUpDwnOverdPrnPenBoldWidth.Location = new System.Drawing.Point(237, 57); + this.ppNumUpDwnOverdPrnPenBoldWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnOverdPrnPenBoldWidth.Name = "ppNumUpDwnOverdPrnPenBoldWidth"; - this.ppNumUpDwnOverdPrnPenBoldWidth.Size = new System.Drawing.Size(38, 20); + this.ppNumUpDwnOverdPrnPenBoldWidth.Size = new System.Drawing.Size(51, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnOverdPrnPenBoldWidth, new DevComponents.DotNetBar.SuperTooltipInfo("Bold Pen Width", "", "This will allow you to override the width used for bold text.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnOverdPrnPenBoldWidth.TabIndex = 3; // // ppNumUpDwnOvrdPrnPenULineWidth // - this.ppNumUpDwnOvrdPrnPenULineWidth.Location = new System.Drawing.Point(422, 15); - this.ppNumUpDwnOvrdPrnPenULineWidth.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppNumUpDwnOvrdPrnPenULineWidth.Location = new System.Drawing.Point(563, 18); + this.ppNumUpDwnOvrdPrnPenULineWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnOvrdPrnPenULineWidth.Name = "ppNumUpDwnOvrdPrnPenULineWidth"; - this.ppNumUpDwnOvrdPrnPenULineWidth.Size = new System.Drawing.Size(38, 20); + this.ppNumUpDwnOvrdPrnPenULineWidth.Size = new System.Drawing.Size(51, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnOvrdPrnPenULineWidth, new DevComponents.DotNetBar.SuperTooltipInfo("Underline Thickness", "", "This will allow you to change the thickness of the uderline.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnOvrdPrnPenULineWidth.TabIndex = 5; // @@ -828,24 +808,23 @@ namespace VEPROMS // this.label21.AutoSize = true; this.label21.BackColor = System.Drawing.Color.Transparent; - this.label21.Location = new System.Drawing.Point(238, 16); - this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label21.Location = new System.Drawing.Point(317, 20); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(176, 13); + this.label21.Size = new System.Drawing.Size(237, 17); this.label21.TabIndex = 4; this.label21.Text = "Override Underline Thickness (dots)"; // // ppNumUpDwnAdjPrnStartPos // - this.ppNumUpDwnAdjPrnStartPos.Location = new System.Drawing.Point(422, 46); - this.ppNumUpDwnAdjPrnStartPos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppNumUpDwnAdjPrnStartPos.Location = new System.Drawing.Point(563, 57); + this.ppNumUpDwnAdjPrnStartPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppNumUpDwnAdjPrnStartPos.Maximum = new decimal(new int[] { 500, 0, 0, 0}); this.ppNumUpDwnAdjPrnStartPos.Name = "ppNumUpDwnAdjPrnStartPos"; - this.ppNumUpDwnAdjPrnStartPos.Size = new System.Drawing.Size(38, 20); + this.ppNumUpDwnAdjPrnStartPos.Size = new System.Drawing.Size(51, 22); this.superTooltip1.SetSuperTooltip(this.ppNumUpDwnAdjPrnStartPos, new DevComponents.DotNetBar.SuperTooltipInfo("Starting Print Position", "", "Allows you to move the starting point on the page of where text and boarder begin" + " printing.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppNumUpDwnAdjPrnStartPos.TabIndex = 7; @@ -854,20 +833,19 @@ namespace VEPROMS // this.label22.AutoSize = true; this.label22.BackColor = System.Drawing.Color.Transparent; - this.label22.Location = new System.Drawing.Point(228, 48); - this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label22.Location = new System.Drawing.Point(304, 59); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(187, 13); + this.label22.Size = new System.Drawing.Size(252, 17); this.label22.TabIndex = 6; this.label22.Text = "Adjust Starting Position on Page (dots)"; // // ppBtnDeftDisAutoDuplx // this.ppBtnDeftDisAutoDuplx.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(434, 60); - this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDeftDisAutoDuplx.Location = new System.Drawing.Point(579, 74); + this.ppBtnDeftDisAutoDuplx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDeftDisAutoDuplx.Name = "ppBtnDeftDisAutoDuplx"; - this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(44, 20); + this.ppBtnDeftDisAutoDuplx.Size = new System.Drawing.Size(59, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDeftDisAutoDuplx, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", resources.GetString("ppBtnDeftDisAutoDuplx.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(255, 150))); this.ppBtnDeftDisAutoDuplx.TabIndex = 35; this.ppBtnDeftDisAutoDuplx.Text = "Default"; @@ -877,10 +855,10 @@ namespace VEPROMS // ppBtnDefWatermark // this.ppBtnDefWatermark.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.ppBtnDefWatermark.Location = new System.Drawing.Point(202, 58); - this.ppBtnDefWatermark.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnDefWatermark.Location = new System.Drawing.Point(269, 71); + this.ppBtnDefWatermark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnDefWatermark.Name = "ppBtnDefWatermark"; - this.ppBtnDefWatermark.Size = new System.Drawing.Size(40, 20); + this.ppBtnDefWatermark.Size = new System.Drawing.Size(53, 25); this.superTooltip1.SetSuperTooltip(this.ppBtnDefWatermark, new DevComponents.DotNetBar.SuperTooltipInfo("The Default Button", "", "This will revert the watermark selection back to using the parent\'s (default) set" + "ting.\r\n\r\nCheck \"Show Default Settings\" to display the \"default\" watermark (below" + " the Watermark selection box).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(255, 145))); @@ -898,10 +876,10 @@ namespace VEPROMS this.ppCmbxWatermark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxWatermark.FormattingEnabled = true; this.ppCmbxWatermark.ItemHeight = 20; - this.ppCmbxWatermark.Location = new System.Drawing.Point(74, 58); - this.ppCmbxWatermark.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxWatermark.Location = new System.Drawing.Point(99, 71); + this.ppCmbxWatermark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxWatermark.Name = "ppCmbxWatermark"; - this.ppCmbxWatermark.Size = new System.Drawing.Size(126, 26); + this.ppCmbxWatermark.Size = new System.Drawing.Size(167, 26); this.ppCmbxWatermark.TabIndex = 32; this.ppCmbxWatermark.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxWatermark.WatermarkText = "select watermark option"; @@ -913,10 +891,9 @@ namespace VEPROMS this.ppLblWatermarkDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblWatermarkDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblWatermarkDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblWatermarkDefault.Location = new System.Drawing.Point(69, 80); - this.ppLblWatermarkDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblWatermarkDefault.Location = new System.Drawing.Point(92, 98); this.ppLblWatermarkDefault.Name = "ppLblWatermarkDefault"; - this.ppLblWatermarkDefault.Size = new System.Drawing.Size(45, 13); + this.ppLblWatermarkDefault.Size = new System.Drawing.Size(61, 17); this.superTooltip1.SetSuperTooltip(this.ppLblWatermarkDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the default Watermark settings", "", "Pressing the Default Button (to the right)\r\nwill reset the watermark setting back" + " to \r\nthis default.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); this.ppLblWatermarkDefault.TabIndex = 57; @@ -925,20 +902,19 @@ namespace VEPROMS // ppTxtBxPDFLoc // this.ppTxtBxPDFLoc.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_PDFLocation", true)); - this.ppTxtBxPDFLoc.Location = new System.Drawing.Point(82, 19); - this.ppTxtBxPDFLoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxtBxPDFLoc.Location = new System.Drawing.Point(109, 23); + this.ppTxtBxPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxtBxPDFLoc.Name = "ppTxtBxPDFLoc"; - this.ppTxtBxPDFLoc.Size = new System.Drawing.Size(373, 20); + this.ppTxtBxPDFLoc.Size = new System.Drawing.Size(496, 22); this.ppTxtBxPDFLoc.TabIndex = 30; // // label18 // this.label18.AutoSize = true; this.label18.BackColor = System.Drawing.Color.Transparent; - this.label18.Location = new System.Drawing.Point(4, 22); - this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label18.Location = new System.Drawing.Point(5, 27); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(72, 13); + this.label18.Size = new System.Drawing.Size(93, 17); this.label18.TabIndex = 54; this.label18.Text = "PDF Location"; // @@ -948,10 +924,9 @@ namespace VEPROMS this.ppLblAutoDuplexDefault.BackColor = System.Drawing.Color.Transparent; this.ppLblAutoDuplexDefault.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppLblAutoDuplexDefault.ForeColor = System.Drawing.Color.Gray; - this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(286, 80); - this.ppLblAutoDuplexDefault.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblAutoDuplexDefault.Location = new System.Drawing.Point(381, 98); this.ppLblAutoDuplexDefault.Name = "ppLblAutoDuplexDefault"; - this.ppLblAutoDuplexDefault.Size = new System.Drawing.Size(64, 13); + this.ppLblAutoDuplexDefault.Size = new System.Drawing.Size(86, 17); this.superTooltip1.SetSuperTooltip(this.ppLblAutoDuplexDefault, new DevComponents.DotNetBar.SuperTooltipInfo("This is the Automatic Duplex default setting", "", "Pressing the Default Button (to the right)\r\nwill reset the Automatic Duplex setti" + "ng back\r\nto this default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); this.ppLblAutoDuplexDefault.TabIndex = 53; @@ -962,10 +937,10 @@ namespace VEPROMS this.ppChbxDisAutoDuplex.AutoSize = true; this.ppChbxDisAutoDuplex.BackColor = System.Drawing.Color.Transparent; this.ppChbxDisAutoDuplex.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_DisableDuplex", true)); - this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(272, 60); - this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppChbxDisAutoDuplex.Location = new System.Drawing.Point(363, 74); + this.ppChbxDisAutoDuplex.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppChbxDisAutoDuplex.Name = "ppChbxDisAutoDuplex"; - this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(161, 17); + this.ppChbxDisAutoDuplex.Size = new System.Drawing.Size(209, 21); this.superTooltip1.SetSuperTooltip(this.ppChbxDisAutoDuplex, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Automatic Duplex", "", "Checking this box will turn OFF the automatic duplexing used in some formats for " + "Foldout pages.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(0, 0))); this.ppChbxDisAutoDuplex.TabIndex = 34; @@ -977,10 +952,9 @@ namespace VEPROMS // this.label17.AutoSize = true; this.label17.BackColor = System.Drawing.Color.Transparent; - this.label17.Location = new System.Drawing.Point(9, 62); - this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label17.Location = new System.Drawing.Point(12, 76); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(59, 13); + this.label17.Size = new System.Drawing.Size(77, 17); this.label17.TabIndex = 27; this.label17.Text = "Watermark"; // @@ -996,10 +970,10 @@ namespace VEPROMS // // this.ppCbShwDefSettings.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppCbShwDefSettings.Location = new System.Drawing.Point(17, 529); - this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCbShwDefSettings.Location = new System.Drawing.Point(23, 651); + this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbShwDefSettings.Name = "ppCbShwDefSettings"; - this.ppCbShwDefSettings.Size = new System.Drawing.Size(154, 20); + this.ppCbShwDefSettings.Size = new System.Drawing.Size(205, 25); this.superTooltip1.SetSuperTooltip(this.ppCbShwDefSettings, new DevComponents.DotNetBar.SuperTooltipInfo("Show Default Settings", "", "When checked, the default (parent\'s) setting will appear below the overridden sel" + "ection.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppCbShwDefSettings.TabIndex = 92; @@ -1021,10 +995,10 @@ namespace VEPROMS this.ppGpbxUserSpecCB.Controls.Add(this.ppLblChgBarPosDefault); this.ppGpbxUserSpecCB.Controls.Add(this.ppLblChgBarTxtTypeDefault); this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(14, 136); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(19, 167); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; - this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(466, 130); + this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(621, 160); // // // @@ -1070,10 +1044,10 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.Controls.Add(this.ppLblChgBarUserMsgOneDefault); this.ppGpbxUserSpecTxt.Controls.Add(this.ppTxbxChangeBarUserMsgOne); this.ppGpbxUserSpecTxt.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(267, 6); - this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(356, 7); + this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt"; - this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(184, 102); + this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(245, 126); // // // @@ -1108,9 +1082,10 @@ namespace VEPROMS // ppTxtBxPdfPre // this.ppTxtBxPdfPre.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_PDFFilePrefix", true)); - this.ppTxtBxPdfPre.Location = new System.Drawing.Point(90, 106); + this.ppTxtBxPdfPre.Location = new System.Drawing.Point(120, 130); + this.ppTxtBxPdfPre.Margin = new System.Windows.Forms.Padding(4); this.ppTxtBxPdfPre.Name = "ppTxtBxPdfPre"; - this.ppTxtBxPdfPre.Size = new System.Drawing.Size(100, 20); + this.ppTxtBxPdfPre.Size = new System.Drawing.Size(132, 22); this.superTooltip1.SetSuperTooltip(this.ppTxtBxPdfPre, new DevComponents.DotNetBar.SuperTooltipInfo("PDF File Prefix", "", "The text entered here will be appended to the beginning of PDF file name when a p" + "rocedure is printed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.ppTxtBxPdfPre.TabIndex = 68; @@ -1118,20 +1093,21 @@ namespace VEPROMS // ppTxtBxPDFSuf // this.ppTxtBxPDFSuf.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_PDFFileSuffix", true)); - this.ppTxtBxPDFSuf.Location = new System.Drawing.Point(302, 106); + this.ppTxtBxPDFSuf.Location = new System.Drawing.Point(403, 130); + this.ppTxtBxPDFSuf.Margin = new System.Windows.Forms.Padding(4); this.ppTxtBxPDFSuf.Name = "ppTxtBxPDFSuf"; - this.ppTxtBxPDFSuf.Size = new System.Drawing.Size(100, 20); + this.ppTxtBxPDFSuf.Size = new System.Drawing.Size(132, 22); this.superTooltip1.SetSuperTooltip(this.ppTxtBxPDFSuf, new DevComponents.DotNetBar.SuperTooltipInfo("PDF File Suffix", "", "The text entered here will be appended to the end of PDF file name when a procedu" + "re is printed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.ppTxtBxPDFSuf.TabIndex = 68; // // ppTxbxUnitNum // - this.ppTxbxUnitNum.Location = new System.Drawing.Point(256, 275); - this.ppTxbxUnitNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxbxUnitNum.Location = new System.Drawing.Point(341, 338); + this.ppTxbxUnitNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxUnitNum.Multiline = false; this.ppTxbxUnitNum.Name = "ppTxbxUnitNum"; - this.ppTxbxUnitNum.Size = new System.Drawing.Size(44, 20); + this.ppTxbxUnitNum.Size = new System.Drawing.Size(57, 24); this.superTooltip1.SetSuperTooltip(this.ppTxbxUnitNum, new DevComponents.DotNetBar.SuperTooltipInfo("User Defined Message", "", "This message will appear on all change bars", null, null, DevComponents.DotNetBar.eTooltipColor.System)); this.ppTxbxUnitNum.TabIndex = 51; this.ppTxbxUnitNum.Text = ""; @@ -1141,10 +1117,9 @@ namespace VEPROMS this.ppLblDefSettingsInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ppLblDefSettingsInfo.AutoSize = true; this.ppLblDefSettingsInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(10, 510); - this.ppLblDefSettingsInfo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(13, 628); this.ppLblDefSettingsInfo.Name = "ppLblDefSettingsInfo"; - this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(156, 13); + this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(205, 17); this.ppLblDefSettingsInfo.TabIndex = 25; this.ppLblDefSettingsInfo.Text = "* Default values shown in italics"; // @@ -1157,19 +1132,19 @@ namespace VEPROMS this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.CanReorderTabs = true; - this.tcVersions.Controls.Add(this.tcpGeneral); this.tcVersions.Controls.Add(this.tabControlPanel1); + this.tcVersions.Controls.Add(this.tcpGeneral); this.tcVersions.Controls.Add(this.tcpApplicability); this.tcVersions.Controls.Add(this.tcpFormatSettings); this.tcVersions.Controls.Add(this.tcpOutputSettings); this.tcVersions.Controls.Add(this.tabControlPanel5); this.tcVersions.Controls.Add(this.tcpRefereceObjects); - this.tcVersions.Location = new System.Drawing.Point(178, 2); - this.tcVersions.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcVersions.Location = new System.Drawing.Point(237, 2); + this.tcVersions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcVersions.Name = "tcVersions"; this.tcVersions.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tcVersions.SelectedTabIndex = 0; - this.tcVersions.Size = new System.Drawing.Size(514, 336); + this.tcVersions.Size = new System.Drawing.Size(685, 414); this.tcVersions.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Dock; this.tcVersions.TabIndex = 28; this.tcVersions.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1200,11 +1175,11 @@ namespace VEPROMS this.tcpGeneral.Controls.Add(this.label1); this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty; this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpGeneral.Location = new System.Drawing.Point(0, 22); - this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcpGeneral.Location = new System.Drawing.Point(0, 24); + this.tcpGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpGeneral.Name = "tcpGeneral"; - this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tcpGeneral.Size = new System.Drawing.Size(514, 314); + this.tcpGeneral.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpGeneral.Size = new System.Drawing.Size(685, 390); this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1223,6 +1198,7 @@ namespace VEPROMS // // tabControlPanel1 // + this.tabControlPanel1.Controls.Add(this.btnUnlinkDocVersion); this.tabControlPanel1.Controls.Add(this.btnNewEnh); this.tabControlPanel1.Controls.Add(this.cbxEnhVersions); this.tabControlPanel1.Controls.Add(this.lblEnhDoc); @@ -1238,11 +1214,11 @@ namespace VEPROMS this.tabControlPanel1.Controls.Add(this.lbEnhanced); this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(514, 314); + this.tabControlPanel1.Size = new System.Drawing.Size(685, 390); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1253,12 +1229,22 @@ namespace VEPROMS this.tabControlPanel1.TabIndex = 20; this.tabControlPanel1.TabItem = this.tiEnhanced; // + // btnUnlinkDocVersion + // + this.btnUnlinkDocVersion.Location = new System.Drawing.Point(183, 184); + this.btnUnlinkDocVersion.Name = "btnUnlinkDocVersion"; + this.btnUnlinkDocVersion.Size = new System.Drawing.Size(358, 28); + this.btnUnlinkDocVersion.TabIndex = 13; + this.btnUnlinkDocVersion.Text = "Remove Links"; + this.btnUnlinkDocVersion.UseVisualStyleBackColor = true; + this.btnUnlinkDocVersion.Click += new System.EventHandler(this.btnUnlinkDocVersion_Click); + // // btnNewEnh // - this.btnNewEnh.Location = new System.Drawing.Point(-1, 137); - this.btnNewEnh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnNewEnh.Location = new System.Drawing.Point(-1, 169); + this.btnNewEnh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnNewEnh.Name = "btnNewEnh"; - this.btnNewEnh.Size = new System.Drawing.Size(56, 19); + this.btnNewEnh.Size = new System.Drawing.Size(75, 23); this.btnNewEnh.TabIndex = 12; this.btnNewEnh.Text = "New"; this.btnNewEnh.UseVisualStyleBackColor = true; @@ -1267,30 +1253,29 @@ namespace VEPROMS // cbxEnhVersions // this.cbxEnhVersions.FormattingEnabled = true; - this.cbxEnhVersions.Location = new System.Drawing.Point(135, 37); - this.cbxEnhVersions.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxEnhVersions.Location = new System.Drawing.Point(180, 46); + this.cbxEnhVersions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxEnhVersions.Name = "cbxEnhVersions"; - this.cbxEnhVersions.Size = new System.Drawing.Size(324, 21); + this.cbxEnhVersions.Size = new System.Drawing.Size(431, 24); this.cbxEnhVersions.TabIndex = 11; // // lblEnhDoc // this.lblEnhDoc.AutoSize = true; this.lblEnhDoc.BackColor = System.Drawing.Color.Transparent; - this.lblEnhDoc.Location = new System.Drawing.Point(136, 18); - this.lblEnhDoc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEnhDoc.Location = new System.Drawing.Point(181, 22); this.lblEnhDoc.Name = "lblEnhDoc"; - this.lblEnhDoc.Size = new System.Drawing.Size(42, 13); + this.lblEnhDoc.Size = new System.Drawing.Size(56, 17); this.lblEnhDoc.TabIndex = 10; this.lblEnhDoc.Text = "Version"; // // tbEnhPdfXOff // this.tbEnhPdfXOff.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniEnhanced, "PdfXOffset", true)); - this.tbEnhPdfXOff.Location = new System.Drawing.Point(327, 85); - this.tbEnhPdfXOff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbEnhPdfXOff.Location = new System.Drawing.Point(436, 105); + this.tbEnhPdfXOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbEnhPdfXOff.Name = "tbEnhPdfXOff"; - this.tbEnhPdfXOff.Size = new System.Drawing.Size(49, 20); + this.tbEnhPdfXOff.Size = new System.Drawing.Size(64, 22); this.tbEnhPdfXOff.TabIndex = 9; // // bsMiniEnhanced @@ -1300,38 +1285,37 @@ namespace VEPROMS // tbEnhPdfToken // this.tbEnhPdfToken.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniEnhanced, "PdfToken", true)); - this.tbEnhPdfToken.Location = new System.Drawing.Point(273, 84); - this.tbEnhPdfToken.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbEnhPdfToken.Location = new System.Drawing.Point(364, 103); + this.tbEnhPdfToken.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbEnhPdfToken.Name = "tbEnhPdfToken"; - this.tbEnhPdfToken.Size = new System.Drawing.Size(52, 20); + this.tbEnhPdfToken.Size = new System.Drawing.Size(68, 22); this.tbEnhPdfToken.TabIndex = 8; // // tbEnhType // this.tbEnhType.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniEnhanced, "Type", true)); - this.tbEnhType.Location = new System.Drawing.Point(235, 84); - this.tbEnhType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbEnhType.Location = new System.Drawing.Point(313, 103); + this.tbEnhType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbEnhType.Name = "tbEnhType"; - this.tbEnhType.Size = new System.Drawing.Size(36, 20); + this.tbEnhType.Size = new System.Drawing.Size(47, 22); this.tbEnhType.TabIndex = 7; // // tbEnhName // this.tbEnhName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniEnhanced, "Name", true)); - this.tbEnhName.Location = new System.Drawing.Point(135, 84); - this.tbEnhName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbEnhName.Location = new System.Drawing.Point(180, 103); + this.tbEnhName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbEnhName.Name = "tbEnhName"; - this.tbEnhName.Size = new System.Drawing.Size(97, 20); + this.tbEnhName.Size = new System.Drawing.Size(128, 22); this.tbEnhName.TabIndex = 6; // // lblEnhPdfXOff // this.lblEnhPdfXOff.AutoSize = true; this.lblEnhPdfXOff.BackColor = System.Drawing.Color.Transparent; - this.lblEnhPdfXOff.Location = new System.Drawing.Point(327, 69); - this.lblEnhPdfXOff.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEnhPdfXOff.Location = new System.Drawing.Point(436, 85); this.lblEnhPdfXOff.Name = "lblEnhPdfXOff"; - this.lblEnhPdfXOff.Size = new System.Drawing.Size(64, 13); + this.lblEnhPdfXOff.Size = new System.Drawing.Size(84, 17); this.lblEnhPdfXOff.TabIndex = 5; this.lblEnhPdfXOff.Text = "Pdf X Offset"; // @@ -1339,10 +1323,9 @@ namespace VEPROMS // this.lblEnhPdfToken.AutoSize = true; this.lblEnhPdfToken.BackColor = System.Drawing.Color.Transparent; - this.lblEnhPdfToken.Location = new System.Drawing.Point(272, 68); - this.lblEnhPdfToken.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEnhPdfToken.Location = new System.Drawing.Point(363, 84); this.lblEnhPdfToken.Name = "lblEnhPdfToken"; - this.lblEnhPdfToken.Size = new System.Drawing.Size(57, 13); + this.lblEnhPdfToken.Size = new System.Drawing.Size(73, 17); this.lblEnhPdfToken.TabIndex = 4; this.lblEnhPdfToken.Text = "Pdf Token"; // @@ -1350,10 +1333,9 @@ namespace VEPROMS // this.lblEnhType.AutoSize = true; this.lblEnhType.BackColor = System.Drawing.Color.Transparent; - this.lblEnhType.Location = new System.Drawing.Point(235, 68); - this.lblEnhType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEnhType.Location = new System.Drawing.Point(313, 84); this.lblEnhType.Name = "lblEnhType"; - this.lblEnhType.Size = new System.Drawing.Size(31, 13); + this.lblEnhType.Size = new System.Drawing.Size(40, 17); this.lblEnhType.TabIndex = 3; this.lblEnhType.Text = "Type"; // @@ -1361,10 +1343,9 @@ namespace VEPROMS // this.lblEnhName.AutoSize = true; this.lblEnhName.BackColor = System.Drawing.Color.Transparent; - this.lblEnhName.Location = new System.Drawing.Point(135, 71); - this.lblEnhName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEnhName.Location = new System.Drawing.Point(180, 87); this.lblEnhName.Name = "lblEnhName"; - this.lblEnhName.Size = new System.Drawing.Size(35, 13); + this.lblEnhName.Size = new System.Drawing.Size(45, 17); this.lblEnhName.TabIndex = 2; this.lblEnhName.Text = "Name"; // @@ -1372,10 +1353,9 @@ namespace VEPROMS // this.lblEnhSet.AutoSize = true; this.lblEnhSet.BackColor = System.Drawing.Color.Transparent; - this.lblEnhSet.Location = new System.Drawing.Point(4, 2); - this.lblEnhSet.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblEnhSet.Location = new System.Drawing.Point(5, 2); this.lblEnhSet.Name = "lblEnhSet"; - this.lblEnhSet.Size = new System.Drawing.Size(113, 13); + this.lblEnhSet.Size = new System.Drawing.Size(147, 17); this.lblEnhSet.TabIndex = 1; this.lblEnhSet.Text = "Enhanced Documents"; // @@ -1383,10 +1363,11 @@ namespace VEPROMS // this.lbEnhanced.DataSource = this.bsEnhanced; this.lbEnhanced.FormattingEnabled = true; - this.lbEnhanced.Location = new System.Drawing.Point(0, 17); - this.lbEnhanced.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lbEnhanced.ItemHeight = 16; + this.lbEnhanced.Location = new System.Drawing.Point(0, 21); + this.lbEnhanced.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbEnhanced.Name = "lbEnhanced"; - this.lbEnhanced.Size = new System.Drawing.Size(115, 121); + this.lbEnhanced.Size = new System.Drawing.Size(152, 148); this.lbEnhanced.TabIndex = 0; this.lbEnhanced.SelectedIndexChanged += new System.EventHandler(this.lbEnhanced_SelectedIndexChanged); // @@ -1425,11 +1406,11 @@ namespace VEPROMS this.tcpApplicability.Controls.Add(this.panel1); this.tcpApplicability.DisabledBackColor = System.Drawing.Color.Empty; this.tcpApplicability.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpApplicability.Location = new System.Drawing.Point(0, 22); - this.tcpApplicability.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcpApplicability.Location = new System.Drawing.Point(0, 24); + this.tcpApplicability.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpApplicability.Name = "tcpApplicability"; - this.tcpApplicability.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tcpApplicability.Size = new System.Drawing.Size(514, 314); + this.tcpApplicability.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpApplicability.Size = new System.Drawing.Size(685, 390); this.tcpApplicability.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpApplicability.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpApplicability.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1444,10 +1425,9 @@ namespace VEPROMS // this.label28.AutoSize = true; this.label28.BackColor = System.Drawing.Color.Transparent; - this.label28.Location = new System.Drawing.Point(160, 161); - this.label28.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label28.Location = new System.Drawing.Point(213, 198); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(54, 13); + this.label28.Size = new System.Drawing.Size(70, 17); this.label28.TabIndex = 21; this.label28.Text = "Set Name"; // @@ -1455,10 +1435,9 @@ namespace VEPROMS // this.label27.AutoSize = true; this.label27.BackColor = System.Drawing.Color.Transparent; - this.label27.Location = new System.Drawing.Point(177, 140); - this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label27.Location = new System.Drawing.Point(236, 172); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(37, 13); + this.label27.Size = new System.Drawing.Size(46, 17); this.label27.TabIndex = 20; this.label27.Text = "Set ID"; // @@ -1466,10 +1445,9 @@ namespace VEPROMS // this.label26.AutoSize = true; this.label26.BackColor = System.Drawing.Color.Transparent; - this.label26.Location = new System.Drawing.Point(118, 119); - this.label26.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label26.Location = new System.Drawing.Point(157, 146); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(96, 13); + this.label26.Size = new System.Drawing.Size(128, 17); this.label26.TabIndex = 19; this.label26.Text = "Procedure Number"; // @@ -1477,10 +1455,9 @@ namespace VEPROMS // this.label25.AutoSize = true; this.label25.BackColor = System.Drawing.Color.Transparent; - this.label25.Location = new System.Drawing.Point(129, 85); - this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label25.Location = new System.Drawing.Point(172, 105); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(28, 13); + this.label25.Size = new System.Drawing.Size(35, 17); this.label25.TabIndex = 18; this.label25.Text = "Text"; // @@ -1488,10 +1465,9 @@ namespace VEPROMS // this.label24.AutoSize = true; this.label24.BackColor = System.Drawing.Color.Transparent; - this.label24.Location = new System.Drawing.Point(118, 63); - this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label24.Location = new System.Drawing.Point(157, 78); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(44, 13); + this.label24.Size = new System.Drawing.Size(58, 17); this.label24.TabIndex = 17; this.label24.Text = "Number"; // @@ -1499,10 +1475,9 @@ namespace VEPROMS // this.label23.AutoSize = true; this.label23.BackColor = System.Drawing.Color.Transparent; - this.label23.Location = new System.Drawing.Point(124, 44); - this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label23.Location = new System.Drawing.Point(165, 54); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(35, 13); + this.label23.Size = new System.Drawing.Size(45, 17); this.label23.TabIndex = 16; this.label23.Text = "Name"; // @@ -1510,10 +1485,9 @@ namespace VEPROMS // this.label16.AutoSize = true; this.label16.BackColor = System.Drawing.Color.Transparent; - this.label16.Location = new System.Drawing.Point(136, 23); - this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label16.Location = new System.Drawing.Point(181, 28); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(18, 13); + this.label16.Size = new System.Drawing.Size(21, 17); this.label16.TabIndex = 15; this.label16.Text = "ID"; // @@ -1521,10 +1495,9 @@ namespace VEPROMS // this.label8.AutoSize = true; this.label8.BackColor = System.Drawing.Color.Transparent; - this.label8.Location = new System.Drawing.Point(330, 6); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(440, 7); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(128, 13); + this.label8.Size = new System.Drawing.Size(166, 17); this.label8.TabIndex = 14; this.label8.Text = "Other Unit/Train/Channel"; // @@ -1532,20 +1505,19 @@ namespace VEPROMS // this.label7.AutoSize = true; this.label7.BackColor = System.Drawing.Color.Transparent; - this.label7.Location = new System.Drawing.Point(165, 6); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(220, 7); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(99, 13); + this.label7.Size = new System.Drawing.Size(126, 17); this.label7.TabIndex = 13; this.label7.Text = "Unit/Train/Channel"; // // textBox11 // this.textBox11.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "OtherText", true)); - this.textBox11.Location = new System.Drawing.Point(330, 83); - this.textBox11.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox11.Location = new System.Drawing.Point(440, 102); + this.textBox11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(151, 20); + this.textBox11.Size = new System.Drawing.Size(200, 22); this.textBox11.TabIndex = 12; // // bsMiniApple @@ -1555,91 +1527,91 @@ namespace VEPROMS // textBox10 // this.textBox10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "OtherNumber", true)); - this.textBox10.Location = new System.Drawing.Point(330, 62); - this.textBox10.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox10.Location = new System.Drawing.Point(440, 76); + this.textBox10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(151, 20); + this.textBox10.Size = new System.Drawing.Size(200, 22); this.textBox10.TabIndex = 11; // // textBox9 // this.textBox9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "OtherName", true)); - this.textBox9.Location = new System.Drawing.Point(330, 41); - this.textBox9.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox9.Location = new System.Drawing.Point(440, 50); + this.textBox9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(151, 20); + this.textBox9.Size = new System.Drawing.Size(200, 22); this.textBox9.TabIndex = 10; // // textBox8 // this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "OtherID", true)); - this.textBox8.Location = new System.Drawing.Point(330, 20); - this.textBox8.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox8.Location = new System.Drawing.Point(440, 25); + this.textBox8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(151, 20); + this.textBox8.Size = new System.Drawing.Size(200, 22); this.textBox8.TabIndex = 9; // // textBox7 // this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "SetName", true)); - this.textBox7.Location = new System.Drawing.Point(225, 158); - this.textBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox7.Location = new System.Drawing.Point(300, 194); + this.textBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(151, 20); + this.textBox7.Size = new System.Drawing.Size(200, 22); this.textBox7.TabIndex = 8; // // textBox6 // this.textBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "SetID", true)); - this.textBox6.Location = new System.Drawing.Point(225, 137); - this.textBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox6.Location = new System.Drawing.Point(300, 169); + this.textBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(151, 20); + this.textBox6.Size = new System.Drawing.Size(200, 22); this.textBox6.TabIndex = 7; // // textBox5 // this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "ProcedureNumber", true)); - this.textBox5.Location = new System.Drawing.Point(225, 115); - this.textBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox5.Location = new System.Drawing.Point(300, 142); + this.textBox5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(151, 20); + this.textBox5.Size = new System.Drawing.Size(200, 22); this.textBox5.TabIndex = 6; // // textBox4 // this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "Text", true)); - this.textBox4.Location = new System.Drawing.Point(165, 83); - this.textBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox4.Location = new System.Drawing.Point(220, 102); + this.textBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(151, 20); + this.textBox4.Size = new System.Drawing.Size(200, 22); this.textBox4.TabIndex = 5; // // textBox3 // this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "Number", true)); - this.textBox3.Location = new System.Drawing.Point(165, 62); - this.textBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox3.Location = new System.Drawing.Point(220, 76); + this.textBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(151, 20); + this.textBox3.Size = new System.Drawing.Size(200, 22); this.textBox3.TabIndex = 4; // // textBox2 // this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "Name", true)); - this.textBox2.Location = new System.Drawing.Point(165, 41); - this.textBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox2.Location = new System.Drawing.Point(220, 50); + this.textBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(151, 20); + this.textBox2.Size = new System.Drawing.Size(200, 22); this.textBox2.TabIndex = 3; // // textBox1 // this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsMiniApple, "ID", true)); - this.textBox1.Location = new System.Drawing.Point(165, 20); - this.textBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBox1.Location = new System.Drawing.Point(220, 25); + this.textBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(151, 20); + this.textBox1.Size = new System.Drawing.Size(200, 22); this.textBox1.TabIndex = 2; // // panel1 @@ -1649,10 +1621,10 @@ namespace VEPROMS this.panel1.Controls.Add(this.lbApplicabilities); this.panel1.Controls.Add(this.label5); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(2, 2); - this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel1.Location = new System.Drawing.Point(3, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(112, 310); + this.panel1.Size = new System.Drawing.Size(149, 386); this.panel1.TabIndex = 1; // // panel2 @@ -1660,19 +1632,19 @@ namespace VEPROMS this.panel2.Controls.Add(this.btnDelApple); this.panel2.Controls.Add(this.btnNewApple); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 287); - this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel2.Location = new System.Drawing.Point(0, 358); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(112, 23); + this.panel2.Size = new System.Drawing.Size(149, 28); this.panel2.TabIndex = 1; // // btnDelApple // this.btnDelApple.Dock = System.Windows.Forms.DockStyle.Fill; - this.btnDelApple.Location = new System.Drawing.Point(56, 0); - this.btnDelApple.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnDelApple.Location = new System.Drawing.Point(75, 0); + this.btnDelApple.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnDelApple.Name = "btnDelApple"; - this.btnDelApple.Size = new System.Drawing.Size(56, 23); + this.btnDelApple.Size = new System.Drawing.Size(74, 28); this.btnDelApple.TabIndex = 1; this.btnDelApple.Text = "Remove"; this.btnDelApple.UseVisualStyleBackColor = true; @@ -1682,9 +1654,9 @@ namespace VEPROMS // this.btnNewApple.Dock = System.Windows.Forms.DockStyle.Left; this.btnNewApple.Location = new System.Drawing.Point(0, 0); - this.btnNewApple.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnNewApple.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnNewApple.Name = "btnNewApple"; - this.btnNewApple.Size = new System.Drawing.Size(56, 23); + this.btnNewApple.Size = new System.Drawing.Size(75, 28); this.btnNewApple.TabIndex = 0; this.btnNewApple.Text = "New"; this.btnNewApple.UseVisualStyleBackColor = true; @@ -1695,10 +1667,11 @@ namespace VEPROMS this.lbApplicabilities.DataSource = this.bsApples; this.lbApplicabilities.Dock = System.Windows.Forms.DockStyle.Fill; this.lbApplicabilities.FormattingEnabled = true; - this.lbApplicabilities.Location = new System.Drawing.Point(0, 17); - this.lbApplicabilities.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lbApplicabilities.ItemHeight = 16; + this.lbApplicabilities.Location = new System.Drawing.Point(0, 20); + this.lbApplicabilities.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbApplicabilities.Name = "lbApplicabilities"; - this.lbApplicabilities.Size = new System.Drawing.Size(112, 293); + this.lbApplicabilities.Size = new System.Drawing.Size(149, 366); this.lbApplicabilities.TabIndex = 0; this.lbApplicabilities.SelectedIndexChanged += new System.EventHandler(this.lbApplicabilities_SelectedIndexChanged); // @@ -1711,9 +1684,8 @@ namespace VEPROMS this.label5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label5.Dock = System.Windows.Forms.DockStyle.Top; this.label5.Location = new System.Drawing.Point(0, 0); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(112, 17); + this.label5.Size = new System.Drawing.Size(149, 20); this.label5.TabIndex = 0; this.label5.Text = "Applicabilities"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1740,11 +1712,11 @@ namespace VEPROMS this.tcpFormatSettings.Controls.Add(this.ppLblFormatDefault); this.tcpFormatSettings.DisabledBackColor = System.Drawing.Color.Empty; this.tcpFormatSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpFormatSettings.Location = new System.Drawing.Point(0, 22); - this.tcpFormatSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcpFormatSettings.Location = new System.Drawing.Point(0, 24); + this.tcpFormatSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpFormatSettings.Name = "tcpFormatSettings"; - this.tcpFormatSettings.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tcpFormatSettings.Size = new System.Drawing.Size(514, 314); + this.tcpFormatSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpFormatSettings.Size = new System.Drawing.Size(685, 390); this.tcpFormatSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpFormatSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpFormatSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1760,10 +1732,10 @@ namespace VEPROMS // this.btnPhoneList.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnPhoneList.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnPhoneList.Location = new System.Drawing.Point(324, 275); - this.btnPhoneList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnPhoneList.Location = new System.Drawing.Point(432, 338); + this.btnPhoneList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnPhoneList.Name = "btnPhoneList"; - this.btnPhoneList.Size = new System.Drawing.Size(74, 20); + this.btnPhoneList.Size = new System.Drawing.Size(99, 25); this.btnPhoneList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnPhoneList.TabIndex = 52; this.btnPhoneList.Text = "Phone List"; @@ -1773,10 +1745,9 @@ namespace VEPROMS // this.ppLblUnitNum.AutoSize = true; this.ppLblUnitNum.BackColor = System.Drawing.Color.Transparent; - this.ppLblUnitNum.Location = new System.Drawing.Point(12, 281); - this.ppLblUnitNum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ppLblUnitNum.Location = new System.Drawing.Point(16, 346); this.ppLblUnitNum.Name = "ppLblUnitNum"; - this.ppLblUnitNum.Size = new System.Drawing.Size(235, 13); + this.ppLblUnitNum.Size = new System.Drawing.Size(315, 17); this.ppLblUnitNum.TabIndex = 50; this.ppLblUnitNum.Text = "Unit Number for Cover and Header page printing"; // @@ -1808,11 +1779,11 @@ namespace VEPROMS this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); this.tcpOutputSettings.DisabledBackColor = System.Drawing.Color.Empty; this.tcpOutputSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpOutputSettings.Location = new System.Drawing.Point(0, 22); - this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcpOutputSettings.Location = new System.Drawing.Point(0, 24); + this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpOutputSettings.Name = "tcpOutputSettings"; - this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tcpOutputSettings.Size = new System.Drawing.Size(514, 314); + this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpOutputSettings.Size = new System.Drawing.Size(685, 390); this.tcpOutputSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpOutputSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1828,9 +1799,10 @@ namespace VEPROMS // this.label30.AutoSize = true; this.label30.BackColor = System.Drawing.Color.Transparent; - this.label30.Location = new System.Drawing.Point(219, 108); + this.label30.Location = new System.Drawing.Point(292, 133); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(76, 13); + this.label30.Size = new System.Drawing.Size(99, 17); this.label30.TabIndex = 67; this.label30.Text = "PDF File Suffix"; // @@ -1838,9 +1810,10 @@ namespace VEPROMS // this.label29.AutoSize = true; this.label29.BackColor = System.Drawing.Color.Transparent; - this.label29.Location = new System.Drawing.Point(8, 108); + this.label29.Location = new System.Drawing.Point(11, 133); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(76, 13); + this.label29.Size = new System.Drawing.Size(100, 17); this.label29.TabIndex = 67; this.label29.Text = "PDF File Prefix"; // @@ -1849,10 +1822,10 @@ namespace VEPROMS this.ppChbxAddBlankPgs.AutoSize = true; this.ppChbxAddBlankPgs.BackColor = System.Drawing.Color.Transparent; this.ppChbxAddBlankPgs.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AddBlankPagesWhenUsingDuplexFoldouts", true)); - this.ppChbxAddBlankPgs.Location = new System.Drawing.Point(9, 284); - this.ppChbxAddBlankPgs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppChbxAddBlankPgs.Location = new System.Drawing.Point(12, 350); + this.ppChbxAddBlankPgs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppChbxAddBlankPgs.Name = "ppChbxAddBlankPgs"; - this.ppChbxAddBlankPgs.Size = new System.Drawing.Size(249, 17); + this.ppChbxAddBlankPgs.Size = new System.Drawing.Size(324, 21); this.ppChbxAddBlankPgs.TabIndex = 66; this.ppChbxAddBlankPgs.Text = "Add Blank Pages When Using Duplex Foldouts"; this.ppChbxAddBlankPgs.UseVisualStyleBackColor = false; @@ -1862,10 +1835,10 @@ namespace VEPROMS this.ppChbxAlwaysViewPDF.AutoSize = true; this.ppChbxAlwaysViewPDF.BackColor = System.Drawing.Color.Transparent; this.ppChbxAlwaysViewPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysViewPDFAfterCreate", true)); - this.ppChbxAlwaysViewPDF.Location = new System.Drawing.Point(9, 263); - this.ppChbxAlwaysViewPDF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppChbxAlwaysViewPDF.Location = new System.Drawing.Point(12, 324); + this.ppChbxAlwaysViewPDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppChbxAlwaysViewPDF.Name = "ppChbxAlwaysViewPDF"; - this.ppChbxAlwaysViewPDF.Size = new System.Drawing.Size(175, 17); + this.ppChbxAlwaysViewPDF.Size = new System.Drawing.Size(227, 21); this.ppChbxAlwaysViewPDF.TabIndex = 37; this.ppChbxAlwaysViewPDF.Text = "Always View PDF after Creation"; this.ppChbxAlwaysViewPDF.UseVisualStyleBackColor = false; @@ -1875,10 +1848,10 @@ namespace VEPROMS this.ppChbxAlwaysOvrWrtPDF.AutoSize = true; this.ppChbxAlwaysOvrWrtPDF.BackColor = System.Drawing.Color.Transparent; this.ppChbxAlwaysOvrWrtPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); - this.ppChbxAlwaysOvrWrtPDF.Location = new System.Drawing.Point(9, 241); - this.ppChbxAlwaysOvrWrtPDF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppChbxAlwaysOvrWrtPDF.Location = new System.Drawing.Point(12, 297); + this.ppChbxAlwaysOvrWrtPDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppChbxAlwaysOvrWrtPDF.Name = "ppChbxAlwaysOvrWrtPDF"; - this.ppChbxAlwaysOvrWrtPDF.Size = new System.Drawing.Size(131, 17); + this.ppChbxAlwaysOvrWrtPDF.Size = new System.Drawing.Size(168, 21); this.ppChbxAlwaysOvrWrtPDF.TabIndex = 36; this.ppChbxAlwaysOvrWrtPDF.Text = "Always Overwrite PDF"; this.ppChbxAlwaysOvrWrtPDF.UseVisualStyleBackColor = false; @@ -1897,10 +1870,10 @@ namespace VEPROMS this.ppGrpbxPrnAdj.Controls.Add(this.label21); this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOvrdPrnPenULineWidth); this.ppGrpbxPrnAdj.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGrpbxPrnAdj.Location = new System.Drawing.Point(8, 141); - this.ppGrpbxPrnAdj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGrpbxPrnAdj.Location = new System.Drawing.Point(11, 174); + this.ppGrpbxPrnAdj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGrpbxPrnAdj.Name = "ppGrpbxPrnAdj"; - this.ppGrpbxPrnAdj.Size = new System.Drawing.Size(466, 97); + this.ppGrpbxPrnAdj.Size = new System.Drawing.Size(621, 119); // // // @@ -1945,11 +1918,11 @@ namespace VEPROMS this.tabControlPanel5.Controls.Add(this.ppGrdLibDocList); this.tabControlPanel5.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel5.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabControlPanel5.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel5.Name = "tabControlPanel5"; - this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tabControlPanel5.Size = new System.Drawing.Size(514, 314); + this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel5.Size = new System.Drawing.Size(685, 390); this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1981,14 +1954,14 @@ namespace VEPROMS this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill; this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false; - this.ppGrdLibDocList.Location = new System.Drawing.Point(2, 2); - this.ppGrdLibDocList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGrdLibDocList.Location = new System.Drawing.Point(3, 2); + this.ppGrdLibDocList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGrdLibDocList.Name = "ppGrdLibDocList"; this.ppGrdLibDocList.RowHeadersVisible = false; this.ppGrdLibDocList.RowTemplate.Height = 24; this.ppGrdLibDocList.SelectAllSignVisible = false; this.ppGrdLibDocList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ppGrdLibDocList.Size = new System.Drawing.Size(510, 310); + this.ppGrdLibDocList.Size = new System.Drawing.Size(679, 386); this.ppGrdLibDocList.TabIndex = 1; // // documentEntryCountDataGridViewTextBoxColumn @@ -2029,11 +2002,11 @@ namespace VEPROMS this.tcpRefereceObjects.Controls.Add(this.label6); this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty; this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22); - this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 24); + this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpRefereceObjects.Name = "tcpRefereceObjects"; - this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.tcpRefereceObjects.Size = new System.Drawing.Size(514, 314); + this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpRefereceObjects.Size = new System.Drawing.Size(685, 390); this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2048,18 +2021,18 @@ namespace VEPROMS // tbRoDb // this.tbRoDb.Enabled = false; - this.tbRoDb.Location = new System.Drawing.Point(80, 13); - this.tbRoDb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbRoDb.Location = new System.Drawing.Point(107, 16); + this.tbRoDb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tbRoDb.Name = "tbRoDb"; - this.tbRoDb.Size = new System.Drawing.Size(318, 20); + this.tbRoDb.Size = new System.Drawing.Size(423, 22); this.tbRoDb.TabIndex = 20; // // ppBtnRoDbBrowse // - this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34); - this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(541, 42); + this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse"; - this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20); + this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(68, 25); this.ppBtnRoDbBrowse.TabIndex = 22; this.ppBtnRoDbBrowse.Text = "Browse..."; this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true; @@ -2070,20 +2043,20 @@ namespace VEPROMS this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image"))); - this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10); - this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnRoDbProperties.Location = new System.Drawing.Point(541, 12); + this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRoDbProperties.Name = "btnRoDbProperties"; - this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23); + this.btnRoDbProperties.Size = new System.Drawing.Size(44, 28); this.btnRoDbProperties.TabIndex = 21; this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click); // // cmbRoDb // this.cmbRoDb.FormattingEnabled = true; - this.cmbRoDb.Location = new System.Drawing.Point(80, 13); - this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cmbRoDb.Location = new System.Drawing.Point(107, 16); + this.cmbRoDb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cmbRoDb.Name = "cmbRoDb"; - this.cmbRoDb.Size = new System.Drawing.Size(318, 21); + this.cmbRoDb.Size = new System.Drawing.Size(423, 24); this.cmbRoDb.TabIndex = 47; this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged); // @@ -2095,10 +2068,10 @@ namespace VEPROMS this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals); this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals); this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69); - this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGpbxUpROvals.Location = new System.Drawing.Point(45, 85); + this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUpROvals.Name = "ppGpbxUpROvals"; - this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162); + this.ppGpbxUpROvals.Size = new System.Drawing.Size(149, 199); // // // @@ -2146,10 +2119,10 @@ namespace VEPROMS this.panVerBtns.Controls.Add(this.btnOutputSettings); this.panVerBtns.Controls.Add(this.btnRefObjs); this.panVerBtns.Controls.Add(this.btnGeneral); - this.panVerBtns.Location = new System.Drawing.Point(5, 2); - this.panVerBtns.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panVerBtns.Location = new System.Drawing.Point(7, 2); + this.panVerBtns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panVerBtns.Name = "panVerBtns"; - this.panVerBtns.Size = new System.Drawing.Size(151, 280); + this.panVerBtns.Size = new System.Drawing.Size(201, 345); this.panVerBtns.TabIndex = 27; // // btnEnhanced @@ -2157,10 +2130,10 @@ namespace VEPROMS this.btnEnhanced.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnEnhanced.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnEnhanced.Dock = System.Windows.Forms.DockStyle.Top; - this.btnEnhanced.Location = new System.Drawing.Point(0, 107); - this.btnEnhanced.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnEnhanced.Location = new System.Drawing.Point(0, 130); + this.btnEnhanced.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnEnhanced.Name = "btnEnhanced"; - this.btnEnhanced.Size = new System.Drawing.Size(151, 15); + this.btnEnhanced.Size = new System.Drawing.Size(201, 18); this.btnEnhanced.TabIndex = 99; this.btnEnhanced.Text = "Enhanced"; this.btnEnhanced.Click += new System.EventHandler(this.btnEnhanced_Click); @@ -2170,10 +2143,10 @@ namespace VEPROMS this.btnApplicability.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnApplicability.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnApplicability.Dock = System.Windows.Forms.DockStyle.Top; - this.btnApplicability.Location = new System.Drawing.Point(0, 92); - this.btnApplicability.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnApplicability.Location = new System.Drawing.Point(0, 112); + this.btnApplicability.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnApplicability.Name = "btnApplicability"; - this.btnApplicability.Size = new System.Drawing.Size(151, 15); + this.btnApplicability.Size = new System.Drawing.Size(201, 18); this.btnApplicability.TabIndex = 98; this.btnApplicability.Text = "Applicability"; this.btnApplicability.Click += new System.EventHandler(this.btnApplicability_Click); @@ -2183,10 +2156,10 @@ namespace VEPROMS this.btnLibDocs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnLibDocs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnLibDocs.Dock = System.Windows.Forms.DockStyle.Top; - this.btnLibDocs.Location = new System.Drawing.Point(0, 73); - this.btnLibDocs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnLibDocs.Location = new System.Drawing.Point(0, 89); + this.btnLibDocs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnLibDocs.Name = "btnLibDocs"; - this.btnLibDocs.Size = new System.Drawing.Size(151, 19); + this.btnLibDocs.Size = new System.Drawing.Size(201, 23); this.btnLibDocs.TabIndex = 97; this.btnLibDocs.Text = "Library Documents"; this.btnLibDocs.Click += new System.EventHandler(this.btnLibDocs_Click); @@ -2196,10 +2169,10 @@ namespace VEPROMS this.btnFmtSettings.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnFmtSettings.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnFmtSettings.Dock = System.Windows.Forms.DockStyle.Top; - this.btnFmtSettings.Location = new System.Drawing.Point(0, 54); - this.btnFmtSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnFmtSettings.Location = new System.Drawing.Point(0, 66); + this.btnFmtSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnFmtSettings.Name = "btnFmtSettings"; - this.btnFmtSettings.Size = new System.Drawing.Size(151, 19); + this.btnFmtSettings.Size = new System.Drawing.Size(201, 23); this.btnFmtSettings.TabIndex = 96; this.btnFmtSettings.Text = "Format Settings"; this.btnFmtSettings.Click += new System.EventHandler(this.btnFmtSettings_Click); @@ -2209,10 +2182,10 @@ namespace VEPROMS this.btnOutputSettings.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnOutputSettings.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnOutputSettings.Dock = System.Windows.Forms.DockStyle.Top; - this.btnOutputSettings.Location = new System.Drawing.Point(0, 35); - this.btnOutputSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnOutputSettings.Location = new System.Drawing.Point(0, 43); + this.btnOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnOutputSettings.Name = "btnOutputSettings"; - this.btnOutputSettings.Size = new System.Drawing.Size(151, 19); + this.btnOutputSettings.Size = new System.Drawing.Size(201, 23); this.btnOutputSettings.TabIndex = 95; this.btnOutputSettings.Text = "Output Settings"; this.btnOutputSettings.Click += new System.EventHandler(this.btnOutputSettings_Click); @@ -2222,10 +2195,10 @@ namespace VEPROMS this.btnRefObjs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnRefObjs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnRefObjs.Dock = System.Windows.Forms.DockStyle.Top; - this.btnRefObjs.Location = new System.Drawing.Point(0, 19); - this.btnRefObjs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnRefObjs.Location = new System.Drawing.Point(0, 23); + this.btnRefObjs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRefObjs.Name = "btnRefObjs"; - this.btnRefObjs.Size = new System.Drawing.Size(151, 16); + this.btnRefObjs.Size = new System.Drawing.Size(201, 20); this.btnRefObjs.TabIndex = 94; this.btnRefObjs.Text = "Referenced Objects"; this.btnRefObjs.Click += new System.EventHandler(this.btnRefObjs_Click); @@ -2236,9 +2209,9 @@ namespace VEPROMS this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top; this.btnGeneral.Location = new System.Drawing.Point(0, 0); - this.btnGeneral.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnGeneral.Name = "btnGeneral"; - this.btnGeneral.Size = new System.Drawing.Size(151, 19); + this.btnGeneral.Size = new System.Drawing.Size(201, 23); this.btnGeneral.TabIndex = 93; this.btnGeneral.Text = "General"; this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); @@ -2249,12 +2222,12 @@ namespace VEPROMS // // frmVersionsProperties // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.ppBtnCancel; this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ClientSize = new System.Drawing.Size(701, 368); + this.ClientSize = new System.Drawing.Size(925, 444); this.ControlBox = false; this.Controls.Add(this.panVerBtns); this.Controls.Add(this.tcVersions); @@ -2264,7 +2237,7 @@ namespace VEPROMS this.Controls.Add(this.ppBtnOK); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmVersionsProperties"; @@ -2478,5 +2451,6 @@ namespace VEPROMS private System.Windows.Forms.ComboBox cbxEnhVersions; private System.Windows.Forms.Label lblEnhDoc; private System.Windows.Forms.Button btnNewEnh; + private System.Windows.Forms.Button btnUnlinkDocVersion; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index e5a349eb..7eff74d3 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -513,6 +513,26 @@ namespace VEPROMS cbxEnhVersions.SelectedIndex = 0; cbxEnhVersions.Enabled = false; btnNewEnh.Visible = false; + + // when in an enhanced doc version, make visible the button that allows user to unlink, need to get its 'title' + // from the source. + DocVersionInfo srcDVInfo = DocVersionInfo.Get(_DocVersionConfig.MyEnhancedDocuments[0].VersionID); + DocVersionConfig srcDVConfig = srcDVInfo.MyConfig as DocVersionConfig; + DVEnhancedDocuments dveds = srcDVConfig.MyEnhancedDocuments; + string ename = null; + foreach (DVEnhancedDocument dved in dveds) + { + if (dved.VersionID == _DocVersionConfig.MyDocVersion.VersionID) + { + ename = dved.Name; + break; + } + } + if (ename != null) + { + btnUnlinkDocVersion.Visible = true; + btnUnlinkDocVersion.Text = string.Format("Remove All {0} Links", ename); + } } else if (hasEnhancedPO) { @@ -520,6 +540,7 @@ namespace VEPROMS _Enhanced = new List(); lbEnhanced.Visible = true; lblEnhSet.Visible = true; + btnUnlinkDocVersion.Visible = false; // no unlink button when on a Source Document foreach (DVEnhancedDocument dved in _DocVersionConfig.MyEnhancedDocuments) { DocVersionInfo dvi = DocVersionInfo.Get(dved.VersionID); @@ -1401,6 +1422,19 @@ namespace VEPROMS btnNewEnh.Enabled = false; // for now, only do 1 at a time. _Initializing = false; } + + private void btnUnlinkDocVersion_Click(object sender, EventArgs e) + { + if (MessageBox.Show(this, "Are you sure you want to Unlink? Your documents will no longer link to Enhanced.", "Unlink", MessageBoxButtons.YesNoCancel) == DialogResult.Yes) + { + this.Cursor = Cursors.WaitCursor; + _DocVersionConfig.MyDocVersion.MyDocVersionInfo.DoUnlinkEnhancedDocVersion(); + ProcessButtonClick(tiGeneral, btnGeneral); + tiEnhanced.Visible = false; + btnEnhanced.Visible = false; + this.Cursor = Cursors.Default; + } + } } [XmlRoot("Enhanced")] public class EnhancedMiniConfig diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs index a239ae2e..f2ad810b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs @@ -1192,6 +1192,66 @@ namespace VEPROMS.CSLA.Library throw new DbCslaException("Error on ContentInfoList.DoEnhancedUnlink", ex); } } + ////// + [Serializable()] + private class EnhancedDocVersionUnlinkCriteria + { + public EnhancedDocVersionUnlinkCriteria(int? enhancedDocVersionID) + { + _EnhancedDocVersionID = enhancedDocVersionID; + } + private int? _EnhancedDocVersionID; + public int? EnhancedDocVersionID + { + get { return _EnhancedDocVersionID; } + set { _EnhancedDocVersionID = value; } + } + } + private void DataPortal_Fetch(EnhancedDocVersionUnlinkCriteria criteria) + { + try + { + using (SqlConnection cn = Database.VEPROMS_SqlConnection) + { + using (SqlCommand cm = cn.CreateCommand()) + { + cm.CommandType = CommandType.StoredProcedure; + cm.CommandText = "vesp_PurgeEnhancedDocVersionsAndChildren"; + cm.Parameters.AddWithValue("@EnhanceID", criteria.EnhancedDocVersionID); // note query has 'EnhanceID' + cm.CommandTimeout = Database.DefaultTimeout; + using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) + { + IsReadOnly = false; + while (dr.Read()) + { + ContentInfo contentInfo = new ContentInfo(dr); + this.Add(contentInfo); + } + IsReadOnly = true; + } + } + } + } + catch (Exception ex) + { + Database.LogException("EnhancedDocVersionUnlinkCriteria.DataPortal_Fetch", ex); + throw new DbCslaException("EnhancedDocVersionUnlinkCriteria.DataPortal_Fetch", ex); + } + } + public static ContentInfoList DoEnhancedDocVersionUnlink(int enhancedDocVersionID) + { + try + { + ContentInfoList tmp = DataPortal.Fetch(new EnhancedDocVersionUnlinkCriteria(enhancedDocVersionID)); + return tmp; + } + catch (Exception ex) + { + throw new DbCslaException("Error on ContentInfoList.DoEnhancedDocVersionUnlink", ex); + } + } + + #endregion Enhanced_Unlink } } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs index 926f6ff3..cd53fbc0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs @@ -246,7 +246,46 @@ namespace VEPROMS.CSLA.Library } public string SearchPath { get { return ""; } } #endregion - + #region UnlinkEnhancedDocVersion + // Unlink (clear) enhanced from source for this docversion. Refresh all related cache items. + public void DoUnlinkEnhancedDocVersion() + { + try + { + // get source docversion id for refresh - used later (check for null, just in case): + int sdvid = DocVersionConfig != null && DocVersionConfig.MyEnhancedDocuments.Count > 0 ? DocVersionConfig.MyEnhancedDocuments[0].VersionID : -1; + using (ContentInfoList cil = ContentInfoList.DoEnhancedDocVersionUnlink(this.VersionID)) + { + foreach (ContentInfo ci in cil) + { + using (Content c = ci.Get()) + { + // first refresh configs because the ContentInfo.Refresh causes events to occur that refresh screen + // and if configs aren't done first, the screen refresh, if based on config data, will not be correct. + foreach (ItemInfo ii in ci.ContentItems) ii.RefreshConfig(); + ContentInfo.Refresh(c); + } + } + } + // Refresh for this docversion + Refresh(DocVersion.Get(this.VersionID)); + DocVersionConfigRefresh(); + // Refresh the source document's cache + if (sdvid > -1) + { + using (DocVersion dv = DocVersion.Get(sdvid)) + { + Refresh(dv); + dv.MyDocVersionInfo.DocVersionConfigRefresh(); + } + } + } + catch (Exception ex) + { + throw new DbCslaException("Error on DocVersionInfo:DoUnlinkEnhancedDocVersion", ex); + } + } + #endregion UnlinkEnhanced #region DocVersion Config [NonSerialized] private DocVersionConfig _DocVersionConfig;