Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added Separate Window Preference

Browse Source 
Added error handling for External Transitions to deleted Procedure.
Added File extension parameter to Make Document
DB Command Line Parameter now supports server name and ItemIDs.
Added Separate Window Preference
Added capability to Update Format and then close.  Command Line Parameter /P= with no IDs shutsdown immediately.
Changed code so that the Anotation panels stay expanded.
Added Console Writeline output when Formats are updated.
Attached Console Output to Parent.  This allows the Console output to be output to a command window when a Batch FIle is used to Update Formats.
This commit is contained in:
Rich 2015-10-27 13:28:06 +00:00
parent af339e0717
commit d720159113
10 changed files with 286 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/VEPROMS User Interface/App.config
View File

@ -166,6 +166,9 @@
<setting name="SyncEnhancedDocuments" serializeAs="String">
<value>True</value>
</setting>
<setting name="SeparateWindows" serializeAs="String">
<value>False</value>
</setting>
</VEPROMS.Properties.Settings>
<UISampleNetBar1.Properties.Settings>
<setting name="ShowDefaultFolderProp" serializeAs="String">

6
PROMS/VEPROMS User Interface/Program.cs
View File

@ -8,7 +8,9 @@ namespace VEPROMS
static class Program
{
private static readonly log4net.ILog _log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
[System.Runtime.InteropServices.DllImport("KERNEL32.DLL")]
static extern bool AttachConsole(int dwProcessId);
private const int ATTACH_PARENT_PROCESS = -1; /// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
@ -16,6 +18,8 @@ namespace VEPROMS
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
// Attach to the parent process via AttachConsole SDK call
AttachConsole(ATTACH_PARENT_PROCESS);
if (System.Diagnostics.Process.GetCurrentProcess().ProcessName.ToLower().EndsWith("vshost"))
{
Application.Run(new frmVEPROMS());

15
PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs generated
View File

@ -373,6 +373,21 @@ namespace VEPROMS.Properties {
set {
this["SyncEnhancedDocuments"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool SeparateWindows
{
get
{
return ((bool)(this["SeparateWindows"]));
}
set
{
this["SeparateWindows"] = value;
}
}
}
}

3
PROMS/VEPROMS User Interface/Properties/Settings.settings
View File

@ -92,5 +92,8 @@
<Setting Name="SyncEnhancedDocuments" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="SeparateWindows" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

17
PROMS/VEPROMS User Interface/dlgExportImport.cs
View File

@ -15,6 +15,12 @@ namespace VEPROMS
{
public partial class dlgExportImport : Form
{
private ItemInfo _ExternalTransitionItem = null;
public ItemInfo ExternalTransitionItem
{
get { return _ExternalTransitionItem; }
set { _ExternalTransitionItem = value; }
}
private Dictionary<int, int> floatFoldout;
private Dictionary<int, string> oldFormat;
private Dictionary<string, int> newFormat;
@ -29,6 +35,7 @@ namespace VEPROMS
public ProcedureInfo MyNewProcedure
{
get { return _MyNewProcedure; }
set { _MyNewProcedure = value; }
}
private string PEIPath;
private string _MyMode;
@ -367,13 +374,21 @@ namespace VEPROMS
foreach (ProcedureInfo lp in MyDocVersion.Procedures)
lastProcedure = lp;
//delete opi
try
{
Item.DeleteItemAndChildren(pi);
}
catch(Exception ex)
{
ExternalTransitionItem = pi.HandleSqlExceptionOnDelete(ex);
File.Delete(fn);
return;
}
//add imported procedure
_MyNewProcedure = AddProcedure(xd.DocumentElement, MyDocVersion, lastProcedure);
//update transitions
AddTransitions(PendingTransitions);
FixFloatingFoldouts();
File.Delete(fn);
}
private void LoadImportDataDocument()
{

4
PROMS/VEPROMS User Interface/frmSectionProperties.cs
View File

@ -188,7 +188,7 @@ namespace VEPROMS
using (Content cont = Content.Get(sectinfo.MyContent.ContentID))
{
Byte[] tstbyte = System.Text.Encoding.Default.GetBytes("");
Document doc = Document.MakeDocument(null, tstbyte, null, null); // tstbyte, null, null, null);
Document doc = Document.MakeDocument(null, tstbyte, null, null,".RTF"); // tstbyte, null, null, null);
Entry entry = cont.MyEntry;
entry.MyDocument = Document.Get(doc.DocID);
cont.Save();
@ -722,7 +722,7 @@ namespace VEPROMS
{
// make new document with 'no' libtitle - use libtitle for the doc title. Then link this
// to the item...
Document doc = Document.MakeDocument(null, doclibinfo.DocContent, doclibinfo.DocAscii, doclibinfo.Config);
Document doc = Document.MakeDocument(null, doclibinfo.DocContent, doclibinfo.DocAscii, doclibinfo.Config,doclibinfo.FileExtension);
_SectionConfig.MySection.MyContent.MyEntry.MyDocument = doc;
}
ppCmbxLibDoc.Items.Clear();

268
PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs generated
View File

@ -42,6 +42,8 @@ namespace VEPROMS
this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
this.tcSysOpts = new DevComponents.DotNetBar.TabControl();
this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
this.groupPanel9 = new DevComponents.DotNetBar.Controls.GroupPanel();
this.cbSeparateWindows = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.groupPanel8 = new DevComponents.DotNetBar.Controls.GroupPanel();
this.cbEnhancedDocumentSync = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.groupPanel7 = new DevComponents.DotNetBar.Controls.GroupPanel();
@ -71,6 +73,7 @@ namespace VEPROMS
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
this.tcSysOpts.SuspendLayout();
this.tabControlPanel3.SuspendLayout();
this.groupPanel9.SuspendLayout();
this.groupPanel8.SuspendLayout();
this.groupPanel7.SuspendLayout();
this.groupPanel6.SuspendLayout();
@ -84,20 +87,20 @@ namespace VEPROMS
//
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);
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";
//
// 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);
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);
@ -110,10 +113,10 @@ namespace VEPROMS
this.groupPanel1.Controls.Add(this.cbRibonBlack);
this.groupPanel1.Controls.Add(this.cbRibonSilver);
this.groupPanel1.Controls.Add(this.cbRibonBlue);
this.groupPanel1.Location = new System.Drawing.Point(52, 16);
this.groupPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel1.Location = new System.Drawing.Point(39, 13);
this.groupPanel1.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel1.Name = "groupPanel1";
this.groupPanel1.Size = new System.Drawing.Size(109, 119);
this.groupPanel1.Size = new System.Drawing.Size(82, 97);
//
//
//
@ -153,10 +156,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);
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);
@ -169,10 +172,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);
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);
@ -185,10 +188,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);
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);
@ -199,10 +202,10 @@ namespace VEPROMS
this.panButtons.Controls.Add(this.btnIntrFaceStngs);
this.panButtons.Controls.Add(this.btnStartMsg);
this.panButtons.Controls.Add(this.btnGeneral);
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);
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;
@ -220,10 +223,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);
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);
@ -233,10 +236,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);
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;
@ -248,9 +251,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);
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;
@ -263,12 +266,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);
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);
@ -280,6 +283,7 @@ namespace VEPROMS
//
// tabControlPanel3
//
this.tabControlPanel3.Controls.Add(this.groupPanel9);
this.tabControlPanel3.Controls.Add(this.groupPanel8);
this.tabControlPanel3.Controls.Add(this.groupPanel7);
this.tabControlPanel3.Controls.Add(this.groupPanel6);
@ -290,10 +294,10 @@ namespace VEPROMS
this.tabControlPanel3.Controls.Add(this.groupPanel1);
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);
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)
@ -303,16 +307,78 @@ namespace VEPROMS
this.tabControlPanel3.TabItem = this.tiIntrFaceStngs;
this.tabControlPanel3.ThemeAware = true;
//
// groupPanel9
//
this.groupPanel9.BackColor = System.Drawing.Color.Transparent;
this.groupPanel9.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanel9.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel9.Controls.Add(this.cbSeparateWindows);
this.groupPanel9.Location = new System.Drawing.Point(313, 244);
this.groupPanel9.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel9.Name = "groupPanel9";
this.groupPanel9.Size = new System.Drawing.Size(127, 81);
//
//
//
this.groupPanel9.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.groupPanel9.Style.BackColorGradientAngle = 90;
this.groupPanel9.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.groupPanel9.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.groupPanel9.Style.BorderBottomWidth = 1;
this.groupPanel9.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.groupPanel9.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.groupPanel9.Style.BorderLeftWidth = 1;
this.groupPanel9.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.groupPanel9.Style.BorderRightWidth = 1;
this.groupPanel9.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.groupPanel9.Style.BorderTopWidth = 1;
this.groupPanel9.Style.CornerDiameter = 4;
this.groupPanel9.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.groupPanel9.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.groupPanel9.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.groupPanel9.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.groupPanel9.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.groupPanel9.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.groupPanel9.TabIndex = 10;
this.groupPanel9.Text = "Separate Windows";
//
// cbSeparateWindows
//
//
//
//
this.cbSeparateWindows.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbSeparateWindows.Checked = true;
this.cbSeparateWindows.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbSeparateWindows.CheckValue = "Y";
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(8, 8);
this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(2);
this.cbSeparateWindows.Name = "cbSeparateWindows";
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);
//
// groupPanel8
//
this.groupPanel8.BackColor = System.Drawing.Color.Transparent;
this.groupPanel8.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel8.Controls.Add(this.cbEnhancedDocumentSync);
this.groupPanel8.Location = new System.Drawing.Point(223, 300);
this.groupPanel8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel8.Location = new System.Drawing.Point(167, 244);
this.groupPanel8.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel8.Name = "groupPanel8";
this.groupPanel8.Size = new System.Drawing.Size(169, 100);
this.groupPanel8.Size = new System.Drawing.Size(127, 81);
//
//
//
this.groupPanel8.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.groupPanel8.Style.BackColorGradientAngle = 90;
this.groupPanel8.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
@ -330,25 +396,33 @@ namespace VEPROMS
this.groupPanel8.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.groupPanel8.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.groupPanel8.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.groupPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.groupPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.groupPanel8.TabIndex = 9;
this.groupPanel8.Text = "Enhanced Documents";
//
// cbEnhancedDocumentSync
//
//
//
//
this.cbEnhancedDocumentSync.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbEnhancedDocumentSync.Checked = true;
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(10, 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);
this.cbEnhancedDocumentSync.Name = "cbEnhancedDocumentSync";
this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(123, 23);
this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19);
this.cbEnhancedDocumentSync.TabIndex = 9;
this.cbEnhancedDocumentSync.Text = "Sync Navigation";
this.cbEnhancedDocumentSync.CheckedChanged += cbEnhancedDocumentSync_CheckedChanged;
//
// groupPanel7
//
@ -357,10 +431,10 @@ namespace VEPROMS
this.groupPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel7.Controls.Add(this.cbPastePlainText);
this.groupPanel7.Controls.Add(this.cbPasteNoReturns);
this.groupPanel7.Location = new System.Drawing.Point(33, 300);
this.groupPanel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel7.Location = new System.Drawing.Point(25, 244);
this.groupPanel7.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel7.Name = "groupPanel7";
this.groupPanel7.Size = new System.Drawing.Size(159, 100);
this.groupPanel7.Size = new System.Drawing.Size(119, 81);
//
//
//
@ -402,10 +476,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(10, 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);
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);
@ -420,10 +494,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(10, 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);
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);
@ -434,10 +508,10 @@ namespace VEPROMS
this.groupPanel6.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel6.Controls.Add(this.cbTVExpand);
this.groupPanel6.Location = new System.Drawing.Point(416, 185);
this.groupPanel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel6.Location = new System.Drawing.Point(312, 150);
this.groupPanel6.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel6.Name = "groupPanel6";
this.groupPanel6.Size = new System.Drawing.Size(159, 88);
this.groupPanel6.Size = new System.Drawing.Size(119, 72);
//
//
//
@ -479,10 +553,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);
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;
@ -495,10 +569,10 @@ namespace VEPROMS
this.groupPanel5.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel5.Controls.Add(this.cbStepTypeToolTip);
this.groupPanel5.Location = new System.Drawing.Point(223, 185);
this.groupPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel5.Location = new System.Drawing.Point(167, 150);
this.groupPanel5.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel5.Name = "groupPanel5";
this.groupPanel5.Size = new System.Drawing.Size(159, 88);
this.groupPanel5.Size = new System.Drawing.Size(119, 72);
//
//
//
@ -537,10 +611,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);
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);
@ -551,10 +625,10 @@ namespace VEPROMS
this.groupPanel4.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel4.Controls.Add(this.cbAnnotationPopup);
this.groupPanel4.Location = new System.Drawing.Point(33, 185);
this.groupPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel4.Location = new System.Drawing.Point(25, 150);
this.groupPanel4.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel4.Name = "groupPanel4";
this.groupPanel4.Size = new System.Drawing.Size(159, 88);
this.groupPanel4.Size = new System.Drawing.Size(119, 72);
//
//
//
@ -596,10 +670,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);
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);
@ -610,10 +684,9 @@ namespace VEPROMS
this.groupPanel3.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanel3.Controls.Add(this.colorPickerButton1);
this.groupPanel3.Location = new System.Drawing.Point(404, 16);
this.groupPanel3.Margin = new System.Windows.Forms.Padding(4);
this.groupPanel3.Location = new System.Drawing.Point(303, 13);
this.groupPanel3.Name = "groupPanel3";
this.groupPanel3.Size = new System.Drawing.Size(195, 76);
this.groupPanel3.Size = new System.Drawing.Size(146, 62);
//
//
//
@ -651,11 +724,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);
//
@ -667,10 +739,10 @@ namespace VEPROMS
this.groupPanel2.Controls.Add(this.cbPropGrid);
this.groupPanel2.Controls.Add(this.cbTabbedIntrFace);
this.groupPanel2.Controls.Add(this.cbButtonIntrFace);
this.groupPanel2.Location = new System.Drawing.Point(207, 15);
this.groupPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupPanel2.Location = new System.Drawing.Point(155, 12);
this.groupPanel2.Margin = new System.Windows.Forms.Padding(2);
this.groupPanel2.Name = "groupPanel2";
this.groupPanel2.Size = new System.Drawing.Size(169, 132);
this.groupPanel2.Size = new System.Drawing.Size(127, 107);
//
//
//
@ -709,10 +781,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);
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;
@ -724,10 +796,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);
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";
//
@ -738,10 +810,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);
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";
//
@ -755,10 +827,10 @@ namespace VEPROMS
//
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);
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)
@ -779,10 +851,10 @@ namespace VEPROMS
//
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);
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)
@ -803,11 +875,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);
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";
@ -820,10 +892,10 @@ namespace VEPROMS
// 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.Controls.Add(this.btnReset);
this.Controls.Add(this.tcSysOpts);
this.Controls.Add(this.panButtons);
@ -831,7 +903,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);
this.Name = "frmSysOptions";
this.Text = "Proms System Options";
this.Load += new System.EventHandler(this.frmSysOptions_Load);
@ -840,6 +912,8 @@ namespace VEPROMS
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit();
this.tcSysOpts.ResumeLayout(false);
this.tabControlPanel3.ResumeLayout(false);
this.groupPanel9.ResumeLayout(false);
this.groupPanel8.ResumeLayout(false);
this.groupPanel7.ResumeLayout(false);
this.groupPanel6.ResumeLayout(false);
this.groupPanel5.ResumeLayout(false);
@ -889,6 +963,8 @@ namespace VEPROMS
private DevComponents.DotNetBar.Controls.CheckBoxX cbTVExpand;
private DevComponents.DotNetBar.Controls.GroupPanel groupPanel8;
private DevComponents.DotNetBar.Controls.CheckBoxX cbEnhancedDocumentSync;
private DevComponents.DotNetBar.Controls.GroupPanel groupPanel9;
private DevComponents.DotNetBar.Controls.CheckBoxX cbSeparateWindows;

