From e35ea8b8c5b847918bf67f8a735d9798982f0e89 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 24 Jul 2009 21:43:53 +0000 Subject: [PATCH] support for StepRTB on property pages --- .../Volian.Controls.Library/DisplayTabItem.cs | 4 +- PROMS/Volian.Controls.Library/DisplayText.cs | 99 ++++++++++--- PROMS/Volian.Controls.Library/StepRTB.cs | 8 +- .../Volian.Controls.Library/StepTabRibbon.cs | 136 ++++++++++++------ .../StepTabRibbon.designer.cs | Bin 162420 -> 173996 bytes .../StepTabRibbon.resx | 30 ++-- PROMS/Volian.Controls.Library/vlnTreeView.cs | 7 + 7 files changed, 210 insertions(+), 74 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTabItem.cs b/PROMS/Volian.Controls.Library/DisplayTabItem.cs index f9303ac6..4c67dd1e 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabItem.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabItem.cs @@ -160,7 +160,7 @@ namespace Volian.Controls.Library Control = _MyStepTabPanel; Name = "tabItem Item " + _MyItemInfo.ItemID; Text = _MyItemInfo.TabTitle; - Tooltip = _MyItemInfo.TabToolTip; + Tooltip = _MyItemInfo.TabToolTip.Replace("\u2011","-"); // _MyDisplayTabControl.Controls.Add(_MyStepTabPanel); _MyDisplayTabControl.MyBar.Items.Add(this); @@ -185,7 +185,7 @@ namespace Volian.Controls.Library Control = _MyDSOTabPanel; Name = "tabItem Item " + _MyItemInfo.ItemID; Text = _MyItemInfo.TabTitle; - Tooltip = _MyItemInfo.TabToolTip; + Tooltip = _MyItemInfo.TabToolTip.Replace("\u2011","-"); _MyDisplayTabControl.Controls.Add(_MyDSOTabPanel); DSOTabPanel.IgnoreEnter = true; Console.WriteLine("AddRange {0}", Name); diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs index f6edef6b..8423d489 100644 --- a/PROMS/Volian.Controls.Library/DisplayText.cs +++ b/PROMS/Volian.Controls.Library/DisplayText.cs @@ -4,13 +4,70 @@ using System.Text; using System.Windows.Forms; using System.Text.RegularExpressions; using System.Drawing; +using VEPROMS.CSLA.Library; -namespace VEPROMS.CSLA.Library +namespace Volian.Controls.Library { public class DisplayText { #region Properties + private E_FieldToEdit _FieldToEdit; + public E_FieldToEdit FieldToEdit + { + get { return _FieldToEdit; } + set { _FieldToEdit = value; } + } private ItemInfo _MyItemInfo; + private string InfoText + { + get + { + switch (FieldToEdit) + { + case E_FieldToEdit.StepText: + case E_FieldToEdit.Text: + return _MyItemInfo.MyContent.Text; + break; + case E_FieldToEdit.Number: + return _MyItemInfo.MyContent.Number; + break; + } + return string.Empty; + } + } + private Item _MyItem; + private string EditText + { + get + { + switch (FieldToEdit) + { + case E_FieldToEdit.StepText: + case E_FieldToEdit.Text: + return _MyItem.MyContent.Text; + break; + case E_FieldToEdit.Number: + return _MyItem.MyContent.Number; + break; + } + return string.Empty; + } + set + { + switch (FieldToEdit) + { + case E_FieldToEdit.StepText: + case E_FieldToEdit.Text: + _MyItem.MyContent.Text = value; + break; + case E_FieldToEdit.Number: + _MyItem.MyContent.Number = value; + break; + default: + break; + } + } + } // list of 'pieces of text' for this item. Pieces include symbols, ros, // transitions & plain text. private List _DisplayTextElementList; @@ -47,13 +104,15 @@ namespace VEPROMS.CSLA.Library /// E_ViewMode vw_mode - view or edit. /// bool noEdit - flags whether to edit or not (used to set data in /// rtb as resolved replacewords for non-active rtb. + /// E_FieldToEdit fieldToEdit - identifies the field to edit (number or text) /// - public DisplayText(ItemInfo itemInfo, E_EditPrintMode epMode, E_ViewMode vwMode, bool noEdit) + public DisplayText(ItemInfo itemInfo, E_EditPrintMode epMode, E_ViewMode vwMode, bool noEdit,E_FieldToEdit fieldToEdit) { + _FieldToEdit = fieldToEdit; _MyItemInfo = itemInfo; - OriginalText = itemInfo.MyContent.Text; + OriginalText = InfoText; TextFont = GetItemFont(); - string text = _MyItemInfo.MyContent.Text; + string text = InfoText; // if in print mode, view mode, or non-active richtextbox do replace words. Only if in // actual edit mode are replace words left as is. @@ -132,10 +191,10 @@ namespace VEPROMS.CSLA.Library { try { - Item itm = _MyItemInfo.Get(); + _MyItem = _MyItemInfo.Get(); // check for different text, i.e. text from this itm doesn't match // original text, a change occurred in database, but not from this user. - if (OriginalText != itm.MyContent.Text) + if (OriginalText != EditText) { Console.WriteLine("Save Failed because text changed outside of this edit session."); return false; @@ -155,30 +214,34 @@ namespace VEPROMS.CSLA.Library // Compare ro/transition lists and delete or add any to the item for any ros/transitions that have been // added/deleted or modified. - ProcessRoTranChanges(itm, origList); - itm.MyContent.Text = DteToString(); + ProcessRoTranChanges(_MyItem, origList); + EditText = DteToString(); // if new transitions/ros, we need to 'fix' the string in the embedded link to contain the // transition or usage record. - Dictionary ctReplacements = BuildCtReplacements(itm.MyContent.ContentTransitions); - Dictionary roUsgReplacements = BuildRoUsgReplacements(itm.MyContent.ContentRoUsages); - itm.Save(); + Dictionary ctReplacements = BuildCtReplacements(_MyItem.MyContent.ContentTransitions); + Dictionary roUsgReplacements = BuildRoUsgReplacements(_MyItem.MyContent.ContentRoUsages); + _MyItem.Save(); if (ctReplacements.Count > 0) { - itm.MyContent.Text = FixCtReplacements(itm.MyContent.Text, ctReplacements); - itm.Save(); + EditText = FixCtReplacements(EditText, ctReplacements); + _MyItem.Save(); } if (roUsgReplacements.Count > 0) { - itm.MyContent.Text = FixRoUsgReplacements(itm.MyContent.Text, roUsgReplacements); - itm.Save(); + EditText = FixRoUsgReplacements(EditText, roUsgReplacements); + _MyItem.Save(); } - modtext = itm.MyContent.Text; + modtext = EditText; } else { - itm.MyContent.Text = modtext; - itm.Save(); + EditText = modtext; + foreach (Csla.Validation.BrokenRule br in _MyItem.MyContent.BrokenRulesCollection) + { + Console.WriteLine("{0} - {1}", br.Property, br.Description); + } + _MyItem.Save(); } OriginalText = modtext; } diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index fc449e0b..3d05f367 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -86,6 +86,12 @@ namespace Volian.Controls.Library // return prams; // } //} + private E_FieldToEdit _FieldToEdit = E_FieldToEdit.StepText; + public E_FieldToEdit FieldToEdit + { + get { return _FieldToEdit; } + set { _FieldToEdit = value; } + } private string _RtfPrefix; // contains Font table and styles (bold/underline/italics) for rtb from step style public string RtfPrefix { @@ -152,7 +158,7 @@ namespace Volian.Controls.Library _InitializingRTB = true; _SelectedRtfSB.Remove(0, _SelectedRtfSB.Length); - DisplayText vlntxt = new DisplayText(_MyItemInfo, EpMode, VwMode, !edit); + DisplayText vlntxt = new DisplayText(_MyItemInfo, EpMode, VwMode, !edit, FieldToEdit); _origDisplayText = vlntxt; #if(DEBUG) // Use Times New Roman for Debugging diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index f7d8f69e..5a49fce4 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -25,6 +25,9 @@ namespace Volian.Controls.Library } } } + private ItemInfo MyItemInfo + { get { return _MyStepRTB.MyItemInfo; } } + private int _MyLastFormatID = -1; private StepRTB _MyStepRTB; public StepRTB MyStepRTB @@ -36,7 +39,18 @@ namespace Volian.Controls.Library if (value != null) { //Console.WriteLine(string.Format("StepTabRibbon: In set of MyStepRTB, Selected Text = {0}", MyStepRTB.SelectedText)); - _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMRtfEdit); + switch (_MyStepRTB.FieldToEdit) + { + case E_FieldToEdit.StepText: + _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMRtfEdit); + break; + case E_FieldToEdit.Text: + case E_FieldToEdit.Number: + _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMRtfEdit3); + break; + default: + break; + } //_MyStepRTB.KeyDown += new KeyEventHandler(MyStepRTB_SelectionChanged); _MyStepRTB.KeyUp += new KeyEventHandler(MyStepRTB_SelectionChanged); _MyStepRTB.ModeChange += new StepRTBModeChangeEvent(_MyStepRTB_ModeChange); @@ -46,48 +60,54 @@ namespace Volian.Controls.Library // Add symbols into the tab ribbon based on format selection. For now, only add symbols once // because all symbols are same!!! If we start defining different symbols in different formats // this will have to change, i.e. remove the second part of 'if' statement. - if (_MyStepRTB.MyStepItem.MyItemInfo.ActiveFormat.FormatID != _MyLastFormatID && _MyLastFormatID == -1) + if (MyItemInfo.ActiveFormat.FormatID != _MyLastFormatID && _MyLastFormatID == -1) { // Add symbols to the tabribbon & also to the context menu getting info from the format file... // Note that the ButtonItems must be used in order to place the buttons on a gallery (cannot // use buttonx or dotnet/windows/button). However, you cannot change the font on ButtonItems so // the ribbon MUST use the Arial Unicode MS Font for this to work!!!! - FormatInfo fmt = _MyStepRTB.MyStepItem.MyItemInfo.ActiveFormat; + FormatInfo fmt = MyItemInfo.ActiveFormat; SymbolList sl = fmt.PlantFormat.FormatData.SymbolList; if (sl == null || sl.Count <= 0) { MessageBox.Show("No symbols are available, check with administrator"); return; } - foreach (Symbol sym in sl) - { - DevComponents.DotNetBar.ButtonItem btn = new DevComponents.DotNetBar.ButtonItem(); - btn.Text = string.Format("{0}", (char)sym.Unicode); - // to name button use unicode rather than desc, desc may have spaces or odd chars - btn.Name = "btn" + sym.Unicode.ToString(); - btn.Tooltip = sym.Desc; - btn.Tag = string.Format(@"{0}", sym.Unicode); - btn.FontBold = true; - btn.Click += new System.EventHandler(btnSym_Click); - galleryContainerSymbols.SubItems.Add(btn); - DevComponents.DotNetBar.ButtonItem btnCM = new DevComponents.DotNetBar.ButtonItem(); - btnCM.Text = string.Format("{0}", (char)sym.Unicode); - // to name button use unicode rather than desc, desc may have spaces or odd chars - btnCM.Name = "btnCM" + sym.Unicode.ToString(); - btnCM.Tooltip = sym.Desc; - btnCM.Tag = string.Format(@"{0}", sym.Unicode); - btnCM.FontBold = true; - btnCM.Click += new System.EventHandler(btnSym_Click); - galleryContainerSymbolsCM.SubItems.Add(btnCM); - } + BuildSymbolGallery(sl, galleryContainerSymbolsCM); + BuildSymbolGallery(sl, galleryContainerSymbolsCM3); } SetButtonAndMenuEnabling(); SetStepButtonAndMenuEnabling(); - _MyLastFormatID = _MyStepRTB.MyStepItem.MyItemInfo.ActiveFormat.FormatID; + _MyLastFormatID = MyItemInfo.ActiveFormat.FormatID; } } } + private void BuildSymbolGallery(SymbolList sl, DevComponents.DotNetBar.GalleryContainer gc) + { + foreach (Symbol sym in sl) + { + DevComponents.DotNetBar.ButtonItem btn = new DevComponents.DotNetBar.ButtonItem(); + btn.Text = string.Format("{0}", (char)sym.Unicode); + // to name button use unicode rather than desc, desc may have spaces or odd chars + btn.Name = "btn" + sym.Unicode.ToString(); + btn.Tooltip = sym.Desc; + btn.Tag = string.Format(@"{0}", sym.Unicode); + btn.FontBold = true; + btn.Click += new System.EventHandler(btnSym_Click); + galleryContainerSymbols.SubItems.Add(btn); + DevComponents.DotNetBar.ButtonItem btnCM = new DevComponents.DotNetBar.ButtonItem(); + btnCM.Text = string.Format("{0}", (char)sym.Unicode); + // to name button use unicode rather than desc, desc may have spaces or odd chars + btnCM.Name = "btnCM" + sym.Unicode.ToString(); + btnCM.Tooltip = sym.Desc; + btnCM.Tag = string.Format(@"{0}", sym.Unicode); + btnCM.FontBold = true; + btnCM.Click += new System.EventHandler(btnSym_Click); + gc.SubItems.Add(btnCM); + } + } + void _MyStepRTB_ModeChange(object sender, StepRTBModeChangeEventArgs args) { SetButtonAndMenuEnabling(); @@ -156,9 +176,33 @@ namespace Volian.Controls.Library } else { - _MyStepItem.AddChild((E_FromType)fromtype, contenttype); + // Maybe someday for Grid Tables + //bool addchild = true; + //if (InsertingTable(contenttype)) + //{ + // VlnFlexGrid grd = CreateNewTable(); + // // if (grd == null) // if null grd, then user changed mind, abort insert of table + // addchild = false; + //} + //if (addchild) + _MyStepItem.AddChild((E_FromType)fromtype, contenttype); } } + // Future Table Grid? + //private bool InsertingTable(int contenttype) + //{ + // bool rtnval = false; + // switch (contenttype) + // { + // case 20008: // Centered table + // case 20010: // AER table + // case 20033: // AER table without boarder + // case 20034: // Centered table without boarder + // rtnval = true; + // break; + // } + // return rtnval; + //} private void btnInsBefore_Click(object sender, EventArgs e) { _MyStepItem.AddSiblingBefore(); @@ -200,6 +244,8 @@ namespace Volian.Controls.Library } private void SetButtonAndMenuEnabling() { + if (_MyStepRTB.FieldToEdit != E_FieldToEdit.StepText) + return; // No need to change menu that does not get used if (_MyStepRTB == null) return; DocVersionInfo dvi = MyStepItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; if (dvi == null) return; @@ -245,15 +291,15 @@ namespace Volian.Controls.Library private void SetStepButtonAndMenuEnabling() { // see if manual page break - only available on HLS - if (_MyStepItem.MyItemInfo.IsHigh) + if (MyItemInfo.IsHigh) { - StepConfig cfg = _MyStepItem.MyItemInfo.MyConfig as StepConfig; + StepConfig cfg = MyItemInfo.MyConfig as StepConfig; btnInsPgBrk.Checked = cfg == null ? false : cfg.Step_ManualPagebreak; } - btnInsPgBrk.Enabled = _MyStepItem.MyItemInfo.IsHigh; + btnInsPgBrk.Enabled = MyItemInfo.IsHigh; // if on procedure or section 'change type' & 'insert' buttons should be disabled. - if (_MyStepItem.MyItemInfo.IsProcedure || _MyStepItem.MyItemInfo.IsSection) + if (MyItemInfo.IsProcedure || MyItemInfo.IsSection) { btnChgTyp.Enabled = false; btnInsHLS.Enabled = btnInsCaut.Enabled = btnInsNote.Enabled = btnInsRNO.Enabled = btnInsFig.Enabled = @@ -268,7 +314,7 @@ namespace Volian.Controls.Library // set up insert buttons based on format E_AccStep? actable = 0; - StepData sd = _MyStepItem.MyItemInfo.FormatStepData; + StepData sd = MyItemInfo.FormatStepData; actable = sd.StepEditData.AcTable; if (actable == null) actable = 0; btnInsHLS.Enabled = true; @@ -294,12 +340,12 @@ namespace Volian.Controls.Library btnInsRNO.Tag = string.Format("{0} {1}", (int)E_FromTypes.RNOs, MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.GetIndexFromType("RNOType")); // add subitems depending on whether parent type is enabled: - if (btnInsHLS.Enabled) GalleryForSubTypes(_MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, sd, btnInsHLS, 0); - if (btnInsCaut.Enabled) GalleryForSubTypes(_MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Caution, sd, btnInsCaut, (int)E_FromType.Caution); - if (btnInsNote.Enabled) GalleryForSubTypes(_MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Note, sd, btnInsNote, (int)E_FromType.Note); - if (btnInsFig.Enabled) GalleryForSubTypes(_MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Fig, sd, btnInsFig, (int)E_FromType.Table); - if (btnInsTable.Enabled) GalleryForSubTypes(_MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Table, sd, btnInsTable, (int)E_FromType.Table); - if (btnInsSubstep.Enabled) GalleryForSubTypes(_MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Substep, sd, btnInsSubstep, (int)E_FromType.Step); + if (btnInsHLS.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.HLS, sd, btnInsHLS, 0); + if (btnInsCaut.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Caution, sd, btnInsCaut, (int)E_FromType.Caution); + if (btnInsNote.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Note, sd, btnInsNote, (int)E_FromType.Note); + if (btnInsFig.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Fig, sd, btnInsFig, (int)E_FromType.Table); + if (btnInsTable.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Table, sd, btnInsTable, (int)E_FromType.Table); + if (btnInsSubstep.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Substep, sd, btnInsSubstep, (int)E_FromType.Step); btnInsTrans.Enabled = btnCMTransition.Enabled = btnInsRO.Enabled = btnCMRO.Enabled = true; } @@ -318,17 +364,17 @@ namespace Volian.Controls.Library // regardless of whether in the AER or RNO column (set to true). For all types, get both except for figures // and tables. bool getall = !(btn.Name == "btnInsFig" || (btn.Name == "btnInsTable")); - List sdl = _MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepGetLevelTypes(getall, sdc, ref cursel, selType.Type, _MyStepItem.MyItemInfo); + List sdl = MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepGetLevelTypes(getall, sdc, ref cursel, selType.Type, MyItemInfo); if (sdl != null && sdl.Count > 0) { foreach (StepDataRetval sdr in sdl) { bool addit = true; - StepData sd = _MyStepItem.MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList[sdr.Index]; + StepData sd = MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList[sdr.Index]; int hlsSubType = -1; // if on hls, use this to set default on substep menu to first child - if (_MyStepItem.MyItemInfo.IsHigh && _MyStepItem.MyItemInfo.Steps != null) + if (MyItemInfo.IsHigh && MyItemInfo.Steps != null) { - hlsSubType = (int)_MyStepItem.MyItemInfo.Steps[0].MyContent.Type - 20000; + hlsSubType = (int)MyItemInfo.Steps[0].MyContent.Type - 20000; } // unfortunately, there are some special cases to be handled. // if high level step, don't put the rno button on @@ -343,7 +389,7 @@ namespace Volian.Controls.Library bi.Text = sdr.Name; bi.Tag = string.Format("{0} {1}", fromtype, sdr.Index); // index of type to insert it when button is clicked bi.Checked = (sd.Type == selType.Type); - if (_MyStepItem.MyItemInfo.IsHigh && hlsSubType != -1 && sdr.Index == hlsSubType) bi.Checked = true; + if (MyItemInfo.IsHigh && hlsSubType != -1 && sdr.Index == hlsSubType) bi.Checked = true; bi.Click += new System.EventHandler(btnInsStep_Click); btn.SubItems.Add(bi); } @@ -370,10 +416,10 @@ namespace Volian.Controls.Library } private void btnInsPgBrk_Click(object sender, EventArgs e) { - if (_MyStepItem.MyItemInfo.IsProcedure || _MyStepItem.MyItemInfo.IsSection) return; + if (MyItemInfo.IsProcedure || MyItemInfo.IsSection) return; // toggle manual page break - StepConfig cfg = _MyStepItem.MyItemInfo.MyConfig as StepConfig; + StepConfig cfg = MyItemInfo.MyConfig as StepConfig; cfg.Step_ManualPagebreak = !cfg.Step_ManualPagebreak; btnInsPgBrk.Checked = cfg.Step_ManualPagebreak; } @@ -561,4 +607,6 @@ namespace Volian.Controls.Library #endif #endregion } +public enum E_FieldToEdit { StepText, Text, Number }; } + diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index dc5daa3c31de05a04ba8147c39426b7b8db4c31d..f7cc3adf10d280f3e720fc78d90304f95f7d68a6 100644 GIT binary patch delta 4860 zcmbVQYj9J?71mkFMiz>Yg)NMEsSf2~z(}$r%QOKqg$yyo5iUbbpbf7ign%EElHw8~ zh)W426ubimXmAxsfpJ}Ga|ugYf^9-GK!F%aDRnwjCX5FtP?wT{QW|>hL-&fm8vpQj zj&{F2=j?a(?!EW!Wi)+mYqnW=$3;8u43_d({s`{*!Y-}of6>Xuf6vNiB%BKzyuw?} z=f0jLxic>H;gM-}ekW8a#qy&bY(5J)P{=1{R`Io&F7WHf@C9^VP)8vh6(x|_XYwUs zor(N97h#=^u+B$VXC$1=8BXFX*0JB@O~U%ReE0Lq3W|yX25Ie9@4Bk&&>GH(#|$p6;0z?CB?4H!L`!FLU$QgLG;2KUT1mmXPAN zpR-9D9(0>|h&#Er+b-RCRFE3i)(&t>10VZ)qw@vWD8jwrM`?1b8$>JFWcLl$IaGBOke>vX%x#PIcUS z#4cSv5=fU8w&t6q>&JJdr?eIIr*g%K7!-iid^$^|uD{@tj-EdOyfojAji16W^v;GH z3^l-q+vY$BkG)C~shtg;UMa08&v%NQ^PySY5R5N^Eb-hMa9rJJ^emxf>Zybys?B?r zlQL?^w|yDZLuzZbtpJzEUk;sWis-2&`_Ye~jtP=|j?%_;;>uc>q%OMcC*bDpU2YLx z2ey><>s$QZ?Ml(S9wOR?#oH_xeUD1_;OFot#WbjN=~%rL>`1v(%9T`2o;z>nw(V4+ z91dsFM9B_l(27~T3!MB~m0MhYAC_mNR=kq^;1+ZC!um8Zr3vgQm1CqRIRKZn>X#g% z42a4tau37F6l)PV0uH6d1om4*#V0TgGQMqEM30*VrZ;%|+oMF!F$jS;*9N5^qQ_w& zh)E~F5B%tPCpuf{IKKG@m}ABZy;*=q!*+UJwwDjW<})xDqo-gBAKx<+=bi$Ou%Cti zWQ0vY(`b{&REYC_4+AiM8uG-tKf;GhY&r+OV`A@lcqUDZ{|ng7Vt*$Tn0fBUZj6p) z77@7uFEL^5g29YWtJRzhU&1OTqTMiuiSak!FcTHGpaO*R4!A9R7$%0@rD63uRSO&c zO%mGs73^ggx&pc4+ygi#A3y5PeB%T+Z`ece{}%@Gjy+ktE#_5>tqwMmdox|U`h$?D z{vWKO{?;am%Ezz)5+|2!YZG(uvV9(m-2&^@JIuyc?Tc~GL^m(kUr;~6A{rQ@BGR#@ zcoUJ;-Er&`EM{(VG82(LiUjgd4iN~$Qo%7+dZrw z@Ax>0HKenK@cuP;R+${)a)3+XT7V&)E2MLgueC3a?n=icT_jLF{UV*ONG9P&R;o!B z=^RBmM-gth0sZ)^wJv==y%qQp3^K;dZ@^R~CLhmSnyqfKGDu5G#i}d``*l^2VQ7d9 zLq%j5IwHeR5*bNaBFiUdi48sAm17`>KPfmr6@Q}cmn#GiK5H@TL&7-@6> zGw-XllntF5AKr(Mwj!xcmA5j&AeYrBZ?-3yTh}8ER&`kSP_I)E&p(7;YqY^6T3wCG zESWaG$3o}!6V$pWX;4U!_-Bt*Ey@m=dJQ&yt+ui<#0XngsOnevpWxO7N&|FJD%i-E zB&sVaoUEu~!;oK1^=}26F15sPmm*YJjMJPwb40#xr@{TjDnWCXb3KLFy)-U3tkq*(S4XANsRmG zsY+e6&CdqwJTh^G^U2f=F;XD1K;FjF5h&2+7y?v27^ugg{P6(W`?JrLn~?VWP`)V0 z3tY%$^XaM8<%7xCF^IVc*UW&~XdT3+5nl66Seo#+JO#5beGn@nqVo&;;#>!K62H|H zLU96j4Pvvz;UGIX$J$;36h!x}5{0Zp&E-S&F7bw4|`uwdaVGHC$ zz>hklXcFFl0fPn%8L$Zd{ydwfF!-=$7JEghihNckI7o^HAsGfG83rjC1}zyy$pqnK gqu4M=a=IaBkXWB~UiT|oasEyAUZPZISF(No2lT-crvLx| delta 5606 zcmbtYi&Io(6u;+NSeE6^wla#36c*P92;qX_D=e_agcw6=d@$&MnquO*HdsbRix!e& zy7)OABU;zSNi%DxJMopHv?w--gfNp$L&#Y9$_K4wJ{Zx?-ueUXy$-{0?>F~%9=~(G z^We~F>&=_djaJLfYZk>byxY#*MKbTs%u`A%mOE7S+Kl>S(Nfi^=968btH}{ zgnYiF&&<>Mt|-1gy_WH%(sKG)CAp=Q(i~~6^fEnH(qFe!A(cwyl0%wFztfbi+h0U# z{g{`|OyG_8W#yHD15x-=1Xz;`NSG!?*p&=UEQy2&5g!Q$*`!=)4PjSGFG@OOY=#68 zjDlvS)nu%Wf$`WJ4OU$8A=F|Z1}s93fpW%wJmwZ9HfS?zmQ^4D z22&vp<8P4(TT|gnV>0ahV1Mr}48x>}5Q_zKm<_!j&{OyvYe+WUzYVGAN`VNpr_tGw zyRZwrNo*uK(m}@hX)uQSoJqJngHZi+F6i6?hEj@R>cqJjlocec$uOr0xGj^6d15Lt zQ_=1zwhOhjaXUwekni(`pAIL?ecIUtL` zEcnihu3SB7B64!!ITQ9gs|SQ#J0KA|^T8~9`A}~bhn|O7QCjb1m^RT_1REH)T4W`# zY<3j)w~XZZs~eOh<^E_LavoFq*7rwf2fUW7^i-yql$xpxE5EWuM?K^@@1!eV*IqOk z$y)N*$$jt2iho-kL(5ih^MW05%9S0TTeaG*l-574IWKtKo|)V`P@_2Z-qGAGlwUt? zF=;hN^{DDoEARNksss+M&~6%0p@bTB0mdrXB2JeEe(tD6$vYYw$!n@SJk(-S_MOfE z^&D_lUC0*(59;`Vp)l$tpXKl*GUR}f_@{Jd*O7?{@ zjOR^|#S4pJwngoe-W59UBL>_s7(?Y?6~Q%7tS1jfVPGA>?CYRVGb}t^B#QhBs(4MW zLbv9CU``cG6diBCIPI#`KIq*TMch%o=Zg6W-w{jNmV@oi?$G@ z_ui&ah6;0yShxkIFhQ5US-ZPbXQz|JH5jO)E>m1bT}F*>_Ac0@T?#QUNd)U5pxNE< z7?yxr8(^5AG0b5V_x3|=q`}fRN_aj42NQB5v}!lHT0k<-I^{#Zpw?C*pcm*eyV3Ox z#m;pY>LZMp^WRit`<7(1HAB9^o_(Cg+JYdsAo?k(j3(k`(rUc19#YVL9LzjaEN7-k zM&{*G5*&t$s+NbaEmO1|gXIt5nxhr6jl(f;g33Y338*mfV{eW?*GVWdO_ehFgTE5P zFAmXj5+*}bhBR49l^nQt0gS@NHW)4DpMrhHCc3(F;N;$EvbggD95EzjvIw04S?@e0x_*X5ChX18qfWKh(?geILJw3ho%@}N_MN3j z`FkPW5M_c`Z!v@nD;L?ngPWoIf?l6R-~zNVtiPlOh&lIYuk;ayPuUxX_72)rg8g6) zA6dk<%XF7{ysmk$bY_Y;{09s(REAXcuU#kAo!4Qv-sKYOLbMdpV%cGseWcKvF?55v zA}yD3=o+Bcw5zndbtXf+@cs>cy~`r`Q~ME zP;8u*vH|MZ>Q+dM>^5YJ8e7kU|K+Hu#t-GhVtFRSW8;0=qy3r0^R|388eJVQSkSj- zLz*yAW=?bfiw$p(Bfj#ni^k+oJ~=VSn2g>Q+Vy{;s^DYHZ#=aSystem.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 - gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k - hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -137,6 +128,15 @@ t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 2CVVWYKhQwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 + gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k + hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC @@ -229,6 +229,18 @@ t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 2CVVWYKhQwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAASBJREFUOE+lU7ERwjAMFCOwQmbJCKFIQQtFGorccS5oUnApU9B4hayQFViBFVgh/Ecm + Z8cmcAd3wlEkvaV/ZTOOo/z1I8DbRIoBtvXfLeJ2GZuLtZMCf9c2BYDYgfEfACxATBYlSvEUOX0FaEUI + YPtF62ft7rY+go5hHgrS7NxYWy2uCRzxE3DgCnKRjskP56Orkv45yU2asKMbpcPJ2839ozKfJTMgbSKU + t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw + DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9 + 2CVVWYKhQwAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 0889706b..9d46a3cd 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -555,6 +555,13 @@ namespace Volian.Controls.Library OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(title, sect.SectionConfig)); } } + private void OpenProperties(StepInfo stpinfo) + { + using (Step stp = stpinfo.Get()) + { + } + } + #endregion #region OpenNode private void tv_KeyPress(object sender, KeyPressEventArgs e)