diff --git a/PROMS/DataLoader/Formats.cs b/PROMS/DataLoader/Formats.cs index 453558a0..81e6506b 100644 --- a/PROMS/DataLoader/Formats.cs +++ b/PROMS/DataLoader/Formats.cs @@ -28,176 +28,176 @@ namespace DataLoader { public string _FmtAllPath; public string _GenmacAllPath; - private FormatInfoList _AllFormats; + //private FormatInfoList _AllFormats; - public FormatInfoList AllFormats - { - get - { - if (_AllFormats == null) - _AllFormats = FormatInfoList.Get(); - return _AllFormats; - } - } - private Dictionary _LookupFormats; - public Dictionary LookupFormats - { - get - { - if (_LookupFormats == null) - { - _LookupFormats = new Dictionary(); - foreach (FormatInfo myFormat in AllFormats) - { - _LookupFormats.Add(myFormat.Name, myFormat.FormatID); - } - } - return _LookupFormats; - } - } - private Format AddFormatToDB(Format parent, string format, bool issub, DateTime Dts, string Userid) - { - string fmtdata = null; - string genmacdata = null; - XmlDocument xd = null; + //public FormatInfoList AllFormats + //{ + // get + // { + // if (_AllFormats == null) + // _AllFormats = FormatInfoList.Get(); + // return _AllFormats; + // } + //} + //private Dictionary _LookupFormats; + //public Dictionary LookupFormats + //{ + // get + // { + // if (_LookupFormats == null) + // { + // _LookupFormats = new Dictionary(); + // foreach (FormatInfo myFormat in AllFormats) + // { + // _LookupFormats.Add(myFormat.Name, myFormat.FormatID); + // } + // } + // return _LookupFormats; + // } + //} + //private Format AddFormatToDB(Format parent, string format, bool issub, DateTime Dts, string Userid) + //{ + // string fmtdata = null; + // string genmacdata = null; + // XmlDocument xd = null; - //string path = "c:\\development\\fmtall\\" + format + "all.xml"; - string path = _FmtAllPath + "\\" + format + "all.xml"; - if (File.Exists(path)) - { - try - { - StreamReader srf = new StreamReader(path); - xd = new XmlDocument(); - xd.Load(srf); - //xd.Load(path); - fmtdata = xd.OuterXml; - } - catch (Exception ex) - { - frmMain.AddError(ex, "AddFormatToDB('{0}','{1}')", parent.Name, path); - return null; - } - } + // //string path = "c:\\development\\fmtall\\" + format + "all.xml"; + // string path = _FmtAllPath + "\\" + format + "all.xml"; + // if (File.Exists(path)) + // { + // try + // { + // StreamReader srf = new StreamReader(path); + // xd = new XmlDocument(); + // xd.Load(srf); + // //xd.Load(path); + // fmtdata = xd.OuterXml; + // } + // catch (Exception ex) + // { + // frmMain.AddError(ex, "AddFormatToDB('{0}','{1}')", parent.Name, path); + // return null; + // } + // } - // Do we need genmac - only if non-subformat - if (!issub) - { - //path = "c:\\development\\genmacall\\" + format + ".svg"; - path = _GenmacAllPath + "\\" + format + ".svg"; - if (File.Exists(path)) - { - try - { - StreamReader sr = new StreamReader(path); - XmlDocument xdg = new XmlDocument(); - xdg.Load(sr); - //xdg.Load(path); - genmacdata = xdg.OuterXml; - } - catch (Exception ex) - { - frmMain.AddError(ex, "AddFormatToDB('{0}','{1}')", parent.Name, path); - return null; - } - } - } - // Get the name & then create the record. - if (Userid == null || Userid == "") Userid = "Migration"; + // // Do we need genmac - only if non-subformat + // if (!issub) + // { + // //path = "c:\\development\\genmacall\\" + format + ".svg"; + // path = _GenmacAllPath + "\\" + format + ".svg"; + // if (File.Exists(path)) + // { + // try + // { + // StreamReader sr = new StreamReader(path); + // XmlDocument xdg = new XmlDocument(); + // xdg.Load(sr); + // //xdg.Load(path); + // genmacdata = xdg.OuterXml; + // } + // catch (Exception ex) + // { + // frmMain.AddError(ex, "AddFormatToDB('{0}','{1}')", parent.Name, path); + // return null; + // } + // } + // } + // // Get the name & then create the record. + // if (Userid == null || Userid == "") Userid = "Migration"; - string nmattr = "Default"; + // string nmattr = "Default"; - // use xpath to get name. - if (parent != null) - { - XmlNode nmnode = xd.SelectSingleNode("//FormatData"); - if (nmnode is XmlElement) - { - XmlElement xm = (XmlElement)nmnode; - nmattr = xm.GetAttribute("Name"); - } - } - // use the format name if base or non sub. If it's a sub, remove the "_". - string fname = issub ? format.Replace("_", "") : format; - Format rec = null; - try - { - if (!LookupFormats.ContainsKey(fname)) - { - rec = Format.MakeFormat(parent, fname, nmattr, fmtdata, genmacdata, Dts, Userid); - } - else - { - rec = Format.Get(LookupFormats[fname]); - rec.Data = fmtdata; - rec.GenMac = genmacdata; - rec = rec.Save(); - } - } - catch (Exception ex) - { - frmMain.AddError(ex, "AddFormatToDB-make format('{0}','{1}')", parent.Name, path); - } - return rec; - } - public void LoadAllFormats() - { - Format basefmt = null; - Format parent = null; + // // use xpath to get name. + // if (parent != null) + // { + // XmlNode nmnode = xd.SelectSingleNode("//FormatData"); + // if (nmnode is XmlElement) + // { + // XmlElement xm = (XmlElement)nmnode; + // nmattr = xm.GetAttribute("Name"); + // } + // } + // // use the format name if base or non sub. If it's a sub, remove the "_". + // string fname = issub ? format.Replace("_", "") : format; + // Format rec = null; + // try + // { + // if (!LookupFormats.ContainsKey(fname)) + // { + // rec = Format.MakeFormat(parent, fname, nmattr, fmtdata, genmacdata, Dts, Userid); + // } + // else + // { + // rec = Format.Get(LookupFormats[fname]); + // rec.Data = fmtdata; + // rec.GenMac = genmacdata; + // rec = rec.Save(); + // } + // } + // catch (Exception ex) + // { + // frmMain.AddError(ex, "AddFormatToDB-make format('{0}','{1}')", parent.Name, path); + // } + // return rec; + //} + //public void LoadAllFormats() + //{ + // Format basefmt = null; + // Format parent = null; - // Load base format. - basefmt = AddFormatToDB(null, "base", false, DateTime.Now, "Migration"); - if (basefmt == null) return; - // now loop through all files... If there is an _ in the name, it's a subformat - // (for example, AEP_00.xml) skip it in main loop, it's handled for each format. - DirectoryInfo di = new DirectoryInfo(_FmtAllPath); //(@"c:\development\fmtall"); - FileInfo[] fis = di.GetFiles("*.xml"); + // // Load base format. + // basefmt = AddFormatToDB(null, "base", false, DateTime.Now, "Migration"); + // if (basefmt == null) return; + // // now loop through all files... If there is an _ in the name, it's a subformat + // // (for example, AEP_00.xml) skip it in main loop, it's handled for each format. + // DirectoryInfo di = new DirectoryInfo(_FmtAllPath); //(@"c:\development\fmtall"); + // FileInfo[] fis = di.GetFiles("*.xml"); - foreach (FileInfo fi in fis) - { - //if (fi.Name.ToUpper() == "WCN2ALL.XML"|| fi.Name.ToUpper() == "OHLPALL.XML") - //{ - bool issub = (fi.Name.IndexOf("_") > 0) ? true : false; - if (!issub && fi.Name.ToLower() != "baseall.xml") - { - string fmtname = fi.Name.Substring(0, fi.Name.Length - 7); - // remove the all.xml part of the filename. - try - { - parent = AddFormatToDB(basefmt, fmtname, issub, DateTime.Now, "Migration"); - if (parent != null) - { - // now see if there are any subformats associated with this, if so - // add them here... - DirectoryInfo sdi = new DirectoryInfo(_FmtAllPath); //("c:\\development\\fmtall"); - FileInfo[] sfis = di.GetFiles(fmtname + "_*.xml"); - foreach (FileInfo sfi in sfis) - { - string nm = sfi.Name.Substring(0, sfi.Name.Length - 7); - //Console.WriteLine("Processing {0}", sfi.Name); - frmMain.Status = string.Format("Processing Format {0}", sfi.Name); - try - { - AddFormatToDB(parent, nm, true, DateTime.Now, "Migration"); - } - catch (Exception ex) - { - frmMain.AddError(ex, "LoadAllFormats() '{0}'", sfi.Name); - //Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message); - } - } - } - } - catch (Exception ex) - { - frmMain.AddError(ex, "LoadAllFormats() '{0}'", fi.Name); - //Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message); - } - } - //} - } - } + // foreach (FileInfo fi in fis) + // { + // //if (fi.Name.ToUpper() == "WCN2ALL.XML"|| fi.Name.ToUpper() == "OHLPALL.XML") + // //{ + // bool issub = (fi.Name.IndexOf("_") > 0) ? true : false; + // if (!issub && fi.Name.ToLower() != "baseall.xml") + // { + // string fmtname = fi.Name.Substring(0, fi.Name.Length - 7); + // // remove the all.xml part of the filename. + // try + // { + // parent = AddFormatToDB(basefmt, fmtname, issub, DateTime.Now, "Migration"); + // if (parent != null) + // { + // // now see if there are any subformats associated with this, if so + // // add them here... + // DirectoryInfo sdi = new DirectoryInfo(_FmtAllPath); //("c:\\development\\fmtall"); + // FileInfo[] sfis = di.GetFiles(fmtname + "_*.xml"); + // foreach (FileInfo sfi in sfis) + // { + // string nm = sfi.Name.Substring(0, sfi.Name.Length - 7); + // //Console.WriteLine("Processing {0}", sfi.Name); + // frmMain.Status = string.Format("Processing Format {0}", sfi.Name); + // try + // { + // AddFormatToDB(parent, nm, true, DateTime.Now, "Migration"); + // } + // catch (Exception ex) + // { + // frmMain.AddError(ex, "LoadAllFormats() '{0}'", sfi.Name); + // //Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message); + // } + // } + // } + // } + // catch (Exception ex) + // { + // frmMain.AddError(ex, "LoadAllFormats() '{0}'", fi.Name); + // //Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message); + // } + // } + // //} + // } + //} public FormatInfo GetFormat(string format) { Format parent = null; diff --git a/PROMS/DataLoader/Loader.cs b/PROMS/DataLoader/Loader.cs index 9d739147..d989dd76 100644 --- a/PROMS/DataLoader/Loader.cs +++ b/PROMS/DataLoader/Loader.cs @@ -117,7 +117,8 @@ namespace DataLoader XmlDocument d = cfg.LoadSystemIni(vepromspath); frmMain.Status = "Load All Formats"; - LoadAllFormats(); + //LoadAllFormats(); + Format.UpdateFormats(_FmtAllPath, _GenmacAllPath); Format baseFormat = Format.Get(1); sysFolder = Folder.MakeFolder(null, dbConn, "VEPROMS", "VEPROMS", "VEPROMS", baseFormat, d.InnerXml, DateTime.Now, "Migration"); diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs index f0b9d0ec..628333cd 100644 --- a/PROMS/DataLoader/frmLoader.cs +++ b/PROMS/DataLoader/frmLoader.cs @@ -305,7 +305,7 @@ namespace DataLoader //TextConvert.ResetSpecialCharacters(); System.Diagnostics.Process[] wordProcesses = WordDoc.WordProcesses; MyFrmErrors.Clear(); - if (wordProcesses.Length > 0) + if (cbFormatsOnly.Checked == false && wordProcesses.Length > 0) { AddError("{0} copies of MS Word are running", wordProcesses.Length); if (MessageBox.Show("MS Word is Running and must be stopped before proceeding.\n\nStop MS Word?", "MS Word is Running", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) @@ -324,7 +324,7 @@ namespace DataLoader MessageBox.Show(@"Format files are taken from c:\development\fmtall"); ldr._FmtAllPath = @"c:\development\fmtall"; ldr._GenmacAllPath = @"c:\development\genmacall"; - ldr.LoadAllFormats(); + Format.UpdateFormats(@"c:\development\fmtall",@"c:\development\genmacall"); //ldr.LoadAllFormats(); MessageBox.Show("Formats Loaded"); return; } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 629572af..ea4d6fe9 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -45,6 +45,7 @@ namespace VEPROMS this.btnPrint = new DevComponents.DotNetBar.ButtonItem(); this.btnPrepare = new DevComponents.DotNetBar.ButtonItem(); this.btnAdmin = new DevComponents.DotNetBar.ButtonItem(); + this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem(); this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer(); this.labelItem8 = new DevComponents.DotNetBar.LabelItem(); this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer(); @@ -81,6 +82,9 @@ namespace VEPROMS this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.displayTags = new Volian.Controls.Library.DisplayTags(); this.infotabTags = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.displayHistory = new Volian.Controls.Library.DisplayHistory(); + this.infotabHistory = new DevComponents.DotNetBar.TabItem(this.components); this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); this.displayTransition = new Volian.Controls.Library.DisplayTransition(); this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); @@ -108,21 +112,18 @@ namespace VEPROMS this.tabItemLibDocs = new DevComponents.DotNetBar.TabItem(this.components); this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.infotabHistory = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.tc = new Volian.Controls.Library.DisplayTabControl(); - this.displayHistory = new Volian.Controls.Library.DisplayHistory(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.bottomBar.SuspendLayout(); this.epAnnotations.SuspendLayout(); this.epProcedures.SuspendLayout(); this.infoPanel.SuspendLayout(); - this.tabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit(); this.infoTabs.SuspendLayout(); this.infotabControlPanelTags.SuspendLayout(); this.panelEx1.SuspendLayout(); + this.tabControlPanel1.SuspendLayout(); this.infotabControlPanelTransitions.SuspendLayout(); this.infotabControlPanelRO.SuspendLayout(); this.toolsPanel.SuspendLayout(); @@ -150,7 +151,6 @@ namespace VEPROMS this.ribbonControl1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F); this.ribbonControl1.Location = new System.Drawing.Point(5, 1); this.ribbonControl1.Name = "ribbonControl1"; - this.ribbonControl1.Office2007ColorTable = DevComponents.DotNetBar.Rendering.eOffice2007ColorScheme.Black; this.ribbonControl1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.office2007StartButton1, @@ -327,8 +327,15 @@ namespace VEPROMS this.btnAdmin.CanCustomize = false; this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin; this.btnAdmin.Name = "btnAdmin"; + this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btnUpdateFormats}); this.btnAdmin.Text = "A&dministration"; - this.btnAdmin.Visible = false; + // + // btnUpdateFormats + // + this.btnUpdateFormats.Name = "btnUpdateFormats"; + this.btnUpdateFormats.Text = "Update Formats"; + this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click); // // icRecentDocs // @@ -442,7 +449,7 @@ namespace VEPROMS this.lblItemID, this.lblResolution, this.btnEditItem}); - this.bottomBar.Location = new System.Drawing.Point(5, 616); + this.bottomBar.Location = new System.Drawing.Point(5, 603); this.bottomBar.Name = "bottomBar"; this.bottomBar.Size = new System.Drawing.Size(1185, 29); this.bottomBar.Stretch = true; @@ -551,7 +558,7 @@ namespace VEPROMS this.epAnnotations.Expanded = false; this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 590); + this.epAnnotations.Location = new System.Drawing.Point(5, 577); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -621,7 +628,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(30, 533); + this.epProcedures.Size = new System.Drawing.Size(30, 520); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -669,7 +676,7 @@ namespace VEPROMS this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(1127, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(30, 533); + this.infoPanel.Size = new System.Drawing.Size(30, 520); this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -695,8 +702,8 @@ namespace VEPROMS // this.infoTabs.BackColor = System.Drawing.Color.Transparent; this.infoTabs.CanReorderTabs = true; - this.infoTabs.Controls.Add(this.tabControlPanel1); this.infoTabs.Controls.Add(this.infotabControlPanelTags); + this.infoTabs.Controls.Add(this.tabControlPanel1); this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Controls.Add(this.infotabControlPanelRO); this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill; @@ -773,6 +780,42 @@ namespace VEPROMS this.infotabTags.Visible = false; this.infotabTags.Click += new System.EventHandler(this.infotabTags_Click); // + // tabControlPanel1 + // + this.tabControlPanel1.Controls.Add(this.displayHistory); + this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(3, 511); + 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.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel1.Style.GradientAngle = 180; + this.tabControlPanel1.TabIndex = 6; + this.tabControlPanel1.TabItem = this.infotabHistory; + this.tabControlPanel1.ThemeAware = true; + // + // displayHistory + // + this.displayHistory.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayHistory.Location = new System.Drawing.Point(1, 1); + this.displayHistory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.displayHistory.MyEditItem = null; + this.displayHistory.MyItemInfo = null; + this.displayHistory.MyProcedureInfo = null; + this.displayHistory.Name = "displayHistory"; + this.displayHistory.Size = new System.Drawing.Size(1, 509); + this.displayHistory.TabIndex = 0; + // + // infotabHistory + // + this.infotabHistory.AttachedControl = this.tabControlPanel1; + this.infotabHistory.Name = "infotabHistory"; + this.infotabHistory.Text = "History"; + this.infotabHistory.Visible = false; + // // infotabControlPanelTransitions // this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); @@ -871,65 +914,65 @@ namespace VEPROMS // // expandableSplitter1 // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter1.Enabled = false; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(35, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 533); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 520); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; // // expandableSplitter2 // - this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter2.Dock = System.Windows.Forms.DockStyle.Bottom; this.expandableSplitter2.Enabled = false; - this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.expandableSplitter2.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter2.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter2.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter2.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter2.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(38, 587); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 574); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(1089, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -938,34 +981,34 @@ namespace VEPROMS // // expandableSplitter3 // - this.expandableSplitter3.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter3.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter3.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter3.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter3.Dock = System.Windows.Forms.DockStyle.Right; this.expandableSplitter3.Enabled = false; - this.expandableSplitter3.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter3.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter3.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter3.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter3.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.expandableSplitter3.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter3.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter3.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter3.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter3.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); this.expandableSplitter3.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter3.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter3.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter3.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter3.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter3.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter3.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter3.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter3.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter3.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter3.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter3.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter3.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(1124, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 530); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 517); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -991,7 +1034,7 @@ namespace VEPROMS this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(1160, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(30, 533); + this.toolsPanel.Size = new System.Drawing.Size(30, 520); this.toolsPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.toolsPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.toolsPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1067,6 +1110,7 @@ namespace VEPROMS this.displaySearch1.SearchString = null; this.displaySearch1.Size = new System.Drawing.Size(1, 603); this.displaySearch1.TabIndex = 0; + this.displaySearch1.TypesSelected = null; // // toolstabResults // @@ -1165,35 +1209,35 @@ namespace VEPROMS // // expandableSplitter4 // - this.expandableSplitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(241)))), ((int)(((byte)(242))))); - this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); + this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter4.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter4.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expandableSplitter4.Dock = System.Windows.Forms.DockStyle.Right; this.expandableSplitter4.Enabled = false; - this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter4.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter4.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter4.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.expandableSplitter4.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter4.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter4.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); this.expandableSplitter4.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); this.expandableSplitter4.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; this.expandableSplitter4.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter4.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter4.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.expandableSplitter4.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(1157, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 533); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 520); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1205,30 +1249,6 @@ namespace VEPROMS this.buttonItem1.Text = "buttonItem19"; this.buttonItem1.Tooltip = "Degree"; // - // infotabHistory - // - this.infotabHistory.AttachedControl = this.tabControlPanel1; - this.infotabHistory.Name = "infotabHistory"; - this.infotabHistory.Text = "History"; - this.infotabHistory.Visible = false; - // - // tabControlPanel1 - // - this.tabControlPanel1.Controls.Add(this.displayHistory); - this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); - this.tabControlPanel1.Name = "tabControlPanel1"; - this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(203, 515); - 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.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel1.Style.GradientAngle = 180; - this.tabControlPanel1.TabIndex = 6; - this.tabControlPanel1.TabItem = this.infotabHistory; - this.tabControlPanel1.ThemeAware = true; - // // itemAnnotationsBindingSource // this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation); @@ -1243,7 +1263,7 @@ namespace VEPROMS this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(1086, 530); + this.tc.Size = new System.Drawing.Size(1086, 517); this.tc.TabIndex = 8; this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay); this.tc.WordSectionClose += new Volian.Controls.Library.StepPanelWordSectionCloseEvent(this.tc_WordSectionClose); @@ -1253,24 +1273,12 @@ namespace VEPROMS this.tc.WordSectionDeleted += new Volian.Controls.Library.StepPanelWordSectionDeletedEvent(this.tc_WordSectionDeleted); this.tc.LinkModifyRO += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyRO); // - // displayHistory - // - //this.displayHistory.AnnotationOnly = false; - this.displayHistory.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayHistory.Location = new System.Drawing.Point(1, 1); - this.displayHistory.MyItemInfo = null; - this.displayHistory.MyProcedureInfo = null; - this.displayHistory.Name = "displayHistory"; - //this.displayHistory.Results = ((System.Collections.Generic.ICollection)(resources.GetObject("displayHistory.Results"))); - this.displayHistory.Size = new System.Drawing.Size(201, 513); - this.displayHistory.TabIndex = 0; - // // frmVEPROMS // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1195, 647); + this.ClientSize = new System.Drawing.Size(1195, 634); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); @@ -1298,6 +1306,7 @@ namespace VEPROMS this.infoTabs.ResumeLayout(false); this.infotabControlPanelTags.ResumeLayout(false); this.panelEx1.ResumeLayout(false); + this.tabControlPanel1.ResumeLayout(false); this.infotabControlPanelTransitions.ResumeLayout(false); this.infotabControlPanelTransitions.PerformLayout(); this.infotabControlPanelRO.ResumeLayout(false); @@ -1308,7 +1317,6 @@ namespace VEPROMS this.tabControlPanel2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.tabControlPanelLD.ResumeLayout(false); - this.tabControlPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit(); this.ResumeLayout(false); @@ -1424,6 +1432,7 @@ namespace VEPROMS private DevComponents.DotNetBar.TabControlPanel tabControlPanel1; private DevComponents.DotNetBar.TabItem infotabHistory; private Volian.Controls.Library.DisplayHistory displayHistory; + private DevComponents.DotNetBar.ButtonItem btnUpdateFormats; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 006613b4..a246ffc5 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1602,5 +1602,22 @@ namespace VEPROMS frmPropGrid pg = new frmPropGrid(tc.SelectedDisplayTabItem.MyStepTabPanel.SelectedEditItem, "EditItem"); pg.Show(); } + private void btnUpdateFormat_Click(object sender, EventArgs e) + { + string appPath = Application.ExecutablePath; + FileInfo fi = new FileInfo(appPath); + DirectoryInfo di = fi.Directory.Parent.Parent.Parent.Parent; + string fmtPath = di.FullName + @"\fmtall"; + string genmacPath = di.FullName + @"\genmacall"; + Format.FormatLoaded += new FormatEvent(Format_FormatLoaded); + Format.UpdateFormats(fmtPath, genmacPath); + Format.FormatLoaded -= new FormatEvent(Format_FormatLoaded); + } + + void Format_FormatLoaded(object sender, FormatEventArgs args) + { + bottomProgBar.Text = args.Status; + } + } }