Compare commits
56 Commits
061bcfdc0f
...
548b845f62
| Author | SHA1 | Date | |
|---|---|---|---|
| 548b845f62 | |||
| 4f733656a0 | |||
| f4ef244a10 | |||
| 839000d48c | |||
| bcb8f419ee | |||
| 059c399240 | |||
| 13b3cd6bc4 | |||
| 3cd4f4c5d9 | |||
| 02b20df652 | |||
| 416bdf16e0 | |||
| 75a4f66714 | |||
| a5b9c26a97 | |||
| 0aa476d9dd | |||
| 0f4eec1df6 | |||
| 4bc73f847c | |||
| e1271c16d9 | |||
| c7d2140e16 | |||
| ac6ee6ff83 | |||
| 1507cf31ce | |||
| aad04647ac | |||
| 934d3977d8 | |||
| 03b0e52bef | |||
| 1da2b8e87c | |||
| e3d16142ac | |||
| b972e40a28 | |||
| c508255ab3 | |||
| e9ec884eb9 | |||
| 592d28e898 | |||
| b826fa6a20 | |||
| 74c2a303da | |||
| dcf50073e7 | |||
| 375871012c | |||
| b7b67cce69 | |||
| 6c22bff1fd | |||
| 0b12805d4a | |||
| 4bac1a4628 | |||
| 2cf164c445 | |||
| 11904e177b | |||
| 527e6b5053 | |||
| 053ebca267 | |||
| 5e7fae9d47 | |||
| 0e4ce99612 | |||
| 3c75637752 | |||
| fb890ded1f | |||
| 4399f31a83 | |||
| ca4b21e593 | |||
| 23a4edb610 | |||
| accc1c622c | |||
| e50ea6a5db | |||
| 04ce6f55db | |||
| f0493e60d8 | |||
| 13edc9c9ff | |||
| fd0ea4404b | |||
| df9d0f908a | |||
| 779394ffd6 | |||
| a230ecef9b |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -377,6 +377,7 @@ namespace ROEditor
|
||||
this.btnOK.TabIndex = 3;
|
||||
this.btnOK.Text = "OK";
|
||||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
|
||||
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
@ -553,6 +554,7 @@ namespace ROEditor
|
||||
// update the local/internal copy of the schema.
|
||||
if (success != true)
|
||||
{
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
return; // DO YET process an error.
|
||||
}
|
||||
else
|
||||
|
||||
@ -266,6 +266,7 @@ namespace ROEditor
|
||||
|
||||
if (success != true)
|
||||
{
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
return; // DO YET process an error.
|
||||
}
|
||||
else
|
||||
@ -367,6 +368,7 @@ namespace ROEditor
|
||||
//
|
||||
// btnOK
|
||||
//
|
||||
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
this.btnOK.Location = new System.Drawing.Point(216, 72);
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.Size = new System.Drawing.Size(88, 24);
|
||||
|
||||
@ -248,6 +248,7 @@ namespace ROEditor
|
||||
|
||||
if (success != true)
|
||||
{
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
return; // DO YET process an error.
|
||||
}
|
||||
return;
|
||||
|
||||
@ -433,6 +433,7 @@ namespace ROEditor
|
||||
//
|
||||
// btnOK
|
||||
//
|
||||
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
this.btnOK.Location = new System.Drawing.Point(24, 248);
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.Size = new System.Drawing.Size(144, 24);
|
||||
|
||||
@ -1251,6 +1251,9 @@ namespace ROEditor
|
||||
{
|
||||
tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>");
|
||||
tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>");
|
||||
//CSM-C2024-035 This is needed for items like Setpoint Value that may have commas with field lengths in them
|
||||
tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname},", $"<{newname},");
|
||||
tbRetVal.Text = tbRetVal.Text.Replace($"<{origname},", $"<{newname},");
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -504,7 +504,6 @@ namespace ROEditor
|
||||
// if a specific RO was passed in. Load the xml tree from it to the root & then
|
||||
// edit it through the ctlXmledit.
|
||||
// from the input tbl string, get a table name.
|
||||
|
||||
ArrayList levelRecids = new ArrayList();
|
||||
int itbl = System.Convert.ToInt32(specificro.Substring(0,4),16);
|
||||
string stbl = System.Convert.ToString(itbl,10);
|
||||
@ -594,7 +593,6 @@ namespace ROEditor
|
||||
return;
|
||||
}
|
||||
roTreeView.SelectedNode = trnd;
|
||||
|
||||
}
|
||||
|
||||
protected void roTreeView_AfterSelect (object sender,
|
||||
@ -676,12 +674,14 @@ namespace ROEditor
|
||||
//if Ctrl/Shift Key is held down
|
||||
if (ROsSelectedforMultiMove == null)
|
||||
ROsSelectedforMultiMove = new List<TreeNode>();
|
||||
|
||||
if ((Control.ModifierKeys & Keys.Shift) != 0)
|
||||
// B2021-094 added check that Control and Alt keys were not pressed with shift key
|
||||
// if user does the <Ctrl><Shift><G> keystroke (Goto selected RO from step editor)
|
||||
// but only lifts up on the G key, it was dropping down into this code below
|
||||
// and getting a null reference error upon initial entry in to the RO Editor
|
||||
if ((Control.ModifierKeys & Keys.Shift) != 0 && (Control.ModifierKeys & Keys.Control) == 0 && (Control.ModifierKeys & Keys.Alt) == 0)
|
||||
{
|
||||
//if shift is held down, clear existing nodes then add the range of nodes
|
||||
roTreeView_ClearAllMultiSelect();
|
||||
|
||||
if (PreviousNode.Index < CurrentNode.Index)
|
||||
{
|
||||
//Traverse Down
|
||||
@ -1673,9 +1673,9 @@ namespace ROEditor
|
||||
{
|
||||
ROCutWasSelected = true;
|
||||
|
||||
string msgstr = "It is recommended that after moving ROs, you create a FST an use it to update RO Values in PROMS to ensure RO Links properly move to the new location as well.\n\n Are you sure you wish to move the RO(s)?";
|
||||
string msgstr = "It is recommended that after moving ROs, you create a FST and use it to update RO Values in PROMS to ensure RO Links properly move to the new location as well.\n\n Are you sure you wish to move the RO(s)?";
|
||||
|
||||
DialogResult AnswerYN = MessageBox.Show(msgstr, "RO Editor", MessageBoxButtons.YesNo);
|
||||
DialogResult AnswerYN = MessageBox.Show(msgstr, "Moving ROs", MessageBoxButtons.YesNo);
|
||||
if (AnswerYN != DialogResult.Yes)
|
||||
ROCutWasSelected = false;
|
||||
|
||||
|
||||
@ -2667,8 +2667,9 @@ namespace RODBInterface
|
||||
bool isused = RODB_CheckForStandardName(oldname);
|
||||
if (isused == true)
|
||||
{
|
||||
MessageBox.Show("The field name is used to define new Setpoints or Graphics Database.\n The update will be for this local (database) group only.", "Field name modification.");
|
||||
DialogResult result = MessageBox.Show($"The field name is used to define new Setpoints or Graphics Database.\n\n The update will be for this local (database) group only.\n\n Select OK to update local definition for all items in that table ({GetTopParentName(myelem)}).", "Field name modification.", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
|
||||
changegeneric = false;
|
||||
if(result == DialogResult.Cancel) return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2680,8 +2681,8 @@ namespace RODBInterface
|
||||
// Generic definition, i.e. all Groups, and No updates only Local definition, i.e. just this Group Added a
|
||||
// Cancel button to Cancel from this dialog and return to previous dialog. Added more information to the
|
||||
// dialog to inform user of this
|
||||
string dmsg = "Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
|
||||
"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group.";
|
||||
string dmsg = $"Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
|
||||
$"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group, and will change the definition for all items in that table ({GetTopParentName(myelem)}).";
|
||||
System.Windows.Forms.DialogResult result = MessageBox.Show(dmsg, "Referenced Object Definition", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
|
||||
if (result == DialogResult.Cancel) return false;
|
||||
if (result == DialogResult.No) changegeneric = false;
|
||||
@ -2786,6 +2787,19 @@ namespace RODBInterface
|
||||
return success;
|
||||
}
|
||||
|
||||
//CSM-C2024-030
|
||||
//Explain that Local is local to that table (and include Table name in wording displayed to user)
|
||||
public string GetTopParentName(VlnXmlElement elem)
|
||||
{
|
||||
VlnXmlElement nodetocheck = elem;
|
||||
while (nodetocheck.GetAttribute("ParentID") != "00000000" && nodetocheck.ParentNode != null)
|
||||
{
|
||||
nodetocheck = (VlnXmlElement) nodetocheck.ParentNode;
|
||||
}
|
||||
|
||||
return nodetocheck.FirstChild.InnerText;
|
||||
}
|
||||
|
||||
public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)
|
||||
{
|
||||
XmlSchema myschema;
|
||||
|
||||
@ -24039,6 +24039,66 @@ GO
|
||||
==========================================================================================================
|
||||
*/
|
||||
|
||||
---The following RememberOpenTabs/AlwaysOpenTabs columns were added for Remeber Open Tabs.
|
||||
--- RememberOpenTabs = Do not prompt User when PROMS opens
|
||||
--- AutoOpenTabs = OpenTabs when PROMS opens - Default to On
|
||||
IF NOT EXISTS(SELECT *
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'Users'
|
||||
AND COLUMN_NAME = 'RememberOpenTabs')
|
||||
ALTER TABLE Users ADD RememberOpenTabs bit NOT NULL DEFAULT(0);
|
||||
go
|
||||
-- Display the status
|
||||
IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for RememberOpenTabs'
|
||||
ELSE PRINT 'Altered table [Users] Error on Alter for RememberOpenTabs'
|
||||
go
|
||||
|
||||
IF NOT EXISTS(SELECT *
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_NAME = 'Users'
|
||||
AND COLUMN_NAME = 'AutoOpenTabs')
|
||||
ALTER TABLE Users ADD AutoOpenTabs bit NOT NULL DEFAULT(1);
|
||||
go
|
||||
-- Display the status
|
||||
IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for AutoOpenTabs'
|
||||
ELSE PRINT 'Altered table [Users] Error on Alter for AutoOpenTabs'
|
||||
go
|
||||
|
||||
/****** Object: StoredProcedure [dbo].[vesp_UpdateUserSettings] Script Date: 10/24/2024 11:29:44 AM ******/
|
||||
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateUserSettings]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
|
||||
DROP PROCEDURE [vesp_UpdateUserSettings];
|
||||
GO
|
||||
|
||||
SET ANSI_NULLS ON
|
||||
GO
|
||||
SET QUOTED_IDENTIFIER ON
|
||||
GO
|
||||
-- =============================================
|
||||
-- Author: Matthew Schill
|
||||
-- Create date: 10/24/2024
|
||||
-- Description: Update User Settings
|
||||
-- =============================================
|
||||
CREATE PROCEDURE [dbo].[vesp_UpdateUserSettings]
|
||||
|
||||
(
|
||||
@UID varchar(100),
|
||||
@Remember bit = null,
|
||||
@AutoOpen bit = null
|
||||
)
|
||||
WITH EXECUTE AS OWNER
|
||||
AS
|
||||
UPDATE Users SET
|
||||
RememberOpenTabs = ISNULL(@Remember,RememberOpenTabs),
|
||||
AutoOpenTabs = ISNULL(@AutoOpen,AutoOpenTabs)
|
||||
WHERE UserID =@UID
|
||||
|
||||
RETURN
|
||||
GO
|
||||
|
||||
IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettings Succeeded'
|
||||
ELSE PRINT 'Running vesp_UpdateUserSettings Failed to Execute'
|
||||
GO
|
||||
|
||||
/*
|
||||
---------------------------------------------------------------------------
|
||||
| ADD New Code Before this Block |
|
||||
@ -24072,7 +24132,7 @@ BEGIN TRY -- Try Block
|
||||
DECLARE @RevDate varchar(255)
|
||||
DECLARE @RevDescription varchar(255)
|
||||
|
||||
set @RevDate = '10/03/2024 11:24'
|
||||
set @RevDate = '10/28/2024 11:24'
|
||||
set @RevDescription = 'Add the ability for PROMS to remember the procedure tabs that were open when you closed PROMS'
|
||||
|
||||
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
||||
|
||||
@ -163,6 +163,12 @@
|
||||
<Compile Include="dlgCheckedOutProcedure.designer.cs">
|
||||
<DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="dlgCheckOpenTabs.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="dlgCheckOpenTabs.Designer.cs">
|
||||
<DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DlgCloseTabsOrExit.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@ -324,6 +330,9 @@
|
||||
<SubType>Designer</SubType>
|
||||
<DependentUpon>AboutVEPROMS.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="dlgCheckOpenTabs.resx">
|
||||
<DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DlgCloseTabsOrExit.resx">
|
||||
<DependentUpon>DlgCloseTabsOrExit.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
116
PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs
generated
Normal file
116
PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs
generated
Normal file
@ -0,0 +1,116 @@
|
||||
|
||||
namespace VEPROMS
|
||||
{
|
||||
partial class dlgCheckOpenTabs
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.labelX1 = new DevComponents.DotNetBar.LabelX();
|
||||
this.cbRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.btnOpenTabs = new DevComponents.DotNetBar.ButtonX();
|
||||
this.btnNoTabs = new DevComponents.DotNetBar.ButtonX();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// labelX1
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.labelX1.Location = new System.Drawing.Point(23, 2);
|
||||
this.labelX1.Name = "labelX1";
|
||||
this.labelX1.Size = new System.Drawing.Size(363, 78);
|
||||
this.labelX1.TabIndex = 0;
|
||||
this.labelX1.Text = "Would you like for PROMS to reopen the tabs that you had open during your last se" +
|
||||
"ssion?";
|
||||
this.labelX1.WordWrap = true;
|
||||
//
|
||||
// cbRemember
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.cbRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbRemember.Location = new System.Drawing.Point(23, 75);
|
||||
this.cbRemember.Name = "cbRemember";
|
||||
this.cbRemember.Size = new System.Drawing.Size(376, 47);
|
||||
this.cbRemember.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.cbRemember.TabIndex = 1;
|
||||
this.cbRemember.Text = "Check this box to not be prompted in the future when opening PROMS. \nNote that th" +
|
||||
"ese settings can be adjusted at any time from the \nOPTIONS menu for PROMS.";
|
||||
//
|
||||
// btnOpenTabs
|
||||
//
|
||||
this.btnOpenTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnOpenTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnOpenTabs.DialogResult = System.Windows.Forms.DialogResult.Yes;
|
||||
this.btnOpenTabs.Location = new System.Drawing.Point(23, 139);
|
||||
this.btnOpenTabs.Name = "btnOpenTabs";
|
||||
this.btnOpenTabs.Size = new System.Drawing.Size(150, 42);
|
||||
this.btnOpenTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnOpenTabs.TabIndex = 2;
|
||||
this.btnOpenTabs.Text = "Yes, Open Tabs from Last Session";
|
||||
this.btnOpenTabs.Click += new System.EventHandler(this.btnTabs_Click);
|
||||
//
|
||||
// btnNoTabs
|
||||
//
|
||||
this.btnNoTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnNoTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnNoTabs.DialogResult = System.Windows.Forms.DialogResult.No;
|
||||
this.btnNoTabs.Location = new System.Drawing.Point(216, 139);
|
||||
this.btnNoTabs.Name = "btnNoTabs";
|
||||
this.btnNoTabs.Size = new System.Drawing.Size(150, 42);
|
||||
this.btnNoTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnNoTabs.TabIndex = 3;
|
||||
this.btnNoTabs.Text = "No, Do Not Open Tabs from Previous Session";
|
||||
this.btnNoTabs.Click += new System.EventHandler(this.btnTabs_Click);
|
||||
//
|
||||
// dlgCheckOpenTabs
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(411, 193);
|
||||
this.ControlBox = false;
|
||||
this.Controls.Add(this.btnNoTabs);
|
||||
this.Controls.Add(this.btnOpenTabs);
|
||||
this.Controls.Add(this.cbRemember);
|
||||
this.Controls.Add(this.labelX1);
|
||||
this.Name = "dlgCheckOpenTabs";
|
||||
this.Text = "Open Tabs from Previous Session";
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private DevComponents.DotNetBar.LabelX labelX1;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbRemember;
|
||||
private DevComponents.DotNetBar.ButtonX btnOpenTabs;
|
||||
private DevComponents.DotNetBar.ButtonX btnNoTabs;
|
||||
}
|
||||
}
|
||||
28
PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs
Normal file
28
PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs
Normal file
@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace VEPROMS
|
||||
{
|
||||
public partial class dlgCheckOpenTabs : Form
|
||||
{
|
||||
public dlgCheckOpenTabs()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public bool Remember { get; set; } = false;
|
||||
|
||||
private void btnTabs_Click(object sender, EventArgs e)
|
||||
{
|
||||
Remember = this.cbRemember.Checked;
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
120
PROMS/VEPROMS User Interface/dlgCheckOpenTabs.resx
Normal file
120
PROMS/VEPROMS User Interface/dlgCheckOpenTabs.resx
Normal file
@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@ -481,12 +481,14 @@ namespace VEPROMS
|
||||
// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
|
||||
private int numTransProcessed = 0;
|
||||
private int numTransFixed = 0;
|
||||
private int numTransCantFix = 0;
|
||||
private int numTransConverted = 0;
|
||||
// B2018-002 - Invalid Transitions - Initialize Transition Refresh Statistics
|
||||
private void ResetTransNumbers()
|
||||
{
|
||||
numTransProcessed = 0;
|
||||
numTransFixed = 0;
|
||||
numTransCantFix = 0;
|
||||
numTransConverted = 0;
|
||||
}
|
||||
private void RefreshTransitions()
|
||||
@ -535,11 +537,12 @@ namespace VEPROMS
|
||||
numTransConverted += ProcedureInfo.TranConvertCount;
|
||||
numTransProcessed += ProcedureInfo.TranCheckCount;
|
||||
numTransFixed += ProcedureInfo.TranFixCount;
|
||||
numTransCantFix += ProcedureInfo.TranCantFixCount; //Bad Transition Link
|
||||
pbProcess.PerformStep();
|
||||
Application.DoEvents();
|
||||
}
|
||||
}
|
||||
if (numTransFixed == 0 && numTransConverted == 0)
|
||||
if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
|
||||
{
|
||||
txtResults.AppendText("No Transitions Needed Updated.");
|
||||
txtResults.AppendText(Environment.NewLine);
|
||||
@ -551,16 +554,18 @@ namespace VEPROMS
|
||||
txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
|
||||
txtProcess.AppendText(Environment.NewLine);
|
||||
// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
|
||||
txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
|
||||
txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed + numTransCantFix)));
|
||||
txtProcess.AppendText(Environment.NewLine);
|
||||
txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
|
||||
txtProcess.AppendText(Environment.NewLine);
|
||||
txtProcess.AppendText(string.Format("Transitions Converted to text: {0}", numTransConverted));
|
||||
txtProcess.AppendText(Environment.NewLine);
|
||||
txtProcess.AppendText(string.Format("Transitions Unable to be Automatically Fixed (Annotation: Bad Transition Link): {0}", numTransCantFix));
|
||||
Application.DoEvents();
|
||||
if (pil.Count > 0)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.AppendLine("The batch refresh process was not usccessful for all procedures selected.");
|
||||
sb.AppendLine("The batch refresh process was not successful for all procedures selected.");
|
||||
sb.AppendLine("The following procedures were not able to be refreshed...");
|
||||
sb.AppendLine();
|
||||
sb.AppendLine(sbProcs.ToString());
|
||||
@ -579,11 +584,11 @@ namespace VEPROMS
|
||||
}
|
||||
}
|
||||
this.Cursor = Cursors.Default;
|
||||
// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
|
||||
if (numTransFixed == 0 && numTransConverted == 0)
|
||||
// B2018-002 - Invalid Transitions - Display Transition Refresh Statistic
|
||||
if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
|
||||
MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
|
||||
else
|
||||
MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
|
||||
MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.\n\n {4} Transitions unable to be automatically fixed (Annotation: Bad Transition Link).", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted + numTransCantFix), numTransFixed, numTransConverted, numTransCantFix), "Refresh Transitions Completed");
|
||||
}
|
||||
|
||||
// C2017-030 - new Admin Tools user interface
|
||||
@ -1103,8 +1108,7 @@ namespace VEPROMS
|
||||
ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
|
||||
TimeSpan ts = DateTime.Now - start;
|
||||
// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
|
||||
txtProcess.AppendText(string.Format("Procedure: {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Elapsed Seconds:{5}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds));
|
||||
//Console.WriteLine("\"{0}\"\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}", pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds, numTransProcessed, numTransFixed, numTransConverted);
|
||||
txtProcess.AppendText(string.Format("Procedure: {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
|
||||
if (myFixes.Length > 0)
|
||||
{
|
||||
txtResults.AppendText(myFixes.ToString());
|
||||
|
||||
333
PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs
generated
333
PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs
generated
@ -76,6 +76,9 @@ namespace VEPROMS
|
||||
this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components);
|
||||
this.btnReset = new DevComponents.DotNetBar.ButtonX();
|
||||
this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
|
||||
this.cbOTRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.cbOTAutoOpen = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.gpOpenTabs = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.gpSystemColor.SuspendLayout();
|
||||
this.panButtons.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
|
||||
@ -91,16 +94,17 @@ namespace VEPROMS
|
||||
this.gpAnnotationSettings.SuspendLayout();
|
||||
this.gpTransRangeColor.SuspendLayout();
|
||||
this.gpPropPageStyle.SuspendLayout();
|
||||
this.gpOpenTabs.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.btnCancel.Location = new System.Drawing.Point(821, 606);
|
||||
this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.btnCancel.Location = new System.Drawing.Point(616, 492);
|
||||
this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.Size = new System.Drawing.Size(75, 23);
|
||||
this.btnCancel.Size = new System.Drawing.Size(56, 19);
|
||||
this.btnCancel.TabIndex = 0;
|
||||
this.btnCancel.Text = "Cancel";
|
||||
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
|
||||
@ -108,10 +112,10 @@ namespace VEPROMS
|
||||
// btnOK
|
||||
//
|
||||
this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnOK.Location = new System.Drawing.Point(723, 606);
|
||||
this.btnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.btnOK.Location = new System.Drawing.Point(542, 492);
|
||||
this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.Size = new System.Drawing.Size(75, 23);
|
||||
this.btnOK.Size = new System.Drawing.Size(56, 19);
|
||||
this.btnOK.TabIndex = 1;
|
||||
this.btnOK.Text = "OK";
|
||||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
|
||||
@ -125,10 +129,10 @@ namespace VEPROMS
|
||||
this.gpSystemColor.Controls.Add(this.cbRibonSilver);
|
||||
this.gpSystemColor.Controls.Add(this.cbRibonBlue);
|
||||
this.gpSystemColor.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpSystemColor.Location = new System.Drawing.Point(52, 16);
|
||||
this.gpSystemColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpSystemColor.Location = new System.Drawing.Point(39, 13);
|
||||
this.gpSystemColor.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpSystemColor.Name = "gpSystemColor";
|
||||
this.gpSystemColor.Size = new System.Drawing.Size(109, 119);
|
||||
this.gpSystemColor.Size = new System.Drawing.Size(82, 97);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -168,10 +172,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbRibonBlack.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbRibonBlack.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbRibonBlack.Location = new System.Drawing.Point(9, 66);
|
||||
this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbRibonBlack.Location = new System.Drawing.Point(7, 54);
|
||||
this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbRibonBlack.Name = "cbRibonBlack";
|
||||
this.cbRibonBlack.Size = new System.Drawing.Size(89, 23);
|
||||
this.cbRibonBlack.Size = new System.Drawing.Size(67, 19);
|
||||
this.cbRibonBlack.TabIndex = 2;
|
||||
this.cbRibonBlack.Text = "Black";
|
||||
this.cbRibonBlack.CheckedChanged += new System.EventHandler(this.cbRibonBlack_CheckedChanged);
|
||||
@ -184,10 +188,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbRibonSilver.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbRibonSilver.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbRibonSilver.Location = new System.Drawing.Point(9, 37);
|
||||
this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbRibonSilver.Location = new System.Drawing.Point(7, 30);
|
||||
this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbRibonSilver.Name = "cbRibonSilver";
|
||||
this.cbRibonSilver.Size = new System.Drawing.Size(89, 23);
|
||||
this.cbRibonSilver.Size = new System.Drawing.Size(67, 19);
|
||||
this.cbRibonSilver.TabIndex = 1;
|
||||
this.cbRibonSilver.Text = "Silver";
|
||||
this.cbRibonSilver.CheckedChanged += new System.EventHandler(this.cbRibonSilver_CheckedChanged);
|
||||
@ -200,10 +204,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbRibonBlue.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbRibonBlue.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbRibonBlue.Location = new System.Drawing.Point(9, 7);
|
||||
this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbRibonBlue.Location = new System.Drawing.Point(7, 6);
|
||||
this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbRibonBlue.Name = "cbRibonBlue";
|
||||
this.cbRibonBlue.Size = new System.Drawing.Size(89, 23);
|
||||
this.cbRibonBlue.Size = new System.Drawing.Size(67, 19);
|
||||
this.cbRibonBlue.TabIndex = 0;
|
||||
this.cbRibonBlue.Text = "Blue";
|
||||
this.cbRibonBlue.CheckedChanged += new System.EventHandler(this.cbRibonBlue_CheckedChanged);
|
||||
@ -215,10 +219,10 @@ namespace VEPROMS
|
||||
this.panButtons.Controls.Add(this.btnStartMsg);
|
||||
this.panButtons.Controls.Add(this.btnGeneral);
|
||||
this.panButtons.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.panButtons.Location = new System.Drawing.Point(19, 17);
|
||||
this.panButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.panButtons.Location = new System.Drawing.Point(14, 14);
|
||||
this.panButtons.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.panButtons.Name = "panButtons";
|
||||
this.panButtons.Size = new System.Drawing.Size(224, 566);
|
||||
this.panButtons.Size = new System.Drawing.Size(168, 460);
|
||||
this.panButtons.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.panButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
|
||||
this.panButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
|
||||
@ -236,10 +240,10 @@ namespace VEPROMS
|
||||
this.btnIntrFaceStngs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnIntrFaceStngs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnIntrFaceStngs.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 46);
|
||||
this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 38);
|
||||
this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnIntrFaceStngs.Name = "btnIntrFaceStngs";
|
||||
this.btnIntrFaceStngs.Size = new System.Drawing.Size(224, 23);
|
||||
this.btnIntrFaceStngs.Size = new System.Drawing.Size(168, 19);
|
||||
this.btnIntrFaceStngs.TabIndex = 2;
|
||||
this.btnIntrFaceStngs.Text = "My Interface Settings";
|
||||
this.btnIntrFaceStngs.Click += new System.EventHandler(this.btnIntrFaceStngs_Click);
|
||||
@ -249,10 +253,10 @@ namespace VEPROMS
|
||||
this.btnStartMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnStartMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnStartMsg.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.btnStartMsg.Location = new System.Drawing.Point(0, 23);
|
||||
this.btnStartMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.btnStartMsg.Location = new System.Drawing.Point(0, 19);
|
||||
this.btnStartMsg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnStartMsg.Name = "btnStartMsg";
|
||||
this.btnStartMsg.Size = new System.Drawing.Size(224, 23);
|
||||
this.btnStartMsg.Size = new System.Drawing.Size(168, 19);
|
||||
this.btnStartMsg.TabIndex = 1;
|
||||
this.btnStartMsg.Text = "Startup Message";
|
||||
this.btnStartMsg.Visible = false;
|
||||
@ -264,9 +268,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(3, 2, 3, 2);
|
||||
this.btnGeneral.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnGeneral.Name = "btnGeneral";
|
||||
this.btnGeneral.Size = new System.Drawing.Size(224, 23);
|
||||
this.btnGeneral.Size = new System.Drawing.Size(168, 19);
|
||||
this.btnGeneral.TabIndex = 0;
|
||||
this.btnGeneral.Text = "General";
|
||||
this.btnGeneral.Visible = false;
|
||||
@ -279,12 +283,12 @@ namespace VEPROMS
|
||||
this.tcSysOpts.Controls.Add(this.tabControlPanel3);
|
||||
this.tcSysOpts.Controls.Add(this.tabControlPanel1);
|
||||
this.tcSysOpts.Controls.Add(this.tabControlPanel2);
|
||||
this.tcSysOpts.Location = new System.Drawing.Point(36, 21);
|
||||
this.tcSysOpts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.tcSysOpts.Location = new System.Drawing.Point(27, 17);
|
||||
this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.tcSysOpts.Name = "tcSysOpts";
|
||||
this.tcSysOpts.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold);
|
||||
this.tcSysOpts.SelectedTabIndex = 2;
|
||||
this.tcSysOpts.Size = new System.Drawing.Size(860, 562);
|
||||
this.tcSysOpts.Size = new System.Drawing.Size(645, 457);
|
||||
this.tcSysOpts.TabIndex = 3;
|
||||
this.tcSysOpts.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
|
||||
this.tcSysOpts.Tabs.Add(this.tiGeneral);
|
||||
@ -296,6 +300,7 @@ namespace VEPROMS
|
||||
//
|
||||
// tabControlPanel3
|
||||
//
|
||||
this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
|
||||
this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt);
|
||||
this.tabControlPanel3.Controls.Add(this.gpVisioPath);
|
||||
this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
|
||||
@ -310,10 +315,10 @@ namespace VEPROMS
|
||||
this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tabControlPanel3.Location = new System.Drawing.Point(0, 27);
|
||||
this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.tabControlPanel3.Name = "tabControlPanel3";
|
||||
this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1);
|
||||
this.tabControlPanel3.Size = new System.Drawing.Size(860, 535);
|
||||
this.tabControlPanel3.Size = new System.Drawing.Size(645, 430);
|
||||
this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
|
||||
this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
|
||||
@ -333,9 +338,10 @@ namespace VEPROMS
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
|
||||
this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.grPanUCFImpOpt.Location = new System.Drawing.Point(417, 15);
|
||||
this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12);
|
||||
this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.grPanUCFImpOpt.Name = "grPanUCFImpOpt";
|
||||
this.grPanUCFImpOpt.Size = new System.Drawing.Size(195, 170);
|
||||
this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -375,10 +381,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbUCFLForSetOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbUCFLForSetOnly.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbUCFLForSetOnly.Location = new System.Drawing.Point(3, 110);
|
||||
this.cbUCFLForSetOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbUCFLForSetOnly.Location = new System.Drawing.Point(2, 89);
|
||||
this.cbUCFLForSetOnly.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbUCFLForSetOnly.Name = "cbUCFLForSetOnly";
|
||||
this.cbUCFLForSetOnly.Size = new System.Drawing.Size(140, 23);
|
||||
this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19);
|
||||
this.cbUCFLForSetOnly.TabIndex = 5;
|
||||
this.cbUCFLForSetOnly.Text = "Load For Set Only";
|
||||
this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
|
||||
@ -391,10 +397,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbUCFLUseAll.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbUCFLUseAll.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbUCFLUseAll.Location = new System.Drawing.Point(3, 83);
|
||||
this.cbUCFLUseAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbUCFLUseAll.Location = new System.Drawing.Point(2, 67);
|
||||
this.cbUCFLUseAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbUCFLUseAll.Name = "cbUCFLUseAll";
|
||||
this.cbUCFLUseAll.Size = new System.Drawing.Size(140, 23);
|
||||
this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19);
|
||||
this.cbUCFLUseAll.TabIndex = 4;
|
||||
this.cbUCFLUseAll.Text = "Load Use All";
|
||||
this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
|
||||
@ -407,10 +413,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbUCFLOnlyImport.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbUCFLOnlyImport.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbUCFLOnlyImport.Location = new System.Drawing.Point(3, 56);
|
||||
this.cbUCFLOnlyImport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbUCFLOnlyImport.Location = new System.Drawing.Point(2, 46);
|
||||
this.cbUCFLOnlyImport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbUCFLOnlyImport.Name = "cbUCFLOnlyImport";
|
||||
this.cbUCFLOnlyImport.Size = new System.Drawing.Size(140, 23);
|
||||
this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19);
|
||||
this.cbUCFLOnlyImport.TabIndex = 3;
|
||||
this.cbUCFLOnlyImport.Text = "Load Only Imported";
|
||||
this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
|
||||
@ -423,10 +429,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbUCFLNotUsed.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbUCFLNotUsed.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbUCFLNotUsed.Location = new System.Drawing.Point(3, 29);
|
||||
this.cbUCFLNotUsed.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbUCFLNotUsed.Location = new System.Drawing.Point(2, 24);
|
||||
this.cbUCFLNotUsed.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbUCFLNotUsed.Name = "cbUCFLNotUsed";
|
||||
this.cbUCFLNotUsed.Size = new System.Drawing.Size(118, 23);
|
||||
this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19);
|
||||
this.cbUCFLNotUsed.TabIndex = 2;
|
||||
this.cbUCFLNotUsed.Text = "Load Not Used";
|
||||
this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
|
||||
@ -439,10 +445,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbUCFIgnore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbUCFIgnore.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbUCFIgnore.Location = new System.Drawing.Point(3, 2);
|
||||
this.cbUCFIgnore.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbUCFIgnore.Location = new System.Drawing.Point(2, 2);
|
||||
this.cbUCFIgnore.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbUCFIgnore.Name = "cbUCFIgnore";
|
||||
this.cbUCFIgnore.Size = new System.Drawing.Size(89, 23);
|
||||
this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19);
|
||||
this.cbUCFIgnore.TabIndex = 1;
|
||||
this.cbUCFIgnore.Text = "Ignore";
|
||||
this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
|
||||
@ -454,10 +460,10 @@ namespace VEPROMS
|
||||
this.gpVisioPath.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpVisioPath.Controls.Add(this.txbxVisioPath);
|
||||
this.gpVisioPath.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpVisioPath.Location = new System.Drawing.Point(33, 427);
|
||||
this.gpVisioPath.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpVisioPath.Location = new System.Drawing.Point(25, 347);
|
||||
this.gpVisioPath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpVisioPath.Name = "gpVisioPath";
|
||||
this.gpVisioPath.Size = new System.Drawing.Size(380, 85);
|
||||
this.gpVisioPath.Size = new System.Drawing.Size(285, 69);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -496,13 +502,12 @@ namespace VEPROMS
|
||||
//
|
||||
this.txbxVisioPath.Border.Class = "TextBoxBorder";
|
||||
this.txbxVisioPath.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.txbxVisioPath.Location = new System.Drawing.Point(11, 16);
|
||||
this.txbxVisioPath.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.txbxVisioPath.Location = new System.Drawing.Point(8, 13);
|
||||
this.txbxVisioPath.Name = "txbxVisioPath";
|
||||
this.txbxVisioPath.PreventEnterBeep = true;
|
||||
this.txbxVisioPath.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
|
||||
this.txbxVisioPath.ShortcutsEnabled = false;
|
||||
this.txbxVisioPath.Size = new System.Drawing.Size(351, 22);
|
||||
this.txbxVisioPath.Size = new System.Drawing.Size(263, 20);
|
||||
this.superTooltip1.SetSuperTooltip(this.txbxVisioPath, new DevComponents.DotNetBar.SuperTooltipInfo("Visio Path", "", "PROMS wil use this specified path to open Visio for use with inserting the Equati" +
|
||||
"on sub step type.\r\n\r\nIf this is blank, then PROMS will look in the registry for " +
|
||||
"the path to Visio.\r\n\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(300, 115)));
|
||||
@ -517,10 +522,10 @@ namespace VEPROMS
|
||||
this.gpSeparateWindows.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpSeparateWindows.Controls.Add(this.cbSeparateWindows);
|
||||
this.gpSeparateWindows.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpSeparateWindows.Location = new System.Drawing.Point(417, 310);
|
||||
this.gpSeparateWindows.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpSeparateWindows.Location = new System.Drawing.Point(313, 252);
|
||||
this.gpSeparateWindows.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpSeparateWindows.Name = "gpSeparateWindows";
|
||||
this.gpSeparateWindows.Size = new System.Drawing.Size(169, 100);
|
||||
this.gpSeparateWindows.Size = new System.Drawing.Size(127, 81);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -559,10 +564,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbSeparateWindows.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbSeparateWindows.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbSeparateWindows.Location = new System.Drawing.Point(11, 10);
|
||||
this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbSeparateWindows.Location = new System.Drawing.Point(8, 8);
|
||||
this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbSeparateWindows.Name = "cbSeparateWindows";
|
||||
this.cbSeparateWindows.Size = new System.Drawing.Size(143, 23);
|
||||
this.cbSeparateWindows.Size = new System.Drawing.Size(107, 19);
|
||||
this.cbSeparateWindows.TabIndex = 9;
|
||||
this.cbSeparateWindows.Text = "By Procedure Set";
|
||||
this.cbSeparateWindows.CheckedChanged += new System.EventHandler(this.cbSeparateWindows_CheckedChanged);
|
||||
@ -574,10 +579,10 @@ namespace VEPROMS
|
||||
this.gpEnhancedDocs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpEnhancedDocs.Controls.Add(this.cbEnhancedDocumentSync);
|
||||
this.gpEnhancedDocs.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpEnhancedDocs.Location = new System.Drawing.Point(223, 310);
|
||||
this.gpEnhancedDocs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpEnhancedDocs.Location = new System.Drawing.Point(167, 252);
|
||||
this.gpEnhancedDocs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpEnhancedDocs.Name = "gpEnhancedDocs";
|
||||
this.gpEnhancedDocs.Size = new System.Drawing.Size(169, 100);
|
||||
this.gpEnhancedDocs.Size = new System.Drawing.Size(127, 81);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -619,10 +624,10 @@ namespace VEPROMS
|
||||
this.cbEnhancedDocumentSync.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.cbEnhancedDocumentSync.CheckValue = "Y";
|
||||
this.cbEnhancedDocumentSync.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbEnhancedDocumentSync.Location = new System.Drawing.Point(11, 10);
|
||||
this.cbEnhancedDocumentSync.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbEnhancedDocumentSync.Location = new System.Drawing.Point(8, 8);
|
||||
this.cbEnhancedDocumentSync.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbEnhancedDocumentSync.Name = "cbEnhancedDocumentSync";
|
||||
this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(132, 23);
|
||||
this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19);
|
||||
this.cbEnhancedDocumentSync.TabIndex = 9;
|
||||
this.cbEnhancedDocumentSync.Text = "Sync Navigation";
|
||||
//
|
||||
@ -634,10 +639,10 @@ namespace VEPROMS
|
||||
this.gpPasteSettings.Controls.Add(this.cbPastePlainText);
|
||||
this.gpPasteSettings.Controls.Add(this.cbPasteNoReturns);
|
||||
this.gpPasteSettings.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpPasteSettings.Location = new System.Drawing.Point(33, 310);
|
||||
this.gpPasteSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpPasteSettings.Location = new System.Drawing.Point(25, 252);
|
||||
this.gpPasteSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpPasteSettings.Name = "gpPasteSettings";
|
||||
this.gpPasteSettings.Size = new System.Drawing.Size(159, 100);
|
||||
this.gpPasteSettings.Size = new System.Drawing.Size(119, 81);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -679,10 +684,10 @@ namespace VEPROMS
|
||||
this.cbPastePlainText.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.cbPastePlainText.CheckValue = "Y";
|
||||
this.cbPastePlainText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbPastePlainText.Location = new System.Drawing.Point(11, 10);
|
||||
this.cbPastePlainText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbPastePlainText.Location = new System.Drawing.Point(8, 8);
|
||||
this.cbPastePlainText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbPastePlainText.Name = "cbPastePlainText";
|
||||
this.cbPastePlainText.Size = new System.Drawing.Size(123, 23);
|
||||
this.cbPastePlainText.Size = new System.Drawing.Size(92, 19);
|
||||
this.cbPastePlainText.TabIndex = 9;
|
||||
this.cbPastePlainText.Text = "Plain Text";
|
||||
this.cbPastePlainText.CheckedChanged += new System.EventHandler(this.cbPastePlainText_CheckedChanged);
|
||||
@ -697,10 +702,10 @@ namespace VEPROMS
|
||||
this.cbPasteNoReturns.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.cbPasteNoReturns.CheckValue = "Y";
|
||||
this.cbPasteNoReturns.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbPasteNoReturns.Location = new System.Drawing.Point(11, 34);
|
||||
this.cbPasteNoReturns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbPasteNoReturns.Location = new System.Drawing.Point(8, 28);
|
||||
this.cbPasteNoReturns.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbPasteNoReturns.Name = "cbPasteNoReturns";
|
||||
this.cbPasteNoReturns.Size = new System.Drawing.Size(123, 23);
|
||||
this.cbPasteNoReturns.Size = new System.Drawing.Size(92, 19);
|
||||
this.cbPasteNoReturns.TabIndex = 10;
|
||||
this.cbPasteNoReturns.Text = "No Returns";
|
||||
this.cbPasteNoReturns.CheckedChanged += new System.EventHandler(this.cbPasteNoReturns_CheckedChanged);
|
||||
@ -712,10 +717,10 @@ namespace VEPROMS
|
||||
this.gpTreeView.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpTreeView.Controls.Add(this.cbTVExpand);
|
||||
this.gpTreeView.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpTreeView.Location = new System.Drawing.Point(416, 203);
|
||||
this.gpTreeView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpTreeView.Location = new System.Drawing.Point(312, 165);
|
||||
this.gpTreeView.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpTreeView.Name = "gpTreeView";
|
||||
this.gpTreeView.Size = new System.Drawing.Size(159, 89);
|
||||
this.gpTreeView.Size = new System.Drawing.Size(119, 72);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -757,10 +762,10 @@ namespace VEPROMS
|
||||
this.cbTVExpand.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.cbTVExpand.CheckValue = "Y";
|
||||
this.cbTVExpand.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbTVExpand.Location = new System.Drawing.Point(11, 16);
|
||||
this.cbTVExpand.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbTVExpand.Location = new System.Drawing.Point(8, 13);
|
||||
this.cbTVExpand.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbTVExpand.Name = "cbTVExpand";
|
||||
this.cbTVExpand.Size = new System.Drawing.Size(123, 23);
|
||||
this.cbTVExpand.Size = new System.Drawing.Size(92, 19);
|
||||
this.superTooltip1.SetSuperTooltip(this.cbTVExpand, new DevComponents.DotNetBar.SuperTooltipInfo("Remember Last", "", "When checked, PROMS will remember the last procedure you had seleced from the tre" +
|
||||
"e and expand the tree to that location the next time PROMS is started.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
|
||||
this.cbTVExpand.TabIndex = 7;
|
||||
@ -774,10 +779,10 @@ namespace VEPROMS
|
||||
this.gpStepTypeToolTip.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpStepTypeToolTip.Controls.Add(this.cbStepTypeToolTip);
|
||||
this.gpStepTypeToolTip.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpStepTypeToolTip.Location = new System.Drawing.Point(223, 203);
|
||||
this.gpStepTypeToolTip.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpStepTypeToolTip.Location = new System.Drawing.Point(167, 165);
|
||||
this.gpStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpStepTypeToolTip.Name = "gpStepTypeToolTip";
|
||||
this.gpStepTypeToolTip.Size = new System.Drawing.Size(159, 89);
|
||||
this.gpStepTypeToolTip.Size = new System.Drawing.Size(119, 72);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -816,10 +821,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbStepTypeToolTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbStepTypeToolTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbStepTypeToolTip.Location = new System.Drawing.Point(11, 16);
|
||||
this.cbStepTypeToolTip.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbStepTypeToolTip.Location = new System.Drawing.Point(8, 13);
|
||||
this.cbStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbStepTypeToolTip.Name = "cbStepTypeToolTip";
|
||||
this.cbStepTypeToolTip.Size = new System.Drawing.Size(123, 23);
|
||||
this.cbStepTypeToolTip.Size = new System.Drawing.Size(92, 19);
|
||||
this.cbStepTypeToolTip.TabIndex = 7;
|
||||
this.cbStepTypeToolTip.Text = "Show Tool Tip";
|
||||
this.cbStepTypeToolTip.CheckedChanged += new System.EventHandler(this.cbStepTypeToolTip_CheckedChanged);
|
||||
@ -831,10 +836,10 @@ namespace VEPROMS
|
||||
this.gpAnnotationSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpAnnotationSettings.Controls.Add(this.cbAnnotationPopup);
|
||||
this.gpAnnotationSettings.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpAnnotationSettings.Location = new System.Drawing.Point(33, 203);
|
||||
this.gpAnnotationSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpAnnotationSettings.Location = new System.Drawing.Point(25, 165);
|
||||
this.gpAnnotationSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpAnnotationSettings.Name = "gpAnnotationSettings";
|
||||
this.gpAnnotationSettings.Size = new System.Drawing.Size(159, 89);
|
||||
this.gpAnnotationSettings.Size = new System.Drawing.Size(119, 72);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -876,10 +881,10 @@ namespace VEPROMS
|
||||
this.cbAnnotationPopup.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.cbAnnotationPopup.CheckValue = "Y";
|
||||
this.cbAnnotationPopup.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbAnnotationPopup.Location = new System.Drawing.Point(11, 16);
|
||||
this.cbAnnotationPopup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbAnnotationPopup.Location = new System.Drawing.Point(8, 13);
|
||||
this.cbAnnotationPopup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbAnnotationPopup.Name = "cbAnnotationPopup";
|
||||
this.cbAnnotationPopup.Size = new System.Drawing.Size(123, 23);
|
||||
this.cbAnnotationPopup.Size = new System.Drawing.Size(92, 19);
|
||||
this.cbAnnotationPopup.TabIndex = 7;
|
||||
this.cbAnnotationPopup.Text = "Auto Popup";
|
||||
this.cbAnnotationPopup.CheckedChanged += new System.EventHandler(this.cbAnnotationPopup_CheckedChanged);
|
||||
@ -891,10 +896,9 @@ namespace VEPROMS
|
||||
this.gpTransRangeColor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpTransRangeColor.Controls.Add(this.colorPickerButton1);
|
||||
this.gpTransRangeColor.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpTransRangeColor.Location = new System.Drawing.Point(650, 16);
|
||||
this.gpTransRangeColor.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.gpTransRangeColor.Location = new System.Drawing.Point(488, 13);
|
||||
this.gpTransRangeColor.Name = "gpTransRangeColor";
|
||||
this.gpTransRangeColor.Size = new System.Drawing.Size(195, 76);
|
||||
this.gpTransRangeColor.Size = new System.Drawing.Size(146, 62);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -932,11 +936,10 @@ namespace VEPROMS
|
||||
this.colorPickerButton1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.colorPickerButton1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.colorPickerButton1.Image = ((System.Drawing.Image)(resources.GetObject("colorPickerButton1.Image")));
|
||||
this.colorPickerButton1.Location = new System.Drawing.Point(9, 15);
|
||||
this.colorPickerButton1.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.colorPickerButton1.Location = new System.Drawing.Point(7, 12);
|
||||
this.colorPickerButton1.Name = "colorPickerButton1";
|
||||
this.colorPickerButton1.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12);
|
||||
this.colorPickerButton1.Size = new System.Drawing.Size(137, 28);
|
||||
this.colorPickerButton1.Size = new System.Drawing.Size(103, 23);
|
||||
this.colorPickerButton1.TabIndex = 0;
|
||||
this.colorPickerButton1.SelectedColorChanged += new System.EventHandler(this.colorPickerButton1_SelectedColorChanged);
|
||||
//
|
||||
@ -949,10 +952,10 @@ namespace VEPROMS
|
||||
this.gpPropPageStyle.Controls.Add(this.cbTabbedIntrFace);
|
||||
this.gpPropPageStyle.Controls.Add(this.cbButtonIntrFace);
|
||||
this.gpPropPageStyle.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpPropPageStyle.Location = new System.Drawing.Point(207, 15);
|
||||
this.gpPropPageStyle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.gpPropPageStyle.Location = new System.Drawing.Point(155, 12);
|
||||
this.gpPropPageStyle.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.gpPropPageStyle.Name = "gpPropPageStyle";
|
||||
this.gpPropPageStyle.Size = new System.Drawing.Size(169, 132);
|
||||
this.gpPropPageStyle.Size = new System.Drawing.Size(127, 107);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -991,10 +994,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbPropGrid.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbPropGrid.Location = new System.Drawing.Point(11, 73);
|
||||
this.cbPropGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbPropGrid.Location = new System.Drawing.Point(8, 59);
|
||||
this.cbPropGrid.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbPropGrid.Name = "cbPropGrid";
|
||||
this.cbPropGrid.Size = new System.Drawing.Size(129, 25);
|
||||
this.cbPropGrid.Size = new System.Drawing.Size(97, 20);
|
||||
this.cbPropGrid.TabIndex = 2;
|
||||
this.cbPropGrid.Text = "Property Grid";
|
||||
this.cbPropGrid.Visible = false;
|
||||
@ -1006,10 +1009,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbTabbedIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbTabbedIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbTabbedIntrFace.Location = new System.Drawing.Point(11, 42);
|
||||
this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbTabbedIntrFace.Location = new System.Drawing.Point(8, 34);
|
||||
this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbTabbedIntrFace.Name = "cbTabbedIntrFace";
|
||||
this.cbTabbedIntrFace.Size = new System.Drawing.Size(148, 25);
|
||||
this.cbTabbedIntrFace.Size = new System.Drawing.Size(111, 20);
|
||||
this.cbTabbedIntrFace.TabIndex = 1;
|
||||
this.cbTabbedIntrFace.Text = "Tabbed Interface";
|
||||
//
|
||||
@ -1020,10 +1023,10 @@ namespace VEPROMS
|
||||
//
|
||||
this.cbButtonIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbButtonIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
|
||||
this.cbButtonIntrFace.Location = new System.Drawing.Point(11, 12);
|
||||
this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.cbButtonIntrFace.Location = new System.Drawing.Point(8, 10);
|
||||
this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbButtonIntrFace.Name = "cbButtonIntrFace";
|
||||
this.cbButtonIntrFace.Size = new System.Drawing.Size(129, 25);
|
||||
this.cbButtonIntrFace.Size = new System.Drawing.Size(97, 20);
|
||||
this.cbButtonIntrFace.TabIndex = 0;
|
||||
this.cbButtonIntrFace.Text = "Button Interface";
|
||||
//
|
||||
@ -1038,10 +1041,10 @@ namespace VEPROMS
|
||||
this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tabControlPanel1.Location = new System.Drawing.Point(0, 27);
|
||||
this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.tabControlPanel1.Name = "tabControlPanel1";
|
||||
this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
|
||||
this.tabControlPanel1.Size = new System.Drawing.Size(860, 535);
|
||||
this.tabControlPanel1.Size = new System.Drawing.Size(645, 430);
|
||||
this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
|
||||
this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
|
||||
@ -1063,10 +1066,10 @@ namespace VEPROMS
|
||||
this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tabControlPanel2.Location = new System.Drawing.Point(0, 27);
|
||||
this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.tabControlPanel2.Name = "tabControlPanel2";
|
||||
this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
|
||||
this.tabControlPanel2.Size = new System.Drawing.Size(860, 535);
|
||||
this.tabControlPanel2.Size = new System.Drawing.Size(645, 430);
|
||||
this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
|
||||
this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
|
||||
@ -1087,11 +1090,11 @@ namespace VEPROMS
|
||||
//
|
||||
this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnReset.Location = new System.Drawing.Point(259, 606);
|
||||
this.btnReset.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.btnReset.Location = new System.Drawing.Point(194, 492);
|
||||
this.btnReset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnReset.Name = "btnReset";
|
||||
this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
|
||||
this.btnReset.Size = new System.Drawing.Size(105, 23);
|
||||
this.btnReset.Size = new System.Drawing.Size(79, 19);
|
||||
this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95)));
|
||||
this.btnReset.TabIndex = 3;
|
||||
this.btnReset.Text = "Default Settings";
|
||||
@ -1102,13 +1105,87 @@ namespace VEPROMS
|
||||
this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
|
||||
this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
|
||||
//
|
||||
// cbOTRemember
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.cbOTRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbOTRemember.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbOTRemember.Location = new System.Drawing.Point(8, 5);
|
||||
this.cbOTRemember.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbOTRemember.Name = "cbOTRemember";
|
||||
this.cbOTRemember.Size = new System.Drawing.Size(119, 19);
|
||||
this.cbOTRemember.TabIndex = 9;
|
||||
this.cbOTRemember.Text = "Remember Setting";
|
||||
this.cbOTRemember.CheckedChanged += new System.EventHandler(this.cbOTRemember_CheckedChanged);
|
||||
//
|
||||
// cbOTAutoOpen
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.cbOTAutoOpen.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbOTAutoOpen.Enabled = false;
|
||||
this.cbOTAutoOpen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.cbOTAutoOpen.Location = new System.Drawing.Point(8, 28);
|
||||
this.cbOTAutoOpen.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbOTAutoOpen.Name = "cbOTAutoOpen";
|
||||
this.cbOTAutoOpen.Size = new System.Drawing.Size(92, 19);
|
||||
this.cbOTAutoOpen.TabIndex = 10;
|
||||
this.cbOTAutoOpen.Text = "Auto Open";
|
||||
this.cbOTAutoOpen.Visible = false;
|
||||
//
|
||||
// gpOpenTabs
|
||||
//
|
||||
this.gpOpenTabs.BackColor = System.Drawing.Color.Transparent;
|
||||
this.gpOpenTabs.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.gpOpenTabs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.gpOpenTabs.Controls.Add(this.cbOTRemember);
|
||||
this.gpOpenTabs.Controls.Add(this.cbOTAutoOpen);
|
||||
this.gpOpenTabs.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.gpOpenTabs.Location = new System.Drawing.Point(462, 252);
|
||||
this.gpOpenTabs.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.gpOpenTabs.Name = "gpOpenTabs";
|
||||
this.gpOpenTabs.Size = new System.Drawing.Size(139, 81);
|
||||
//
|
||||
//
|
||||
//
|
||||
this.gpOpenTabs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
|
||||
this.gpOpenTabs.Style.BackColorGradientAngle = 90;
|
||||
this.gpOpenTabs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
|
||||
this.gpOpenTabs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.gpOpenTabs.Style.BorderBottomWidth = 1;
|
||||
this.gpOpenTabs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.gpOpenTabs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.gpOpenTabs.Style.BorderLeftWidth = 1;
|
||||
this.gpOpenTabs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.gpOpenTabs.Style.BorderRightWidth = 1;
|
||||
this.gpOpenTabs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.gpOpenTabs.Style.BorderTopWidth = 1;
|
||||
this.gpOpenTabs.Style.CornerDiameter = 4;
|
||||
this.gpOpenTabs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
|
||||
this.gpOpenTabs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
|
||||
this.gpOpenTabs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.gpOpenTabs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.gpOpenTabs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.gpOpenTabs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.gpOpenTabs.TabIndex = 13;
|
||||
this.gpOpenTabs.Text = "Open Tabs";
|
||||
//
|
||||
// frmSysOptions
|
||||
//
|
||||
this.AcceptButton = this.btnOK;
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.CancelButton = this.btnCancel;
|
||||
this.ClientSize = new System.Drawing.Size(932, 640);
|
||||
this.ClientSize = new System.Drawing.Size(699, 520);
|
||||
this.ControlBox = false;
|
||||
this.Controls.Add(this.btnReset);
|
||||
this.Controls.Add(this.tcSysOpts);
|
||||
@ -1117,7 +1194,7 @@ namespace VEPROMS
|
||||
this.Controls.Add(this.btnCancel);
|
||||
this.DoubleBuffered = true;
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.Name = "frmSysOptions";
|
||||
this.Text = "Proms System Options";
|
||||
this.Load += new System.EventHandler(this.frmSysOptions_Load);
|
||||
@ -1136,6 +1213,7 @@ namespace VEPROMS
|
||||
this.gpAnnotationSettings.ResumeLayout(false);
|
||||
this.gpTransRangeColor.ResumeLayout(false);
|
||||
this.gpPropPageStyle.ResumeLayout(false);
|
||||
this.gpOpenTabs.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@ -1189,9 +1267,8 @@ namespace VEPROMS
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFIgnore;
|
||||
|
||||
|
||||
|
||||
|
||||
private DevComponents.DotNetBar.Controls.GroupPanel gpOpenTabs;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbOTRemember;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbOTAutoOpen;
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ using DevComponents.DotNetBar;
|
||||
using VEPROMS.Properties;
|
||||
using Volian.Base.Library;
|
||||
using DescriptiveEnum;
|
||||
using VEPROMS.CSLA.Library;
|
||||
|
||||
namespace VEPROMS
|
||||
{
|
||||
@ -24,6 +25,9 @@ namespace VEPROMS
|
||||
get { return _CanChangeSeparateWindowsSetting; }
|
||||
set { _CanChangeSeparateWindowsSetting = value; }
|
||||
}
|
||||
|
||||
private UserSettings _usersettings;
|
||||
|
||||
public frmSysOptions()
|
||||
{
|
||||
_initializing = true;
|
||||
@ -89,6 +93,13 @@ namespace VEPROMS
|
||||
break;
|
||||
}
|
||||
|
||||
//CSM - C2024-031 - Getting User Settings
|
||||
//and set checkboxes based on what they are set to
|
||||
_usersettings = new UserSettings(VlnSettings.UserID);
|
||||
cbOTRemember.Checked = _usersettings.UserSetting_OpenTabs_Remember;
|
||||
cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
|
||||
cbOTAutoOpen.Checked = _usersettings.UserSetting_OpenTabs_AutoOpen || !cbOTRemember.Checked;
|
||||
|
||||
}
|
||||
private void cbEnhancedDocumentSync_CheckedChanged(object sender, System.EventArgs e)
|
||||
{
|
||||
@ -151,6 +162,15 @@ namespace VEPROMS
|
||||
Settings.Default.PropPageStyle = 3;
|
||||
|
||||
Settings.Default.Save();
|
||||
//CSM - C2024-031 - Save User Settings
|
||||
//based on what checkboxes are set to
|
||||
bool? OTAuto = null;
|
||||
if (cbOTRemember.Checked)
|
||||
{
|
||||
OTAuto = cbOTAutoOpen.Checked;
|
||||
}
|
||||
_usersettings.SetUserSettings(cbOTRemember.Checked, OTAuto);
|
||||
|
||||
this.DialogResult = DialogResult.OK;
|
||||
this.Close();
|
||||
}
|
||||
@ -324,5 +344,10 @@ namespace VEPROMS
|
||||
Settings.Default.UCFImportOpt = 4;
|
||||
}
|
||||
}
|
||||
|
||||
private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -112,21 +112,20 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="colorPickerButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
|
||||
EnEB89x6jgAAACpJREFUOE9j+P//P0UYQgApcjCKASCaFDxqwKgBIDwcDSAHww0gH/9nAACxLJWH1IMf
|
||||
ngAAAABJRU5ErkJggg==
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAKklE
|
||||
QVQ4T2P4//8/RRhCAClyMIoBIJoUPGrAqAEgPBwNIAfDDSAf/2cAALEslYfUgx+eAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
||||
@ -2356,7 +2356,26 @@ namespace VEPROMS
|
||||
// Retrieve edit tab state from database.
|
||||
DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
|
||||
|
||||
if (DisPlayTabState.Rows.Count > 0)
|
||||
//CSM - C2024-031 - Getting User Settings
|
||||
//and set checkboxes based on what they are set to
|
||||
UserSettings usersettings = new UserSettings(VlnSettings.UserID);
|
||||
|
||||
if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
|
||||
{
|
||||
//will open tabs by default / ask by default
|
||||
DialogResult result = DialogResult.Yes;
|
||||
if (!usersettings.UserSetting_OpenTabs_Remember)
|
||||
{
|
||||
dlgCheckOpenTabs checkOpenTabs = new dlgCheckOpenTabs();
|
||||
result = checkOpenTabs.ShowDialog();
|
||||
|
||||
//if checkbox was checked in form, then update User Settings in database
|
||||
if (checkOpenTabs.Remember)
|
||||
usersettings.SetUserSettings(true, result == DialogResult.Yes);
|
||||
}
|
||||
|
||||
|
||||
if (result == DialogResult.Yes)
|
||||
{
|
||||
foreach (DataRow TabState in DisPlayTabState.Rows)
|
||||
{
|
||||
@ -2366,6 +2385,17 @@ namespace VEPROMS
|
||||
OpenItem(_Procedure);
|
||||
// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
|
||||
SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
|
||||
|
||||
//CSM B2024-090 - if last displaytab item,
|
||||
//select the steptab panel for it
|
||||
//and set the EditItem for Find/Replace
|
||||
//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
|
||||
if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
|
||||
{
|
||||
SelectedStepTabPanel.Select();
|
||||
dlgFindReplace.MyEditItem = tc.MyEditItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -474,6 +474,25 @@ namespace VEPROMS.CSLA.Library
|
||||
OnPropertyChanged("Step_FixedTblForSrch");
|
||||
}
|
||||
}
|
||||
//CSM F2024-080: For South Texas - Ability to toggle off Initial Line
|
||||
public bool Step_DisableInitialLine
|
||||
{
|
||||
get
|
||||
{
|
||||
string s = _Xp["Step", "DisableInitialLine"];
|
||||
|
||||
if (s == string.Empty) return false;
|
||||
if (s == "True") return true;
|
||||
return false;
|
||||
}
|
||||
set
|
||||
{
|
||||
string s = _Xp["Step", "DisableInitialLine"];
|
||||
if (value.ToString() == s) return;
|
||||
_Xp["Step", "DisableInitialLine"] = value.ToString();
|
||||
OnPropertyChanged("Step_DisableInitialLine");
|
||||
}
|
||||
}
|
||||
#region RO image sizing
|
||||
// if the RO image (figure) is resized, save it in the step config, not in the ROImageConfig. If stored in ROImageConfig
|
||||
// the size is set for ALL uses.
|
||||
|
||||
@ -687,19 +687,35 @@ namespace VEPROMS.CSLA.Library
|
||||
myLength += mg.Groups[3].Length;
|
||||
}
|
||||
string gg = MyGrid.Data.Substring(myIndex, myLength);
|
||||
//CSM B2024-003 Updating RO Values inside a text Grid, adding a karat
|
||||
// and/or dash into the RO value changes to question marks in the UI,
|
||||
if (newvalue.Contains(@"\u8209?"))
|
||||
{
|
||||
Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
||||
if (m == null)
|
||||
newvalue = newvalue.Replace(@"\u8209?", "-");
|
||||
else if (m.Groups[1].Value == "")
|
||||
newvalue = newvalue.Replace(@"\u8209?", @"\f1\u8209?\f0 ");
|
||||
else
|
||||
newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
|
||||
}
|
||||
if (newvalue.Contains(@"\u916?"))
|
||||
{
|
||||
Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
||||
if (m == null)
|
||||
newvalue = newvalue.Replace(@"\u916?", "^");
|
||||
else if (m.Groups[1].Value == "")
|
||||
newvalue = newvalue.Replace(@"\u916?", @"\f1\u916?\f0 ");
|
||||
else
|
||||
newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
|
||||
}
|
||||
if (newvalue.Contains(@"\u8593?"))
|
||||
{
|
||||
Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
||||
if (m == null)
|
||||
newvalue = newvalue.Replace(@"\u8593?", "^");
|
||||
else if (m.Groups[1].Value == "")
|
||||
newvalue = newvalue.Replace(@"\u8593?", @"\f1\u8593?\f0 ");
|
||||
else
|
||||
newvalue = newvalue.Replace(@"\u8593?", m.Groups[1].Value + @"\u8593?" + m.Groups[3].Value);
|
||||
}
|
||||
@ -708,6 +724,8 @@ namespace VEPROMS.CSLA.Library
|
||||
Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
|
||||
if (m == null)
|
||||
newvalue = newvalue.Replace(@"\u9586?", @"\\");
|
||||
else if (m.Groups[1].Value == "")
|
||||
newvalue = newvalue.Replace(@"\u9586?", @"\f1\u9586?\f0 ");
|
||||
else
|
||||
newvalue = newvalue.Replace(@"\u9586?", m.Groups[1].Value + @"\u9586?" + m.Groups[3].Value);
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ using System.Xml;
|
||||
using System.Drawing;
|
||||
using System.Text.RegularExpressions;
|
||||
using Volian.Base.Library;
|
||||
using System.Linq;
|
||||
|
||||
namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
@ -402,6 +403,99 @@ namespace VEPROMS.CSLA.Library
|
||||
return tmpForLink;
|
||||
}
|
||||
|
||||
//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
|
||||
// This will be used to simulate the non-high level part of a tab
|
||||
// for case where sorting and all other fields match
|
||||
// Note: This is cut down to improve the sort's performance
|
||||
// but congruent to Volian.Print.Library.PDFReport-> BuildStepTab(ItemInfo item)
|
||||
public string BuildStepTab()
|
||||
{
|
||||
StringBuilder sret = new StringBuilder();
|
||||
ItemInfo pitem = this;
|
||||
|
||||
while (!pitem.IsSection && !pitem.IsHigh)
|
||||
{
|
||||
using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
|
||||
{
|
||||
string thisTab = stpinfo.MyTab.CleanText;
|
||||
|
||||
string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
|
||||
|
||||
if (!string.IsNullOrEmpty(thisTab))
|
||||
{
|
||||
thisTab = thisTab.Trim();
|
||||
}
|
||||
|
||||
// if the tab is null or
|
||||
// if the the tab is not a letter or number OR
|
||||
// the tab is an AND or OR type and is the letter "o"
|
||||
// then reset the tab an empty string so that the type name along with the count of that type
|
||||
// (ex. "AND 2", "OR 3")
|
||||
if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
|
||||
{
|
||||
thisTab = string.Empty;
|
||||
}
|
||||
|
||||
if (pitem.IsRNOPart)
|
||||
{
|
||||
if (string.IsNullOrEmpty(thisTab))
|
||||
{
|
||||
sret.Insert(0, "RNO.");
|
||||
}
|
||||
else
|
||||
{
|
||||
thisTab = thisTab.Trim();
|
||||
|
||||
if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
|
||||
{
|
||||
thisTab += ".";
|
||||
}
|
||||
|
||||
sret.Insert(0, "RNO." + thisTab);
|
||||
}
|
||||
}
|
||||
else if (pitem.IsCaution || pitem.IsNote)
|
||||
{
|
||||
// add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
|
||||
if (string.IsNullOrEmpty(thisTab))
|
||||
{
|
||||
sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
|
||||
}
|
||||
else
|
||||
{
|
||||
thisTab = thisTab.Trim(" ".ToCharArray());
|
||||
sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!string.IsNullOrEmpty(thisTab))
|
||||
{
|
||||
thisTab = thisTab.Trim(" ".ToCharArray());
|
||||
|
||||
if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
|
||||
{
|
||||
thisTab += ".";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
|
||||
}
|
||||
|
||||
sret.Insert(0, thisTab);
|
||||
}
|
||||
}
|
||||
|
||||
pitem = pitem.ActiveParent as ItemInfo;
|
||||
|
||||
if (pitem == null)
|
||||
break;
|
||||
}
|
||||
|
||||
return sret.ToString().Trim(" .)".ToCharArray());
|
||||
}
|
||||
|
||||
public void SetHeader(VE_Font myFont, string myText)
|
||||
{
|
||||
_MyHeader = new MetaTag(myFont);
|
||||
@ -619,12 +713,14 @@ namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
TranCheckCount = 0;
|
||||
TranFixCount = 0;
|
||||
TranCantFixCount = 0;
|
||||
TranConvertCount = 0;// B2018-002 - Invalid Transitions - Initialize Transition Conversion Count
|
||||
}
|
||||
|
||||
public static int TranCheckCount = 0;
|
||||
public static int TranFixCount = 0;
|
||||
public static int TranConvertCount = 0;// B2018-002 - Invalid Transitions - Declare Transition Conversion Count
|
||||
public static int TranCantFixCount = 0;
|
||||
internal static TransitionInfoList TransitionsToDisconnected;
|
||||
internal static TransitionInfoList TransitionsToNonEditable;
|
||||
|
||||
@ -731,6 +827,15 @@ namespace VEPROMS.CSLA.Library
|
||||
content.Save();
|
||||
}
|
||||
}
|
||||
else if (newText.Contains("<CTID=-"))
|
||||
{
|
||||
//CSM C2024-028 - Bad Transition Link - Make an annotation
|
||||
using (Item itm = Item.Get(itemInfo.ItemID))
|
||||
{
|
||||
TranCantFixCount++;
|
||||
Annotation.MakeAnnotation(itm, AnnotationType.GetByNameOrCreate("Bad Transition Link"), "", $"Invalid Transition Link: ({ItemInfo.ConvertToDisplayText(newValue)})", null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2752,6 +2857,29 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
#endregion UnlinkEnhanced
|
||||
#region Search
|
||||
|
||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
||||
//Create cleaned version of variable for use in DisplaySearch
|
||||
//This is the Function that does the cleaning
|
||||
public string CleanSearchString(string value)
|
||||
{
|
||||
// \u000C = PageBreak
|
||||
// \u0009 = Tab
|
||||
// \u160? = Hard Space
|
||||
// \u0007 = Bell (Separates Parent Path and Child Path)
|
||||
// \u0011 - Separates DisplayNumber & DisplayText of Step
|
||||
|
||||
if (value == null)
|
||||
return null;
|
||||
|
||||
string tmp = value.Replace("\a", "\\").Replace("\u0007", "\\");
|
||||
tmp = tmp.Replace("\u000C", " ").Replace("\u0009", " ").Replace(@"\u160?", " ").Replace("\u0011", " ");
|
||||
|
||||
if (tmp.StartsWith("\\"))
|
||||
tmp = tmp.Substring(1);
|
||||
return tmp;
|
||||
}
|
||||
|
||||
internal string _SearchDVPath;
|
||||
public string SearchDVPath
|
||||
{
|
||||
@ -2767,6 +2895,10 @@ namespace VEPROMS.CSLA.Library
|
||||
return _SearchDVPath;
|
||||
}
|
||||
}
|
||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
||||
//Create cleaned version of variable for use in DisplaySearch
|
||||
public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
|
||||
|
||||
internal string _SearchPath;
|
||||
public string SearchPath
|
||||
{
|
||||
@ -2790,6 +2922,10 @@ namespace VEPROMS.CSLA.Library
|
||||
return _SearchPath;
|
||||
}
|
||||
}
|
||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
||||
//Create cleaned version of variable for use in DisplaySearch
|
||||
public string SearchPath_clean => CleanSearchString(SearchPath);
|
||||
|
||||
public string ShortSearchPath
|
||||
{
|
||||
get
|
||||
@ -2800,6 +2936,9 @@ namespace VEPROMS.CSLA.Library
|
||||
return dtext;
|
||||
}
|
||||
}
|
||||
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
|
||||
//Create cleaned version of variable for use in DisplaySearch
|
||||
public string ShortSearchPath_clean => CleanSearchString(ShortSearchPath);
|
||||
|
||||
// B2021-076: Proms search results are not presented in order when printed to PDF
|
||||
internal string _SearchDefaultSort;
|
||||
@ -3100,6 +3239,24 @@ namespace VEPROMS.CSLA.Library
|
||||
//get { return ConvertToDisplayText(MyContent.Number); }
|
||||
}
|
||||
|
||||
//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
|
||||
//Get Numeric part of HLS Tab
|
||||
//Used for Certain sorting situations
|
||||
//If no numeric part then use 999 (will be at end of that level of the sort if there are other items with numbered HLS)
|
||||
public int NumericSortNumber
|
||||
{
|
||||
get
|
||||
{
|
||||
string numericpart = null;
|
||||
if (MyHLS != null)
|
||||
numericpart = new string(MyHLS?.MyTab?.CleanTextNoSymbols.TakeWhile(Char.IsDigit).ToArray());
|
||||
if (!string.IsNullOrEmpty(numericpart) && numericpart.All(char.IsNumber))
|
||||
return int.Parse(numericpart);
|
||||
else
|
||||
return 999;
|
||||
}
|
||||
}
|
||||
|
||||
// for step designators (a redefined caution type used in Comanche Peak with the SameRowAsParentMultiLines format flag)
|
||||
// we what to allow for a hard return to allow for multiple designator lines - jsj 5/21/2015
|
||||
public static string ConvertToMulitLineStepDesignatorDisplayText(string txt)
|
||||
@ -4251,6 +4408,13 @@ namespace VEPROMS.CSLA.Library
|
||||
if (tbformat.Contains("{!.+?}"))
|
||||
tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph
|
||||
_MyTab.Text = tstr;
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
|
||||
{
|
||||
if (tstr.StartsWith(" "))
|
||||
tstr = tstr.Substring(1);
|
||||
tstr = FormatStepData.TabData.MacroEditTag + tstr;
|
||||
}
|
||||
_MyTab.CleanText = tstr;
|
||||
return;
|
||||
}
|
||||
@ -4341,25 +4505,73 @@ namespace VEPROMS.CSLA.Library
|
||||
incSub = (ord + 1).ToString();
|
||||
if (MyParent.MyTab.CleanText.Trim().EndsWith(")"))
|
||||
{
|
||||
_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub;
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub;
|
||||
if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
|
||||
{
|
||||
if (tstr.StartsWith(" "))
|
||||
tstr = tstr.Substring(1);
|
||||
tstr = FormatStepData.TabData.MacroEditTag + tstr;
|
||||
}
|
||||
else if (IsInitialLineDisabled && tstr.StartsWith("_"))
|
||||
tstr = tstr.Substring(1);
|
||||
|
||||
_MyTab.CleanText = tstr;
|
||||
_MyTab.Text = _MyTab.CleanText;
|
||||
return;
|
||||
}
|
||||
if (MyParent.MyTab.CleanText.Contains(ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB))
|
||||
{
|
||||
_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
|
||||
if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
|
||||
{
|
||||
if (tstr.StartsWith(" "))
|
||||
tstr = tstr.Substring(1);
|
||||
tstr = FormatStepData.TabData.MacroEditTag + tstr;
|
||||
}
|
||||
else if(IsInitialLineDisabled && tstr.StartsWith("_"))
|
||||
tstr = tstr.Substring(1);
|
||||
|
||||
_MyTab.CleanText = tstr;
|
||||
_MyTab.Text = _MyTab.CleanText;
|
||||
return;
|
||||
}
|
||||
string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
|
||||
_MyTab.CleanText = tmprnotab.TrimStart();
|
||||
_MyTab.Text = tmprnotab.TrimStart();
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
tmprnotab = tmprnotab.TrimStart();
|
||||
if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_"))
|
||||
{
|
||||
if (tmprnotab.StartsWith(" "))
|
||||
tmprnotab = tmprnotab.Substring(1);
|
||||
tmprnotab = FormatStepData.TabData.MacroEditTag + tmprnotab;
|
||||
}
|
||||
else if (IsInitialLineDisabled && tmprnotab.StartsWith("_"))
|
||||
tmprnotab = tmprnotab.Substring(1);
|
||||
|
||||
_MyTab.CleanText = tmprnotab;
|
||||
_MyTab.Text = tmprnotab;
|
||||
return;
|
||||
}
|
||||
if ((((ItemInfo)ActiveParent).IsHigh && FormatStepData.NumberHighLevel) || ((!((ItemInfo)ActiveParent).IsHigh) && ((tbformat == null || tbformat == "") && (RNOLevel <= ColumnMode))))
|
||||
{
|
||||
_MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText;
|
||||
_MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text;
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_"))
|
||||
{
|
||||
if (_MyTab.CleanText.StartsWith(" "))
|
||||
_MyTab.CleanText = _MyTab.CleanText.Substring(1);
|
||||
_MyTab.CleanText = FormatStepData.TabData.MacroEditTag + _MyTab.CleanText;
|
||||
}
|
||||
if (IsInitialLineDisabled && _MyTab.CleanText.StartsWith("_"))
|
||||
{
|
||||
_MyTab.CleanText = _MyTab.CleanText.Substring(1);
|
||||
}
|
||||
if (IsInitialLineDisabled && _MyTab.Text.StartsWith("_"))
|
||||
{
|
||||
_MyTab.Text = _MyTab.Text.Substring(1);
|
||||
}
|
||||
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
|
||||
if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset;
|
||||
if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
|
||||
@ -4694,7 +4906,7 @@ namespace VEPROMS.CSLA.Library
|
||||
// Note could have modified logic for clock macro (above) but older logic uses the IdentEdit setting
|
||||
// for CAS (Continuous Action Summary steps) that have a circle printed around the step number
|
||||
// this is the least impact of current code/formats
|
||||
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag))
|
||||
if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag))
|
||||
{
|
||||
int eidx = tbformat.IndexOf("}", macroindx);
|
||||
if (eidx > -1)
|
||||
@ -4716,6 +4928,17 @@ namespace VEPROMS.CSLA.Library
|
||||
cltext = cltext + " ";
|
||||
}
|
||||
}
|
||||
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
|
||||
else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
|
||||
{
|
||||
if (cltext == null)
|
||||
cltext = tbformat;
|
||||
if (cltext.StartsWith(" "))
|
||||
cltext = cltext.Substring(1);
|
||||
if (tbformat.StartsWith(" "))
|
||||
tbformat = tbformat.Substring(1);
|
||||
cltext = FormatStepData.TabData.MacroEditTag + cltext;
|
||||
}
|
||||
}
|
||||
macroindx = tbformat.IndexOf("{!diamond1}");
|
||||
if (macroindx > -1) //i found it
|
||||
@ -5520,10 +5743,27 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
if (count <= macro.Grouping) addToList = false;
|
||||
}
|
||||
|
||||
//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
|
||||
if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
|
||||
addToList = false;
|
||||
|
||||
if (addToList) tmp.Add(macro);
|
||||
}
|
||||
if (tmp.Count > 0) _MyMacros = tmp;
|
||||
}
|
||||
|
||||
//CSM F2024 - 080: For South Texas - check if initial line is disabled for this step
|
||||
public bool IsInitialLineDisabled
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!IsStep) return false;
|
||||
StepConfig sc = MyConfig as StepConfig;
|
||||
return sc.Step_DisableInitialLine;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
#region UseSmartTemplate
|
||||
|
||||
@ -6022,6 +6262,168 @@ namespace VEPROMS.CSLA.Library
|
||||
throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
|
||||
}
|
||||
}
|
||||
|
||||
//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
|
||||
// Found various inconsistencies in the reports so adding this to manually sort
|
||||
//instead of binding the sort to 1 or 2 individual fields
|
||||
public List<ItemInfo> SortedList(bool sortbyFoundRoid = false)
|
||||
{
|
||||
List<ItemInfo> tmp = new List<ItemInfo>(this);
|
||||
if (sortbyFoundRoid)
|
||||
{
|
||||
// Priority of Sorting order:
|
||||
// 1. FoundRoid (by Referenced Object ID)
|
||||
// 2. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
|
||||
// 3. Keep in order of the Procedures within the set
|
||||
// 4. Keep in the order of the Section within the Procedure
|
||||
// 5. NumericSortNumber - numeric part of the HLS if there is one
|
||||
// 6. Substep Tab - will sort as a string since combined numbers/text
|
||||
tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
|
||||
{
|
||||
int cmp = 0;
|
||||
int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
|
||||
switch (FoundROID_cmp)
|
||||
{
|
||||
case int result when result < 0:
|
||||
cmp -= 10000000;
|
||||
break;
|
||||
case int result when result == 0:
|
||||
break;
|
||||
case int result when result > 0:
|
||||
cmp += 10000000;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
|
||||
switch (DVPath_cmp)
|
||||
{
|
||||
case int result when result < 0:
|
||||
cmp -= 1000000;
|
||||
break;
|
||||
case int result when result == 0:
|
||||
break;
|
||||
case int result when result > 0:
|
||||
cmp += 1000000;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (x.MyProcedure != null && y.MyProcedure != null)
|
||||
{
|
||||
cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 100000);
|
||||
}
|
||||
|
||||
if (x.ActiveSection != null && y.ActiveSection != null)
|
||||
{
|
||||
cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
|
||||
}
|
||||
|
||||
cmp += x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 10;
|
||||
|
||||
if (cmp == 0)
|
||||
{
|
||||
int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
|
||||
switch (StepTab_cmp)
|
||||
{
|
||||
case int result when result < 0:
|
||||
cmp -= 1;
|
||||
break;
|
||||
case int result when result == 0:
|
||||
break;
|
||||
case int result when result > 0:
|
||||
cmp += 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return cmp;
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
// Priority of Sorting order:
|
||||
// 1. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
|
||||
// 2. Keep in order of the Procedures within the set
|
||||
// 3. Keep in the order of the Section within the Procedure
|
||||
// 4. NumericSortNumber - numeric part of the HLS if there is one
|
||||
// 5. Substep Tab - will sort as a string since combined numbers/text
|
||||
// 6. FoundRoid (by Referenced Object ID)
|
||||
tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
|
||||
{
|
||||
int cmp = 0;
|
||||
|
||||
int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
|
||||
switch (DVPath_cmp)
|
||||
{
|
||||
case int result when result < 0:
|
||||
cmp -= 10000000;
|
||||
break;
|
||||
case int result when result == 0:
|
||||
break;
|
||||
case int result when result > 0:
|
||||
cmp += 10000000;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (x.MyProcedure != null && y.MyProcedure != null)
|
||||
{
|
||||
cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 1000000);
|
||||
}
|
||||
|
||||
if (x.ActiveSection != null && y.ActiveSection != null)
|
||||
{
|
||||
cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
|
||||
}
|
||||
|
||||
cmp += (x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 100);
|
||||
|
||||
if (cmp == 0)
|
||||
{
|
||||
int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
|
||||
switch (StepTab_cmp)
|
||||
{
|
||||
case int result when result < 0:
|
||||
cmp -= 10;
|
||||
break;
|
||||
case int result when result == 0:
|
||||
break;
|
||||
case int result when result > 0:
|
||||
cmp += 10;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
|
||||
switch (FoundROID_cmp)
|
||||
{
|
||||
case int result when result < 0:
|
||||
cmp -= 1;
|
||||
break;
|
||||
case int result when result == 0:
|
||||
break;
|
||||
case int result when result > 0:
|
||||
cmp += 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return cmp;
|
||||
});
|
||||
}
|
||||
|
||||
return tmp;
|
||||
}
|
||||
|
||||
[Serializable()]
|
||||
private class MoveItemCriteria
|
||||
{
|
||||
|
||||
@ -676,37 +676,47 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
public void AppendPrefix()
|
||||
{
|
||||
if (HasText && Prefix != null)
|
||||
if (Prefix == null) return; // no Prefix text to add
|
||||
if (HasText)
|
||||
{
|
||||
if (!_Results.ToString().EndsWith(_Prefix))
|
||||
if (!_Results.ToString().EndsWith(_Prefix)) //existing transition text does not end with Prefix text, OK to append
|
||||
_Results.Append(Prefix);
|
||||
_Prefix = null;
|
||||
}
|
||||
else if (_TranType == 4 && _ToItem.MoreThanOneStepSection())
|
||||
{
|
||||
if (!HasText && Prefix != null && Prefix.ToUpper().StartsWith(", STEP")
|
||||
&& _FromItem.ActiveFormat.Name.StartsWith("WEP"))
|
||||
{
|
||||
Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
|
||||
_Prefix = null;
|
||||
return;
|
||||
}
|
||||
_Results.Append(Prefix);
|
||||
_Prefix = null;
|
||||
}
|
||||
else if (_TranType == 5 && Prefix != null)
|
||||
{
|
||||
if (!HasText && Prefix.StartsWith(", "))
|
||||
_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
|
||||
else
|
||||
// WEP (Point Beach) is no longer a customer - commented out
|
||||
//if (!HasText && Prefix.ToUpper().StartsWith(", STEP")
|
||||
// && _FromItem.ActiveFormat.Name.StartsWith("WEP"))
|
||||
//{
|
||||
// Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
|
||||
// _Prefix = null;
|
||||
// return;
|
||||
//}
|
||||
_Results.Append(Prefix);
|
||||
_Prefix = null;
|
||||
}
|
||||
// If the prefix contains an open paren, we want to add the open paren regardless
|
||||
// of whether there already is text in the resulting string.
|
||||
else if (!HasText && Prefix != null && Prefix.Contains("("))
|
||||
else if (!HasText && Prefix.Contains("("))
|
||||
{
|
||||
_Results.Append(Prefix.TrimStart(" ".ToCharArray())); // since no text in result, trim starting space.
|
||||
_Prefix = null;
|
||||
}
|
||||
else if (!HasText && Prefix.StartsWith(", "))
|
||||
{
|
||||
_Results.Append(Prefix.TrimStart(", ".ToCharArray()));// no preceeding text, remove comma and space
|
||||
_Prefix = null;
|
||||
}
|
||||
else if (!HasText && Prefix.StartsWith(","))
|
||||
{
|
||||
_Results.Append(Prefix.TrimStart(",".ToCharArray())); // no preceeding text, remove comma
|
||||
_Prefix = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
_Results.Append(Prefix); // append prefix as is
|
||||
_Prefix = null;
|
||||
}
|
||||
}
|
||||
public string OverridePrefix
|
||||
|
||||
@ -3175,6 +3175,17 @@ namespace VEPROMS.CSLA.Library
|
||||
return LazyLoad(ref _ChangeFontUpperCaseIinArial, "@ChangeFontUpperCaseIinArial");
|
||||
}
|
||||
}
|
||||
|
||||
// F2024-080 South Texas
|
||||
// Used to show if "Initial Line Disable" checkbox should show in the DisplayTab
|
||||
private LazyLoad<bool> _ShowInitialLineDisable;
|
||||
public bool ShowInitialLineDisable
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _ShowInitialLineDisable, "@ShowInitialLineDisable");
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion - StepSectionData
|
||||
#region TextTypeValue
|
||||
@ -6202,6 +6213,36 @@ public StepData Equation // equation has a parent of embedded object.
|
||||
}
|
||||
}
|
||||
|
||||
// F2024-078 adjusts the the spacing before the Note/Caution tab - the space betwee the top of the box and the tab text
|
||||
private LazyLoad<float?> _AdjSpB4Tab;
|
||||
public float? AdjSpB4Tab
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _AdjSpB4Tab, "@AdjSpB4Tab");
|
||||
}
|
||||
}
|
||||
|
||||
// F2024-078 adjusts the the spacing after the Note/Caution tab - the space betwee the tab text and the first line of of Note/Caution text
|
||||
private LazyLoad<float?> _AdjSpAftTab;
|
||||
public float? AdjSpAftTab
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _AdjSpAftTab, "@AdjSpAftTab");
|
||||
}
|
||||
}
|
||||
|
||||
// F2024-078 adjusts the the spacing after the last line of Note/Caution text - between the last line of text and the bottom of the box
|
||||
private LazyLoad<float?> _AdjLastBlnkLn;
|
||||
public float? AdjLastBlnkLn
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _AdjLastBlnkLn, "@AdjLastBlnkLn");
|
||||
}
|
||||
}
|
||||
|
||||
// this will adjust the line spacing when an extra thick line is used for a box, so that the text below the box doesn't hit up against the bottom of the box
|
||||
private LazyLoad<bool> _ThickDouble; // F2021-026: Barakah single column 2 thick double lines around Warnings
|
||||
public bool ThickDouble
|
||||
@ -6396,7 +6437,7 @@ public StepData Equation // equation has a parent of embedded object.
|
||||
}
|
||||
public TransData(XmlNode xmlNode) : base(xmlNode) { }
|
||||
|
||||
// a character that is placed before and after the title that's in the transition text
|
||||
// a character that is placed before and after the procedure title that's in the transition text
|
||||
private LazyLoad<string> _DelimiterForTransitionTitle;
|
||||
public string DelimiterForTransitionTitle
|
||||
{
|
||||
@ -6673,7 +6714,9 @@ public StepData Equation // equation has a parent of embedded object.
|
||||
}
|
||||
}
|
||||
|
||||
// holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers
|
||||
// Holdover from 16bit, used to define whether transitions are range (types 2 & 3).
|
||||
// This is used in the logic for transitions with page numbers. This gets defined as "Type" in the code for the transition class.
|
||||
// NOTE: the TransType you see in the code is actually the index into the list of transition definitions for given format.
|
||||
private LazyLoad<int?> _Type;
|
||||
public int? Type
|
||||
{
|
||||
|
||||
91
PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs
Normal file
91
PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs
Normal file
@ -0,0 +1,91 @@
|
||||
using System;
|
||||
using Csla.Data;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
|
||||
//CSM - C2024-031 - Minimal Class for Saving / Getting User Settings
|
||||
//For Use with getting / saving if a User wishes to have tabs kept open
|
||||
namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
public class UserSettings
|
||||
{
|
||||
#region Private Properties
|
||||
private readonly string _userid;
|
||||
#endregion
|
||||
|
||||
#region Public Properties
|
||||
public bool UserSetting_OpenTabs_Remember { get; protected set; } = false;
|
||||
public bool UserSetting_OpenTabs_AutoOpen { get; protected set; } = true;
|
||||
#endregion
|
||||
|
||||
|
||||
#region Constructor
|
||||
public UserSettings(string UserID)
|
||||
{
|
||||
_userid = UserID;
|
||||
|
||||
try
|
||||
{
|
||||
using (SqlConnection cn = Database.VEPROMS_SqlConnection)
|
||||
{
|
||||
using (SqlCommand cm = cn.CreateCommand())
|
||||
{
|
||||
cm.CommandType = CommandType.Text;
|
||||
cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs FROM Users where UserID = @UID";
|
||||
cm.Parameters.AddWithValue("@UID", _userid);
|
||||
cm.CommandTimeout = Database.DefaultTimeout;
|
||||
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
|
||||
{
|
||||
if (dr.Read())
|
||||
{
|
||||
UserSetting_OpenTabs_Remember = (bool) dr.GetValue("RememberOpenTabs");
|
||||
UserSetting_OpenTabs_AutoOpen = (bool) dr.GetValue("AutoOpenTabs");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Database.LogException("UserSettings_GetData", ex);
|
||||
throw new DbCslaException("UserSettings_GetData", ex);
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Save Properties
|
||||
public void SetUserSettings(bool OpenTabs_Remember, bool? OpenTabs_AutoOpen = null)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (SqlConnection cn = Database.VEPROMS_SqlConnection)
|
||||
{
|
||||
using (SqlCommand cm = cn.CreateCommand())
|
||||
{
|
||||
cm.CommandType = CommandType.StoredProcedure;
|
||||
cm.CommandText = "vesp_UpdateUserSettings";
|
||||
cm.Parameters.AddWithValue("@UID", _userid);
|
||||
UserSetting_OpenTabs_Remember = OpenTabs_Remember;
|
||||
cm.Parameters.AddWithValue("@Remember", OpenTabs_Remember);
|
||||
if (OpenTabs_AutoOpen != null)
|
||||
{
|
||||
UserSetting_OpenTabs_AutoOpen = (bool) OpenTabs_AutoOpen;
|
||||
cm.Parameters.AddWithValue("@AutoOpen", OpenTabs_AutoOpen);
|
||||
}
|
||||
cm.CommandTimeout = Database.DefaultTimeout;
|
||||
|
||||
cm.ExecuteNonQuery();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Database.LogException("UserSettings_SetUserSettings", ex);
|
||||
throw new DbCslaException("UserSettings_SetUserSettings", ex);
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@ -380,6 +380,7 @@
|
||||
<Compile Include="Generated\ZContentInfo.cs" />
|
||||
<Compile Include="Generated\ZTransition.cs" />
|
||||
<Compile Include="Generated\ZTransitionInfo.cs" />
|
||||
<Compile Include="Minimal\UserSettings.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="VEObjects\VEDrillDown.cs" />
|
||||
<Compile Include="VEObjects\VETreeNode.cs" />
|
||||
|
||||
@ -236,7 +236,11 @@ namespace Volian.Controls.Library
|
||||
else
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.AppendLine("Changing the applicability for this step will invalidate a transition in the following steps...");
|
||||
string tmpwrd = MyItemInfo.IsSection ? "section" : "step";
|
||||
sb.AppendLine($"The applicability for this {tmpwrd} cannot be changed due to transition links.");
|
||||
sb.AppendLine("Applicability settings will return to original settings when OK is selected.");
|
||||
sb.AppendLine($"Changing the applicability for this {tmpwrd} will invalidate a transition in the following steps...");
|
||||
|
||||
sb.AppendLine();
|
||||
// B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external
|
||||
// determine this by looking strings for source and target (to), if procedure level and internal the target starts
|
||||
|
||||
@ -1078,7 +1078,13 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
else if (searchValue.Contains("#Link:ReferencedObject")) // RO Link (roid)
|
||||
{
|
||||
searchValue = searchValue.Replace("1[END>", string.Empty).Trim();
|
||||
// we where only removing the END if the searchValue ended in "1[END>"
|
||||
// but sometimes it ended in "2[END>" and cause a null reference error
|
||||
// - was seen only running via Visual Studio debugger
|
||||
// I cleaned up the code to remove in ether case so that we get the expected roid value - jsj 11-18-2024
|
||||
string substr = searchValue.Substring(searchValue.LastIndexOf(" "));
|
||||
if (substr.Contains("[END>"))
|
||||
searchValue = searchValue.Substring(0, searchValue.Length - substr.Length);
|
||||
string roid = ROFSTLookup.FormatRoidKey(searchValue.Substring(searchValue.LastIndexOf(" ")), true);
|
||||
|
||||
if (roid != selectedChld.roid)
|
||||
|
||||
@ -511,8 +511,8 @@ namespace Volian.Controls.Library
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.btnPrintReport);
|
||||
this.Controls.Add(this.xpSetToReport);
|
||||
this.Controls.Add(this.xpSelROs);
|
||||
this.Controls.Add(this.xpSetToReport);
|
||||
this.Controls.Add(this.tctrlReports);
|
||||
this.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.Name = "DisplayReports";
|
||||
|
||||
@ -805,17 +805,9 @@ namespace Volian.Controls.Library
|
||||
string SearchString = GetListOfROs(true);// Include the RODbID in the RO list
|
||||
ItemInfoList SearchResults = ItemInfoList.GetListFromROReport(DocVersionList, "", SearchString, "");
|
||||
|
||||
if (!usageSortedByProcedure) // sort on ROs
|
||||
{
|
||||
Csla.SortedBindingList<ItemInfo> sortedResults = new Csla.SortedBindingList<ItemInfo>(SearchResults);
|
||||
sortedResults.ApplySort("FoundROID", ListSortDirection.Ascending);
|
||||
List<ItemInfo> sortedResults = SearchResults.SortedList(!usageSortedByProcedure);
|
||||
OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By RO", "RO Usage", sortedResults, usageSortedByProcedure, cbxIncldMissingROs.Checked, paperSize));
|
||||
}
|
||||
else
|
||||
{
|
||||
OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By Procedure", "RO Usage", SearchResults, usageSortedByProcedure, cbxIncldMissingROs.Checked, paperSize));
|
||||
}
|
||||
}
|
||||
else if (cbxTransFromProcs.Checked)
|
||||
{
|
||||
}
|
||||
|
||||
@ -658,7 +658,7 @@ namespace Volian.Controls.Library
|
||||
this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.cmboTreeROs.TabIndex = 1;
|
||||
this.cmboTreeROs.ThemeAware = true;
|
||||
this.cmboTreeROs.WatermarkText = "Select an RO to seach";
|
||||
this.cmboTreeROs.WatermarkText = "Select an RO to search";
|
||||
this.cmboTreeROs.SelectedIndexChanged += new System.EventHandler(this.cmboTreeROs_SelectedIndexChanged);
|
||||
//
|
||||
// tabROSearch
|
||||
|
||||
@ -66,7 +66,7 @@ namespace Volian.Controls.Library
|
||||
private Color saveGrpPanSearchResults;
|
||||
private ItemInfoList _SearchResults;
|
||||
|
||||
private string _DisplayMember = "SearchPath";
|
||||
private string _DisplayMember = "SearchPath_clean";
|
||||
private bool _OpenDocFromSearch;
|
||||
private ROFSTLookup _MyROFSTLookup;
|
||||
private bool _LoadingList = false;
|
||||
@ -1745,7 +1745,7 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
|
||||
// B2021-076: Proms search results are not presented in order when printed to PDF
|
||||
if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath")
|
||||
if (_DisplayMember == "SearchPath_clean" || _DisplayMember == "ShortSearchPath_clean")
|
||||
{
|
||||
cbSorted.Checked = false;
|
||||
cbSorted.Enabled = false;
|
||||
@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library
|
||||
switch (cmbResultsStyle.Text)
|
||||
{
|
||||
case "Document Path":
|
||||
_DisplayMember = "SearchDVPath";
|
||||
_DisplayMember = "SearchDVPath_clean";
|
||||
break;
|
||||
case "Step Path":
|
||||
_DisplayMember = "ShortSearchPath";
|
||||
_DisplayMember = "ShortSearchPath_clean";
|
||||
break;
|
||||
case "Annotation Text":
|
||||
_DisplayMember = "SearchAnnotationText";
|
||||
@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library
|
||||
_DisplayMember = "DisplayText";
|
||||
break;
|
||||
default:
|
||||
_DisplayMember = "SearchPath";
|
||||
_DisplayMember = "SearchPath_clean";
|
||||
break;
|
||||
}
|
||||
DisplayResults();
|
||||
|
||||
@ -34,6 +34,7 @@ namespace Volian.Controls.Library
|
||||
this.cbCAS = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.cmbCheckoff = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||
this.groupPanelCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.cbInitialLine = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.groupPanelChgBar = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.tbChgID = new System.Windows.Forms.TextBox();
|
||||
this.lblChgId = new System.Windows.Forms.Label();
|
||||
@ -78,7 +79,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelPaginate.Controls.Add(this.cbPageBreak);
|
||||
this.groupPanelPaginate.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelPaginate.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelPaginate.Location = new System.Drawing.Point(0, 330);
|
||||
this.groupPanelPaginate.Location = new System.Drawing.Point(0, 339);
|
||||
this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupPanelPaginate.Name = "groupPanelPaginate";
|
||||
this.groupPanelPaginate.Size = new System.Drawing.Size(202, 58);
|
||||
@ -187,13 +188,14 @@ namespace Volian.Controls.Library
|
||||
//
|
||||
this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.groupPanelCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.groupPanelCheckoff.Controls.Add(this.cbInitialLine);
|
||||
this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff);
|
||||
this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 145);
|
||||
this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupPanelCheckoff.Name = "groupPanelCheckoff";
|
||||
this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 77);
|
||||
this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 86);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -226,6 +228,25 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelCheckoff.Text = "Signoff / Checkoff";
|
||||
this.groupPanelCheckoff.VisibleChanged += new System.EventHandler(this.groupPanelCheckoff_VisibleChanged);
|
||||
//
|
||||
// cbInitialLine
|
||||
//
|
||||
this.cbInitialLine.AutoSize = true;
|
||||
this.cbInitialLine.BackColor = System.Drawing.Color.Transparent;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.cbInitialLine.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbInitialLine.Location = new System.Drawing.Point(3, 44);
|
||||
this.cbInitialLine.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbInitialLine.Name = "cbInitialLine";
|
||||
this.cbInitialLine.Size = new System.Drawing.Size(112, 15);
|
||||
this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: <Ctrl><Ente" +
|
||||
"r>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.cbInitialLine.TabIndex = 1;
|
||||
this.cbInitialLine.Text = "Disable Initial Line";
|
||||
this.cbInitialLine.Visible = false;
|
||||
this.cbInitialLine.CheckedChanged += new System.EventHandler(this.cbInitialLine_CheckedChanged);
|
||||
//
|
||||
// groupPanelChgBar
|
||||
//
|
||||
this.groupPanelChgBar.BackColor = System.Drawing.Color.Transparent;
|
||||
@ -237,7 +258,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelChgBar.Controls.Add(this.rbChgBarOn);
|
||||
this.groupPanelChgBar.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelChgBar.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelChgBar.Location = new System.Drawing.Point(0, 222);
|
||||
this.groupPanelChgBar.Location = new System.Drawing.Point(0, 231);
|
||||
this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupPanelChgBar.Name = "groupPanelChgBar";
|
||||
this.groupPanelChgBar.Size = new System.Drawing.Size(202, 108);
|
||||
@ -480,8 +501,7 @@ namespace Volian.Controls.Library
|
||||
this.cbTCAS.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbTCAS.Name = "cbTCAS";
|
||||
this.cbTCAS.Size = new System.Drawing.Size(167, 15);
|
||||
this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: <Shift" +
|
||||
"><F7>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Time Critical Action Summary", "", "Include this in the Time Critical Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.cbTCAS.TabIndex = 3;
|
||||
this.cbTCAS.Text = "Time Critical Action Summary";
|
||||
this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged);
|
||||
@ -498,7 +518,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelIncludeOn.Controls.Add(this.cbCAS);
|
||||
this.groupPanelIncludeOn.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelIncludeOn.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 388);
|
||||
this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 397);
|
||||
this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupPanelIncludeOn.Name = "groupPanelIncludeOn";
|
||||
this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 121);
|
||||
@ -541,7 +561,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelWcnTrnResp.Controls.Add(this.tbRespons);
|
||||
this.groupPanelWcnTrnResp.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelWcnTrnResp.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 509);
|
||||
this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 518);
|
||||
this.groupPanelWcnTrnResp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
this.groupPanelWcnTrnResp.Name = "groupPanelWcnTrnResp";
|
||||
this.groupPanelWcnTrnResp.Size = new System.Drawing.Size(202, 138);
|
||||
@ -600,7 +620,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelFigSize.Controls.Add(this.lblFSWidth);
|
||||
this.groupPanelFigSize.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelFigSize.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelFigSize.Location = new System.Drawing.Point(0, 647);
|
||||
this.groupPanelFigSize.Location = new System.Drawing.Point(0, 656);
|
||||
this.groupPanelFigSize.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupPanelFigSize.Name = "groupPanelFigSize";
|
||||
this.groupPanelFigSize.Size = new System.Drawing.Size(202, 135);
|
||||
@ -724,6 +744,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelPaginate.ResumeLayout(false);
|
||||
this.groupPanelPaginate.PerformLayout();
|
||||
this.groupPanelCheckoff.ResumeLayout(false);
|
||||
this.groupPanelCheckoff.PerformLayout();
|
||||
this.groupPanelChgBar.ResumeLayout(false);
|
||||
this.groupPanelChgBar.PerformLayout();
|
||||
this.groupPanelChgStepType.ResumeLayout(false);
|
||||
@ -772,5 +793,6 @@ namespace Volian.Controls.Library
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbPrefPageBreak;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeInTOC;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbTCAS;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbInitialLine;
|
||||
}
|
||||
}
|
||||
|
||||
@ -142,6 +142,8 @@ namespace Volian.Controls.Library
|
||||
tbChgID.Enabled = false;
|
||||
lblChgId.Visible = tbChgID.Visible = false;
|
||||
CurItemInfo = null;
|
||||
cbInitialLine.Visible = cbInitialLine.Enabled = false;
|
||||
|
||||
}
|
||||
private bool StepOverRide()
|
||||
{
|
||||
@ -553,6 +555,16 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats
|
||||
//Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step
|
||||
cbInitialLine.Visible = cbInitialLine.Enabled = false;
|
||||
if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData?.TabData?.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO))
|
||||
{
|
||||
cbInitialLine.Visible = cbInitialLine.Enabled = true;
|
||||
cbInitialLine.Checked = sc.Step_DisableInitialLine;
|
||||
}
|
||||
|
||||
_Initalizing = false;
|
||||
}
|
||||
public void SetFigure(double wd, double wd2)
|
||||
@ -969,6 +981,23 @@ namespace Volian.Controls.Library
|
||||
sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
|
||||
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||
}
|
||||
|
||||
private void cbInitialLine_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (_Initalizing) return;
|
||||
MyEditItem.SaveContents();
|
||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||
if (sc == null) return;
|
||||
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||
sc.Step_DisableInitialLine = cbInitialLine.Checked;
|
||||
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||
|
||||
//needed to refresh display changing
|
||||
MyEditItem.RefreshContent();
|
||||
MyEditItem.SetAllTabs();
|
||||
|
||||
}
|
||||
|
||||
//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
|
||||
//{
|
||||
// // User left Atlernate Continuous Action Text field. If text changed, then prompt
|
||||
|
||||
@ -30,25 +30,26 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
|
||||
this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.cbHoldProcSet = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.btnTranCancel = new DevComponents.DotNetBar.ButtonX();
|
||||
this.btnTranSave = new DevComponents.DotNetBar.ButtonX();
|
||||
this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.listBoxTranFmt = new System.Windows.Forms.ListBox();
|
||||
this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
|
||||
this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.cbTranProcs = new System.Windows.Forms.ComboBox();
|
||||
this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.cbTranSects = new System.Windows.Forms.ComboBox();
|
||||
this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||
this.tvTran = new Volian.Controls.Library.vlnTreeView3();
|
||||
this.pnlTranStepBtns = new System.Windows.Forms.Panel();
|
||||
this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX();
|
||||
this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX();
|
||||
this.btnUp1 = new DevComponents.DotNetBar.ButtonX();
|
||||
this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip();
|
||||
this.tvTran = new Volian.Controls.Library.vlnTreeView3();
|
||||
this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
|
||||
this.groupPanelBtns.SuspendLayout();
|
||||
this.groupPanelTranFmt.SuspendLayout();
|
||||
this.groupPanelTransitionSets.SuspendLayout();
|
||||
@ -62,6 +63,7 @@ namespace Volian.Controls.Library
|
||||
//
|
||||
this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.groupPanelBtns.Controls.Add(this.cbHoldProcSet);
|
||||
this.groupPanelBtns.Controls.Add(this.cbPageNum);
|
||||
this.groupPanelBtns.Controls.Add(this.btnTranCancel);
|
||||
this.groupPanelBtns.Controls.Add(this.btnTranSave);
|
||||
@ -69,7 +71,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
|
||||
this.groupPanelBtns.Name = "groupPanelBtns";
|
||||
this.groupPanelBtns.Size = new System.Drawing.Size(376, 58);
|
||||
this.groupPanelBtns.Size = new System.Drawing.Size(376, 82);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -100,6 +102,23 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.groupPanelBtns.TabIndex = 25;
|
||||
//
|
||||
// cbHoldProcSet
|
||||
//
|
||||
this.cbHoldProcSet.BackColor = System.Drawing.Color.Transparent;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.cbHoldProcSet.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbHoldProcSet.Location = new System.Drawing.Point(0, 54);
|
||||
this.cbHoldProcSet.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbHoldProcSet.Name = "cbHoldProcSet";
|
||||
this.cbHoldProcSet.Size = new System.Drawing.Size(214, 15);
|
||||
this.cbHoldProcSet.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.superToolTipDispTran.SetSuperTooltip(this.cbHoldProcSet, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbHoldProcSet.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.cbHoldProcSet.TabIndex = 27;
|
||||
this.cbHoldProcSet.Text = "Hold Procedure Set / Procedure";
|
||||
this.cbHoldProcSet.CheckedChanged += new System.EventHandler(this.cbHoldProcSet_CheckedChanged);
|
||||
//
|
||||
// cbPageNum
|
||||
//
|
||||
this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
|
||||
@ -108,7 +127,7 @@ namespace Volian.Controls.Library
|
||||
//
|
||||
this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbPageNum.Location = new System.Drawing.Point(0, 35);
|
||||
this.cbPageNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbPageNum.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbPageNum.Name = "cbPageNum";
|
||||
this.cbPageNum.Size = new System.Drawing.Size(126, 15);
|
||||
this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -123,7 +142,7 @@ namespace Volian.Controls.Library
|
||||
this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
|
||||
this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.btnTranCancel.Name = "btnTranCancel";
|
||||
this.btnTranCancel.Size = new System.Drawing.Size(88, 36);
|
||||
this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" +
|
||||
@ -154,7 +173,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
|
||||
this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 58);
|
||||
this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 82);
|
||||
this.groupPanelTranFmt.Name = "groupPanelTranFmt";
|
||||
this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
|
||||
//
|
||||
@ -208,7 +227,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
|
||||
this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 199);
|
||||
this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 223);
|
||||
this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
|
||||
this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
|
||||
//
|
||||
@ -242,6 +261,18 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTransitionSets.TabIndex = 31;
|
||||
this.groupPanelTransitionSets.Text = "Select Procedure Set";
|
||||
//
|
||||
// vlnTreeComboSets
|
||||
//
|
||||
this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
|
||||
this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.vlnTreeComboSets.Name = "vlnTreeComboSets";
|
||||
this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
|
||||
this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.vlnTreeComboSets.TabIndex = 33;
|
||||
this.vlnTreeComboSets.Value = null;
|
||||
this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
|
||||
//
|
||||
// groupPanelTransitionProcs
|
||||
//
|
||||
this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
@ -249,7 +280,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
|
||||
this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 247);
|
||||
this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 271);
|
||||
this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
|
||||
this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
|
||||
//
|
||||
@ -302,7 +333,7 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
|
||||
this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 293);
|
||||
this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 317);
|
||||
this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
|
||||
this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
|
||||
//
|
||||
@ -357,9 +388,9 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
|
||||
this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 342);
|
||||
this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366);
|
||||
this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
|
||||
this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334);
|
||||
this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310);
|
||||
//
|
||||
//
|
||||
//
|
||||
@ -391,6 +422,17 @@ namespace Volian.Controls.Library
|
||||
this.groupPanelTranstionSteps.TabIndex = 34;
|
||||
this.groupPanelTranstionSteps.Text = "Select Step";
|
||||
//
|
||||
// tvTran
|
||||
//
|
||||
this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tvTran.HideSelection = false;
|
||||
this.tvTran.Location = new System.Drawing.Point(0, 46);
|
||||
this.tvTran.Name = "tvTran";
|
||||
this.tvTran.Size = new System.Drawing.Size(370, 243);
|
||||
this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.tvTran.TabIndex = 31;
|
||||
this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
|
||||
//
|
||||
// pnlTranStepBtns
|
||||
//
|
||||
this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
|
||||
@ -410,7 +452,7 @@ namespace Volian.Controls.Library
|
||||
//
|
||||
this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.cbIncStepNum.Location = new System.Drawing.Point(8, 12);
|
||||
this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.cbIncStepNum.Name = "cbIncStepNum";
|
||||
this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
|
||||
this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -465,29 +507,6 @@ namespace Volian.Controls.Library
|
||||
this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
|
||||
this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
|
||||
//
|
||||
// tvTran
|
||||
//
|
||||
this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tvTran.HideSelection = false;
|
||||
this.tvTran.Location = new System.Drawing.Point(0, 46);
|
||||
this.tvTran.Name = "tvTran";
|
||||
this.tvTran.Size = new System.Drawing.Size(370, 267);
|
||||
this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.tvTran.TabIndex = 31;
|
||||
this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
|
||||
//
|
||||
// vlnTreeComboSets
|
||||
//
|
||||
this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
|
||||
this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.vlnTreeComboSets.Name = "vlnTreeComboSets";
|
||||
this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
|
||||
this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.vlnTreeComboSets.TabIndex = 33;
|
||||
this.vlnTreeComboSets.Value = null;
|
||||
this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
|
||||
//
|
||||
// DisplayTransition
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@ -498,7 +517,7 @@ namespace Volian.Controls.Library
|
||||
this.Controls.Add(this.groupPanelTransitionSets);
|
||||
this.Controls.Add(this.groupPanelTranFmt);
|
||||
this.Controls.Add(this.groupPanelBtns);
|
||||
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.Name = "DisplayTransition";
|
||||
this.Size = new System.Drawing.Size(376, 676);
|
||||
this.groupPanelBtns.ResumeLayout(false);
|
||||
@ -535,5 +554,6 @@ namespace Volian.Controls.Library
|
||||
private DevComponents.DotNetBar.SuperTooltip superToolTipDispTran;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbIncStepNum;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbPageNum;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbHoldProcSet;
|
||||
}
|
||||
}
|
||||
|
||||
@ -27,7 +27,31 @@ namespace Volian.Controls.Library
|
||||
set
|
||||
{
|
||||
if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
|
||||
if (value == null) // Insert a transition
|
||||
//CSM-C2024-026 Evaluate the transitions panel
|
||||
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
|
||||
//HeldLinkText will store if a transition was manually selected
|
||||
//to override defaulting the listboxes to the current step / selected transition
|
||||
if (HeldLinkText != "" && value != null)
|
||||
{
|
||||
//handle case where is held text and click on an already existing transition so cannot save one on top of the other.
|
||||
_CurTrans = value;
|
||||
btnTranSave.Enabled = false;
|
||||
btnTranCancel.Enabled = true;
|
||||
return;
|
||||
}
|
||||
else if (HeldLinkText != "" && MyRTB.MyItemInfo.ActiveFormat.Name == HeldLink_CurItemFrom.ActiveFormat.Name)
|
||||
{
|
||||
//this else if will handle case of defaulting to held transition instead of what has been clicked on
|
||||
//Note that if format is not the same, it will ignore the held item
|
||||
//This is because if different format, then options / selections may be different so will need to refresh the lists
|
||||
if (_CurTrans == value && _CurItemFrom == HeldLink_CurItemFrom) return;
|
||||
_CurItemFrom = HeldLink_CurItemFrom;
|
||||
_TranFmtIndx = HeldLink_TranFmtIndx;
|
||||
bool isenh = MyRTB != null && HeldLink_CurItemFrom != null && HeldLink_CurItemFrom.IsEnhancedStep;
|
||||
btnTranSave.Enabled = !isenh && UserInfo.CanEdit(MyUserInfo, Mydvi) && (value == null); //Can Insert Transitions
|
||||
btnTranCancel.Enabled = true;
|
||||
}
|
||||
else if (value == null) // Insert a transition
|
||||
{
|
||||
if (MyRTB == null) return;
|
||||
if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return;
|
||||
@ -121,13 +145,7 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)
|
||||
{
|
||||
//if (_MyRTB.MyLinkText == null)
|
||||
// CurTrans = null;
|
||||
//else
|
||||
//{
|
||||
// StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
|
||||
CurTrans = args.MyLinkText.MyTransitionInfo;
|
||||
//}
|
||||
}
|
||||
private ItemInfo _CurrentItemProcedure; // the selected item's procedure
|
||||
private ItemInfo _CurrentToProcedure; // the 'to' location's procedure (may be same as _CurrentItemProcedure)
|
||||
@ -138,6 +156,12 @@ namespace Volian.Controls.Library
|
||||
private Color _OrigGroupPanelProcs;
|
||||
private Color _OrigGroupPanelSects;
|
||||
private Color _OrigGroupPanelSteps;
|
||||
//CSM-C2024-026 Evaluate the transitions panel
|
||||
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
|
||||
public string HeldLinkText { get; protected set; } = ""; //will hold link text to stay on
|
||||
public int HeldLink_TranFmtIndx { get; protected set; } = 0; //this will hold transition format that was selected on held item
|
||||
public ItemInfo HeldLink_CurItemFrom { get; protected set; } //this will hold item that transitioning from
|
||||
|
||||
#endregion
|
||||
#region Constructors
|
||||
public DisplayTransition()
|
||||
@ -237,7 +261,7 @@ namespace Volian.Controls.Library
|
||||
if (selitm != null && selitm.MyContent.Type >= 20000)
|
||||
{
|
||||
|
||||
if (_DoingRange)
|
||||
if (_DoingRange && CurTrans != null)
|
||||
{
|
||||
tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1);
|
||||
}
|
||||
@ -938,6 +962,17 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
_InitializingTrans = false;
|
||||
SaveCancelEnabling();
|
||||
|
||||
//CSM-C2024-026 Evaluate the transitions panel
|
||||
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
|
||||
//If checkbox is checked to enable holding an item,
|
||||
//then store the first step in the currently selected item
|
||||
if (cbHoldProcSet.Checked && secitm.Steps != null && secitm.Steps.Count > 0)
|
||||
{
|
||||
HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, secitm.Steps[0].ItemID);
|
||||
HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
|
||||
HeldLink_CurItemFrom = secitm.Steps[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
// B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
|
||||
@ -1089,6 +1124,18 @@ namespace Volian.Controls.Library
|
||||
return;
|
||||
}
|
||||
SaveCancelEnabling();
|
||||
|
||||
//CSM-C2024-026 Evaluate the transitions panel
|
||||
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
|
||||
//If checkbox is checked to enable holding an item,
|
||||
//then store the currently selected item
|
||||
if (cbHoldProcSet.Checked)
|
||||
{
|
||||
HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
|
||||
HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
|
||||
HeldLink_CurItemFrom = selii;
|
||||
}
|
||||
|
||||
if (_DoingRange)
|
||||
{
|
||||
if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null))
|
||||
@ -1370,6 +1417,13 @@ namespace Volian.Controls.Library
|
||||
_MyLog.InfoFormat("ItemID {0}, LinkText '{1}'", MyRTB.MyItemInfo.ItemID, linkText);
|
||||
int sel = MyRTB.SelectionStart + MyRTB.SelectionLength;
|
||||
MyRTB.Select(sel, 0);// Move cursor to end of LINK
|
||||
|
||||
//CSM-C2024-026 Evaluate the transitions panel
|
||||
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
|
||||
//After save a transition, set the Linktext / tab to go back to the held transition
|
||||
//if none then this will refresh it to the currently selected item as it did before this csm
|
||||
MyRTB.MyLinkText = HeldLinkText;
|
||||
|
||||
MyRTB.Focus();
|
||||
}
|
||||
#endregion
|
||||
@ -1489,6 +1543,32 @@ namespace Volian.Controls.Library
|
||||
btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
|
||||
}
|
||||
}
|
||||
|
||||
//CSM-C2024-026 Evaluate the transitions panel
|
||||
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
|
||||
//If checkbox is checked to enable holding an item,
|
||||
//then store the currently selected item
|
||||
//if checkbox becomes unchecked then clear item.
|
||||
private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cbHoldProcSet.Checked)
|
||||
{
|
||||
VETreeNode vt = tvTran.SelectedNode as VETreeNode;
|
||||
ItemInfo selii = vt.VEObject as ItemInfo;
|
||||
if (selii != null)
|
||||
{
|
||||
HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
|
||||
HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
|
||||
HeldLink_CurItemFrom = selii;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
HeldLinkText = "";
|
||||
HeldLink_CurItemFrom = null;
|
||||
HeldLink_TranFmtIndx = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
public class TransItem
|
||||
{
|
||||
|
||||
@ -112,14 +112,21 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="superToolTipDispTran.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="superToolTipDispTran.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="cbHoldProcSet.SuperTooltip" xml:space="preserve">
|
||||
<value>By default, PROMS will load the Procedure Set/Procedure in this window for the step (or transition link within a step) that is selected with the mouse.
|
||||
|
||||
Selecting this checkbox temporarily disables that behavior so that clicking on various steps within the procedure will not move away from the Procedure Set/Procedure that has currently been selected in these windows.
|
||||
|
||||
Note: One exception to this is if you navigate to a Procedure set that has a different format. In that case, it will refresh these options based on that new format.</value>
|
||||
</data>
|
||||
<data name="vlnTreeComboSets.SuperTooltip" xml:space="preserve">
|
||||
<value>This allows you to select the procedure set that the transition points to, if the selected transition format allows for the transition to point to another set. If the format does NOT allow for pointing to another set, a selection will not be available.</value>
|
||||
</data>
|
||||
|
||||
@ -279,18 +279,24 @@ namespace Volian.Controls.Library
|
||||
//
|
||||
// btnCmCut
|
||||
//
|
||||
this.btnCmCut.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||
this.btnCmCut.Image = global::Volian.Controls.Library.Properties.Resources.Cut_Image;
|
||||
this.btnCmCut.Name = "btnCmCut";
|
||||
this.btnCmCut.Text = "Cut";
|
||||
this.btnCmCut.Click += new System.EventHandler(this.btnCmCut_Click);
|
||||
//
|
||||
// btnCmCopy
|
||||
//
|
||||
this.btnCmCopy.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||
this.btnCmCopy.Image = global::Volian.Controls.Library.Properties.Resources.Copy_Image;
|
||||
this.btnCmCopy.Name = "btnCmCopy";
|
||||
this.btnCmCopy.Text = "Copy";
|
||||
this.btnCmCopy.Click += new System.EventHandler(this.btnCmCopy_Click);
|
||||
//
|
||||
// btnCmPaste
|
||||
//
|
||||
this.btnCmPaste.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||
this.btnCmPaste.Image = global::Volian.Controls.Library.Properties.Resources.PasteSmall_Image;
|
||||
this.btnCmPaste.Name = "btnCmPaste";
|
||||
this.btnCmPaste.Text = "Paste";
|
||||
this.btnCmPaste.Click += new System.EventHandler(this.btnCmPaste_Click);
|
||||
@ -305,12 +311,16 @@ namespace Volian.Controls.Library
|
||||
//
|
||||
// btnCmHardSp
|
||||
//
|
||||
this.btnCmHardSp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||
this.btnCmHardSp.Image = global::Volian.Controls.Library.Properties.Resources.HardSpace_Image;
|
||||
this.btnCmHardSp.Name = "btnCmHardSp";
|
||||
this.btnCmHardSp.Text = "Hard Space";
|
||||
this.btnCmHardSp.Click += new System.EventHandler(this.btnCmHardSp_Click);
|
||||
//
|
||||
// btnCmSymbol
|
||||
//
|
||||
this.btnCmSymbol.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||
this.btnCmSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image;
|
||||
this.btnCmSymbol.Name = "btnCmSymbol";
|
||||
this.btnCmSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
|
||||
this.galSymbols});
|
||||
|
||||
@ -30,7 +30,8 @@ namespace Volian.Controls.Library
|
||||
//We need to check to see if the current database has been updated with the necessary changes
|
||||
//to the folder configuration value. If so then build the list of available to be returned
|
||||
//to the calling code
|
||||
if (fList == null)
|
||||
// added check for a list count of zero. Was getting null error from data gotten from customer
|
||||
if (fList == null || fList.Count == 0)
|
||||
{
|
||||
_MyLog.InfoFormat("Filtered format list not available: Database update needed for config value of top folder record");
|
||||
return RawList;
|
||||
|
||||
@ -1376,7 +1376,9 @@ namespace Volian.Controls.Library
|
||||
public static String GetDefaultKeyValue(String key)
|
||||
{
|
||||
object xxx = null;
|
||||
return Registry.GetValue(key, "", xxx).ToString();
|
||||
// fixed null reference error - appeared only while debugged - for user was handled via Try/Catch and ignored
|
||||
object gtval = Registry.GetValue(key, "", xxx);
|
||||
return (string)((gtval != null) ? gtval.ToString() : gtval);
|
||||
}
|
||||
private EditItem FindStepAfter(string types, int contenttype)
|
||||
{
|
||||
@ -1985,6 +1987,9 @@ namespace Volian.Controls.Library
|
||||
case "Cont. Act\r\nSummary":
|
||||
btnCASCreate_Click(sender, e);
|
||||
break;
|
||||
case "Time Crit\r\nSummary":
|
||||
btnTCASCreate_Click(sender, e);
|
||||
break;
|
||||
}
|
||||
MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0; // unselect the unit (child)
|
||||
}
|
||||
@ -1999,6 +2004,9 @@ namespace Volian.Controls.Library
|
||||
btnCASCreate.SubItems.Clear();
|
||||
btnCASCreate.Tag = null;
|
||||
btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click);
|
||||
btnTCASCreate.SubItems.Clear();
|
||||
btnTCASCreate.Tag = null;
|
||||
btnTCASCreate.Click -= new System.EventHandler(btnTCASCreate_Click);
|
||||
btnReviewCreatePDF.SubItems.Clear();
|
||||
btnReviewCreatePDF.Tag = null;
|
||||
btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click);
|
||||
@ -2025,6 +2033,9 @@ namespace Volian.Controls.Library
|
||||
btnCASCreate.SubItems.Add(btn);
|
||||
btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
|
||||
btn.Enabled = procAppl;
|
||||
btnTCASCreate.SubItems.Add(btn);
|
||||
btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
|
||||
btn.Enabled = procAppl;
|
||||
btnReviewPdfQuickCreate.SubItems.Add(btn);
|
||||
}
|
||||
btnPdfCreate.AutoExpandOnClick = true;
|
||||
@ -2032,6 +2043,7 @@ namespace Volian.Controls.Library
|
||||
btnReviewCreatePDF.AutoExpandOnClick = true;
|
||||
btnReviewPdfQuickCreate.AutoExpandOnClick = true;
|
||||
btnCASCreate.AutoExpandOnClick = true;
|
||||
btnTCASCreate.AutoExpandOnClick = true;
|
||||
}
|
||||
private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler)
|
||||
{
|
||||
@ -3122,7 +3134,13 @@ namespace Volian.Controls.Library
|
||||
// a referenced object, bring up ReferencedObject Editor (for now, just put up a message box.
|
||||
if (_MyStepRTB.MyLinkText != null && _MyStepRTB.MyLinkText.IndexOf("Transition") > -1)
|
||||
{
|
||||
_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(_MyStepRTB.MyLinkText));
|
||||
// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
|
||||
// Needed to clear the selection of the link or it will be used the next time
|
||||
// <Shift><Ctrl><G> is used
|
||||
string lnkText = _MyStepRTB.MyLinkText; // save the transition link information
|
||||
_MyStepRTB.SetSelection(0, 0); // Clear the selection of the transition link
|
||||
// note _MyStepRTB.DeselectAll() did not work all the time
|
||||
_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(lnkText));
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -3145,7 +3163,12 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
else
|
||||
{
|
||||
LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
|
||||
LinkText lt = new LinkText(_MyStepRTB.MyLinkText); // save the RO link information
|
||||
// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
|
||||
// Needed to clear the selection of the link or it will be used the next time
|
||||
// <Shift><Ctrl><G> is used
|
||||
_MyStepRTB.SetSelection(0, 0); // clear the selection of the RO link
|
||||
// note _MyStepRTB.DeselectAll() did not work all the time
|
||||
//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
|
||||
if (lt.MyRoUsageInfo != null)
|
||||
{
|
||||
@ -3785,7 +3808,7 @@ namespace Volian.Controls.Library
|
||||
ProcedureInfo.RefreshTransitions(MyItemInfo.MyProcedure as ProcedureInfo);
|
||||
this.Cursor = Cursors.Default;
|
||||
// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
|
||||
FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions, {3} transitions unable to be fixed (Annotation: Bad Transition Link)", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
private void btnRefObjRefresh_Click(object sender, System.EventArgs e)
|
||||
{
|
||||
|
||||
@ -1074,7 +1074,9 @@ namespace Volian.Print.Library
|
||||
|
||||
string lastProcNum = string.Empty;
|
||||
string lastSection = string.Empty;
|
||||
string lastDVPath = string.Empty;
|
||||
//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
|
||||
//setting this to something other than empty - otherwise will not print first initial header
|
||||
string lastDVPath = "start";
|
||||
if (_ResultList.Count > 0)
|
||||
{
|
||||
foreach (ItemInfo item in _ResultList)
|
||||
@ -1088,6 +1090,12 @@ namespace Volian.Print.Library
|
||||
// procedure set title at the top of the report (once).
|
||||
if (lastDVPath != "" && lastDVPath != item.SearchDVPath)
|
||||
{
|
||||
//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
|
||||
//was placing last item from the precious section in the new section
|
||||
//place it before starting the new section and then clear items
|
||||
PutROusageForProcedure(datatable, roUse, headerwidths);
|
||||
roUse.Clear();
|
||||
|
||||
subTable = new PdfPTable(headerwidths);
|
||||
AddMainPathGroup(datatable, item.SearchDVPath, splitAt, f2, Color.LIGHT_GRAY, 0);
|
||||
lastProcNum = string.Empty;
|
||||
@ -1138,7 +1146,7 @@ namespace Volian.Print.Library
|
||||
document.Add(datatable);
|
||||
}
|
||||
|
||||
private void AddProcROUse(ItemInfo item, SortedDictionary<string, List<ItemInfo>> procRoUse)
|
||||
private void AddProcROUse(ItemInfo item, Dictionary<string, List<ItemInfo>> procRoUse)
|
||||
{
|
||||
string dictKey = GetCurProcNum(item.SearchPath) + " " + GetCurSectionNumTitle(item);
|
||||
|
||||
@ -1157,7 +1165,7 @@ namespace Volian.Print.Library
|
||||
}
|
||||
}
|
||||
|
||||
private void PutStepListForProcedure(PdfPTable rotable, SortedDictionary<string, ItemInfo> sortedStepList)
|
||||
private void PutStepListForProcedure(PdfPTable rotable, Dictionary<string, ItemInfo> sortedStepList)
|
||||
{
|
||||
// C2017-036 get best available proportional font for symbols that looks close to Arial
|
||||
// Note that Microsoft no longer supplies Arial Unicode MS as of Word16
|
||||
@ -1173,13 +1181,13 @@ namespace Volian.Print.Library
|
||||
sortedStepList.Clear();
|
||||
}
|
||||
|
||||
private void PutROusageForROID(PdfPTable curTable, SortedDictionary<string, List<ItemInfo>> procRoUse, float[] headerwidths, int splitAt, bool moreThanOneProcSet)
|
||||
private void PutROusageForROID(PdfPTable curTable, Dictionary<string, List<ItemInfo>> procRoUse, float[] headerwidths, int splitAt, bool moreThanOneProcSet)
|
||||
{
|
||||
// C2017-036 get best available proportional font for symbols that looks close to Arial
|
||||
// Note that Microsoft no longer supplies Arial Unicode MS as of Word16
|
||||
iTextSharp.text.Font f2 = pdf.GetFont(Volian.Base.Library.vlnFont.ReportsFont, 10, 0, Color.BLACK);
|
||||
|
||||
SortedDictionary<string, ItemInfo> sortedStepList = new SortedDictionary<string, ItemInfo>();
|
||||
Dictionary<string, ItemInfo> sortedStepList = new Dictionary<string, ItemInfo>();
|
||||
string lastProcKey = string.Empty;
|
||||
string lastProcNumTitle = string.Empty;
|
||||
string lastDVPath = string.Empty;
|
||||
@ -1293,7 +1301,7 @@ namespace Volian.Print.Library
|
||||
|
||||
private void BuildROUsageTableByRO(iTextSharp.text.Document document)
|
||||
{
|
||||
SortedDictionary<string, List<ItemInfo>> procRoUse = new SortedDictionary<string, List<ItemInfo>>();
|
||||
Dictionary<string, List<ItemInfo>> procRoUse = new Dictionary<string, List<ItemInfo>>();
|
||||
|
||||
float[] headerwidths = { 20, 80 };
|
||||
PdfPTable datatable = new PdfPTable(1);
|
||||
|
||||
@ -226,6 +226,8 @@ namespace Volian.Print.Library
|
||||
else
|
||||
yoff += vlnPrintObject.SixLinesPerInch;
|
||||
}
|
||||
if (box.MyBox != null)
|
||||
yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
|
||||
}
|
||||
bxIndex = bxIndx;
|
||||
}
|
||||
@ -273,6 +275,8 @@ namespace Volian.Print.Library
|
||||
box.YOffset = yoff + ((ln - 1) * vlnPrintObject.SixLinesPerInch);
|
||||
if (childItemInfo.FormatStepData.OneLineBeforeTab) ln++;
|
||||
yoff += ln * vlnPrintObject.SixLinesPerInch;
|
||||
if (box.MyBox != null)
|
||||
yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
|
||||
}
|
||||
}
|
||||
bxIndex = bxIndx;
|
||||
@ -3781,7 +3785,12 @@ namespace Volian.Print.Library
|
||||
else if (itemInfo.MyTab.AltPrintTab != null)
|
||||
mytab = new vlnTab(cb, this, itemInfo.MyTab.AltPrintTab, itemInfo.MyTab.AltPrintTab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
|
||||
else
|
||||
mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, itemInfo.MyTab.CleanText, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
|
||||
{
|
||||
string clntxt = itemInfo.MyTab.CleanText;
|
||||
if (!string.IsNullOrEmpty(itemInfo.FormatStepData?.TabData?.MacroEditTag) && itemInfo.FormatStepData.TabData.MacroEditTag == "_" && clntxt.StartsWith("_"))
|
||||
clntxt = clntxt.Substring(1);
|
||||
mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, clntxt, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
|
||||
}
|
||||
PartsLeft.Add(mytab);
|
||||
if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro);
|
||||
}
|
||||
@ -5492,7 +5501,23 @@ namespace Volian.Print.Library
|
||||
// code looks up parents to see if they have next before returning a 0 (no blank line)
|
||||
// B2022-042: double Caution followed by Critical Step missing bullet
|
||||
// F2022-010: substeps in multiple notes, cautions, warning print differently
|
||||
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
|
||||
if (MyItemInfo.IsInCautionOrNote)
|
||||
{
|
||||
float adjLastBlankLineInNoteCautionWarning = 0;
|
||||
// Get the box information for the Note, Caution, or Warning
|
||||
ItemInfo tifo = (MyItemInfo.IsCaution || MyItemInfo.IsNote) ? MyItemInfo : MyItemInfo.ParentNoteOrCaution;
|
||||
int typ = ((int)tifo.MyContent.Type) % 10000;
|
||||
int? bxIndx = tifo.ActiveFormat.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
|
||||
if (bxIndx != null)
|
||||
{
|
||||
Box bx = tifo.ActiveFormat.PlantFormat.FormatData.BoxList[(int)bxIndx];
|
||||
// F2024-078 save the adjustment of the last blank line - this value will be added to the SixLinesPerInch value (a blank line)
|
||||
adjLastBlankLineInNoteCautionWarning = (float)(bx.AdjLastBlnkLn ?? 0);
|
||||
}
|
||||
//}
|
||||
// if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
|
||||
// F2024-078 added check for adjustment of the last blank line in the Note/Caution box
|
||||
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn || adjLastBlankLineInNoteCautionWarning != 0)
|
||||
{
|
||||
if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null)) // there are no sub-steps, see if any parents have next
|
||||
{
|
||||
@ -5505,9 +5530,22 @@ namespace Volian.Print.Library
|
||||
if ((par.NextItem == null) || (par.MyContent.Type != par.NextItem.MyContent.Type)) par = par.MyParent;
|
||||
else break;
|
||||
}
|
||||
if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type)) return 0;
|
||||
if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type))
|
||||
{
|
||||
if (adjLastBlankLineInNoteCautionWarning != 0)
|
||||
return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning; // F2024-078 adjust the size of the last blank line of Note/Caution box
|
||||
else
|
||||
return 0; // no blank line after last text line of Note/Caution/Warning
|
||||
}
|
||||
}
|
||||
if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)
|
||||
{
|
||||
if (adjLastBlankLineInNoteCautionWarning != 0)
|
||||
return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning;
|
||||
else
|
||||
return 0; // no blank line after last text line of Note/Caution/Warning
|
||||
}
|
||||
}
|
||||
if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type) return 0;
|
||||
}
|
||||
if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;
|
||||
// B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. Added a format flag so as not to affect other plants.
|
||||
@ -5792,6 +5830,7 @@ namespace Volian.Print.Library
|
||||
float hdrWidth = (itemInfo.MyHeader.CleanText == null) ? 0 : itemInfo.MyHeader.CleanText.Length * 6;
|
||||
int typ = ((int)itemInfo.MyContent.Type) % 10000;
|
||||
int? bxIndx = formatInfo.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
|
||||
float adjmentAfterBoxedNoteCautionTab = 0; // F2024-078 used to save the adjustment of the space after the Note/Caution tab
|
||||
|
||||
if (itemInfo.MyHeader.Justify == System.Drawing.ContentAlignment.MiddleCenter)
|
||||
{
|
||||
@ -5802,6 +5841,7 @@ namespace Volian.Print.Library
|
||||
xoff += (float)bx.TabPos; // xoff starts as left margin
|
||||
else
|
||||
xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2)); // xoff starts as left margin
|
||||
adjmentAfterBoxedNoteCautionTab = (float) (bx.AdjSpAftTab ?? 0); // F2024-078 save the adjustment of the space (line) after the Note/Caution tab
|
||||
}
|
||||
else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote)) // C2014-009
|
||||
xoff = XOffset + (para.Width / 2) - (hdrWidth / 2);
|
||||
@ -5836,7 +5876,7 @@ namespace Volian.Print.Library
|
||||
// F2022-121 added SpecialStepsFoldoutKeepWhiteSpace flag to allow for all of the other special foldout formatting, but
|
||||
// not compress the page - this need to handle explicit OR and AND sub-steps to ensure there are blank lines before and after
|
||||
// the separator text.
|
||||
return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0);
|
||||
return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0) + adjmentAfterBoxedNoteCautionTab; // F2024-078 add adjustment to the space after the Note/Caution tab
|
||||
}
|
||||
private float AdjustToCharPosition(float position, float? CPI)
|
||||
{
|
||||
@ -6847,7 +6887,13 @@ namespace Volian.Print.Library
|
||||
}
|
||||
else if (itemInfo.IsSection)
|
||||
{
|
||||
Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO);
|
||||
// B2023-074 The itemInfo we are processing is a section (number and title). Change maxRNO to zero to getting the width.
|
||||
// The Width is used when printing the section number and title (when the check box on the properties page is checked)
|
||||
// and is assumemed the section is a single column section (maxRNO = 0) and uses the format variable WidSTablePrint
|
||||
// which holds the widths for then the section has one column, two column, or three column.
|
||||
// For printing section numbers and titles like this, we always want to accomodate for lone section title text.
|
||||
// So the initial width should always be set to the one column width value so that it can spane across the page.
|
||||
Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, 0);
|
||||
float adjwidths = 0;
|
||||
adjwidths = AdjustMetaWidth(itemInfo, formatInfo, adjwidths, false);
|
||||
Width += (adjwidths + _WidthAdjust);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user