diff --git a/PROMS/Volian.Controls.Library/DisplayTabRibbon.cs b/PROMS/Volian.Controls.Library/DisplayTabRibbon.cs index 0a70a76e..470c4d92 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabRibbon.cs @@ -153,16 +153,31 @@ namespace Volian.Controls.Library { _MyDisplayRTB.SetSelectedCase('T'); } + //public event DisplayRTBLinkEvent LinkInsertTran; + //private void OnLinkInsertTran(object sender, LinkClickedEventArgs args) + //{ + // _LinkClickedEventArgs = args; + // if (LinkInsertTran != null) LinkInsertTran(sender, args); + //} private void btnInsTrans_Click(object sender, EventArgs e) { // see if user is positioned 'on' a transition within the rtb, if so do a modify, otherwise, // insert transition. - + DisplayTabPanel tmp = Parent as DisplayTabPanel; + tmp.MyTabControl.OnLinkModifyTran(this, new DisplayLinkEventArgs(_MyDisplayItem, null)); } private void btnInsHrdSpc_Click(object sender, EventArgs e) { _MyDisplayRTB.InsertSymbol(@"\u160?"); } + + private void btnInsRO_Click(object sender, EventArgs e) + { + // see if user is positioned 'on' an RO within the rtb, if so do a modify, otherwise, + // insert transition. + DisplayTabPanel tmp = Parent as DisplayTabPanel; + tmp.MyTabControl.OnLinkModifyRO(this, new DisplayLinkEventArgs(_MyDisplayItem, null)); + } } } diff --git a/PROMS/Volian.Controls.Library/DisplayTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/DisplayTabRibbon.designer.cs index fd503c0f..1d04361e 100644 Binary files a/PROMS/Volian.Controls.Library/DisplayTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/DisplayTabRibbon.designer.cs differ diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs index a7bfa13c..fc50c805 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs @@ -34,17 +34,17 @@ namespace Volian.Controls.Library this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel(); this.listBoxTranFmt = new System.Windows.Forms.ListBox(); this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo(); this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbTranProcs = new System.Windows.Forms.ComboBox(); this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbTranSects = new System.Windows.Forms.ComboBox(); this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tvTran = new Volian.Controls.Library.vlnTreeView3(); this.pnlTranStepBtns = new System.Windows.Forms.Panel(); this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX(); this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX(); this.btnUp1 = new DevComponents.DotNetBar.ButtonX(); - this.tvTran = new Volian.Controls.Library.vlnTreeView3(); - this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo(); this.groupPanelBtns.SuspendLayout(); this.groupPanelTranFmt.SuspendLayout(); this.groupPanelTransitionSets.SuspendLayout(); @@ -188,6 +188,16 @@ namespace Volian.Controls.Library this.groupPanelTransitionSets.TabIndex = 31; this.groupPanelTransitionSets.Text = "Select Procedure Set"; // + // vlnTreeComboSets + // + this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill; + this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0); + this.vlnTreeComboSets.Name = "vlnTreeComboSets"; + this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21); + this.vlnTreeComboSets.TabIndex = 33; + this.vlnTreeComboSets.Value = null; + this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing); + // // groupPanelTransitionProcs // this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control; @@ -306,6 +316,16 @@ namespace Volian.Controls.Library this.groupPanelTranstionSteps.TabIndex = 34; this.groupPanelTranstionSteps.Text = "Select Step"; // + // tvTran + // + this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill; + this.tvTran.HideSelection = false; + this.tvTran.Location = new System.Drawing.Point(0, 46); + this.tvTran.Name = "tvTran"; + this.tvTran.Size = new System.Drawing.Size(370, 312); + this.tvTran.TabIndex = 31; + this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect); + // // pnlTranStepBtns // this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip); @@ -351,26 +371,6 @@ namespace Volian.Controls.Library this.btnUp1.TabIndex = 30; this.btnUp1.Click += new System.EventHandler(this.btnUp1_Click); // - // tvTran - // - this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill; - this.tvTran.HideSelection = false; - this.tvTran.Location = new System.Drawing.Point(0, 46); - this.tvTran.Name = "tvTran"; - this.tvTran.Size = new System.Drawing.Size(370, 312); - this.tvTran.TabIndex = 31; - this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect); - // - // vlnTreeComboSets - // - this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill; - this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0); - this.vlnTreeComboSets.Name = "vlnTreeComboSets"; - this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21); - this.vlnTreeComboSets.TabIndex = 33; - this.vlnTreeComboSets.Value = null; - this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing); - // // DisplayTransition // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index 17b09138..af06901f 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -15,7 +15,6 @@ namespace Volian.Controls.Library public partial class DisplayTransition : UserControl { #region Properties - private int _TranFmtIndx = -1; // stores selected transition format private ItemInfo _CurItemFrom; // stores what item transition is 'from' private TransitionInfo _CurTrans; // if modify, this is transition to modify @@ -23,19 +22,22 @@ namespace Volian.Controls.Library { get { return _CurTrans; } set - { - _CurTrans = value; - if (_CurTrans == null) // Insert a transition + { + if (!Visible) return; + if (value == null) // Insert a transition { if (MyRTB == null) return; + if (_CurTrans == value && _CurItemFrom == MyRTB.MyItem) return; _CurItemFrom = MyRTB.MyItem; _TranFmtIndx = 0; } - else // Modify a transition + else // Modify a transition { - _TranFmtIndx = _CurTrans.TranType; + if (_CurTrans == value) return; + _TranFmtIndx = value.TranType; _CurItemFrom = MyRTB.MyItem; } + _CurTrans = value; _SavCurItemFrom = _CurItemFrom; _SavTranFmtIndx = _TranFmtIndx; TransitionFillIn(); @@ -60,7 +62,30 @@ namespace Volian.Controls.Library public DisplayRTB MyRTB { get { return _MyRTB; } - set { _MyRTB = value; } + set + { + if (!Visible) return; + // add or remove events for + if (_MyRTB != null) + _MyRTB.LinkChanged -= new DisplayRTBLinkEvent(_MyRTB_LinkChanged); + if (value == null) return; + _MyRTB = value; + _MyRTB.LinkChanged += new DisplayRTBLinkEvent(_MyRTB_LinkChanged); + if (_MyRTB.MyLinkText == null) + { + CurTrans = null; + } + } + } + void _MyRTB_LinkChanged(object sender, LinkClickedEventArgs e) + { + if (_MyRTB.MyLinkText == null) + CurTrans = null; + else + { + DisplayLinkEventArgs tmp = new DisplayLinkEventArgs(null, e); + CurTrans = tmp.MyTransition; + } } private ItemInfo _CurrentItemProcedure; // the selected item's procedure private ItemInfo _CurrentToProcedure; // the 'to' location's procedure (may be same as _CurrentItemProcedure)