This commit is contained in:
Kathy Ruffing 2012-02-28 15:17:44 +00:00
parent eecafd42db
commit 0e8d0d6b4d
2 changed files with 20 additions and 13 deletions

View File

@ -65,19 +65,24 @@ namespace Volian.Controls.Library
} }
_MyEditItem = value; _MyEditItem = value;
CurItemInfo = value.MyItemInfo; 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 // only change all at level if all substeps are of same type
bool allSameType = true; //bool allSameType = true;
ItemInfo itmp = CurItemInfo.FirstSibling; //ItemInfo itmp = CurItemInfo.FirstSibling;
while (itmp != null) //while (itmp != null)
{ //{
if (CurItemInfo.MyContent.Type != itmp.MyContent.Type) // if (CurItemInfo.MyContent.Type != itmp.MyContent.Type)
{ // {
allSameType = false; // allSameType = false;
break; // break;
} // }
itmp = itmp.NextItem; // itmp = itmp.NextItem;
} //}
cbChgAll.Checked = allSameType; cbChgAll.Checked = false;
TagsFillIn(); TagsFillIn();
} }
} }

View File

@ -150,7 +150,9 @@ namespace Volian.Controls.Library
if (MyItemInfo != null) if (MyItemInfo != null)
{ {
ItemInfo.ResetTabString(MyID); 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; lblTab.Text = tabString;
// calculate the width based upon characters per inch considering user's DPI // calculate the width based upon characters per inch considering user's DPI
int cpi = MyItemInfo.IsStep ? (int)MyItemInfo.FormatStepData.TabData.Font.CPI : 12; int cpi = MyItemInfo.IsStep ? (int)MyItemInfo.FormatStepData.TabData.Font.CPI : 12;