7
PROMS/VEPROMS User Interface/frmSysOptions.cs
View File

@ -60,6 +60,7 @@ namespace VEPROMS
cbPasteNoReturns.Checked = Settings.Default.PasteNoReturns;
cbPastePlainText.Checked = Settings.Default.PastePlainText;
cbEnhancedDocumentSync.Checked = Settings.Default.SyncEnhancedDocuments;
cbSeparateWindows.Checked = Settings.Default.SeparateWindows;
}
private void cbEnhancedDocumentSync_CheckedChanged(object sender, System.EventArgs e)
{
@ -182,16 +183,18 @@ namespace VEPROMS
tcSysOpts.SelectedTab = tiIntrFaceStngs;
btnIntrFaceStngs.Checked = true;
}
private void cbStepTypeToolTip_CheckedChanged(object sender, EventArgs e)
{
Settings.Default.StepTypeToolTip = cbStepTypeToolTip.Checked;
VlnSettings.StepTypeToolType = cbStepTypeToolTip.Checked;
}
private void cbTVExpand_CheckedChanged(object sender, EventArgs e)
{
Settings.Default.SaveTreeviewExpanded = cbTVExpand.Checked;
}
private void cbSeparateWindows_CheckedChanged(object sender, EventArgs e)
{
Settings.Default.SeparateWindows = cbSeparateWindows.Checked;
}
}
}

