From 0e8d0d6b4d2c9a0ec15b2db656a2862bcdfd4cdf Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 28 Feb 2012 15:17:44 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/DisplayTags.cs | 29 ++++++++++++-------- PROMS/Volian.Controls.Library/RTBItem.cs | 4 ++- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index 205d8410..3254c587 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -65,19 +65,24 @@ namespace Volian.Controls.Library } _MyEditItem = value; CurItemInfo = value.MyItemInfo; + // originally the change all (for step type) checkbox was initialized based + // on whether all steps at level were same type, i.e. if same type, default + // it to checked. This may confuse the user, so we decided to always default + // to not checked. The code was left in here in case that decision is changed. + // MRC, JSJ & KBR were in on discussion on 2/27/12: // only change all at level if all substeps are of same type - bool allSameType = true; - ItemInfo itmp = CurItemInfo.FirstSibling; - while (itmp != null) - { - if (CurItemInfo.MyContent.Type != itmp.MyContent.Type) - { - allSameType = false; - break; - } - itmp = itmp.NextItem; - } - cbChgAll.Checked = allSameType; + //bool allSameType = true; + //ItemInfo itmp = CurItemInfo.FirstSibling; + //while (itmp != null) + //{ + // if (CurItemInfo.MyContent.Type != itmp.MyContent.Type) + // { + // allSameType = false; + // break; + // } + // itmp = itmp.NextItem; + //} + cbChgAll.Checked = false; TagsFillIn(); } } diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs index ceecd62e..f213fc36 100644 --- a/PROMS/Volian.Controls.Library/RTBItem.cs +++ b/PROMS/Volian.Controls.Library/RTBItem.cs @@ -150,7 +150,9 @@ namespace Volian.Controls.Library if (MyItemInfo != null) { ItemInfo.ResetTabString(MyID); - string tabString = MyItemInfo.MyTab.CleanText; + string tabString = MyItemInfo.IsSection?MyItemInfo.DisplayNumber.PadRight(MyItemInfo.MyTab.CleanText.Length):MyItemInfo.MyTab.CleanText; + //string tabString = /*MyItemInfo.IsSection ? MyItemInfo.DisplayNumber : */ MyItemInfo.MyTab.CleanText; + lblTab.Text = tabString; // calculate the width based upon characters per inch considering user's DPI int cpi = MyItemInfo.IsStep ? (int)MyItemInfo.FormatStepData.TabData.Font.CPI : 12;