From 7ea8e04e41e5960f7a437188cbd11e419553896c Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 26 Apr 2011 12:00:22 +0000 Subject: [PATCH] --- .../DisplayTransition.Designer.cs | 4 ---- PROMS/Volian.Controls.Library/DisplayTransition.cs | 9 ++++++++- PROMS/Volian.Controls.Library/DisplayTransition.resx | 3 --- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs index 9e23130f..76ad163a 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs @@ -105,7 +105,6 @@ namespace Volian.Controls.Library // this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnTranCancel.AutoSize = true; - this.btnTranCancel.CallBasePaintBackground = true; this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right; this.btnTranCancel.Location = new System.Drawing.Point(407, 0); @@ -122,7 +121,6 @@ namespace Volian.Controls.Library // this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnTranSave.AutoSize = true; - this.btnTranSave.CallBasePaintBackground = true; this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left; this.btnTranSave.Location = new System.Drawing.Point(0, 0); @@ -469,7 +467,6 @@ namespace Volian.Controls.Library // btnTranRangeClear // this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnTranRangeClear.CallBasePaintBackground = true; this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left; this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0); @@ -484,7 +481,6 @@ namespace Volian.Controls.Library // btnUp1 // this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnUp1.CallBasePaintBackground = true; this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS; this.btnUp1.Location = new System.Drawing.Point(280, 0); diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index 62c8d183..764bd491 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -678,9 +678,16 @@ namespace Volian.Controls.Library { _CurrentProcedure = _CurrentItemProcedure; cbTranProcsFillIn(_CurrentProcedure); + ItemInfo tmpitm = _CurItemFrom; + ItemInfo secitm = null; + while (tmpitm.MyContent.Type != 0) // find current section + { + if (tmpitm.MyContent.Type >= 10000 && tmpitm.MyContent.Type < 20000) secitm = tmpitm; + tmpitm = tmpitm.MyParent; + } int sectstartid = FindSectionStart(_CurrentProcedure); IList chldrn = _CurrentProcedure.GetChildren(); - if (chldrn != null && chldrn.Count > 0) cbTranSectsFillIn((ItemInfo)chldrn[0], sectstartid); + if (chldrn != null && chldrn.Count > 0) cbTranSectsFillIn((ItemInfo)chldrn[0], secitm==null?sectstartid:secitm.ItemID); //sectstartid); } _TranFmtIndx = listBoxTranFmt.SelectedIndex; groupPanelTranFmt.Style.BackColor = (_CurTrans == null && _TranFmtIndx == 0) ? Color.Yellow : Color.Orange; diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.resx b/PROMS/Volian.Controls.Library/DisplayTransition.resx index e95f0692..c766cbd0 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.resx +++ b/PROMS/Volian.Controls.Library/DisplayTransition.resx @@ -120,9 +120,6 @@ 17, 17 - - 17, 17 - This allows you to select the procedure set that the transition points to, if the selected transition format allows for the transition to point to another set. If the format does NOT allow for pointing to another set, a selection will not be available.