9
PROMS/VEPROMS User Interface/frmSysOptions.resx
View File

@ -124,14 +124,11 @@
<data name="colorPickerButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA
EnQB3mYfeAAAAC9JREFUOE9j/P//PwNFAGoAyBSSMVgvzAAQTQoGWThqwGgYDMd0QFFmIiUToasFAIXC
aLVvIg/JAAAAAElFTkSuQmCC
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
EnEB89x6jgAAACpJREFUOE9j+P//P0UYQgApcjCKASCaFDxqwKgBIDwcDSAHww0gH/9nAACxLJWH1IMf
ngAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAIAEBAQAAAABAAoAQAAJgAAACAgEAAAAAQA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAMAA

39
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -247,11 +247,9 @@ namespace VEPROMS
cmbFont.DisplayMember = "Name";
cmbFont.SelectedIndex = -1;
string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
foreach (string parameter in parameters)
{
if (parameter.StartsWith("/DB="))
Database.SelectedDatabase = parameter.Substring(4);
}
string db = Volian.Base.Library.VlnSettings.GetDB();
if(db != null)
Database.SelectedDatabase = db;
if (Properties.Settings.Default["DefaultDB"] != string.Empty)
Database.LastDatabase = Properties.Settings.Default.DefaultDB;
// Setup the Context menu for DisplaySearch including the symbols
@ -449,10 +447,14 @@ namespace VEPROMS
{
int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
dlgExportImport dlg = new dlgExportImport("Import", dvi);
dlg.MyNewProcedure = null;
dlg.ExternalTransitionItem = null;
dlg.ShowDialog(this);
MySessionInfo.CheckInItem(ownerid);
if(dlg.MyNewProcedure != null)
tv.AddNewNode(dlg.MyNewProcedure);
if (dlg.ExternalTransitionItem != null)
tc.OpenItem(dlg.ExternalTransitionItem);
}
}
if (pi != null)
@ -1253,7 +1255,10 @@ namespace VEPROMS
// dlgCI.ShowDialog(this);
//}
// RHM20150506 Multiline ItemID TextBox
this.txtSearch.Text = Volian.Base.Library.VlnSettings.GetCommand("ItemIDs", "").Replace(",","\r\n");
this.txtSearch.Text = Volian.Base.Library.VlnSettings.GetItemIDs().Replace(",","\r\n");
// Open First Item
if (this.txtSearch.Text.Length > 0 && !this.txtSearch.Text.Contains("\r\n"))
CurrentID = txtSearch.Text;
}
/// <summary>
/// This looks for sessions associated with the current PC and user which are no longer active and removes them.
@ -1284,11 +1289,17 @@ namespace VEPROMS
// return false;
//}
void tc_OpenEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)
{
if (!Properties.Settings.Default.SeparateWindows)
{
tc.OpenItem(args.MyItemInfo);
}
else
{
if (!tc.dicEnhancedDocuments.ContainsKey(args.MyItemInfo.MyProcedure.MyDocVersion))
{
frmEnhanced frm = new frmEnhanced(args.MyItemInfo);
foreach(VersionWindow vw in MyVersionWindowList)
foreach (VersionWindow vw in MyVersionWindowList)
if (vw.VersionID == args.MyItemInfo.MyProcedure.MyDocVersion.VersionID)
{
frm.SetDesktopBounds(vw.MyRectangle.Left, vw.MyRectangle.Top, vw.MyRectangle.Width, vw.MyRectangle.Height);
@ -1309,6 +1320,7 @@ namespace VEPROMS
frm.OpenItem();
}
}
}
void frmEnhancedDocumentResize(object sender, EventArgs e)
{
@ -1807,19 +1819,22 @@ namespace VEPROMS
{
string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray());
foreach (string dvstr in dvstrs)
{
if (dvstr != "")
{
DocVersionInfo dvi = DocVersionInfo.Get(int.Parse(dvstr));
if (dvi != null)
{
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi,true);
DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
if (dvi.MultiUnitCount == 0)
prnDlg.SelectedSlave = -1;
prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
//prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
//while (!_RunNext) Application.DoEvents();
ranAuto = true;
}
}
ranAuto = true;
}
}
}
if (ranAuto)
@ -2853,8 +2868,8 @@ namespace VEPROMS
}
else
{
if (!btnAnnoDetailsPushPin.Checked)
epAnnotations.Expanded = false;
//if (!btnAnnoDetailsPushPin.Checked)
// epAnnotations.Expanded = false;
epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor;
ctrlAnnotationDetails.AnnotationText = null;
}
@ -3342,6 +3357,7 @@ namespace VEPROMS
Format.FormatLoaded += new FormatEvent(Format_FormatLoaded);
Format.UpdateFormats(fmtPathAll, genmacPathAll);
Format.FormatLoaded -= new FormatEvent(Format_FormatLoaded);
_MyLog.WarnFormat("Formats in {0} updated to {1}", Database.SelectedDatabase, fmtPathAll);
}
void Format_FormatLoaded(object sender, FormatEventArgs args)
@ -3360,6 +3376,7 @@ namespace VEPROMS
bottomProgBar.Text = args.Status;
bottomProgBar.TextVisible = true;
Application.DoEvents();
Console.WriteLine(args.Status);
}
private void btnSendErrorLog_Click(object sender, EventArgs e)